Merge pull request #374 from untangle/MFW-4565-fix-session-dumping

MFW-4565: Update type fon conntrack id version: bug
untangle · Mar 8, 2024 · 9b6b90f · 9b6b90f
2 parents d9ac7b6 + 8e2a0a7
commit 9b6b90f
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/protobuffersrc/ActiveSessions.proto b/protobuffersrc/ActiveSessions.proto
@@ -25,7 +25,7 @@ message Session {
   string client_address_new = 16;
   uint32 client_interface_id = 17;
   uint32 client_interface_type = 18;
-  uint32 conntrack_id = 20;
+  uint64 conntrack_id = 20;
   uint32 family = 21;
   uint32 ip_protocol = 22;
   uint32 mark = 23;

diff --git a/services/licensemanager/testdata/appstates/appstate_service_state.json b/services/licensemanager/testdata/appstates/appstate_service_state.json
@@ -1 +1 @@
-[{"name":"untangle-node-sitefilter","allowedState":0},{"name":"untangle-node-geoip","allowedState":0},{"name":"untangle-node-discovery","allowedState":0},{"name":"untangle-node-classd","allowedState":1},{"name":"untangle-node-dynamic-lists","allowedState":0},{"name":"untangle-node-captiveportal","allowedState":0},{"name":"untangle-node-threat-prevention","allowedState":1}]
+[{"name":"untangle-node-captiveportal","allowedState":0},{"name":"untangle-node-threat-prevention","allowedState":1},{"name":"untangle-node-sitefilter","allowedState":0},{"name":"untangle-node-geoip","allowedState":0},{"name":"untangle-node-discovery","allowedState":0},{"name":"untangle-node-classd","allowedState":1},{"name":"untangle-node-dynamic-lists","allowedState":0}]
diff --git a/structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go b/structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go
diff --git a/structs/protocolbuffers/Alerts/Alerts.pb.go b/structs/protocolbuffers/Alerts/Alerts.pb.go
diff --git a/structs/protocolbuffers/CaptivePortal/Captiveportal.pb.go b/structs/protocolbuffers/CaptivePortal/Captiveportal.pb.go
diff --git a/structs/protocolbuffers/Discoverd/Discovery.pb.go b/structs/protocolbuffers/Discoverd/Discovery.pb.go
diff --git a/structs/protocolbuffers/InterfaceStatsEvent/InterfaceStatsEvent.pb.go b/structs/protocolbuffers/InterfaceStatsEvent/InterfaceStatsEvent.pb.go
diff --git a/structs/protocolbuffers/SessionEvent/SessionEvent.pb.go b/structs/protocolbuffers/SessionEvent/SessionEvent.pb.go
diff --git a/structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go b/structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go
diff --git a/structs/protocolbuffers/ZMQRequest/ZMQRequest.pb.go b/structs/protocolbuffers/ZMQRequest/ZMQRequest.pb.go
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"name":"untangle-node-sitefilter","allowedState":0},{"name":"untangle-node-geoip","allowedState":0},{"name":"untangle-node-discovery","allowedState":0},{"name":"untangle-node-classd","allowedState":1},{"name":"untangle-node-dynamic-lists","allowedState":0},{"name":"untangle-node-captiveportal","allowedState":0},{"name":"untangle-node-threat-prevention","allowedState":1}]
		[{"name":"untangle-node-captiveportal","allowedState":0},{"name":"untangle-node-threat-prevention","allowedState":1},{"name":"untangle-node-sitefilter","allowedState":0},{"name":"untangle-node-geoip","allowedState":0},{"name":"untangle-node-discovery","allowedState":0},{"name":"untangle-node-classd","allowedState":1},{"name":"untangle-node-dynamic-lists","allowedState":0}]