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

Fix another stupid bug

Browse source
This commit is contained in:
Quentin 2019-08-28 17:42:15 +02:00
parent a9e5267495
commit eb7b3a4712
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/packet.c
View file

@ -47,7 +47,7 @@ union abstract_packet* buffer_append_ap(struct buffer_packet* bp, union abstract
enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer_packet* bp) { enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer_packet* bp) {
ssize_t nread = 0, ap_aread = 0, cur_ap_aread = 0; ssize_t nread = 0, ap_aread = 0, cur_ap_aread = 0;
union abstract_packet* ap = (union abstract_packet*) &bp->ip; union abstract_packet* ap = buffer_first_ap (bp);
size_t pkt_size_size = sizeof(ap->fmt.headers.size); size_t pkt_size_size = sizeof(ap->fmt.headers.size);
if (bp->mode != BP_READING) return FDS_ERR; if (bp->mode != BP_READING) return FDS_ERR;
@ -55,7 +55,8 @@ enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer
do { do {
//fprintf(stderr, "bp->ap_count=%d\n", bp->ap_count); //fprintf(stderr, "bp->ap_count=%d\n", bp->ap_count);
ap = (union abstract_packet*) &bp->ip; ap = buffer_first_ap (bp);
ap_aread = 0;
for (int i = 0; i < bp->ap_count; i++) { for (int i = 0; i < bp->ap_count; i++) {
ap_aread += ap->fmt.headers.size; ap_aread += ap->fmt.headers.size;
ap = ap_next (ap); ap = ap_next (ap);
@ -84,6 +85,7 @@ enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer
bp->ap_count++; bp->ap_count++;
//fprintf(stderr, "bp->ap_count=%d, buffer_count_ap(bp)=%ld\n", bp->ap_count, buffer_count_ap (bp)); //fprintf(stderr, "bp->ap_count=%d, buffer_count_ap(bp)=%ld\n", bp->ap_count, buffer_count_ap (bp));
//dump_buffer_packet (bp);
} while (bp->ap_count != buffer_count_ap (bp)); } while (bp->ap_count != buffer_count_ap (bp));
bp->mode = BP_WRITING; bp->mode = BP_WRITING;
@ -196,10 +198,8 @@ enum FD_STATE read_packet_from_udp (struct evt_core_fdinfo* fdinfo, struct buffe
void dump_buffer_packet(struct buffer_packet* bp) { void dump_buffer_packet(struct buffer_packet* bp) {
printf("<Buffer Packet>\n"); printf("<Buffer Packet>\n");
printf(" mode=%d, aread=%d, awrite=%d, ap_count=%d, usage=%ld/%ld\n", bp->mode, bp->aread, bp->awrite, bp->ap_count, buffer_full_size (bp), sizeof(bp->ip)); printf(" mode=%d, aread=%d, awrite=%d, ap_count=%d, usage=%ld/%ld\n", bp->mode, bp->aread, bp->awrite, bp->ap_count, buffer_full_size (bp), sizeof(bp->ip));
union abstract_packet* ap = (union abstract_packet*) &bp->ip; for (union abstract_packet* ap = buffer_first_ap (bp); ap != NULL; ap = ap_next (ap)) {
for (int i = 0; i < bp->ap_count; i++) {
dump_abstract_packet(ap); dump_abstract_packet(ap);
ap = (union abstract_packet*)(&ap->raw + ap->fmt.headers.size);
} }
printf("</Buffer Packet>\n"); printf("</Buffer Packet>\n");
} }