magic

client/golang/client.go

@@ -3,15 +3,16 @@ package main
 import (
 	//"encoding/base64"
 	"encoding/binary"
-	"errors"
 	"fmt"
-	"net"
+	//"net"
 
 	//"strings"
 	"time"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/pcap"
+
+	"client/utils"
 )
 
 type SaprusHeaderPacket struct {
@@ -75,40 +76,8 @@ func listenDiscoverResponse(addrChan chan string, readyFlag chan int) {
 	return
 }
 
-func toMaxHost(n *net.IPNet) (net.IP, error) {
-	if n.IP.To4() == nil {
-		return net.IP{}, errors.New("IP address is not IPv4")
-	}
-
-	ip := make(net.IP, len(n.IP.To4()))
-	binary.BigEndian.PutUint32(ip,
-		binary.BigEndian.Uint32(n.IP.To4())|^binary.BigEndian.Uint32(net.IP(n.Mask).To4()))
-
-	return ip, nil
-}
-
-func bcastAddresses() []string {
-	var addrs []string = nil
-	interfaceInfo, _ := net.Interfaces()
-	for i := 0; i < len(interfaceInfo); i++ {
-		addr, err := interfaceInfo[i].Addrs()
-		errCheck(err)
-		for j := 0; j < len(addr); j++ {
-			_, ipNet, _ := net.ParseCIDR(addr[j].String())
-			bcast, err := toMaxHost(ipNet)
-
-			if err != nil {
-			} else {
-				addrs = append(addrs, bcast.String())
-			}
-		}
-	}
-
-	return addrs
-}
-
 func main() {
-	sendAddrs := bcastAddresses()
+	sendAddrs := []string{"255.255.255.255"}
 
 	addrChan := make(chan string)
 	readyFlag := make(chan int)
@@ -119,15 +88,9 @@ func main() {
 	<- readyFlag
 
 	for i := 0; i < len(sendAddrs); i++ {
-		remoteAddr := sendAddrs[i] + ":8888"
-		remote, err := net.ResolveUDPAddr("udp4", remoteAddr)
-		errCheck(err)
-		conn, err := net.DialUDP("udp4", nil, remote)
-		errCheck(err)
-		defer conn.Close()
+		c := utils.SocketCall{}
 
-		_, err = conn.Write([]byte(conn.LocalAddr().String() + "here"))
-		errCheck(err)
+		c.SendData("hello")
 	}
 
 	// Listen timeout