diff options
Diffstat (limited to 'libgo/go/net/ipraw_test.go')
-rw-r--r-- | libgo/go/net/ipraw_test.go | 244 |
1 files changed, 33 insertions, 211 deletions
diff --git a/libgo/go/net/ipraw_test.go b/libgo/go/net/ipraw_test.go index 92dc8dc5694..5d86a9d0316 100644 --- a/libgo/go/net/ipraw_test.go +++ b/libgo/go/net/ipraw_test.go @@ -5,17 +5,18 @@ package net import ( - "bytes" - "fmt" - "os" "reflect" - "runtime" "testing" - "time" ) +// The full stack test cases for IPConn have been moved to the +// following: +// golang.org/x/net/ipv4 +// golang.org/x/net/ipv6 +// golang.org/x/net/icmp + type resolveIPAddrTest struct { - net string + network string litAddrOrName string addr *IPAddr err error @@ -37,210 +38,41 @@ var resolveIPAddrTests = []resolveIPAddrTest{ {"", "127.0.0.1", &IPAddr{IP: IPv4(127, 0, 0, 1)}, nil}, // Go 1.0 behavior {"", "::1", &IPAddr{IP: ParseIP("::1")}, nil}, // Go 1.0 behavior + {"ip4:icmp", "", &IPAddr{}, nil}, + {"l2tp", "127.0.0.1", nil, UnknownNetworkError("l2tp")}, {"l2tp:gre", "127.0.0.1", nil, UnknownNetworkError("l2tp:gre")}, {"tcp", "1.2.3.4:123", nil, UnknownNetworkError("tcp")}, } -func init() { - if ifi := loopbackInterface(); ifi != nil { - index := fmt.Sprintf("%v", ifi.Index) - resolveIPAddrTests = append(resolveIPAddrTests, []resolveIPAddrTest{ - {"ip6", "fe80::1%" + ifi.Name, &IPAddr{IP: ParseIP("fe80::1"), Zone: zoneToString(ifi.Index)}, nil}, - {"ip6", "fe80::1%" + index, &IPAddr{IP: ParseIP("fe80::1"), Zone: index}, nil}, - }...) - } - if ips, err := LookupIP("localhost"); err == nil && len(ips) > 1 && supportsIPv4 && supportsIPv6 { - resolveIPAddrTests = append(resolveIPAddrTests, []resolveIPAddrTest{ - {"ip", "localhost", &IPAddr{IP: IPv4(127, 0, 0, 1)}, nil}, - {"ip4", "localhost", &IPAddr{IP: IPv4(127, 0, 0, 1)}, nil}, - {"ip6", "localhost", &IPAddr{IP: IPv6loopback}, nil}, - }...) - } -} - -func skipRawSocketTest(t *testing.T) (skip bool, skipmsg string) { - skip, skipmsg, err := skipRawSocketTests() - if err != nil { - t.Fatal(err) - } - return skip, skipmsg -} - func TestResolveIPAddr(t *testing.T) { - switch runtime.GOOS { - case "nacl": - t.Skipf("skipping test on %q", runtime.GOOS) + if !testableNetwork("ip+nopriv") { + t.Skip("ip+nopriv test") } - for _, tt := range resolveIPAddrTests { - addr, err := ResolveIPAddr(tt.net, tt.litAddrOrName) + origTestHookLookupIP := testHookLookupIP + defer func() { testHookLookupIP = origTestHookLookupIP }() + testHookLookupIP = lookupLocalhost + + for i, tt := range resolveIPAddrTests { + addr, err := ResolveIPAddr(tt.network, tt.litAddrOrName) if err != tt.err { - t.Fatalf("ResolveIPAddr(%v, %v) failed: %v", tt.net, tt.litAddrOrName, err) + t.Errorf("#%d: %v", i, err) } else if !reflect.DeepEqual(addr, tt.addr) { - t.Fatalf("got %#v; expected %#v", addr, tt.addr) + t.Errorf("#%d: got %#v; want %#v", i, addr, tt.addr) } - } -} - -var icmpEchoTests = []struct { - net string - laddr string - raddr string -}{ - {"ip4:icmp", "0.0.0.0", "127.0.0.1"}, - {"ip6:ipv6-icmp", "::", "::1"}, -} - -func TestConnICMPEcho(t *testing.T) { - if skip, skipmsg := skipRawSocketTest(t); skip { - t.Skip(skipmsg) - } - - for i, tt := range icmpEchoTests { - net, _, err := parseNetwork(tt.net) if err != nil { - t.Fatalf("parseNetwork failed: %v", err) - } - if net == "ip6" && !supportsIPv6 { continue } - - c, err := Dial(tt.net, tt.raddr) - if err != nil { - t.Fatalf("Dial failed: %v", err) - } - c.SetDeadline(time.Now().Add(100 * time.Millisecond)) - defer c.Close() - - typ := icmpv4EchoRequest - if net == "ip6" { - typ = icmpv6EchoRequest - } - xid, xseq := os.Getpid()&0xffff, i+1 - wb, err := (&icmpMessage{ - Type: typ, Code: 0, - Body: &icmpEcho{ - ID: xid, Seq: xseq, - Data: bytes.Repeat([]byte("Go Go Gadget Ping!!!"), 3), - }, - }).Marshal() + rtaddr, err := ResolveIPAddr(addr.Network(), addr.String()) if err != nil { - t.Fatalf("icmpMessage.Marshal failed: %v", err) - } - if _, err := c.Write(wb); err != nil { - t.Fatalf("Conn.Write failed: %v", err) - } - var m *icmpMessage - rb := make([]byte, 20+len(wb)) - for { - if _, err := c.Read(rb); err != nil { - t.Fatalf("Conn.Read failed: %v", err) - } - if net == "ip4" { - rb = ipv4Payload(rb) - } - if m, err = parseICMPMessage(rb); err != nil { - t.Fatalf("parseICMPMessage failed: %v", err) - } - switch m.Type { - case icmpv4EchoRequest, icmpv6EchoRequest: - continue - } - break - } - switch p := m.Body.(type) { - case *icmpEcho: - if p.ID != xid || p.Seq != xseq { - t.Fatalf("got id=%v, seqnum=%v; expected id=%v, seqnum=%v", p.ID, p.Seq, xid, xseq) - } - default: - t.Fatalf("got type=%v, code=%v; expected type=%v, code=%v", m.Type, m.Code, typ, 0) + t.Errorf("#%d: %v", i, err) + } else if !reflect.DeepEqual(rtaddr, addr) { + t.Errorf("#%d: got %#v; want %#v", i, rtaddr, addr) } } } -func TestPacketConnICMPEcho(t *testing.T) { - if skip, skipmsg := skipRawSocketTest(t); skip { - t.Skip(skipmsg) - } - - for i, tt := range icmpEchoTests { - net, _, err := parseNetwork(tt.net) - if err != nil { - t.Fatalf("parseNetwork failed: %v", err) - } - if net == "ip6" && !supportsIPv6 { - continue - } - - c, err := ListenPacket(tt.net, tt.laddr) - if err != nil { - t.Fatalf("ListenPacket failed: %v", err) - } - c.SetDeadline(time.Now().Add(100 * time.Millisecond)) - defer c.Close() - - ra, err := ResolveIPAddr(tt.net, tt.raddr) - if err != nil { - t.Fatalf("ResolveIPAddr failed: %v", err) - } - typ := icmpv4EchoRequest - if net == "ip6" { - typ = icmpv6EchoRequest - } - xid, xseq := os.Getpid()&0xffff, i+1 - wb, err := (&icmpMessage{ - Type: typ, Code: 0, - Body: &icmpEcho{ - ID: xid, Seq: xseq, - Data: bytes.Repeat([]byte("Go Go Gadget Ping!!!"), 3), - }, - }).Marshal() - if err != nil { - t.Fatalf("icmpMessage.Marshal failed: %v", err) - } - if _, err := c.WriteTo(wb, ra); err != nil { - t.Fatalf("PacketConn.WriteTo failed: %v", err) - } - var m *icmpMessage - rb := make([]byte, 20+len(wb)) - for { - if _, _, err := c.ReadFrom(rb); err != nil { - t.Fatalf("PacketConn.ReadFrom failed: %v", err) - } - // See BUG section. - //if net == "ip4" { - // rb = ipv4Payload(rb) - //} - if m, err = parseICMPMessage(rb); err != nil { - t.Fatalf("parseICMPMessage failed: %v", err) - } - switch m.Type { - case icmpv4EchoRequest, icmpv6EchoRequest: - continue - } - break - } - switch p := m.Body.(type) { - case *icmpEcho: - if p.ID != xid || p.Seq != xseq { - t.Fatalf("got id=%v, seqnum=%v; expected id=%v, seqnum=%v", p.ID, p.Seq, xid, xseq) - } - default: - t.Fatalf("got type=%v, code=%v; expected type=%v, code=%v", m.Type, m.Code, typ, 0) - } - } -} - -func ipv4Payload(b []byte) []byte { - if len(b) < 20 { - return b - } - hdrlen := int(b[0]&0x0f) << 2 - return b[hdrlen:] -} - var ipConnLocalNameTests = []struct { net string laddr *IPAddr @@ -251,44 +83,34 @@ var ipConnLocalNameTests = []struct { } func TestIPConnLocalName(t *testing.T) { - switch runtime.GOOS { - case "nacl", "plan9", "windows": - t.Skipf("skipping test on %q", runtime.GOOS) - default: - if os.Getuid() != 0 { - t.Skip("skipping test; must be root") - } - } - for _, tt := range ipConnLocalNameTests { + if !testableNetwork(tt.net) { + t.Logf("skipping %s test", tt.net) + continue + } c, err := ListenIP(tt.net, tt.laddr) if err != nil { - t.Fatalf("ListenIP failed: %v", err) + t.Fatal(err) } defer c.Close() if la := c.LocalAddr(); la == nil { - t.Fatal("IPConn.LocalAddr failed") + t.Fatal("should not fail") } } } func TestIPConnRemoteName(t *testing.T) { - switch runtime.GOOS { - case "plan9", "windows": - t.Skipf("skipping test on %q", runtime.GOOS) - default: - if os.Getuid() != 0 { - t.Skip("skipping test; must be root") - } + if !testableNetwork("ip:tcp") { + t.Skip("ip:tcp test") } raddr := &IPAddr{IP: IPv4(127, 0, 0, 1).To4()} c, err := DialIP("ip:tcp", &IPAddr{IP: IPv4(127, 0, 0, 1)}, raddr) if err != nil { - t.Fatalf("DialIP failed: %v", err) + t.Fatal(err) } defer c.Close() if !reflect.DeepEqual(raddr, c.RemoteAddr()) { - t.Fatalf("got %#v, expected %#v", c.RemoteAddr(), raddr) + t.Fatalf("got %#v; want %#v", c.RemoteAddr(), raddr) } } |