fixed packet sender really this time

Author: orangepizza

providers/http/nfqueue/nfqueue.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"os/exec"
 	"strings"
-	"syscall"
 	"time"
 
 	gnfqueue "github.com/florianl/go-nfqueue"
@@ -62,40 +61,35 @@ func craftReplyPacketBytes(keyAuth string, inputpacket gopacket.Packet) []byte {
 	httplayer := gopacket.Payload(craftkeyauthresponse(keyAuth))
 	tcplayer := &layers.TCP{
 		// we reply back so reverse src and dst ports
-		SrcPort:    inputTcp.DstPort,
-		DstPort:    inputTcp.SrcPort,
-		Ack:        inputTcp.Seq + uint32(len(inputTcp.Payload)),
-		Seq:        inputTcp.Ack - 1,
-		DataOffset: 5,
-		PSH:        true,
+		SrcPort: inputTcp.DstPort,
+		DstPort: inputTcp.SrcPort,
+		Ack:     inputTcp.Seq + uint32(len(inputTcp.Payload)),
+		Seq:     inputTcp.Ack,
+		PSH:     true,
+		ACK:     true,
 	}
+	// log.Infof("dstp: %s, srcp %s", tcplayer.DstPort.String(), tcp)
 	//check network layer
 	// this is reply so we reverse sorce and dst ip
 	iplayer := &layers.IPv4{
 		SrcIP: inputIPv4.DstIP,
 		DstIP: inputIPv4.SrcIP,
 	}
 	tcplayer.SetNetworkLayerForChecksum(iplayer)
-	gopacket.SerializeLayers(outbuffer, opt, iplayer, tcplayer, httplayer)
+	gopacket.SerializeLayers(outbuffer, opt, tcplayer, httplayer)
 
 	return outbuffer.Bytes()
 }
 
-func sendPacketv4(packet []byte, DstIP net.IP) {
+func sendPacketv4(packet []byte, DstIP *net.IP) {
 	var err error
-	DstIP = DstIP.To4()
-	dst := [4]byte{DstIP[0], DstIP[1], DstIP[2], DstIP[3]}
-	sk, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_RAW, syscall.IPPROTO_RAW)
+	con, err := net.Dial("ip:6", DstIP.String())
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
-	addr := syscall.SockaddrInet4{
-		Port: 0,
-		Addr: dst,
-	}
-	err = syscall.Sendto(sk, packet, 0, &addr)
+	_, err = con.Write(packet)
 	if err != nil {
-		log.Fatal("Sendto:", err)
+		log.Fatal(err)
 	}
 }
 
@@ -134,12 +128,13 @@ func (w *HTTPProvider) serve(domain, token, keyAuth string) error {
 		payload := gopacket.NewPacket(*a.Payload, layers.LayerTypeIPv4, opt)
 		ipL := payload.Layer(layers.LayerTypeIPv4)
 		srcip := ipL.(*layers.IPv4).SrcIP
-		log.Infof("%s", srcip.String())
+		log.Infof("%s, %s", srcip.String())
 		if tcpLayer := payload.Layer(layers.LayerTypeTCP); tcpLayer != nil {
 			// Get actual TCP data from this layer
 			inputTcp, _ := tcpLayer.(*layers.TCP)
 			log.Infof("From src port %d to dst port %d\n", inputTcp.SrcPort, inputTcp.DstPort)
-			log.Infof("layer under P %s", inputTcp.Payload)
+			log.Infof("Payload: %s", inputTcp.Payload)
+			log.Infof("tcp header: %s", inputTcp.LayerContents())
 			// this should be HTTP payload
 			httpPayload, err := http.ReadRequest(bufio.NewReader((bytes.NewReader(inputTcp.LayerPayload()))))
 			if err != nil {
@@ -157,7 +152,7 @@ func (w *HTTPProvider) serve(domain, token, keyAuth string) error {
 				//dial validation agent
 				// Send the modified packet back into the session
 				log.Infof(string(replypacket))
-				sendPacketv4(replypacket, srcip)
+				sendPacketv4(replypacket, &srcip)
 				// packet sent, end of function
 				return 0
 			} else {