Changeset 2c457ec
- Timestamp:
- 11/16/17 10:37:56 (3 years ago)
- Branches:
- cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance
- Children:
- 9726d0e
- Parents:
- be32cc7
- git-author:
- Robert A Zeh <robert.a.zeh@…> (11/16/17 10:36:16)
- git-committer:
- Robert A Zeh <razeh@…> (11/16/17 10:37:56)
- Location:
- lib
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_atmhdr.c
ree6e802 r2c457ec 137 137 { 138 138 if (numbytes != 0) { 139 trace_set_err(libtrace, errno,"read(%s)",libtrace->uridata);139 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"read(%s)",libtrace->uridata); 140 140 } 141 141 return numbytes; -
lib/format_legacy.c
ree6e802 r2c457ec 269 269 (size_t)64)) != 64) { 270 270 if (numbytes < 0) { 271 trace_set_err(libtrace, errno,"read(%s)",libtrace->uridata);271 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"read(%s)",libtrace->uridata); 272 272 } else if (numbytes > 0) { 273 273 … … 310 310 (size_t)68)) != 68) { 311 311 if (numbytes < 0) { 312 trace_set_err(libtrace, errno,"read(%s)",libtrace->uridata);312 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"read(%s)",libtrace->uridata); 313 313 } else if (numbytes > 0) 314 314 continue; -
lib/format_pcapfile.c
r633339d r2c457ec 357 357 sizeof(libtrace_pcapfile_pkt_hdr_t)); 358 358 if (err<0) { 359 trace_set_err(libtrace, errno,"reading packet");359 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"reading packet"); 360 360 return -1; 361 361 } … … 366 366 367 367 if (err < (int)sizeof(libtrace_pcapfile_pkt_hdr_t)) { 368 trace_set_err(libtrace, errno, "Incomplete pcap packet header");368 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Incomplete pcap packet header"); 369 369 return -1; 370 370 } … … 393 393 394 394 if (err<0) { 395 trace_set_err(libtrace, errno,"reading packet");395 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"reading packet"); 396 396 return -1; 397 397 } … … 401 401 402 402 if (err < (int)bytes_to_read) { 403 trace_set_err(libtrace, errno, "Incomplete pcap packet body");403 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "Incomplete pcap packet body"); 404 404 return -1; 405 405 } -
lib/format_pcapng.c
red5b2ce r2c457ec 330 330 err = wandio_read(libtrace->io, buf, nextread); 331 331 if (err < 0) { 332 trace_set_err(libtrace, errno,332 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, 333 333 "Reading section header options"); 334 334 return -1; … … 351 351 err = wandio_read(libtrace->io, body, to_read); 352 352 if (err < 0) { 353 trace_set_err(libtrace, errno,353 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, 354 354 "Failed to read pcapng interface options"); 355 355 return err; … … 444 444 445 445 if (err < 0) { 446 trace_set_err(libtrace, errno,446 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, 447 447 "Reading pcapng section header block"); 448 448 return -1; … … 519 519 520 520 if (err < 0) { 521 trace_set_err(libtrace, errno,521 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, 522 522 "Reading pcapng interface header block"); 523 523 return -1; … … 626 626 627 627 if (err < 0) { 628 trace_set_err(libtrace, errno, "reading pcapng name resolution block");628 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng name resolution block"); 629 629 return -1; 630 630 } … … 682 682 683 683 if (err < 0) { 684 trace_set_err(libtrace, errno, "reading pcapng custom block");684 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng custom block"); 685 685 return -1; 686 686 } … … 740 740 741 741 if (err < 0) { 742 trace_set_err(libtrace, errno, "reading pcapng interface stats");742 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng interface stats"); 743 743 return -1; 744 744 } … … 861 861 862 862 if (err < 0) { 863 trace_set_err(libtrace, errno, "reading pcapng simple packet");863 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng simple packet"); 864 864 return -1; 865 865 } … … 930 930 931 931 if (err < 0) { 932 trace_set_err(libtrace, errno, "reading pcapng enhanced packet");932 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng enhanced packet"); 933 933 return -1; 934 934 } … … 1039 1039 err = wandio_peek(libtrace->io, &peeker, sizeof(peeker)); 1040 1040 if (err < 0) { 1041 trace_set_err(libtrace, errno, "reading pcapng packet");1041 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng packet"); 1042 1042 return -1; 1043 1043 } … … 1048 1048 1049 1049 if (err < (int)sizeof(struct pcapng_peeker)) { 1050 trace_set_err(libtrace, errno, "Incomplete pcapng block");1050 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "Incomplete pcapng block"); 1051 1051 return -1; 1052 1052 } -
lib/format_tsh.c
ree6e802 r2c457ec 131 131 buffer2, 132 132 (size_t)sizeof(tsh_pkt_header_t))) == -1) { 133 trace_set_err(libtrace, errno,"read(%s)",133 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"read(%s)", 134 134 libtrace->uridata); 135 135 return -1; … … 141 141 142 142 if (numbytes < (int)sizeof(tsh_pkt_header_t)) { 143 trace_set_err(libtrace, errno, "Incomplete TSH header");143 trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "Incomplete TSH header"); 144 144 return -1; 145 145 } … … 152 152 (size_t)sizeof(libtrace_ip_t)+16)) /* 16 bytes of transport header */ 153 153 != sizeof(libtrace_ip_t)+16) { 154 trace_set_err(libtrace, errno,"read(%s)",154 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"read(%s)", 155 155 libtrace->uridata); 156 156 return -1; … … 167 167 buffer2, 168 168 16)) != 16) { 169 trace_set_err(libtrace, errno,"read(%s)",169 trace_set_err(libtrace,TRACE_ERR_WANDIO_FAILED,"read(%s)", 170 170 libtrace->uridata); 171 171 return -1; -
lib/libtrace.h.in
rea75ec2 r2c457ec 305 305 TRACE_ERR_RT_FAILURE = -10, 306 306 /** Compression format unsupported */ 307 TRACE_ERR_UNSUPPORTED_COMPRESS = -11 307 TRACE_ERR_UNSUPPORTED_COMPRESS = -11, 308 /** Wandio has returned an error */ 309 TRACE_ERR_WANDIO_FAILED = -12 308 310 }; 309 311
Note: See TracChangeset
for help on using the changeset viewer.