try injecting dumpPackets in startPPPSession

skadarnold · Jul 18, 2024 · 5c5ca5b · 5c5ca5b
1 parent 5059e7c
commit 5c5ca5b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/ipxbox.go b/ipxbox.go
@@ -85,15 +85,14 @@ func makeNetwork(ctx context.Context) (network.Network, network.Network) {
 	//  5. ReadPacket() by server, and transmit to client.
 	var net network.Network
 	net = ipxswitch.New()
-	if *dumpPackets != "" {
-		tappableLayer := tappable.Wrap(net)
-		w := makePcapWriter()
-		sink := phys.NewPcapgoSink(w, phys.FramerEthernetII)
-		//go ipx.CopyPackets(ctx, tappableLayer.NewTap(), sink)
-		go pptp.CopyPackets(ctx, tappableLayer.NewTap(), sink)
-
-		net = tappableLayer
-	}
+	//if *dumpPackets != "" {
+	//	tappableLayer := tappable.Wrap(net)
+	//	w := makePcapWriter()
+	//	sink := phys.NewPcapgoSink(w, phys.FramerEthernetII)
+	//	go ipx.CopyPackets(ctx, tappableLayer.NewTap(), sink)
+	//	
+	//	net = tappableLayer
+	//}
 	if !*allowNetBIOS {
 		net = filter.Wrap(net)
 	}

diff --git a/ppp/pptp/server.go b/ppp/pptp/server.go
@@ -123,6 +123,15 @@ func (c *Connection) startPPPSession(ctx context.Context, sendCallID uint16) {
 	}
 	node := c.s.n.NewNode()
 	c.ppp = ppp.NewSession(gre, node)
+
+	if *dumpPackets != "" {
+		tappableLayer := tappable.Wrap(net)
+		w := makePcapWriter()
+		sink := phys.NewPcapgoSink(w, phys.FramerEthernetII)
+		go ipx.CopyPackets(ctx, tappableLayer.NewTap(), sink)
+
+		net = tappableLayer
+	}
 	go func() {
 		err := c.ppp.Run(ctx)
 		if err != nil {