Fix minor connection state formatting in historical flows. (#8363)

ntop · May 9, 2024 · 498445b · 498445b
1 parent 1b18e18
commit 498445b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scripts/lua/modules/historical_flow_details_formatter.lua b/scripts/lua/modules/historical_flow_details_formatter.lua
@@ -203,7 +203,7 @@ local function format_tcp_connection_states(info)
     local conn_states = {}
     conn_states[#conn_states + 1] = string.format("%s: %s (%s)", i18n("flow_fields_description.major_connection_state"),
         i18n(string.format("flow_fields_description.major_connection_states.%s", info.major_connection_state.value)),
-        i18n(string.format("flow_fields_description.minor_connection_states_info.%u", info.minor_connection_state.value)))
+        i18n(string.format("flow_fields_description.major_connection_states_info.%u", info.major_connection_state.value)))
     conn_states[#conn_states + 1] = string.format("%s: %s (%s)", i18n("flow_fields_description.minor_connection_state"),
         i18n(string.format("flow_fields_description.minor_connection_states.%s", info.minor_connection_state.value)),
         i18n(string.format("flow_fields_description.minor_connection_states_info.%u", info.minor_connection_state.value)))

diff --git a/scripts/lua/modules/historical_flow_utils.lua b/scripts/lua/modules/historical_flow_utils.lua
@@ -621,10 +621,14 @@ end
 
 local function dt_format_connection_state(id, major)
    local i18n_conn_states = "flow_fields_description.minor_connection_states"
+   local name = ""
    if (major) then
       i18n_conn_states = "flow_fields_description.major_connection_states"
+      name = ternary(tonumber(id) == 0, "", i18n(string.format("%s.%u",i18n_conn_states,id)))
+   else 
+      name = ternary(tonumber(id) == 0, "", i18n(string.format("%s.%u",i18n_conn_states,id)) .. " - " .. i18n(string.format("%s.%u","flow_fields_description.minor_connection_states_info",id))) 
    end
-   local name = ternary(tonumber(id) == 0, "", i18n(string.format("%s.%u",i18n_conn_states,id)))
+    
 
    local conn_state_tag = {
       value = id,