From 13790469a765fb69713d36d0e148d2f78c29aace Mon Sep 17 00:00:00 2001 From: Pin Date: Mon, 6 Mar 2023 23:42:53 -0500 Subject: [PATCH] saprus update --- server/utils/raw_packet_send.go | 27 +++++++++++++++------------ server/utils/service.go | 3 --- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/utils/raw_packet_send.go b/server/utils/raw_packet_send.go index 2741b81..4d50666 100644 --- a/server/utils/raw_packet_send.go +++ b/server/utils/raw_packet_send.go @@ -1,13 +1,17 @@ package utils import ( - "log" - "net" - "unicode/utf8" + //"bytes" + //"encoding/binary" + "log" + "net" + "unicode/utf8" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/mdlayher/packet" + "github.com/google/gopacket" + "github.com/google/gopacket/layers" + "github.com/mdlayher/packet" + + "saprusserver/structs" ) type SocketCall struct { @@ -44,11 +48,6 @@ func (c* SocketCall)init(data string) { iface, _ := net.InterfaceByName("virbr0") conn, err := packet.Listen(iface, packet.Raw, int(layers.EthernetTypeIPv4), nil) - payload := []byte(data) - if len(payload) > 1500 { - log.Printf("Larger than 1500 -- %d", len(payload)) - } - if err != nil { log.Panic(err) } @@ -72,6 +71,10 @@ func (c* SocketCall)init(data string) { SrcPort: 6868, DstPort: 6767, } + saprus := structs.SaprusHeaderFrame{ + MagicNumber: 132, + Payload: []byte(data), + } buf := gopacket.NewSerializeBuffer() opts := gopacket.SerializeOptions{ @@ -80,7 +83,7 @@ func (c* SocketCall)init(data string) { } udp.SetNetworkLayerForChecksum(&ip) - err = gopacket.SerializeLayers(buf, opts, ð, &ip, &udp, gopacket.Payload(payload)) + err = gopacket.SerializeLayers(buf, opts, ð, &ip, &udp, gopacket.Payload(saprus.Bytes())) if err != nil { log.Panic(err) } diff --git a/server/utils/service.go b/server/utils/service.go index 4e4f4cd..4b267fe 100644 --- a/server/utils/service.go +++ b/server/utils/service.go @@ -4,6 +4,3 @@ import ( ) -type SaprusPacket struct { - callType [2]string -}