update session/stream commands

Author: GIC-de

code/bngblaster/src/bbl_ctrl.c

@@ -54,28 +54,30 @@ const char *schema_session_update[] = {
     NULL
 };
 const char *schema_session_summary[] = {
-    "session-id", "sessions", "session-id-min", "session-id-max",
+    "session-id", "session-group-id", 
+    "sessions", "session-id-min", "session-id-max",
     NULL
 };
 const char *schema_stream_info[] = {
     "flow-id", "debug", NULL
 };
-const char *schema_stream_summary[] = {
-    "session-group-id",
-    "flows", "flow-id-min", "flow-id-max",
+const char *schema_stream_args[] = {
+    "session-id", "session-group-id",
+    "flows", "flow-id", "flow-id-min", "flow-id-max",
     "name", "interface", "direction",
+    "verified-only", "bidirectional-verified-only",
+    "pending-only",
     NULL
 };
-const char *schema_stream_start_stop[] = {
-    "flow-id", "session-id", "session-group-id",
-    "flows", "flow-id-min", "flow-id-max",
+const char *schema_stream_update[] = {
+    "session-id", "session-group-id",
+    "flows", "flow-id", "flow-id-min", "flow-id-max",
     "name", "interface", "direction",
     "verified-only", "bidirectional-verified-only",
+    "pending-only",
+    "tcp-flags", "pps", 
     NULL
 };
-const char *schema_stream_update[] = {
-    "flow-id", "tcp-flags", "pps", NULL
-};
 const char *schema_bgp[] = {
     "local-ipv4-address", "peer-ipv4-address",
     "local-ipv6-address", "peer-ipv6-address",  "ipv6-link-local",
@@ -278,9 +280,9 @@ static const struct action actions[] = {
     {"terminate", bbl_ctrl_terminate, schema_session_terminate, false},
     {"traffic-start", bbl_ctrl_traffic_start, schema_no_args, false},
     {"traffic-stop", bbl_ctrl_traffic_stop, schema_no_args, false},
-    {"stream-start", bbl_stream_ctrl_start, schema_stream_start_stop, true},
-    {"stream-stop", bbl_stream_ctrl_stop, schema_stream_start_stop, true},
-    {"stream-stop-verified", bbl_stream_ctrl_stop_verified, schema_stream_start_stop, true},
+    {"stream-start", bbl_stream_ctrl_start, schema_stream_args, true},
+    {"stream-stop", bbl_stream_ctrl_stop, schema_stream_args, true},
+    {"stream-stop-verified", bbl_stream_ctrl_stop_verified, schema_stream_args, true},
     {"stream-update", bbl_stream_ctrl_update, schema_stream_update, true},
     {"session-traffic-start", bbl_session_ctrl_traffic_start, schema_session_direction, true},
     {"session-traffic-stop", bbl_session_ctrl_traffic_stop, schema_session_direction, true},
@@ -289,7 +291,7 @@ static const struct action actions[] = {
     {"stream-info", bbl_stream_ctrl_info, schema_stream_info, true},
     {"stream-stats", bbl_stream_ctrl_stats, schema_no_args, true},
     {"stream-reset", bbl_stream_ctrl_reset, schema_no_args, false},
-    {"stream-summary", bbl_stream_ctrl_summary, schema_stream_summary, true},
+    {"stream-summary", bbl_stream_ctrl_summary, schema_stream_args, true},
     {"streams-pending", bbl_stream_ctrl_pending, schema_no_args, true},
     {"session-traffic", bbl_session_ctrl_traffic_stats, schema_no_args, true},
     {"session-traffic-reset", bbl_session_ctrl_traffic_reset, schema_session_group_id, false},
@@ -379,10 +381,10 @@ static const struct action actions[] = {
     {"commands", bbl_ctrl_commands, schema_no_args, true},
     {"session-traffic-enabled", bbl_session_ctrl_traffic_start, schema_session_direction, true},
     {"session-traffic-disabled", bbl_session_ctrl_traffic_stop, schema_session_direction, true},
-    {"stream-traffic-enabled", bbl_stream_ctrl_start, schema_stream_start_stop, true},
-    {"stream-traffic-start", bbl_stream_ctrl_start, schema_stream_start_stop, true},
-    {"stream-traffic-disabled", bbl_stream_ctrl_stop, schema_stream_start_stop, true},
-    {"stream-traffic-stop", bbl_stream_ctrl_stop, schema_stream_start_stop, true},
+    {"stream-traffic-enabled", bbl_stream_ctrl_start, schema_stream_args, true},
+    {"stream-traffic-start", bbl_stream_ctrl_start, schema_stream_args, true},
+    {"stream-traffic-disabled", bbl_stream_ctrl_stop, schema_stream_args, true},
+    {"stream-traffic-stop", bbl_stream_ctrl_stop, schema_stream_args, true},
     /* END */
     {NULL, NULL, NULL, false},
 };

code/bngblaster/src/bbl_session.c

@@ -2097,10 +2097,12 @@ int
 bbl_session_ctrl_summary(int fd, uint32_t session_id, json_t *arguments)
 {
     int result = 0;
+    int session_group_id = -1;
+    int size;
+    int intv;
 
-    int session_id_min = 0;
-    int session_id_max = 0;
-    int size, i;
+    uint32_t session_id_min = 1;
+    uint32_t session_id_max = g_ctx->sessions;
 
     json_t *jobj, *jobj_array, *sessions;
     bbl_session_s *session;
@@ -2111,16 +2113,27 @@ bbl_session_ctrl_summary(int fd, uint32_t session_id, json_t *arguments)
             return bbl_ctrl_status(fd, "error", 400, "sessions must be of type array e.g. [1,2,3]");
        }
     } else {
-        if(json_unpack(arguments, "{s:i}", "session-id-min", &session_id_min) != 0) {
-            return bbl_ctrl_status(fd, "error", 400, "sessions or session-id-min/max required");
+        if(json_unpack(arguments, "{s:i}", "session-id-min", &intv) == 0) {
+            if(intv < 1 || (uint32_t)intv > UINT32_MAX) {
+                return bbl_ctrl_status(fd, "warning", 400, "invalid session-id-min");
+            }
+            session_id_min = intv;
         }
-        if(json_unpack(arguments, "{s:i}", "session-id-max", &session_id_max) != 0) {
-            return bbl_ctrl_status(fd, "error", 400, "session-id-max missing");
+        if(json_unpack(arguments, "{s:i}", "session-id-max", &intv) == 0) {
+            if(intv < 0 || (uint32_t)intv > UINT32_MAX) {
+                return bbl_ctrl_status(fd, "warning", 400, "invalid session-id-max");
+            }
+            if((uint32_t)intv < g_ctx->sessions) session_id_max = intv;
         }
         if(session_id_min > session_id_max) {
             return bbl_ctrl_status(fd, "error", 400, "session-id-min > max");
         }
     }
+    if(json_unpack(arguments, "{s:i}", "session-group-id", &session_group_id) == 0) {
+        if(session_group_id < 0 || session_group_id > UINT16_MAX) {
+            return bbl_ctrl_status(fd, "error", 400, "invalid session-group-id");
+        }
+    }
 
     jobj_array = json_array();
     if(session_id) {
@@ -2134,7 +2147,7 @@ bbl_session_ctrl_summary(int fd, uint32_t session_id, json_t *arguments)
     }
     if(sessions) {
         size = json_array_size(sessions);
-        for (i = 0; i < size; i++) {
+        for(int i = 0; i < size; i++) {
             jobj = json_array_get(sessions, i);
             if(json_is_number(jobj)) {
                 session = bbl_session_get(json_number_value(jobj));
@@ -2150,7 +2163,7 @@ bbl_session_ctrl_summary(int fd, uint32_t session_id, json_t *arguments)
         while(session_id_min <= session_id_max) {
             session_id = session_id_min;
             session = bbl_session_get(session_id);
-            if(session) {
+            if(session && (session_group_id < 0 || session->session_group_id == session_group_id)) {
                 jobj = bbl_session_summary_json(session);
                 if(jobj) {
                     json_array_append_new(jobj_array, jobj);

code/bngblaster/src/bbl_session.h

@@ -271,6 +271,7 @@ typedef struct bbl_session_
     struct {
         uint16_t group_id;
         bbl_stream_s *head;
+        bbl_stream_s *tail;
     } streams;
 
     struct {