From d812180ce06efc6d2cdacc8a648cd2dde54f362c Mon Sep 17 00:00:00 2001 From: Pablu23 Date: Mon, 27 Nov 2023 14:38:51 +0100 Subject: [PATCH] Added Ip Address for request to cli removed print for speed --- Makefile | 5 ++++- internal/client/client.go | 8 ++++---- internal/server/server.go | 2 +- main.go | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3145bd8..aeb07d3 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,7 @@ server: go run main.go server test: - go run main.go client testFiles/testFile \ No newline at end of file + go run main.go client testFiles/testFile 0.0.0.0:13374 + +win: + GOOS=windows GOARCH=amd64 go build -o bin/app-amd64.exe main.go \ No newline at end of file diff --git a/internal/client/client.go b/internal/client/client.go index cd7db7c..99baf72 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -34,7 +34,7 @@ func ReceivePacket(key [32]byte, conn *net.UDPConn) common.Packet { panic(err) } - fmt.Printf("Decrypted Packet, Sync: %v, Type: %v\n", pck.Sync, pck.Flag) + // fmt.Printf("Decrypted Packet, Sync: %v, Type: %v\n", pck.Sync, pck.Flag) return pck } @@ -63,7 +63,7 @@ func ReceivePacketWithTimeout(key [32]byte, conn *net.UDPConn) (common.Packet, b return pck, true } -func GetFile(path string) { +func GetFile(path string, address string) { request := common.NewRequest(path) k := make([]byte, 32) @@ -74,8 +74,8 @@ func GetFile(path string) { key := [32]byte(k) keyExchangePck := common.NewRsaPacket(request.Sid, key) - udpAddr, err := net.ResolveUDPAddr("udp", "0.0.0.0:13374") - // udpAddr, err := net.ResolveUDPAddr("udp", "192.168.2.145:13374") + // udpAddr, err := net.ResolveUDPAddr("udp", "0.0.0.0:13374") + udpAddr, err := net.ResolveUDPAddr("udp", address) if err != nil { fmt.Println(err) diff --git a/internal/server/server.go b/internal/server/server.go index 5ad1016..649b9be 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -40,7 +40,7 @@ func New() (*Server, error) { func (server *Server) sendPacket(conn *net.UDPConn, addr *net.UDPAddr, pck *common.Packet) { key := server.sessions[pck.Sid].key - fmt.Printf("Sending Packet, Sync: %v, Type: %v\n", pck.Sync, pck.Flag) + // fmt.Printf("Sending Packet, Sync: %v, Type: %v\n", pck.Sync, pck.Flag) secPck := common.NewSymetricSecurePacket(key, pck) if _, err := conn.WriteToUDP(secPck.ToBytes(), addr); err != nil { diff --git a/main.go b/main.go index 9cbd1d3..45a6e90 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,6 @@ func main() { } server.Serve() } else { - client.GetFile(os.Args[2]) + client.GetFile(os.Args[2], os.Args[3]) } }