Changeset c69aecb
- Timestamp:
- 09/30/14 15:17:06 (6 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
- 3c54095
- Parents:
- 525d09d
- Location:
- lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
rc70f59f rc69aecb 480 480 packet->buffer, 481 481 (size_t)dag_record_size)) == -1) { 482 trace_set_err(libtrace,errno,"read(%s)", 483 libtrace->uridata); 482 trace_set_err(libtrace,errno,"reading ERF file"); 484 483 return -1; 485 484 } … … 488 487 return 0; 489 488 } 489 490 if (numbytes < (int)dag_record_size) { 491 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Incomplete ERF header"); 492 return -1; 493 } 490 494 491 495 rlen = ntohs(((dag_record_t *)packet->buffer)->rlen); … … 522 526 return -1; 523 527 } 528 529 if (numbytes < (int)size) { 530 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Incomplete ERF record"); 531 return -1; 532 } 524 533 525 534 if (erf_prepare_packet(libtrace, packet, packet->buffer, -
lib/format_pcapfile.c
rc70f59f rc69aecb 210 210 211 211 if (err<1) { 212 if (err == 0) { 213 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, 214 "Reading pcap file header\n"); 215 } 212 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, 213 "Error while reading pcap file header\n"); 216 214 return -1; 217 215 } 218 216 217 if (err != (int)sizeof(DATA(libtrace)->header)) { 218 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, 219 "Incomplete pcap file header"); 220 return -1; 221 } 222 219 223 if (!header_is_magic(&(DATA(libtrace)->header))) { 220 224 trace_set_err(libtrace,TRACE_ERR_INIT_FAILED, … … 359 363 packet->buffer, 360 364 sizeof(libtrace_pcapfile_pkt_hdr_t)); 361 362 365 if (err<0) { 363 366 trace_set_err(libtrace,errno,"reading packet"); … … 368 371 return 0; 369 372 } 373 374 if (err < (int)sizeof(libtrace_pcapfile_pkt_hdr_t)) { 375 trace_set_err(libtrace, errno, "Incomplete pcap packet header"); 376 return -1; 377 } 370 378 371 379 bytes_to_read = swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen); … … 391 399 ); 392 400 393 394 401 if (err<0) { 395 402 trace_set_err(libtrace,errno,"reading packet"); … … 399 406 return 0; 400 407 } 408 409 if (err < (int)bytes_to_read) { 410 trace_set_err(libtrace, errno, "Incomplete pcap packet body"); 411 return -1; 412 } 401 413 402 414 if (pcapfile_prepare_packet(libtrace, packet, packet->buffer, -
lib/format_tsh.c
rc909fad rc69aecb 147 147 return 0; 148 148 } 149 150 if (numbytes < (int)sizeof(tsh_pkt_header_t)) { 151 trace_set_err(libtrace, errno, "Incomplete TSH header"); 152 return -1; 153 } 149 154 150 155 buffer2 = (char*)buffer2 + numbytes;
Note: See TracChangeset
for help on using the changeset viewer.