Revert pcap

.github/workflows/check.yaml

@@ -23,9 +23,6 @@ jobs:
         with:
           go-version: 'stable'
 
-      - name: Install pcap
-        run: sudo apt install -y libpcap-dev
-
       - run: go vet ./...
 
       - name: staticcheck
@@ -47,7 +44,4 @@ jobs:
         with:
           go-version: 'stable'
 
-      - name: Install pcap
-        run: sudo apt install -y libpcap-dev
-
       - run: go test ./...

.github/workflows/release.yaml

@@ -24,13 +24,11 @@ jobs:
         with:
           go-version: "1.22"
 
-      - name: Install pcap
-        run: sudo apt install -y libpcap-dev
-
       - name: Build
         env:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
+          CGO_ENABLED: 0
         run: |
           mkdir -p build
           go build -o build/OpenGFW-${GOOS}-${GOARCH} -ldflags "-s -w" .

cmd/root.go

@@ -43,7 +43,6 @@ var logger *zap.Logger
 // Flags
 var (
 	cfgFile   string
-	pcapFile  string
 	logLevel  string
 	logFormat string
 )
@@ -119,7 +118,6 @@ func init() {
 
 func initFlags() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file")
-	rootCmd.PersistentFlags().StringVarP(&pcapFile, "pcap", "p", "", "pcap file (optional)")
 	rootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "l", envOrDefaultString(appLogLevelEnv, "info"), "log level")
 	rootCmd.PersistentFlags().StringVarP(&logFormat, "log-format", "f", envOrDefaultString(appLogFormatEnv, "console"), "log format")
 }
@@ -169,7 +167,6 @@ type cliConfig struct {
 	IO      cliConfigIO      `mapstructure:"io"`
 	Workers cliConfigWorkers `mapstructure:"workers"`
 	Ruleset cliConfigRuleset `mapstructure:"ruleset"`
-	Replay  cliConfigReplay  `mapstructure:"replay"`
 }
 
 type cliConfigIO struct {
@@ -180,10 +177,6 @@ type cliConfigIO struct {
 	RST         bool   `mapstructure:"rst"`
 }
 
-type cliConfigReplay struct {
-	Realtime bool `mapstructure:"realtime"`
-}
-
 type cliConfigWorkers struct {
 	Count                      int           `mapstructure:"count"`
 	QueueSize                  int           `mapstructure:"queueSize"`
@@ -204,30 +197,17 @@ func (c *cliConfig) fillLogger(config *engine.Config) error {
 }
 
 func (c *cliConfig) fillIO(config *engine.Config) error {
-	var ioImpl io.PacketIO
-	var err error
-	if pcapFile != "" {
-		// Setup IO for pcap file replay
-		logger.Info("replaying from pcap file", zap.String("pcap file", pcapFile))
-		ioImpl, err = io.NewPcapPacketIO(io.PcapPacketIOConfig{
-			PcapFile: pcapFile,
-			Realtime: c.Replay.Realtime,
-		})
-	} else {
-		// Setup IO for nfqueue
-		ioImpl, err = io.NewNFQueuePacketIO(io.NFQueuePacketIOConfig{
-			QueueSize:   c.IO.QueueSize,
-			ReadBuffer:  c.IO.ReadBuffer,
-			WriteBuffer: c.IO.WriteBuffer,
-			Local:       c.IO.Local,
-			RST:         c.IO.RST,
-		})
-	}
-
+	nfio, err := io.NewNFQueuePacketIO(io.NFQueuePacketIOConfig{
+		QueueSize:   c.IO.QueueSize,
+		ReadBuffer:  c.IO.ReadBuffer,
+		WriteBuffer: c.IO.WriteBuffer,
+		Local:       c.IO.Local,
+		RST:         c.IO.RST,
+	})
 	if err != nil {
 		return configError{Field: "io", Err: err}
 	}
-	config.IO = ioImpl
+	config.IO = nfio
 	return nil
 }
 

engine/engine.go

@@ -58,17 +58,12 @@ func (e *engine) UpdateRuleset(r ruleset.Ruleset) error {
 }
 
 func (e *engine) Run(ctx context.Context) error {
-	workerCtx, workerCancel := context.WithCancel(ctx)
-	defer workerCancel() // Stop workers
-
-	// Register IO shutdown
 	ioCtx, ioCancel := context.WithCancel(ctx)
-	e.io.SetCancelFunc(ioCancel)
-	defer ioCancel() // Stop IO
+	defer ioCancel() // Stop workers & IO
 
 	// Start workers
 	for _, w := range e.workers {
-		go w.Run(workerCtx)
+		go w.Run(ioCtx)
 	}
 
 	// Register IO callback
@@ -90,8 +85,6 @@ func (e *engine) Run(ctx context.Context) error {
 		return err
 	case <-ctx.Done():
 		return nil
-	case <-ioCtx.Done():
-		return nil
 	}
 }
 

io/interface.go

@@ -48,9 +48,6 @@ type PacketIO interface {
 	ProtectedDialContext(ctx context.Context, network, address string) (net.Conn, error)
 	// Close closes the packet IO.
 	Close() error
-	// SetCancelFunc gives packet IO access to context cancel function, enabling it to
-	// trigger a shutdown
-	SetCancelFunc(cancelFunc context.CancelFunc) error
 }
 
 type ErrInvalidPacket struct {

io/nfqueue.go

@@ -281,11 +281,6 @@ func (n *nfqueuePacketIO) Close() error {
 	return n.n.Close()
 }
 
-// nfqueue IO does not issue shutdown
-func (n *nfqueuePacketIO) SetCancelFunc(cancelFunc context.CancelFunc) error {
-	return nil
-}
-
 func (n *nfqueuePacketIO) setupNft(local, rst, remove bool) error {
 	rules, err := generateNftRules(local, rst)
 	if err != nil {