summaryrefslogtreecommitdiff
path: root/src/lib/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/net')
-rw-r--r--src/lib/net/dialgoogle_test.go4
-rw-r--r--src/lib/net/dnsclient.go6
-rw-r--r--src/lib/net/dnsmsg.go4
-rw-r--r--src/lib/net/ip_test.go22
-rw-r--r--src/lib/net/parse.go2
-rw-r--r--src/lib/net/port_test.go58
6 files changed, 48 insertions, 48 deletions
diff --git a/src/lib/net/dialgoogle_test.go b/src/lib/net/dialgoogle_test.go
index de7158a7b..0bf3eae9a 100644
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/lib/net/dialgoogle_test.go
@@ -50,7 +50,7 @@ func doDialTCP(t *testing.T, network, addr string) {
fd.Close()
}
-var googleaddrs = []string {
+var googleaddrs = []string (
"74.125.19.99:80",
"www.google.com:80",
"74.125.19.99:http",
@@ -62,7 +62,7 @@ var googleaddrs = []string {
"[0:0:0:0:000000:ffff:74.125.19.99]:80",
"[0:0:0:0:0:ffff::74.125.19.99]:80",
"[2001:4860:0:2001::68]:80" // ipv6.google.com; removed if ipv6 flag not set
-}
+)
func TestDialGoogle(t *testing.T) {
// If no ipv6 tunnel, don't try the last address.
diff --git a/src/lib/net/dnsclient.go b/src/lib/net/dnsclient.go
index 072ffb3e4..22d2684aa 100644
--- a/src/lib/net/dnsclient.go
+++ b/src/lib/net/dnsclient.go
@@ -46,9 +46,9 @@ func _Exchange(cfg *DNS_Config, c Conn, name string) (m *DNS_Msg, err *os.Error)
}
out := new(DNS_Msg);
out.id = 0x1234;
- out.question = []DNS_Question{
- DNS_Question{ name, DNS_TypeA, DNS_ClassINET }
- };
+ out.question = []DNS_Question(
+ DNS_Question( name, DNS_TypeA, DNS_ClassINET )
+ );
out.recursion_desired = true;
msg, ok := out.Pack();
if !ok {
diff --git a/src/lib/net/dnsmsg.go b/src/lib/net/dnsmsg.go
index b93a9c375..c82f345d2 100644
--- a/src/lib/net/dnsmsg.go
+++ b/src/lib/net/dnsmsg.go
@@ -197,7 +197,7 @@ type DNS_RR_A struct {
// packing sequence.
// Map of constructors for each RR wire type.
-var rr_mk = map[int] func()DNS_RR {
+var rr_mk = map[int] func()DNS_RR (
DNS_TypeCNAME: func() DNS_RR { return new(DNS_RR_CNAME) },
DNS_TypeHINFO: func() DNS_RR { return new(DNS_RR_HINFO) },
DNS_TypeMB: func() DNS_RR { return new(DNS_RR_MB) },
@@ -210,7 +210,7 @@ var rr_mk = map[int] func()DNS_RR {
DNS_TypeSOA: func() DNS_RR { return new(DNS_RR_SOA) },
DNS_TypeTXT: func() DNS_RR { return new(DNS_RR_TXT) },
DNS_TypeA: func() DNS_RR { return new(DNS_RR_A) },
-}
+)
// _Pack a domain name s into msg[off:].
// Domain names are a sequence of counted strings
diff --git a/src/lib/net/ip_test.go b/src/lib/net/ip_test.go
index 9788db243..f8d8bd2ba 100644
--- a/src/lib/net/ip_test.go
+++ b/src/lib/net/ip_test.go
@@ -10,7 +10,7 @@ import (
)
func _IPv4(a, b, c, d byte) []byte {
- return []byte{ 0,0,0,0, 0,0,0,0, 0,0,255,255, a,b,c,d }
+ return []byte( 0,0,0,0, 0,0,0,0, 0,0,255,255, a,b,c,d )
}
func isEqual(a []byte, b []byte) bool {
@@ -32,16 +32,16 @@ type parseIPTest struct {
in string;
out []byte;
}
-var parseiptests = []parseIPTest {
- parseIPTest{"127.0.1.2", _IPv4(127, 0, 1, 2)},
- parseIPTest{"127.0.0.1", _IPv4(127, 0, 0, 1)},
- parseIPTest{"127.0.0.256", nil},
- parseIPTest{"abc", nil},
- parseIPTest{"::ffff:127.0.0.1", _IPv4(127, 0, 0, 1)},
- parseIPTest{"2001:4860:0:2001::68",
- []byte{0x20,0x01, 0x48,0x60, 0,0, 0x20,0x01, 0,0, 0,0, 0,0, 0x00,0x68}},
- parseIPTest{"::ffff:4a7d:1363", _IPv4(74, 125, 19, 99)},
-}
+var parseiptests = []parseIPTest (
+ parseIPTest("127.0.1.2", _IPv4(127, 0, 1, 2)),
+ parseIPTest("127.0.0.1", _IPv4(127, 0, 0, 1)),
+ parseIPTest("127.0.0.256", nil),
+ parseIPTest("abc", nil),
+ parseIPTest("::ffff:127.0.0.1", _IPv4(127, 0, 0, 1)),
+ parseIPTest("2001:4860:0:2001::68",
+ []byte(0x20,0x01, 0x48,0x60, 0,0, 0x20,0x01, 0,0, 0,0, 0,0, 0x00,0x68)),
+ parseIPTest("::ffff:4a7d:1363", _IPv4(74, 125, 19, 99)),
+)
func TestParseIP(t *testing.T) {
for i := 0; i < len(parseiptests); i++ {
diff --git a/src/lib/net/parse.go b/src/lib/net/parse.go
index 0477b349f..a1cf10c4a 100644
--- a/src/lib/net/parse.go
+++ b/src/lib/net/parse.go
@@ -60,7 +60,7 @@ func _Open(name string) *_File {
if err != nil {
return nil
}
- return &_File{fd, make([]byte, 1024)[0:0]};
+ return &_File(fd, make([]byte, 1024)[0:0]);
}
func _ByteIndex(s string, c byte) int {
diff --git a/src/lib/net/port_test.go b/src/lib/net/port_test.go
index f6123fd8d..f48ced075 100644
--- a/src/lib/net/port_test.go
+++ b/src/lib/net/port_test.go
@@ -16,37 +16,37 @@ type portTest struct {
ok bool;
}
-var porttests = []portTest {
- portTest{ "tcp", "echo", 7, true },
- portTest{ "tcp", "discard", 9, true },
- portTest{ "tcp", "systat", 11, true },
- portTest{ "tcp", "daytime", 13, true },
- portTest{ "tcp", "chargen", 19, true },
- portTest{ "tcp", "ftp-data", 20, true },
- portTest{ "tcp", "ftp", 21, true },
- portTest{ "tcp", "ssh", 22, true },
- portTest{ "tcp", "telnet", 23, true },
- portTest{ "tcp", "smtp", 25, true },
- portTest{ "tcp", "time", 37, true },
- portTest{ "tcp", "domain", 53, true },
- portTest{ "tcp", "gopher", 70, true },
- portTest{ "tcp", "finger", 79, true },
- portTest{ "tcp", "http", 80, true },
+var porttests = []portTest (
+ portTest( "tcp", "echo", 7, true ),
+ portTest( "tcp", "discard", 9, true ),
+ portTest( "tcp", "systat", 11, true ),
+ portTest( "tcp", "daytime", 13, true ),
+ portTest( "tcp", "chargen", 19, true ),
+ portTest( "tcp", "ftp-data", 20, true ),
+ portTest( "tcp", "ftp", 21, true ),
+ portTest( "tcp", "ssh", 22, true ),
+ portTest( "tcp", "telnet", 23, true ),
+ portTest( "tcp", "smtp", 25, true ),
+ portTest( "tcp", "time", 37, true ),
+ portTest( "tcp", "domain", 53, true ),
+ portTest( "tcp", "gopher", 70, true ),
+ portTest( "tcp", "finger", 79, true ),
+ portTest( "tcp", "http", 80, true ),
- portTest{ "udp", "echo", 7, true },
- portTest{ "udp", "tacacs", 49, true },
- portTest{ "udp", "tftp", 69, true },
- portTest{ "udp", "bootpc", 68, true },
- portTest{ "udp", "bootps", 67, true },
- portTest{ "udp", "domain", 53, true },
- portTest{ "udp", "ntp", 123, true },
- portTest{ "udp", "snmp", 161, true },
- portTest{ "udp", "syslog", 514, true },
- portTest{ "udp", "nfs", 2049, true },
+ portTest( "udp", "echo", 7, true ),
+ portTest( "udp", "tacacs", 49, true ),
+ portTest( "udp", "tftp", 69, true ),
+ portTest( "udp", "bootpc", 68, true ),
+ portTest( "udp", "bootps", 67, true ),
+ portTest( "udp", "domain", 53, true ),
+ portTest( "udp", "ntp", 123, true ),
+ portTest( "udp", "snmp", 161, true ),
+ portTest( "udp", "syslog", 514, true ),
+ portTest( "udp", "nfs", 2049, true ),
- portTest{ "--badnet--", "zzz", 0, false },
- portTest{ "tcp", "--badport--", 0, false },
-}
+ portTest( "--badnet--", "zzz", 0, false ),
+ portTest( "tcp", "--badport--", 0, false ),
+)
func TestLookupPort(t *testing.T) {
for i := 0; i < len(porttests); i++ {
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-01 22:20:05 +0000