From 175ced2c8a3cd50c8a6ca818cd2d50c422970654 Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Sat, 1 Dec 2012 01:06:07 +0900 Subject: [PATCH] go.net/ipv4: remove arguments from example functions The testing packege expects that Example functions in each package don't take any arguments. Will do so for the safety. R=iant, dave, minux.ma, adg CC=golang-dev https://golang.org/cl/6591076 --- ipv4/example_test.go | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/ipv4/example_test.go b/ipv4/example_test.go index 6d7d349a..500d1254 100644 --- a/ipv4/example_test.go +++ b/ipv4/example_test.go @@ -222,14 +222,45 @@ func ExampleIPOSPFListener() { } } -func _ExampleWriteIPOSPFHello(c *ipv4.RawConn, ifs []*net.Interface) { - hello := make([]byte, OSPFHelloHeaderLen) +func ExampleWriteIPOSPFHello() { + var ifs []*net.Interface + en0, err := net.InterfaceByName("en0") + if err != nil { + log.Fatal(err) + } + ifs = append(ifs, en0) + en1, err := net.InterfaceByIndex(911) + if err != nil { + log.Fatal(err) + } + ifs = append(ifs, en1) + c, err := net.ListenPacket("ip4:89", "0.0.0.0") + if err != nil { + log.Fatal(err) + } + defer c.Close() + + r, err := ipv4.NewRawConn(c) + if err != nil { + log.Fatal(err) + } + for _, ifi := range ifs { + err := r.JoinGroup(ifi, &net.IPAddr{IP: AllSPFRouters}) + if err != nil { + log.Fatal(err) + } + err = r.JoinGroup(ifi, &net.IPAddr{IP: AllDRouters}) + if err != nil { + log.Fatal(err) + } + } + + hello := make([]byte, OSPFHelloHeaderLen) ospf := make([]byte, OSPFHeaderLen) ospf[0] = OSPF_VERSION ospf[1] = OSPF_TYPE_HELLO ospf = append(ospf, hello...) - iph := &ipv4.Header{} iph.Version = ipv4.Version iph.Len = ipv4.HeaderLen @@ -240,11 +271,11 @@ func _ExampleWriteIPOSPFHello(c *ipv4.RawConn, ifs []*net.Interface) { iph.Dst = AllSPFRouters for _, ifi := range ifs { - err := c.SetMulticastInterface(ifi) + err := r.SetMulticastInterface(ifi) if err != nil { return } - err = c.Write(iph, ospf, nil) + err = r.Write(iph, ospf, nil) if err != nil { return }