added monotonic time converter

sipcapture · Jun 3, 2023 · d59a74d · d59a74d
1 parent 845aaf1
commit d59a74d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -366,7 +366,7 @@ assets_nocore: \
 build: \
 	.checkver_$(CMD_GO) \
 	assets
-	CGO_ENABLED=0 $(CMD_GO) build -tags $(TARGET_TAG) -ldflags "-w -s -X 'rtcagent/cli/cmd.GitVersion=$(TARGET_TAG)_$(UNAME_M):$(VERSION):[CORE]'" -o bin/rtcagent .
+	CGO_ENABLED=1 $(CMD_GO) build -tags $(TARGET_TAG) -ldflags "-extldflags '-static' -w -s -X 'rtcagent/cli/cmd.GitVersion=$(TARGET_TAG)_$(UNAME_M):$(VERSION):[CORE]'" -tags netgo -installsuffix netgo -o bin/rtcagent .
 
 
 # FOR NON-CORE
@@ -375,7 +375,7 @@ build_nocore: \
 	.checkver_$(CMD_GO) \
 	assets_nocore \
 	ebpf_nocore
-	CGO_ENABLED=0 $(CMD_GO) build -tags $(TARGET_TAG) -ldflags "-w -s -X 'rtcagent/cli/cmd.GitVersion=$(TARGET_TAG)_$(UNAME_M):$(VERSION):$(UNAME_R)' -X 'main.enableCORE=false'" -o bin/rtcagent .
+	CGO_ENABLED=1 $(CMD_GO) build -tags $(TARGET_TAG) -ldflags "-extldflags '-static' -w -s -X 'rtcagent/cli/cmd.GitVersion=$(TARGET_TAG)_$(UNAME_M):$(VERSION):$(UNAME_R)' -X 'main.enableCORE=false'" -tags netgo -installsuffix netgo -o bin/rtcagent .
 
 # Format the code
 format:

diff --git a/user/event/event_freeswitch.go b/user/event/event_freeswitch.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"net"
 	"rtcagent/outdata/hep"
-	"time"
+	monotonic "rtcagent/user/time"
 )
 
 type IpAddrFS struct {
@@ -163,8 +163,10 @@ func (kem *FreeSwitchEvent) String() string {
 		connInfo = fmt.Sprintf("%sUNKNOW_%d%s", COLORRED, kem.DataType, COLORRESET)
 	}
 
-	s := fmt.Sprintf("PID:%d, Comm:%s, TID:%d, %s, Time:%d, SrcIP: %s, SrcPort: %d, DstIP: %s, DstPort: %d, Payload:\n%s%s, \n%s", kem.Pid, bytes.TrimSpace(kem.Comm[:]), kem.Tid, connInfo,
-		kem.Timestamp, srcIP, srcPort, dstIP, dstPort, perfix, string(kem.Data[:kem.DataLen]), COLORRESET)
+	date := monotonic.GetRealTime(kem.Timestamp)
+
+	s := fmt.Sprintf("PID:%d, Comm:%s, TID:%d, %s, TimeML: %d, RealTime: %s, SrcIP: %s, SrcPort: %d, DstIP: %s, DstPort: %d, Payload:\n%s%s, \n%s", kem.Pid, bytes.TrimSpace(kem.Comm[:]), kem.Tid, connInfo,
+		kem.Timestamp, date.String(), srcIP, srcPort, dstIP, dstPort, perfix, string(kem.Data[:kem.DataLen]), COLORRESET)
 
 	return s
 }
@@ -186,7 +188,7 @@ func (kem *FreeSwitchEvent) GenerateHEP() ([]byte, error) {
 	srcIP := net.IP(dst.IP.Addr[:4])
 	dstIP := net.IP(dst.IP.Addr[:4])
 
-	var date time.Time
+	date := monotonic.GetRealTime(kem.Timestamp)
 
 	hepPacket := hep.Packet{
 		Version:   0x02,

diff --git a/user/event/event_kamailio.go b/user/event/event_kamailio.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"net"
 	"rtcagent/outdata/hep"
-	"time"
+	monotonic "rtcagent/user/time"
 )
 
 const MaxDataSize = 1024 * 4
@@ -186,9 +186,10 @@ func (kem *KamailioEvent) String() string {
 
 	srcIP := net.IP(t.SrcIP.Addr[:4])
 	dstIP := net.IP(t.DstIP.Addr[:4])
-
 	addr := fmt.Sprintf("%s:%d", srcIP.String(), t.SrcPort)
 
+	date := monotonic.GetRealTime(kem.Timestamp)
+
 	var perfix, connInfo string
 	switch AttachType(kem.DataType) {
 	case ProbeEntry:
@@ -201,8 +202,8 @@ func (kem *KamailioEvent) String() string {
 		connInfo = fmt.Sprintf("%sUNKNOW_%d%s", COLORRED, kem.DataType, COLORRESET)
 	}
 
-	s := fmt.Sprintf("PID:%d, Comm:%s, TID:%d, %s, Time:%d, SrcIP: %s, SrcPort: %d, DstIP: %s, DstPort: %d, Payload:\n%s%s%s", kem.Pid, bytes.TrimSpace(kem.Comm[:]), kem.Tid, connInfo,
-		kem.Timestamp,
+	s := fmt.Sprintf("PID:%d, Comm:%s, TID:%d, %s, TimeML: %d, RealTime: %s, SrcIP: %s, SrcPort: %d, DstIP: %s, DstPort: %d, Payload:\n%s%s%s", kem.Pid, bytes.TrimSpace(kem.Comm[:]), kem.Tid, connInfo,
+		kem.Timestamp, date.String(),
 		srcIP.String(), t.SrcPort, dstIP.String(), t.DstPort, perfix, string(kem.Data[:kem.DataLen]), COLORRESET)
 
 	//s := fmt.Sprintf("PID:%d, Comm:%s, TID:%d, %s, SrcPort: %d, DstPort:%d, SrcIPv6: %d, Mask: %d, Payload:\n%s%s%s", kem.Pid, bytes.TrimSpace(kem.Comm[:]), kem.Tid, connInfo,
@@ -227,7 +228,7 @@ func (kem *KamailioEvent) GenerateHEP() ([]byte, error) {
 	srcIP := net.IP(t.SrcIP.Addr[:4])
 	dstIP := net.IP(t.DstIP.Addr[:4])
 
-	var date time.Time
+	date := monotonic.GetRealTime(kem.Timestamp)
 
 	hepPacket := hep.Packet{
 		Version:   0x02,

diff --git a/user/time/monotonic.go b/user/time/monotonic.go
@@ -0,0 +1,28 @@
+package monotonic
+
+import (
+	"time"
+)
+
+/*
+#include <time.h>
+static unsigned long long get_nsecs(void)
+{
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    return (unsigned long long)ts.tv_sec * 1000000000UL + ts.tv_nsec;
+}
+*/
+import "C"
+
+func GetTime() (uint64, int64) {
+	monotonic := uint64(C.get_nsecs())
+	timestamp := time.Now().UTC().UnixNano()
+	return monotonic, timestamp
+}
+
+func GetRealTime(capTime uint64) time.Time {
+	monotonic := uint64(C.get_nsecs())
+	timestamp := time.Now().UTC().UnixNano()
+	return time.Unix(0, (timestamp - int64(monotonic-capTime)))
+}