From 87356f4f5100756ca63ab612f9e8130b7f84668f Mon Sep 17 00:00:00 2001 From: Pablu23 <43807157+Pablu23@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:19:51 +0100 Subject: [PATCH 1/3] Update readme.md --- readme.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/readme.md b/readme.md index d0236a0..7392adb 100644 --- a/readme.md +++ b/readme.md @@ -14,8 +14,5 @@ A udp File transfer "Suite" with TCP Connection establishment - Better Cli support - Better Readme -## Known Bugs / Errors / Fix list: -- Path Exploits (will get changed to only allow Files in curr exe Path or Configurable Path) - ## Notes - Udp max packet size is set with 504 From 271644cfafcad7d7ff7f9996f42c5075c4dbd876 Mon Sep 17 00:00:00 2001 From: Pablu23 Date: Mon, 11 Dec 2023 16:23:51 +0100 Subject: [PATCH 2/3] Better client performance --- internal/client/client.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/client/client.go b/internal/client/client.go index d4f32ce..56d1f9a 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -206,10 +206,6 @@ func GetFile(path string, address string) { } }) - for _, i := range lostPackets { - fmt.Println(i) - } - lastPacket := ackPck for { From 4d6571800f687b1d89d5b7afc5485eefbeabd042 Mon Sep 17 00:00:00 2001 From: Pablu23 Date: Mon, 11 Dec 2023 16:28:52 +0100 Subject: [PATCH 3/3] Removed comments --- internal/client/client.go | 4 ---- internal/server/server.go | 5 ----- 2 files changed, 9 deletions(-) diff --git a/internal/client/client.go b/internal/client/client.go index 56d1f9a..3900428 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -41,8 +41,6 @@ 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) - return pck } @@ -112,7 +110,6 @@ func GetFile(path string, address string) { StartConnection(request.Sid, key, fmt.Sprintf("%v:13375", address)) - // udpAddr, err := net.ResolveUDPAddr("udp", "0.0.0.0:13374") udpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%v:13374", address)) if err != nil { fmt.Println(err) @@ -227,7 +224,6 @@ func GetFile(path string, address string) { } offset := (int64(pck.Sync) - int64(ackPck.Sync+1)) * int64(common.MaxDataSize) - // fmt.Printf("Sync: %v, Offset: %v\n", pck.sync, offset) _, err = file.WriteAt(pck.Data, offset) if err != nil { diff --git a/internal/server/server.go b/internal/server/server.go index 4bbafab..7010a8e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -242,11 +242,8 @@ func (server *Server) sendPTE(conn *net.UDPConn, addr *net.UDPAddr, pck *common. file := filepath.Join(server.parentFilePath, path) file = filepath.Clean(file) - // fmt.Sprintf("%v\\*", server.parentFilePath) matched, err := filepath.Match(filepath.Join(server.parentFilePath, "*"), file) - fmt.Println(filepath.Join(server.parentFilePath, "*")) - if err != nil || !matched { log.WithFields(log.Fields{ "ParentFilePath": server.parentFilePath, @@ -383,8 +380,6 @@ func (server *Server) handleConnection(conn net.Conn) { return } - // fmt.Println(buf) - rsaPck := common.RsaPacketFromBytes(buf[0:r]) key, err := rsaPck.ExtractKey(server.rsa) if err != nil && !errors.Is(err, io.EOF) {