mats/go-cart-actor
1
0
Fork 0
Code Issues Pull Requests 1 Actions 3 Packages Projects Releases Wiki Activity

test stuff
Some checks failed
Build and Publish / BuildAndDeployAmd64 (push) Failing after 26s
Details
Build and Publish / BuildAndDeploy (push) Successful in 3m14s
Details

Browse Source
This commit is contained in:
matst80
2024-11-12 16:27:59 +01:00
parent f0dfef59a5
commit 1c42cf0976
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cart-packet-queue.go
View File

@@ -6,6 +6,7 @@ import (
"log" "log"
"net" "net"
"sync" "sync"
"time"
) )
type CartPacketQueue struct { type CartPacketQueue struct {
@@ -41,6 +42,7 @@ func (p *CartPacketQueue) HandleConnection(connection net.Conn) error {
defer p.RemoveListeners() defer p.RemoveListeners()
defer connection.Close() defer connection.Close()
var packet CartPacket var packet CartPacket
connection.SetReadDeadline(time.Now().Add(time.Millisecond * 200))
reader := bufio.NewReader(connection) reader := bufio.NewReader(connection)
for { for {
err := ReadCartPacket(reader, &packet) err := ReadCartPacket(reader, &packet)
@@ -52,8 +54,8 @@ func (p *CartPacketQueue) HandleConnection(connection net.Conn) error {
return err return err
} }
if packet.Version != CurrentPacketVersion { if packet.Version != CurrentPacketVersion {
log.Printf("Error receiving packet: %v\n", err) log.Printf("Incorrect version: %v\n", packet.Version)
continue return nil
} }
if packet.DataLength == 0 { if packet.DataLength == 0 {
go p.HandleData(packet.MessageType, packet.Id, CallResult{ go p.HandleData(packet.MessageType, packet.Id, CallResult{

4
packet-queue.go
View File

@@ -7,6 +7,7 @@ import (
"log" "log"
"net" "net"
"sync" "sync"
"time"
) )
type PacketQueue struct { type PacketQueue struct {
@@ -46,6 +47,7 @@ func (p *PacketQueue) HandleConnection(connection net.Conn) error {
defer p.RemoveListeners() defer p.RemoveListeners()
var packet Packet var packet Packet
reader := bufio.NewReader(connection) reader := bufio.NewReader(connection)
connection.SetReadDeadline(time.Now().Add(time.Millisecond * 200))
for { for {
err := ReadPacket(reader, &packet) err := ReadPacket(reader, &packet)
if err != nil { if err != nil {
@@ -56,7 +58,7 @@ func (p *PacketQueue) HandleConnection(connection net.Conn) error {
return err return err
} }
if packet.Version != CurrentPacketVersion { if packet.Version != CurrentPacketVersion {
log.Printf("Error receiving packet: %v\n", packet.Version) log.Printf("Incorrect packet version: %v\n", packet.Version)
return fmt.Errorf("incorrect packet version: %d", packet.Version) return fmt.Errorf("incorrect packet version: %d", packet.Version)
} }
if packet.DataLength == 0 { if packet.DataLength == 0 {