code review 6482044: go.net/ipv4: new package

ipv4/multicast_test.go

 // 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.
 
-// +build darwin freebsd linux openbsd
+// +build darwin freebsd linux netbsd openbsd
 
 package ipv4_test
 
 import (
         "code.google.com/p/go.net/ipv4"
         "net"
         "os"
         "testing"
 )
 
-func TestReadWriteMulticastUDPoIPPayload(t *testing.T) {

[dave_cheney.net, 2012/09/05 06:27:16]

toIPPayload ?

[mikio, 2012/09/06 10:43:48]

changed to IPPayloadUDP.

[mikio, 2012/09/06 10:43:48]

Done.

+func TestReadWriteMulticastIPPayloadUDP(t *testing.T) {
         if testing.Short() || !*testExternal {
                 t.Logf("skipping test to avoid external network")
                 return
         }
 
-        c, err := net.ListenPacket("udp4", "224.0.0.0"+":"+"1024") // see RFC 4727

[dave_cheney.net, 2012/09/05 06:27:16]

Can't this just be "224.0.0.0:1024" ?

[mikio, 2012/09/06 10:43:48]

Done.

+        c, err := net.ListenPacket("udp4", "224.0.0.0:1024") // see RFC 4727
         if err != nil {
                 t.Fatalf("net.ListenPacket failed: %v", err)
         }
         defer c.Close()
 
         ifi := loopbackInterface()
         if ifi == nil {
                 t.Logf("skipping test; an appropriate interface not found")
                 return
         }
-        dst, err := net.ResolveUDPAddr("udp4", "224.0.0.254"+":"+"1024") // see RFC 4727

[dave_cheney.net, 2012/09/05 06:27:16]

ditto

[mikio, 2012/09/06 10:43:48]

Done.

+        dst, err := net.ResolveUDPAddr("udp4", "224.0.0.254:1024") // see RFC 4727
         if err != nil {
                 t.Fatalf("net.ResolveUDPAddr failed: %v", err)
         }
 
         p := ipv4.NewPacketConn(c)
         if err := p.JoinGroup(ifi, dst); err != nil {
                 t.Fatalf("ipv4.PacketConn.JoinGroup on %v failed: %v", ifi, err)
         }
         if err := p.SetMulticastInterface(ifi); err != nil {
                 t.Fatalf("ipv4.PacketConn.SetMulticastInterface failed: %v", err)
         }
         if err := p.SetMulticastLoopback(true); err != nil {
                 t.Fatalf("ipv4.PacketConn.SetMulticastLoopback failed: %v", err)
         }
         runPayloadTransponder(t, p, []byte("HELLO-R-U-THERE"), dst)
 }
 
-func TestReadWriteMulticastICMPoIPPayload(t *testing.T) {
+func TestReadWriteMulticastIPPayloadICMP(t *testing.T) {
         if testing.Short() || !*testExternal {
                 t.Logf("skipping test to avoid external network")
                 return
         }
         if os.Getuid() != 0 {
                 t.Logf("skipping test; must be root")
                 return
         }
 
         c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
@@ skipping 57 matching lines @@
         if err := r.JoinGroup(ifi, dst); err != nil {
                 t.Fatalf("ipv4.RawConn.JoinGroup on %v failed: %v", ifi, err)
         }
         if err := r.SetMulticastInterface(ifi); err != nil {
                 t.Fatalf("ipv4.PacketConn.SetMulticastInterface failed: %v", err)
         }
         id := os.Getpid() & 0xffff
         pld := newICMPEchoRequest(id, 1, 128, []byte("HELLO-R-U-THERE"))
         runDatagramTransponder(t, r, pld, nil, dst)
 }