added semaphore for exit file

config/config.go

@@ -1,11 +1,15 @@
 package config
 
 import (
+	"sync"
+
 	"github.com/negbie/logp"
 )
 
 var Cfg Config
 
+var WgExitGroup sync.WaitGroup
+
 type Config struct {
 	Iface              *InterfacesConfig
 	Logging            *logp.Logging

decoder/decoder.go

@@ -1081,6 +1081,17 @@ func (d *Decoder) SendPingHEPPacket() {
 	PacketQueue <- pkt
 }
 
+func (d *Decoder) SendExitHEPPacket() {
+
+	var data = []byte{0x48, 0x45, 0x50, 0x33, 0x3, 0xa}
+	pkt := &Packet{
+		Version: 255,
+		Payload: data,
+	}
+
+	PacketQueue <- pkt
+}
+
 func stb(s string) []byte {
 	sh := (*reflect.StringHeader)(unsafe.Pointer(&s))
 	var res []byte

main.go

@@ -15,7 +15,7 @@ import (
 	"github.com/sipcapture/heplify/sniffer"
 )
 
-const version = "heplify 1.66.2"
+const version = "heplify 1.66.3"
 
 func createFlags() {
 

publish/publisher.go

@@ -81,6 +81,15 @@ func (pub *Publisher) Start(pq chan *decoder.Packet) {
 			}
 			pub.setHEPPing(msg)
 			logp.Debug("publisher", "sent hep ping from collector")
+		} else if pkt.Version == 255 {
+			//this is EXIT
+			logp.Info("received exit signal")
+			if config.Cfg.Iface.EOFExit {
+				logp.Info("exiting...")
+				config.WgExitGroup.Done()
+				return
+			}
+			break
 		} else {
 
 			if scriptEnable {

sniffer/sniffer.go

@@ -63,6 +63,7 @@ type Worker interface {
 	OnPacket(data []byte, ci *gopacket.CaptureInfo)
 	OnHEPPacket(data []byte)
 	SendPingHEPPacket()
+	SendExitHEPPacket()
 }
 
 type stats struct {
@@ -106,6 +107,10 @@ func (mw *MainWorker) SendPingHEPPacket() {
 	mw.decoder.SendPingHEPPacket()
 }
 
+func (mw *MainWorker) SendExitHEPPacket() {
+	mw.decoder.SendExitHEPPacket()
+}
+
 func (sniffer *SnifferSetup) setFromConfig() error {
 	var err error
 
@@ -334,6 +339,11 @@ func (sniffer *SnifferSetup) SendPing() error {
 	return nil
 }
 
+func (sniffer *SnifferSetup) SendExitPacket() error {
+	sniffer.worker.SendExitHEPPacket()
+	return nil
+}
+
 func (sniffer *SnifferSetup) Run() error {
 	var (
 		loopCount   = 1
@@ -462,6 +472,11 @@ LOOP:
 				logp.Debug("sniffer", "End of file")
 
 				if sniffer.config.EOFExit {
+					logp.Info("EOFExit enabled.Prepare exit...")
+					sniffer.worker.SendExitHEPPacket()
+					config.WgExitGroup.Add(1)
+					config.WgExitGroup.Wait()
+					logp.Info("Sent all packets, exiting...")
 					sniffer.Close()
 					os.Exit(0)
 				}