Changeset 6646938
- Timestamp:
- 08/17/18 17:21:48 (3 years ago)
- Branches:
- develop, master, ringdecrementfix, ringperformance
- Children:
- 37ee856, 73a5b72
- Parents:
- 54a76f2 (diff), 2044185 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Location:
- lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_etsilive.c
r32ee9b2 r2044185 83 83 etsithread_t *receivers; 84 84 int nextthreadid; 85 wandder_etsispec_t *shareddec; 85 86 } etsilive_format_data_t; 86 87 … … 227 228 FORMAT_DATA->listenport = strdup(scan + 1); 228 229 230 FORMAT_DATA->shareddec = wandder_create_etsili_decoder(); 231 229 232 return 0; 230 233 } … … 240 243 if (FORMAT_DATA->listenport) { 241 244 free(FORMAT_DATA->listenport); 245 } 246 if (FORMAT_DATA->shareddec) { 247 wandder_free_etsili_decoder(FORMAT_DATA->shareddec); 242 248 } 243 249 free(libtrace->format_data); … … 522 528 packet->wire_length = esock->cached.length; 523 529 packet->capture_length = esock->cached.length; 524 525 /*526 for (j = 0; j < packet->wire_length; j++) {527 printf("%02x ", *(((uint8_t *)packet->buffer) + j));528 if ((j % 16) == 15) printf("\n");529 }530 printf("\n");531 */532 530 533 531 /* Advance the read pointer for this buffer … … 589 587 590 588 /* Should never get here because cache is set when packet is read */ 591 wandder_etsispec_t *dec;592 589 size_t reclen; 590 libtrace_t *libtrace = packet->trace; 591 592 assert(libtrace); 593 assert(FORMAT_DATA->shareddec); 593 594 594 595 /* 0 should be ok here for quickly evaluating the first length 595 596 * field... */ 596 dec = wandder_create_etsili_decoder();597 wandder_attach_etsili_buffer(dec, packet->buffer,0, false);598 reclen = (size_t)wandder_etsili_get_pdu_length( dec);599 wandder_free_etsili_decoder(dec);597 wandder_attach_etsili_buffer(FORMAT_DATA->shareddec, packet->buffer, 598 0, false); 599 reclen = (size_t)wandder_etsili_get_pdu_length( 600 FORMAT_DATA->shareddec); 600 601 601 602 return reclen; … … 607 608 } 608 609 609 static struct timeval etsilive_get_timeval(const libtrace_packet_t *packet) { 610 /* TODO add cached timestamps to libtrace so we don't have to look 611 * this up again. */ 612 struct timeval tv; 613 wandder_etsispec_t *dec; 614 615 tv.tv_sec = 0; 616 tv.tv_usec = 0; 617 618 619 dec = wandder_create_etsili_decoder(); 620 wandder_attach_etsili_buffer(dec, packet->buffer, 0, false); 621 tv = wandder_etsili_get_header_timestamp(dec); 622 wandder_free_etsili_decoder(dec); 623 return tv; 610 static uint64_t etsilive_get_erf_timestamp(const libtrace_packet_t *packet) { 611 return packet->order; 624 612 } 625 613 … … 652 640 NULL, /* get_direction */ 653 641 NULL, /* set_direction */ 654 NULL,/* get_erf_timestamp */655 etsilive_get_timeval,/* get_timeval */642 etsilive_get_erf_timestamp, /* get_erf_timestamp */ 643 NULL, /* get_timeval */ 656 644 NULL, /* get_timespec */ 657 645 NULL, /* get_seconds */ -
lib/trace.c
r47d4f8c rc862ad1 1008 1008 ++libtrace->accepted_packets; 1009 1009 } 1010 trace_packet_set_order(packet, libtrace->sequence_number); 1010 if (packet->order == 0) { 1011 trace_packet_set_order(packet, libtrace->sequence_number); 1012 } 1011 1013 ++libtrace->sequence_number; 1012 1014 if (!libtrace_parallel && packet->trace == libtrace) -
lib/trace_parallel.c
rc95ef4a reeabc19b 1777 1777 } 1778 1778 1779 if (ret !=0) {1779 if (ret < 0) { 1780 1780 goto cleanup_none; 1781 1781 }
Note: See TracChangeset
for help on using the changeset viewer.