add config for LI udp port

Author: GIC-de

code/bngblaster/src/bbl_config.c

@@ -20,6 +20,8 @@ const char g_default_system_id[] = "0100.1001.0010";
 const char g_default_area[] = "49.0001/24";
 const char g_default_ospf_area[] = "0.0.0.0";
 
+extern uint16_t g_li_udp_port;
+
 #define JSON_OBJ_GET_BOOL(_json, _val, _section, _key) \
     do { \
         _val = json_object_get(_json, _key); \
@@ -3938,7 +3940,8 @@ json_parse_config(json_t *root)
             "stream-burst-ms",
             "reassemble-fragments",
             "multicast-autostart",
-            "udp-checksum"
+            "udp-checksum",
+            "li-udp-port"
         };
         if(!schema_validate(section, "traffic", schema, 
         sizeof(schema)/sizeof(schema[0]))) {
@@ -3981,6 +3984,10 @@ json_parse_config(json_t *root)
         if(value) {
             g_ctx->config.stream_udp_checksum = json_boolean_value(value);
         }
+        JSON_OBJ_GET_NUMBER(section, value, "traffic", "li-udp-port", 0, 65535);
+        if(value) {
+            g_li_udp_port = json_number_value(value);
+        }
     }
 
     /* Session Traffic Configuration */

code/bngblaster/src/bbl_interactive.c

@@ -163,9 +163,15 @@ void
 bbl_interactive_read_key_job(timer_s *timer)
 {
     int ch;
+    static bool show_li = false;
 
     UNUSED(timer);
 
+    if(!show_li && dict_count(g_ctx->li_flow_dict)) {
+        show_li = true;
+        bbl_interactive_init_window();
+    }
+
     ch = getch();
     switch (ch) {
         case KEY_F(1):

code/bngblaster/src/bbl_protocols.c

@@ -16,6 +16,8 @@
 static protocol_error_t decode_l2tp(uint8_t *buf, uint16_t len, uint8_t *sp, uint16_t sp_len, bbl_ethernet_header_s *eth, bbl_l2tp_s **_l2tp);
 static protocol_error_t encode_l2tp(uint8_t *buf, uint16_t *len, bbl_l2tp_s *l2tp);
 
+uint16_t g_li_udp_port = QMX_LI_UDP_PORT;
+
 /** 
  * This function searches for the BNG Blaster data
  * traffic signature and returns true if found.
@@ -3427,37 +3429,32 @@ decode_udp(uint8_t *buf, uint16_t len,
             udp->protocol = UDP_PROTOCOL_DHCP;
             ret_val = decode_dhcp(buf, len, sp, sp_len, (bbl_dhcp_s**)&udp->next);
             break;
-        case QMX_LI_UDP_PORT:
-            udp->protocol = UDP_PROTOCOL_QMX_LI;
-            ret_val = decode_qmx_li(buf, len, sp, sp_len, (bbl_qmx_li_s**)&udp->next);
-            break;
         case LDP_PORT:
             if(udp->src == LDP_PORT) {
                 udp->protocol = UDP_PROTOCOL_LDP;
                 ret_val = decode_ldp_hello(buf, len, sp, sp_len, (bbl_ldp_hello_s**)&udp->next);
             }
             break;
         default:
+            if(udp->dst == g_li_udp_port || udp->src == g_li_udp_port) {
+                udp->protocol = UDP_PROTOCOL_QMX_LI;
+                ret_val = decode_qmx_li(buf, len, sp, sp_len, (bbl_qmx_li_s**)&udp->next);
+            }
             break;
     }
 
     if(ret_val == UNKNOWN_PROTOCOL) {
-        if(udp->src == QMX_LI_UDP_PORT) {
-            udp->protocol = UDP_PROTOCOL_QMX_LI;
-            ret_val = decode_qmx_li(buf, len, sp, sp_len, (bbl_qmx_li_s**)&udp->next);
+        /* Try if payload could be decoded as BBL! 
+         * This fails fast if the 64 bit magic number 
+         * is not found on the expected position. */
+        ret_val = decode_bbl(buf, len, sp, sp_len, (bbl_bbl_s**)&udp->next);
+        if(ret_val == PROTOCOL_SUCCESS) {
+            udp->protocol = UDP_PROTOCOL_BBL;
+            eth->bbl = udp->next;
         } else {
-            /* Try if payload could be decoded as BBL! 
-             * This fails fast if the 64 bit magic number 
-             * is not found on the expected position. */
-            ret_val = decode_bbl(buf, len, sp, sp_len, (bbl_bbl_s**)&udp->next);
-            if(ret_val == PROTOCOL_SUCCESS) {
-                udp->protocol = UDP_PROTOCOL_BBL;
-                eth->bbl = udp->next;
-            } else {
-                ret_val = PROTOCOL_SUCCESS;
-                udp->protocol = 0;
-                udp->next = NULL;
-            }
+            ret_val = PROTOCOL_SUCCESS;
+            udp->protocol = 0;
+            udp->next = NULL;
         }
     }
 

docsrc/sources/configuration/traffic.rst

@@ -57,4 +57,7 @@
 |                                 | | Currently, this is restricted to BBL stream traffic  |
 |                                 | | only!                                                |
 |                                 | | Default: false                                       |
++---------------------------------+--------------------------------------------------------+
+| **li-udp-port**                 | | Change default UDP port for LI traffic.              |
+|                                 | | Default: 49152                                       |
 +---------------------------------+--------------------------------------------------------+