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

10
include/stellar/session.h
View File

@@ -123,17 +123,17 @@ enum session_timestamp
};
struct session;
#define SESSION_SEEN_C2S_FLOW (1 << 0)
#define SESSION_SEEN_S2C_FLOW (1 << 1)
int session_is_symmetric(struct session *sess, unsigned char *flag);
int session_is_symmetric(const struct session *sess, unsigned char *flag);
int session_has_duplicate_traffic(const struct session *sess);
enum session_type session_get_type(const struct session *sess);
enum session_state session_get_state(const struct session *sess);
enum session_state session_get_current_state(const struct session *sess);
const struct packet *session_get0_current_packet(struct session *sess);
const char *session_get0_current_payload(struct session *sess, size_t *payload_len);
const struct packet *session_get0_current_packet(const struct session *sess);
const char *session_get0_current_payload(const struct session *sess, size_t *payload_len);
enum closing_reason session_get_closing_reason(const struct session *sess);
enum session_direction session_get_direction(const struct session *sess);
@@ -142,8 +142,6 @@ const struct packet *session_get_first_packet(const struct session *sess, enum f
const struct tuple6 *session_get_tuple6(const struct session *sess);
enum flow_direction session_get_tuple6_direction(const struct session *sess);
// tuple6 str format: "src_addr:src_port -> dst_addr:dst_port, proto: ip_proto, domain: domain"
const char *session_get_tuple6_str(const struct session *sess);
uint64_t session_get_id(const struct session *sess);
uint64_t session_get_timestamp(const struct session *sess, enum session_timestamp type);

2
include/stellar/stellar.h
View File

@@ -9,8 +9,6 @@ extern "C"
#include <stdint.h>
#include "stellar/session.h"
#include "session.h"
struct session;
struct stellar;