X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fpcap.c;h=9c95c4092ad984b8b47a80860c1347b7e22447a6;hb=23edef9e61fd8c89db4a238c5526b8f44e938aaf;hp=028dd0cb7b36b3749611de862e6389d076ad0fa4;hpb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;p=sliver-openvswitch.git diff --git a/lib/pcap.c b/lib/pcap.c index 028dd0cb7..9c95c4092 100644 --- a/lib/pcap.c +++ b/lib/pcap.c @@ -22,10 +22,10 @@ #include #include "compiler.h" #include "ofpbuf.h" - -#define THIS_MODULE VLM_pcap #include "vlog.h" +VLOG_DEFINE_THIS_MODULE(pcap); + struct pcap_hdr { uint32_t magic_number; /* magic number */ uint16_t version_major; /* major version number */ @@ -76,8 +76,7 @@ pcap_read_header(FILE *file) struct pcap_hdr ph; if (fread(&ph, sizeof ph, 1, file) != 1) { int error = ferror(file) ? errno : EOF; - VLOG_WARN("failed to read pcap header: %s", - error > 0 ? strerror(error) : "end of file"); + VLOG_WARN("failed to read pcap header: %s", ovs_retval_to_string(error)); return error; } if (ph.magic_number != 0xa1b2c3d4 && ph.magic_number != 0xd4c3b2a1) { @@ -101,7 +100,7 @@ pcap_write_header(FILE *file) ph.sigfigs = 0; ph.snaplen = 1518; ph.network = 1; /* Ethernet */ - fwrite(&ph, sizeof ph, 1, file); + ignore(fwrite(&ph, sizeof ph, 1, file)); } int @@ -118,7 +117,7 @@ pcap_read(FILE *file, struct ofpbuf **bufp) if (fread(&prh, sizeof prh, 1, file) != 1) { int error = ferror(file) ? errno : EOF; VLOG_WARN("failed to read pcap record header: %s", - error > 0 ? strerror(error) : "end of file"); + ovs_retval_to_string(error)); return error; } @@ -144,7 +143,7 @@ pcap_read(FILE *file, struct ofpbuf **bufp) if (fread(data, len, 1, file) != 1) { int error = ferror(file) ? errno : EOF; VLOG_WARN("failed to read pcap packet: %s", - error > 0 ? strerror(error) : "end of file"); + ovs_retval_to_string(error)); ofpbuf_delete(buf); return error; } @@ -160,6 +159,6 @@ pcap_write(FILE *file, struct ofpbuf *buf) prh.ts_usec = 0; prh.incl_len = buf->size; prh.orig_len = buf->size; - fwrite(&prh, sizeof prh, 1, file); - fwrite(buf->data, buf->size, 1, file); + ignore(fwrite(&prh, sizeof prh, 1, file)); + ignore(fwrite(buf->data, buf->size, 1, file)); }