Add support for sinceEpoch field in bfd session

czerwonk · Oct 18, 2023 · 7e254ab · 7e254ab
1 parent a0396f6
commit 7e254ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/parser/bfd.go b/parser/bfd.go
@@ -14,7 +14,7 @@ var (
 )
 
 func init() {
-	bfdSessionRegex = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+(Up|Down|Init)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}|[^\s]+)\s+([0-9\.]+)\s+([0-9\.]+)$`)
+	bfdSessionRegex = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+(Up|Down|Init)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}|[^\s]+)\s+(\d{1,})?\s+([0-9\.]+)\s+([0-9\.]+)$`)
 }
 
 type bfdContext struct {
@@ -45,14 +45,21 @@ func parseBFDSessionLine(c *bfdContext) {
 	if m == nil {
 		return
 	}
+	var since_epoch int64
+	if m[5] == "" {
+		since_epoch = 0
+	} else {
+		since_epoch = parseInt(m[5])
+	}
 
 	sess := protocol.BFDSession{
 		ProtocolName: c.protocol,
 		IP:           m[1],
 		Interface:    m[2],
 		Since:        parseUptime(m[4]),
-		Interval:     parseFloat(m[5]),
-		Timeout:      parseFloat(m[6]),
+		SinceEpoch:   since_epoch,
+		Interval:     parseFloat(m[6]),
+		Timeout:      parseFloat(m[7]),
 	}
 
 	if m[3] == "Up" {

diff --git a/parser/bfd_test.go b/parser/bfd_test.go
@@ -16,7 +16,7 @@ func TestParseBFDSessions(t *testing.T) {
 	data := `BIRD 2.0.7 ready.
 bfd1:
 IP address                Interface  State      Since         Interval  Timeout
-192.168.64.9              enp0s2     Up         2022-01-27 09:00:00    0.100    1.000
+192.168.64.9              enp0s2     Up         2022-01-27 09:00:00 1697620076    0.100    1.000
 192.168.64.10             enp0s2     Down       2022-01-27 08:00:00    0.300    0.000
 192.168.64.12             enp0s2     Init       2022-01-27 08:00:00    0.300    5.000`
 
@@ -30,6 +30,7 @@ IP address                Interface  State      Since         Interval  Timeout
 		Interface:    "enp0s2",
 		Up:           true,
 		Since:        3600,
+		SinceEpoch:   1697620076,
 		Interval:     0.1,
 		Timeout:      1,
 	}
@@ -39,6 +40,7 @@ IP address                Interface  State      Since         Interval  Timeout
 		Interface:    "enp0s2",
 		Up:           false,
 		Since:        7200,
+		SinceEpoch:   0,
 		Interval:     0.3,
 		Timeout:      0,
 	}
@@ -48,6 +50,7 @@ IP address                Interface  State      Since         Interval  Timeout
 		Interface:    "enp0s2",
 		Up:           false,
 		Since:        7200,
+		SinceEpoch:   0,
 		Interval:     0.3,
 		Timeout:      5,
 	}

diff --git a/protocol/bfd_session.go b/protocol/bfd_session.go
@@ -6,6 +6,7 @@ type BFDSession struct {
 	Interface    string
 	Up           bool
 	Since        int
+	SinceEpoch   int64
 	Interval     float64
 	Timeout      float64
 }