From e329da4c31601356cba5c2d5982ac980c82aa7e1 Mon Sep 17 00:00:00 2001 From: Alexander Matson Date: Thu, 16 May 2019 23:57:41 -0400 Subject: [PATCH] simplify package --- src/errfn/errors.go => errfn.go | 2 +- src/p2p/main.go => main.go | 7 ++--- src/peers/peers.go => peers.go | 29 ++++++++++-------- src/p2p/daytime.go | 35 ---------------------- src/p2p/echo.go | 53 --------------------------------- src/p2p/ip.go | 26 ---------------- 6 files changed, 20 insertions(+), 132 deletions(-) rename src/errfn/errors.go => errfn.go (91%) rename src/p2p/main.go => main.go (85%) rename src/peers/peers.go => peers.go (78%) delete mode 100644 src/p2p/daytime.go delete mode 100644 src/p2p/echo.go delete mode 100644 src/p2p/ip.go diff --git a/src/errfn/errors.go b/errfn.go similarity index 91% rename from src/errfn/errors.go rename to errfn.go index e7b5dbf..c58446e 100644 --- a/src/errfn/errors.go +++ b/errfn.go @@ -1,4 +1,4 @@ -package errfn +package main import ( "fmt" diff --git a/src/p2p/main.go b/main.go similarity index 85% rename from src/p2p/main.go rename to main.go index 372431e..26c5cfa 100644 --- a/src/p2p/main.go +++ b/main.go @@ -3,10 +3,9 @@ package main import ( "os" "fmt" - "peers" ) -var lpt []peers.Peer +var lpt []peer func main() { if len(os.Args) <= 1 { @@ -15,12 +14,12 @@ func main() { } // Configure this local node's listening port. - local := peers.Peer{} + local := peer{} local.SetAddr(os.Args[1]) // If a remote peer's port is specified, we want to connect and message it if len(os.Args) == 3 { - remote := peers.Peer{} + remote := peer{} remote.SetAddr(os.Args[2]) local.Connect(remote) } diff --git a/src/peers/peers.go b/peers.go similarity index 78% rename from src/peers/peers.go rename to peers.go index 1d522ba..b4d31df 100644 --- a/src/peers/peers.go +++ b/peers.go @@ -1,30 +1,30 @@ -package peers +package main import ( "net" "os" "fmt" "strings" - "errfn" ) -type Peer struct { +type peer struct { address net.TCPAddr listener net.TCPListener connection net.TCPConn + lpt []peer } -func (p* Peer) SetAddr(port string) { +func (p* peer) SetAddr(port string) { service := ":" + port tcpAddr, err := net.ResolveTCPAddr("tcp4", service) - errfn.Check(err) + Check(err) p.address = *tcpAddr } -func (p* Peer) StartListening() { +func (p* peer) StartListening() { listener, err := net.ListenTCP("tcp", &p.address) - errfn.Check(err) + Check(err) p.listener = *listener @@ -39,20 +39,24 @@ func (p* Peer) StartListening() { } } -func (p* Peer) Connect(remote Peer) { +func (p* peer) Connect(remote peer) { peerconn, err := net.DialTCP("tcp4", nil, &remote.address) - errfn.Check(err) + Check(err) fmt.Println("Found a remote peer") p.connection = *peerconn - _, err = p.connection.Write([]byte("Hello from " + os.Args[1])) - errfn.Check(err) + p.lpt = append(p.lpt, remote) +} + +func (p peer) Version(remote peer) { + _, err := p.connection.Write([]byte("Hello from " + os.Args[1])) + Check(err) var buf [512]byte n, err := p.connection.Read(buf[0:]) - errfn.Check(err) + Check(err) result := string(buf[0:n]) fmt.Println(string(result)) @@ -83,6 +87,5 @@ func handleConnection(conn net.Conn) { return } } - } } diff --git a/src/p2p/daytime.go b/src/p2p/daytime.go deleted file mode 100644 index 7d7a286..0000000 --- a/src/p2p/daytime.go +++ /dev/null @@ -1,35 +0,0 @@ -package main - -// import ( -// "fmt" -// "net" -// "os" -// "time" -// ) -// -// func main() { -// service := ":1200" -// tcpAddr, err := net.ResolveTCPAddr("tcp4", service) -// checkError(err) -// -// listener, err := net.ListenTCP("tcp", tcpAddr) -// checkError(err) -// -// for { -// conn, err := listener.Accept() -// if err != nil { -// continue -// } -// -// daytime := "Hahahaha virgin client vs chad server" + time.Now().String() -// conn.Write([]byte(daytime)) -// conn.Close() -// } -// } -// -// func checkError(err error) { -// if err != nil { -// fmt.Fprintf(os.Stderr, "Fatal error: %s", err.Error()) -// os.Exit(1) -// } -// } diff --git a/src/p2p/echo.go b/src/p2p/echo.go deleted file mode 100644 index 3dbdddc..0000000 --- a/src/p2p/echo.go +++ /dev/null @@ -1,53 +0,0 @@ -package main - -// import ( -// "net" -// "os" -// "fmt" -// ) -// -// func main() { -// service := ":1201" -// tcpAddr, err := net.ResolveTCPAddr("tcp4", service) -// checkError(err) -// -// listener, err := net.ListenTCP("tcp", tcpAddr) -// checkError(err) -// -// for { -// conn, err := listener.Accept() -// if err != nil { -// continue -// } -// -// go handleClient(conn) -// } -// } -// -// func handleClient(conn net.Conn) { -// // close connection on exit -// defer conn.Close() -// -// var buf [512]byte -// -// for { -// // read up to 512 bytes -// n, err := conn.Read(buf[0:]) -// if err != nil { -// return -// } -// -// // write the n bytes read -// _, err2 := conn.Write(buf[0:n]) -// if err2 != nil { -// return -// } -// } -// } -// -// func checkError(err error) { -// if err != nil { -// fmt.Fprintf(os.Stderr, "Fatal error: %s", err.Error()) -// os.Exit(1) -// } -// } diff --git a/src/p2p/ip.go b/src/p2p/ip.go deleted file mode 100644 index da9e82a..0000000 --- a/src/p2p/ip.go +++ /dev/null @@ -1,26 +0,0 @@ -/* IP - */ - -package main - -// import ( -// "net" -// "os" -// "fmt" -// ) -// -// func main() { -// if len(os.Args) != 2 { -// fmt.Fprintf(os.Stderr, "Usage: %s ip-addr\n", os.Args[0]) -// os.Exit(1) -// } -// name := os.Args[1] -// -// addr := net.ParseIP(name) -// if addr == nil { -// fmt.Println("Invalid address") -// } else { -// fmt.Println("The address is ", addr.String()) -// } -// os.Exit(0) -// }