gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
luwenpeng
2024-05-20 11:12:24 +08:00
parent ccaddf7fdb
commit 0e33a1b647
24 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/session/session.cpp
View File

@@ -1,4 +1,3 @@
#include "stellar/session.h"
#include <assert.h>
#include "packet_priv.h"
@@ -62,14 +61,14 @@ enum flow_direction session_get_tuple6_direction(const struct session *sess)
return sess->tuple_dir;
}
const char *session_get_tuple6_str(const struct session *sess)
const char *session_get0_readable_addr(const struct session *sess)
{
return sess->tuple_str;
}
const char *session_get0_readable_addr(struct session *sess)
{
return sess->tuple_str;
return sess->tuple_str;
}
void session_set_direction(struct session *sess, enum session_direction dir)
@@ -92,16 +91,11 @@ enum flow_direction session_get_current_flow_direction(const struct session *ses
return sess->flow_dir;
}
void session_set_state(struct session *sess, enum session_state state)
void session_set_current_state(struct session *sess, enum session_state state)
{
sess->state = state;
}
enum session_state session_get_state(const struct session *sess)
{
return sess->state;
}
enum session_state session_get_current_state(const struct session *sess)
{
return sess->state;
@@ -202,53 +196,54 @@ void session_set_current_packet(struct session *sess, const struct packet *pkt)
sess->curr_pkt = pkt;
}
const struct packet *session_get_current_packet(const struct session *sess)
const struct packet *session_get0_current_packet(const struct session *sess)
{
return sess->curr_pkt;
}
const inline struct packet *session_get0_current_packet(struct session *sess)
const char *session_get0_current_payload(const struct session *sess, size_t *payload_len)
{
return sess->curr_pkt;
}
const char *session_get0_current_payload(struct session *sess, size_t *payload_len)
{
const struct packet *pkt=session_get_current_packet(sess);
if(pkt)
const struct packet *pkt = session_get0_current_packet(sess);
if (pkt)
{
const struct packet_layer *pkt_layer=packet_get_innermost_layer(pkt, LAYER_TYPE_ALL);
if(pkt_layer)
const struct packet_layer *pkt_layer = packet_get_innermost_layer(pkt, LAYER_TYPE_ALL);
if (pkt_layer)
{
*payload_len=pkt_layer->pld_len;
*payload_len = pkt_layer->pld_len;
return pkt_layer->pld_ptr;
}
}
*payload_len=0;
*payload_len = 0;
return NULL;
}
int session_is_symmetric(struct session *sess, unsigned char *flag)
int session_is_symmetric(const struct session *sess, unsigned char *flag)
{
int is_symmetric=0;
int is_symmetric = 0;
if (sess->first_pkt[FLOW_DIRECTION_C2S] && sess->first_pkt[FLOW_DIRECTION_S2C])
{
if (flag)
{
*flag = (SESSION_SEEN_C2S_FLOW | SESSION_SEEN_S2C_FLOW);
}
is_symmetric = 1;
}
else if (sess->first_pkt[FLOW_DIRECTION_C2S])
{
if (flag)
{
*flag = SESSION_SEEN_C2S_FLOW;
}
}
else if (sess->first_pkt[FLOW_DIRECTION_S2C])
{
if (flag)
{
*flag = SESSION_SEEN_S2C_FLOW;
}
}
return is_symmetric;
}
}
void session_set_user_data(struct session *sess, void *user_data)
{
@@ -518,12 +513,12 @@ int session_to_json(struct session *sess, char *buff, int size)
used += snprintf(buff + used, size - used, "\"id\":%" PRIu64 ",", session_get_id(sess));
used += snprintf(buff + used, size - used, "\"start_timestamp\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_START));
used += snprintf(buff + used, size - used, "\"last_timestamp\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get_tuple6_str(sess));
used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get0_readable_addr(sess));
used += snprintf(buff + used, size - used, "\"type\":\"%s\",", session_type_to_str(session_get_type(sess)));
used += snprintf(buff + used, size - used, "\"state\":\"%s\",", session_state_to_str(session_get_state(sess)));
used += snprintf(buff + used, size - used, "\"state\":\"%s\",", session_state_to_str(session_get_current_state(sess)));
used += snprintf(buff + used, size - used, "\"closing_reason\":\"%s\",", closing_reason_to_str(session_get_closing_reason(sess)));
used += snprintf(buff + used, size - used, "\"duplicate_traffic\":%d,", session_has_duplicate_traffic(sess));
used += snprintf(buff + used, size - used, "\"current_packet\":\"%p\",", session_get_current_packet(sess));
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};