Added Ip Address for request to cli removed print for speed
This commit is contained in:
5
Makefile
5
Makefile
@@ -5,4 +5,7 @@ server:
|
||||
go run main.go server
|
||||
|
||||
test:
|
||||
go run main.go client testFiles/testFile
|
||||
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
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user