rename session_direction to flow_direction
This commit is contained in:
@@ -50,12 +50,12 @@ const struct tuple6 *session_get_tuple(const struct session *sess)
|
||||
return &sess->tuple;
|
||||
}
|
||||
|
||||
void session_set_tuple_direction(struct session *sess, enum session_direction dir)
|
||||
void session_set_tuple_direction(struct session *sess, enum flow_direction dir)
|
||||
{
|
||||
sess->tuple_dir = dir;
|
||||
}
|
||||
|
||||
enum session_direction session_get_tuple_direction(const struct session *sess)
|
||||
enum flow_direction session_get_tuple_direction(const struct session *sess)
|
||||
{
|
||||
return sess->tuple_dir;
|
||||
}
|
||||
@@ -65,14 +65,24 @@ const char *session_get_tuple_str(const struct session *sess)
|
||||
return sess->tuple_str;
|
||||
}
|
||||
|
||||
void session_set_current_direction(struct session *sess, enum session_direction dir)
|
||||
void session_set_direction(struct session *sess, enum session_direction dir)
|
||||
{
|
||||
sess->cur_dir = dir;
|
||||
sess->sess_dir = dir;
|
||||
}
|
||||
|
||||
enum session_direction session_get_current_direction(const struct session *sess)
|
||||
enum session_direction session_get_direction(const struct session *sess)
|
||||
{
|
||||
return sess->cur_dir;
|
||||
return sess->sess_dir;
|
||||
}
|
||||
|
||||
void session_set_flow_direction(struct session *sess, enum flow_direction dir)
|
||||
{
|
||||
sess->flow_dir = dir;
|
||||
}
|
||||
|
||||
enum flow_direction session_get_flow_direction(const struct session *sess)
|
||||
{
|
||||
return sess->flow_dir;
|
||||
}
|
||||
|
||||
void session_set_state(struct session *sess, enum session_state state)
|
||||
@@ -115,12 +125,12 @@ enum closing_reason session_get_closing_reason(const struct session *sess)
|
||||
return sess->reason;
|
||||
}
|
||||
|
||||
void session_inc_stat(struct session *sess, enum session_direction dir, enum session_stat stat, uint64_t val)
|
||||
void session_inc_stat(struct session *sess, enum flow_direction dir, enum session_stat stat, uint64_t val)
|
||||
{
|
||||
sess->stats[dir][stat] += val;
|
||||
}
|
||||
|
||||
uint64_t session_get_stat(const struct session *sess, enum session_direction dir, enum session_stat stat)
|
||||
uint64_t session_get_stat(const struct session *sess, enum flow_direction dir, enum session_stat stat)
|
||||
{
|
||||
return sess->stats[dir][stat];
|
||||
}
|
||||
@@ -135,42 +145,42 @@ uint64_t session_get_timestamp(const struct session *sess, enum session_timestam
|
||||
return sess->timestamps[type];
|
||||
}
|
||||
|
||||
void session_clear_sid_list(struct session *sess, enum session_direction dir)
|
||||
void session_clear_sid_list(struct session *sess, enum flow_direction dir)
|
||||
{
|
||||
memset(&sess->sids[dir], 0, sizeof(struct sid_list));
|
||||
}
|
||||
|
||||
void session_set_sid_list(struct session *sess, enum session_direction dir, const struct sid_list *list)
|
||||
void session_set_sid_list(struct session *sess, enum flow_direction dir, const struct sid_list *list)
|
||||
{
|
||||
sess->sids[dir] = *list;
|
||||
}
|
||||
|
||||
void session_get_sid_list(const struct session *sess, enum session_direction dir, struct sid_list *list)
|
||||
void session_get_sid_list(const struct session *sess, enum flow_direction dir, struct sid_list *list)
|
||||
{
|
||||
*list = sess->sids[dir];
|
||||
}
|
||||
|
||||
void session_clear_route_ctx(struct session *sess, enum session_direction dir)
|
||||
void session_clear_route_ctx(struct session *sess, enum flow_direction dir)
|
||||
{
|
||||
memset(&sess->route_ctx[dir], 0, sizeof(struct route_ctx));
|
||||
}
|
||||
|
||||
void session_set_route_ctx(struct session *sess, enum session_direction dir, const struct route_ctx *ctx)
|
||||
void session_set_route_ctx(struct session *sess, enum flow_direction dir, const struct route_ctx *ctx)
|
||||
{
|
||||
sess->route_ctx[dir] = *ctx;
|
||||
}
|
||||
|
||||
void session_get_route_ctx(const struct session *sess, enum session_direction dir, struct route_ctx *ctx)
|
||||
void session_get_route_ctx(const struct session *sess, enum flow_direction dir, struct route_ctx *ctx)
|
||||
{
|
||||
*ctx = sess->route_ctx[dir];
|
||||
}
|
||||
|
||||
void session_set_1st_packet(struct session *sess, enum session_direction dir, const struct packet *pkt)
|
||||
void session_set_first_packet(struct session *sess, enum flow_direction dir, const struct packet *pkt)
|
||||
{
|
||||
sess->first_pkt[dir] = packet_dup(pkt);
|
||||
}
|
||||
|
||||
const struct packet *session_get_1st_packet(const struct session *sess, enum session_direction dir)
|
||||
const struct packet *session_get_first_packet(const struct session *sess, enum flow_direction dir)
|
||||
{
|
||||
return sess->first_pkt[dir];
|
||||
}
|
||||
@@ -197,7 +207,7 @@ void *session_get_user_data(const struct session *sess)
|
||||
|
||||
struct tcp_segment *session_get_tcp_segment(struct session *sess)
|
||||
{
|
||||
enum session_direction dir = session_get_current_direction(sess);
|
||||
enum flow_direction dir = session_get_flow_direction(sess);
|
||||
struct tcp_half *half = &sess->tcp_halfs[dir];
|
||||
|
||||
if (half->in_order.data != NULL && half->in_order.len > 0)
|
||||
@@ -225,7 +235,7 @@ void session_free_tcp_segment(struct session *sess, struct tcp_segment *seg)
|
||||
return;
|
||||
}
|
||||
|
||||
enum session_direction dir = session_get_current_direction(sess);
|
||||
enum flow_direction dir = session_get_flow_direction(sess);
|
||||
struct tcp_half *half = &sess->tcp_halfs[dir];
|
||||
|
||||
if (seg == &half->in_order)
|
||||
@@ -405,13 +415,13 @@ const char *session_type_to_str(enum session_type type)
|
||||
}
|
||||
}
|
||||
|
||||
const char *session_direction_to_str(enum session_direction dir)
|
||||
const char *flow_direction_to_str(enum flow_direction dir)
|
||||
{
|
||||
switch (dir)
|
||||
{
|
||||
case SESSION_DIRECTION_C2S:
|
||||
case FLOW_DIRECTION_C2S:
|
||||
return "C2S";
|
||||
case SESSION_DIRECTION_S2C:
|
||||
case FLOW_DIRECTION_S2C:
|
||||
return "S2C";
|
||||
default:
|
||||
return "unknown";
|
||||
@@ -458,7 +468,7 @@ int session_to_json(struct session *sess, char *buff, int size)
|
||||
used += snprintf(buff + used, size - used, "\"current_packet\":\"%p\",", session_get_current_packet(sess));
|
||||
|
||||
const char *str[] = {"c2s", "s2c"};
|
||||
enum session_direction dir[] = {SESSION_DIRECTION_C2S, SESSION_DIRECTION_S2C};
|
||||
enum flow_direction dir[] = {FLOW_DIRECTION_C2S, FLOW_DIRECTION_S2C};
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
if (session_get_type(sess) == SESSION_TYPE_TCP)
|
||||
@@ -486,7 +496,7 @@ int session_to_json(struct session *sess, char *buff, int size)
|
||||
used += snprintf(buff + used, size - used, "\"%s_tcp_plds_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_RELEASED));
|
||||
}
|
||||
|
||||
used += snprintf(buff + used, size - used, "\"%s_1st_pkt\":\"%p\",", str[i], session_get_1st_packet(sess, dir[i]));
|
||||
used += snprintf(buff + used, size - used, "\"%s_1st_pkt\":\"%p\",", str[i], session_get_first_packet(sess, dir[i]));
|
||||
used += snprintf(buff + used, size - used, "\"%s_raw_pkts_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PKTS_RX));
|
||||
used += snprintf(buff + used, size - used, "\"%s_raw_bytes_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_RX));
|
||||
used += snprintf(buff + used, size - used, "\"%s_raw_pkts_tx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PKTS_TX));
|
||||
|
||||
Reference in New Issue
Block a user