Merge tag 'upstream/1.4' into debian-experimental

* tag 'upstream/1.4':
  Imported Upstream version 1.4

1 files changed, 24 insertions, 0 deletions

diff --git a/src/net/port.go b/src/net/port.go
new file mode 100644
index 000000000..c24f4ed5b
--- /dev/null
+++ b/src/net/port.go
@@ -0,0 +1,24 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Network service port manipulations
+
+package net
+
+// parsePort parses port as a network service port number for both
+// TCP and UDP.
+func parsePort(net, port string) (int, error) {
+	p, i, ok := dtoi(port, 0)
+	if !ok || i != len(port) {
+		var err error
+		p, err = LookupPort(net, port)
+		if err != nil {
+			return 0, err
+		}
+	}
+	if p < 0 || p > 0xFFFF {
+		return 0, &AddrError{"invalid port", port}
+	}
+	return p, nil
+}