Make buffer not eat all memory.

This commit is contained in:
2022-01-13 22:20:35 +10:30
parent f872453f16
commit 0261886b43
4 changed files with 144 additions and 66 deletions

View File

@@ -18,7 +18,7 @@ type Server struct {
}
func (s *Server) Run() {
address := fmt.Sprintf("127.0.0.1:%d", s.port)
address := fmt.Sprintf(":%d", s.port)
networkAddress, _ := net.ResolveTCPAddr("tcp", address)
listener, err := net.ListenTCP("tcp", networkAddress)
@@ -41,7 +41,7 @@ func (s *Server) Run() {
func handleConnection(conn *net.TCPConn) {
defer conn.Close()
conn.SetDeadline(time.Now().Add(time.Second))
conn.SetDeadline(time.Now().Add(time.Second * 5))
sharedKey := secure.Handshake(conn)
secureConnection := secure.SecureConnection{Conn: conn, SharedKey: sharedKey, Buffer: &bytes.Buffer{}}
@@ -51,35 +51,56 @@ func handleConnection(conn *net.TCPConn) {
dec := gob.NewDecoder(&secureConnection)
// At this point we are in
for {
p1 := secure.PacketStart{}
log.Print("trying to decode something from wire")
err := dec.Decode(&p1)
if err == io.EOF {
log.Printf("connection has been closed")
return
}
if err != nil {
panic(err)
}
log.Printf("Decoded packet:\n%#v", p1)
p2 := secure.PacketSendDataStart{}
err = dec.Decode(&p2)
if err == io.EOF {
log.Printf("connection has been closed")
return
}
if err != nil {
panic(err)
}
log.Printf("Decoded packet:\n%#v", p2)
// Get the start packet
start := secure.PacketStart{}
err := dec.Decode(&start)
if err == io.EOF {
log.Printf("connection has been closed after start packet")
return
}
if err != nil {
log.Printf("some error with start packet: %w", err)
return
}
log.Printf("Decoded packet:\n%#v", start)
conn.SetDeadline(time.Now().Add(time.Second * 5))
if start.OperationType == secure.OperationTypeSend {
log.Printf("client wants to send us something, expecting a send start")
sendStart := secure.PacketSendDataStart{}
err = dec.Decode(&sendStart)
if err != nil {
log.Printf("error at send data start: %w", err)
return
}
log.Printf("send start looks like: %v", sendStart)
file, err := os.CreateTemp("", "netgiv_")
if err != nil {
log.Printf("got error with temp file: %w", err)
return
}
log.Printf("writing data to file: %s", file.Name())
sendData := secure.PacketSendDataNext{}
for {
conn.SetDeadline(time.Now().Add(time.Second * 5))
err = dec.Decode(&sendData)
if err == io.EOF {
log.Printf("WE ARE DONE writing to: %s", file.Name())
break
}
if err != nil {
log.Printf("error decoding data next: %s", err)
return
}
file.Write(sendData.Data)
}
return
} else {
log.Printf("bad operation")
return
}
}