Changeset d8f02df for lib/trace.c
- Timestamp:
- 02/27/06 16:53:10 (16 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
- Children:
- 5fb2251
- Parents:
- 8a8e54b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/trace.c
rd5879cc rd8f02df 292 292 libtrace->filter = NULL; 293 293 libtrace->snaplen = 0; 294 libtrace->started=false; 294 295 295 296 for (i = 0; i < nformats; i++) { … … 330 331 331 332 libtrace->fifo = create_tracefifo(1048576); 333 if (!libtrace->fifo) { 334 trace_set_err(libtrace,ENOMEM,"Could not allocate memory for fifo"); 335 free(scan); 336 return libtrace; 337 } 332 338 assert(libtrace->fifo); 333 339 free(scan); 334 libtrace->started=false;335 340 trace_set_err(libtrace,0,""); 336 341 return libtrace; … … 594 599 memcpy(dest->header,packet->header,trace_get_framing_length(packet)); 595 600 memcpy(dest->payload,packet->payload,trace_get_capture_length(packet)); 601 602 return dest; 596 603 } 597 604 … … 631 638 do { 632 639 packet->size=libtrace->format->read_packet(libtrace,packet); 633 if (packet->size== -1 || packet->size==0)640 if (packet->size==(size_t)-1 || packet->size==0) 634 641 return packet->size; 635 642 if (libtrace->filter) { … … 1169 1176 } 1170 1177 1171 int trace_get_capture_length(const struct libtrace_packet_t *packet) {1178 size_t trace_get_capture_length(const libtrace_packet_t *packet) { 1172 1179 1173 1180 assert(packet->size>0 && packet->size<65536); … … 1188 1195 * not be the same as the Capture Len. 1189 1196 */ 1190 int trace_get_wire_length(const struct libtrace_packet_t *packet){1197 size_t trace_get_wire_length(const libtrace_packet_t *packet){ 1191 1198 assert(packet->size>0 && packet->size<65536); 1192 1199 … … 1207 1214 */ 1208 1215 SIMPLE_FUNCTION 1209 int trace_get_framing_length(const libtrace_packet_t *packet) {1216 size_t trace_get_framing_length(const libtrace_packet_t *packet) { 1210 1217 if (packet->trace->format->get_framing_length) { 1211 1218 return packet->trace->format->get_framing_length(packet);
Note: See TracChangeset
for help on using the changeset viewer.