quentin/tor_multipath_voip
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed an alignment bug

Browse source
This commit is contained in:
Quentin 2021-01-26 15:19:09 +01:00
parent c77fcf148d
commit 4b48b69d92
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/meas_lat.c
View file

@ -110,9 +110,8 @@ void measlat_stop(
int net_fd, int timer_fd) { int net_fd, int timer_fd) {
if (ms->mp_in->counter < mctx->mp.max_measure) return; if (ms->mp_in->counter < mctx->mp.max_measure) return;
if (ms->mp_out->counter < mctx->mp.max_measure) return; if (ms->mp_out->counter < mctx->mp.max_measure) return;
printf("[states] measurement %d+%d terminated\n", net_fd, timer_fd); printf("[states] measurement %d+%d terminated\n", net_fd, timer_fd);
measure_summary (&mctx->mp, ms); measure_summary (&(mctx->mp), ms);
evt_core_rm_fd(ctx, timer_fd); evt_core_rm_fd(ctx, timer_fd);
if (!(mctx->connectionless && mctx->role == MEASLAT_SERVER)) if (!(mctx->connectionless && mctx->role == MEASLAT_SERVER))
evt_core_rm_fd(ctx, net_fd); evt_core_rm_fd(ctx, net_fd);

6
src/measure.c
View file

@ -158,6 +158,12 @@ int cmpuint64t(const void* u1, const void* u2) {
return *i1 < *i2 ? -1 : 1; return *i1 < *i2 ? -1 : 1;
} }
void measure_param_print(struct measure_params* mp) {
fprintf(stderr,
"measure_params {\n\tmax_measure: %lu\n\tpayload_size: %lu\n\tinterval: %lu\n\tis_server: %u\n\ttag: %s\n}\n",
mp->max_measure, mp->payload_size, mp->interval, mp->is_server, mp->tag);
}
void measure_summary(struct measure_params* mp, struct measure_state* ms) { void measure_summary(struct measure_params* mp, struct measure_state* ms) {
char uuidstr[128]; char uuidstr[128];
uuid_unparse (ms->uuid, uuidstr); uuid_unparse (ms->uuid, uuidstr);

3
src/measure.h
View file

@ -30,9 +30,11 @@ struct measure_packet {
uint8_t flag; uint8_t flag;
struct timespec emit_time; struct timespec emit_time;
}; };
#pragma pack()
void measure_params_init(struct measure_params* mp); void measure_params_init(struct measure_params* mp);
void measure_params_setpl (struct measure_params* mp, size_t plsize); void measure_params_setpl (struct measure_params* mp, size_t plsize);
void measure_param_print(struct measure_params* mp);
void measure_state_init(struct measure_params* mp, struct measure_state* ms); void measure_state_init(struct measure_params* mp, struct measure_state* ms);
void measure_state_free(struct measure_state* ms); void measure_state_free(struct measure_state* ms);
@ -42,3 +44,4 @@ struct measure_packet* measure_generate(struct measure_params* mp, struct measur
void measure_next_tick(struct measure_params *mp, struct measure_state* ms, struct timespec *next); void measure_next_tick(struct measure_params *mp, struct measure_state* ms, struct timespec *next);
void measure_summary(struct measure_params* mp, struct measure_state* ms); void measure_summary(struct measure_params* mp, struct measure_state* ms);

1
src/packet.h
View file

@ -78,6 +78,7 @@ union abstract_packet {
} content; } content;
} fmt; } fmt;
}; };
#pragma pack()
struct buffer_packet { struct buffer_packet {
enum BP_MODE mode; enum BP_MODE mode;

4
src/socks5.h
View file

@ -94,13 +94,11 @@ struct client_handshake {
uint8_t methods[255]; uint8_t methods[255];
}; };
#pragma pack(1)
struct server_handshake { struct server_handshake {
uint8_t ver; uint8_t ver;
uint8_t method; uint8_t method;
}; };
#pragma pack(1)
struct client_request { struct client_request {
uint8_t ver; uint8_t ver;
uint8_t cmd; uint8_t cmd;
@ -110,7 +108,6 @@ struct client_request {
uint16_t port; uint16_t port;
}; };
#pragma pack(1)
struct server_reply { struct server_reply {
uint8_t ver; uint8_t ver;
uint8_t rep; uint8_t rep;
@ -119,6 +116,7 @@ struct server_reply {
union socks5_addr bind_addr; union socks5_addr bind_addr;
uint16_t port; uint16_t port;
}; };
#pragma pack()
struct socks5_ctx { struct socks5_ctx {
uint16_t port; uint16_t port;