rename flow_direction to flow_type

1 files changed, 84 insertions, 84 deletions

diff --git a/infra/session_manager/session_utils.c b/infra/session_manager/session_utils.c
index 528f1b2..74edbd8 100644
--- a/infra/session_manager/session_utils.c
+++ b/infra/session_manager/session_utils.c
@@ -41,14 +41,14 @@ enum session_direction session_get_direction(const struct session *sess)
     return sess->sess_dir;
 }
 
-void session_set_current_flow_direction(struct session *sess, enum flow_direction dir)
+void session_set_flow_type(struct session *sess, enum flow_type type)
 {
-    sess->flow_dir = dir;
+    sess->flow_type = type;
 }
 
-enum flow_direction session_get_current_flow_direction(const struct session *sess)
+enum flow_type session_get_flow_type(const struct session *sess)
 {
-    return sess->flow_dir;
+    return sess->flow_type;
 }
 
 void session_set_current_state(struct session *sess, enum session_state state)
@@ -63,12 +63,12 @@ enum session_state session_get_current_state(const struct session *sess)
 
 void session_set_type(struct session *sess, enum session_type type)
 {
-    sess->type = type;
+    sess->sess_type = type;
 }
 
 enum session_type session_get_type(const struct session *sess)
 {
-    return sess->type;
+    return sess->sess_type;
 }
 
 void session_set_duplicate_traffic(struct session *sess)
@@ -91,14 +91,14 @@ enum closing_reason session_get_closing_reason(const struct session *sess)
     return sess->reason;
 }
 
-void session_inc_stat(struct session *sess, enum flow_direction dir, enum session_stat stat, uint64_t val)
+void session_inc_stat(struct session *sess, enum flow_type type, enum session_stat stat, uint64_t val)
 {
-    sess->stats[dir][stat] += val;
+    sess->stats[type][stat] += val;
 }
 
-uint64_t session_get_stat(const struct session *sess, enum flow_direction dir, enum session_stat stat)
+uint64_t session_get_stat(const struct session *sess, enum flow_type type, enum session_stat stat)
 {
-    return sess->stats[dir][stat];
+    return sess->stats[type][stat];
 }
 
 void session_set_timestamp(struct session *sess, enum session_timestamp type, uint64_t value)
@@ -111,44 +111,44 @@ uint64_t session_get_timestamp(const struct session *sess, enum session_timestam
     return sess->timestamps[type];
 }
 
-void session_clear_sids(struct session *sess, enum flow_direction dir)
+void session_clear_sids(struct session *sess, enum flow_type type)
 {
-    memset(&sess->sids[dir], 0, sizeof(struct sids));
+    memset(&sess->sids[type], 0, sizeof(struct sids));
 }
 
-void session_set_sids(struct session *sess, enum flow_direction dir, const struct sids *sids)
+void session_set_sids(struct session *sess, enum flow_type type, const struct sids *sids)
 {
-    sess->sids[dir] = *sids;
+    sess->sids[type] = *sids;
 }
 
-const struct sids *session_get_sids(const struct session *sess, enum flow_direction dir)
+const struct sids *session_get_sids(const struct session *sess, enum flow_type type)
 {
-    return &sess->sids[dir];
+    return &sess->sids[type];
 }
 
-void session_clear_route_ctx(struct session *sess, enum flow_direction dir)
+void session_clear_route_ctx(struct session *sess, enum flow_type type)
 {
-    memset(&sess->route_ctx[dir], 0, sizeof(struct route_ctx));
+    memset(&sess->route_ctx[type], 0, sizeof(struct route_ctx));
 }
 
-void session_set_route_ctx(struct session *sess, enum flow_direction dir, const struct route_ctx *ctx)
+void session_set_route_ctx(struct session *sess, enum flow_type type, const struct route_ctx *ctx)
 {
-    sess->route_ctx[dir] = *ctx;
+    sess->route_ctx[type] = *ctx;
 }
 
-const struct route_ctx *session_get_route_ctx(const struct session *sess, enum flow_direction dir)
+const struct route_ctx *session_get_route_ctx(const struct session *sess, enum flow_type type)
 {
-    return &sess->route_ctx[dir];
+    return &sess->route_ctx[type];
 }
 
-void session_set_first_packet(struct session *sess, enum flow_direction dir, const struct packet *pkt)
+void session_set_first_packet(struct session *sess, enum flow_type type, const struct packet *pkt)
 {
-    sess->first_pkt[dir] = pkt;
+    sess->first_pkt[type] = pkt;
 }
 
-const struct packet *session_get_first_packet(const struct session *sess, enum flow_direction dir)
+const struct packet *session_get_first_packet(const struct session *sess, enum flow_type type)
 {
-    return sess->first_pkt[dir];
+    return sess->first_pkt[type];
 }
 
 void session_set_current_packet(struct session *sess, const struct packet *pkt)
@@ -164,7 +164,7 @@ const struct packet *session_get0_current_packet(const struct session *sess)
 int session_is_symmetric(const struct session *sess, unsigned char *flag)
 {
     int is_symmetric = 0;
-    if (sess->first_pkt[FLOW_DIRECTION_C2S] && sess->first_pkt[FLOW_DIRECTION_S2C])
+    if (sess->first_pkt[FLOW_TYPE_C2S] && sess->first_pkt[FLOW_TYPE_S2C])
     {
         if (flag)
         {
@@ -172,14 +172,14 @@ int session_is_symmetric(const struct session *sess, unsigned char *flag)
         }
         is_symmetric = 1;
     }
-    else if (sess->first_pkt[FLOW_DIRECTION_C2S])
+    else if (sess->first_pkt[FLOW_TYPE_C2S])
     {
         if (flag)
         {
             *flag = SESSION_SEEN_C2S_FLOW;
         }
     }
-    else if (sess->first_pkt[FLOW_DIRECTION_S2C])
+    else if (sess->first_pkt[FLOW_TYPE_S2C])
     {
         if (flag)
         {
@@ -201,8 +201,8 @@ void *session_get_user_data(const struct session *sess)
 
 struct tcp_segment *session_get_tcp_segment(struct session *sess)
 {
-    enum flow_direction dir = session_get_current_flow_direction(sess);
-    struct tcp_half *half = &sess->tcp_halfs[dir];
+    enum flow_type type = session_get_flow_type(sess);
+    struct tcp_half *half = &sess->tcp_halfs[type];
 
     if (half->in_order.data != NULL && half->in_order.len > 0 && half->in_order_ref == 0)
     {
@@ -215,8 +215,8 @@ struct tcp_segment *session_get_tcp_segment(struct session *sess)
         struct tcp_segment *seg = tcp_reassembly_pop(half->assembler);
         if (seg)
         {
-            session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_REORDERED, 1);
-            session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_REORDERED, seg->len);
+            session_inc_stat(sess, type, STAT_TCP_SEGMENTS_REORDERED, 1);
+            session_inc_stat(sess, type, STAT_TCP_PAYLOADS_REORDERED, seg->len);
 
             // TODO
             sess->mgr_stat->tcp_segs_consumed++;
@@ -233,8 +233,8 @@ void session_free_tcp_segment(struct session *sess, struct tcp_segment *seg)
         return;
     }
 
-    enum flow_direction dir = session_get_current_flow_direction(sess);
-    struct tcp_half *half = &sess->tcp_halfs[dir];
+    enum flow_type type = session_get_flow_type(sess);
+    struct tcp_half *half = &sess->tcp_halfs[type];
 
     if (seg == &half->in_order)
     {
@@ -244,8 +244,8 @@ void session_free_tcp_segment(struct session *sess, struct tcp_segment *seg)
     }
     else
     {
-        session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RELEASED, 1);
-        session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RELEASED, seg->len);
+        session_inc_stat(sess, type, STAT_TCP_SEGMENTS_RELEASED, 1);
+        session_inc_stat(sess, type, STAT_TCP_PAYLOADS_RELEASED, seg->len);
         sess->mgr_stat->tcp_segs_freed++;
 
         tcp_segment_free(seg);
@@ -309,13 +309,13 @@ const char *session_type_to_str(enum session_type type)
     }
 }
 
-const char *flow_direction_to_str(enum flow_direction dir)
+const char *flow_direction_to_str(enum flow_type type)
 {
-    switch (dir)
+    switch (type)
     {
-    case FLOW_DIRECTION_C2S:
+    case FLOW_TYPE_C2S:
         return "C2S";
-    case FLOW_DIRECTION_S2C:
+    case FLOW_TYPE_S2C:
         return "S2C";
     default:
         return "unknown";
@@ -357,9 +357,9 @@ int session_to_str(const struct session *sess, int bref, char *buff, int size)
                          session_get0_readable_addr(sess),
                          session_type_to_str(session_get_type(sess)),
                          session_state_to_str(session_get_current_state(sess)),
-                         flow_direction_to_str(session_get_current_flow_direction(sess)),
-                         session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED),
-                         session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED));
+                         flow_direction_to_str(session_get_flow_type(sess)),
+                         session_get_stat(sess, FLOW_TYPE_C2S, STAT_RAW_PACKETS_RECEIVED),
+                         session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED));
     }
     else
     {
@@ -375,75 +375,75 @@ int session_to_str(const struct session *sess, int bref, char *buff, int size)
         used += snprintf(buff + used, size - used, "\"current_packet\":\"%p\",", session_get0_current_packet(sess));
 
         const char *str[] = {"c2s", "s2c"};
-        enum flow_direction dir[] = {FLOW_DIRECTION_C2S, FLOW_DIRECTION_S2C};
+        enum flow_type type[] = {FLOW_TYPE_C2S, FLOW_TYPE_S2C};
         for (int i = 0; i < 2; i++)
         {
             // raw packets
-            used += snprintf(buff + used, size - used, "\"%s_raw_packets_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PACKETS_RECEIVED));
-            used += snprintf(buff + used, size - used, "\"%s_raw_bytes_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_RECEIVED));
+            used += snprintf(buff + used, size - used, "\"%s_raw_packets_received\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_RAW_PACKETS_RECEIVED));
+            used += snprintf(buff + used, size - used, "\"%s_raw_bytes_received\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_RAW_BYTES_RECEIVED));
 
-            used += snprintf(buff + used, size - used, "\"%s_raw_packets_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PACKETS_TRANSMITTED));
-            used += snprintf(buff + used, size - used, "\"%s_raw_bytes_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_TRANSMITTED));
+            used += snprintf(buff + used, size - used, "\"%s_raw_packets_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_RAW_PACKETS_TRANSMITTED));
+            used += snprintf(buff + used, size - used, "\"%s_raw_bytes_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_RAW_BYTES_TRANSMITTED));
 
-            used += snprintf(buff + used, size - used, "\"%s_raw_packets_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PACKETS_DROPPED));
-            used += snprintf(buff + used, size - used, "\"%s_raw_bytes_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_DROPPED));
+            used += snprintf(buff + used, size - used, "\"%s_raw_packets_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_RAW_PACKETS_DROPPED));
+            used += snprintf(buff + used, size - used, "\"%s_raw_bytes_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_RAW_BYTES_DROPPED));
 
             // duplicate packets
-            used += snprintf(buff + used, size - used, "\"%s_duplicate_packets_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_DUPLICATE_PACKETS_BYPASS));
-            used += snprintf(buff + used, size - used, "\"%s_duplicate_bytes_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_DUPLICATE_BYTES_BYPASS));
+            used += snprintf(buff + used, size - used, "\"%s_duplicate_packets_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_DUPLICATE_PACKETS_BYPASS));
+            used += snprintf(buff + used, size - used, "\"%s_duplicate_bytes_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_DUPLICATE_BYTES_BYPASS));
 
             // injected packets
-            used += snprintf(buff + used, size - used, "\"%s_injected_packets_failed\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_INJECTED_PACKETS_FAILED));
-            used += snprintf(buff + used, size - used, "\"%s_injected_packets_success\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_INJECTED_PACKETS_SUCCESS));
-            used += snprintf(buff + used, size - used, "\"%s_injected_bytes_success\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_INJECTED_BYTES_SUCCESS));
+            used += snprintf(buff + used, size - used, "\"%s_injected_packets_failed\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_INJECTED_PACKETS_FAILED));
+            used += snprintf(buff + used, size - used, "\"%s_injected_packets_success\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_INJECTED_PACKETS_SUCCESS));
+            used += snprintf(buff + used, size - used, "\"%s_injected_bytes_success\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_INJECTED_BYTES_SUCCESS));
 
             // control packets
-            used += snprintf(buff + used, size - used, "\"%s_control_packets_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_PACKETS_RECEIVED));
-            used += snprintf(buff + used, size - used, "\"%s_control_bytes_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_BYTES_RECEIVED));
+            used += snprintf(buff + used, size - used, "\"%s_control_packets_received\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_CONTROL_PACKETS_RECEIVED));
+            used += snprintf(buff + used, size - used, "\"%s_control_bytes_received\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_CONTROL_BYTES_RECEIVED));
 
-            used += snprintf(buff + used, size - used, "\"%s_control_packets_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_PACKETS_TRANSMITTED));
-            used += snprintf(buff + used, size - used, "\"%s_control_bytes_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_BYTES_TRANSMITTED));
+            used += snprintf(buff + used, size - used, "\"%s_control_packets_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_CONTROL_PACKETS_TRANSMITTED));
+            used += snprintf(buff + used, size - used, "\"%s_control_bytes_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_CONTROL_BYTES_TRANSMITTED));
 
-            used += snprintf(buff + used, size - used, "\"%s_control_packets_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_PACKETS_DROPPED));
-            used += snprintf(buff + used, size - used, "\"%s_control_bytes_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_BYTES_DROPPED));
+            used += snprintf(buff + used, size - used, "\"%s_control_packets_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_CONTROL_PACKETS_DROPPED));
+            used += snprintf(buff + used, size - used, "\"%s_control_bytes_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_CONTROL_BYTES_DROPPED));
 
             if (session_get_type(sess) == SESSION_TYPE_TCP)
             {
-                used += snprintf(buff + used, size - used, "\"%s_tcp_last_seq\":%u,", str[i], sess->tcp_halfs[dir[i]].seq);
-                used += snprintf(buff + used, size - used, "\"%s_tcp_last_ack\":%u,", str[i], sess->tcp_halfs[dir[i]].ack);
+                used += snprintf(buff + used, size - used, "\"%s_tcp_last_seq\":%u,", str[i], sess->tcp_halfs[type[i]].seq);
+                used += snprintf(buff + used, size - used, "\"%s_tcp_last_ack\":%u,", str[i], sess->tcp_halfs[type[i]].ack);
                 memset(flags, 0, sizeof(flags));
-                tcp_flags_to_str(sess->tcp_halfs[dir[i]].flags, flags, sizeof(flags));
+                tcp_flags_to_str(sess->tcp_halfs[type[i]].flags, flags, sizeof(flags));
                 used += snprintf(buff + used, size - used, "\"%s_tcp_flags\":\"%s\",", str[i], flags);
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_RECEIVED));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_RECEIVED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_received\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_RECEIVED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_received\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_RECEIVED));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_EXPIRED));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_EXPIRED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_EXPIRED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_EXPIRED));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_retransmit\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_RETRANSMIT));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_retransmit\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_RETRANSMIT));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_retransmit\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_RETRANSMIT));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_retransmit\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_RETRANSMIT));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_OVERLAP));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_OVERLAP));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_OVERLAP));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_OVERLAP));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_NOSPACE));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_NOSPACE));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_NOSPACE));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_NOSPACE));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_INORDER));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_INORDER));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_INORDER));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_INORDER));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_REORDERED));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_REORDERED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_REORDERED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_REORDERED));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_BUFFERED));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_BUFFERED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_BUFFERED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_BUFFERED));
 
-                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_RELEASED));
-                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_RELEASED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_segments_released\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_SEGMENTS_RELEASED));
+                used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_released\":%" PRIu64 ",", str[i], session_get_stat(sess, type[i], STAT_TCP_PAYLOADS_RELEASED));
             }
 
-            used += snprintf(buff + used, size - used, "\"%s_first_packet\":\"%p\"", str[i], session_get_first_packet(sess, dir[i]));
+            used += snprintf(buff + used, size - used, "\"%s_first_packet\":\"%p\"", str[i], session_get_first_packet(sess, type[i]));
             if (i == 0)
             {
                 used += snprintf(buff + used, size - used, ",");