diff options
| author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2006-04-11 22:26:38 +0000 |
|---|---|---|
| committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2006-04-11 22:26:38 +0000 |
| commit | 4b372dfdbba4ba9c582a8b9cef51ed2cb7ac7e13 (patch) | |
| tree | c945f70ac0db0278b6da655bec44deeaae2ee59b /net/trafshow/files/patch-show_dump.c | |
| parent | Also fix IGNORE to follow style. (diff) | |
Update to 5.2.3
Notes
Notes:
svn path=/head/; revision=159352
Diffstat (limited to 'net/trafshow/files/patch-show_dump.c')
| -rw-r--r-- | net/trafshow/files/patch-show_dump.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/net/trafshow/files/patch-show_dump.c b/net/trafshow/files/patch-show_dump.c index 6e7fc4bbfc35..a6426d831122 100644 --- a/net/trafshow/files/patch-show_dump.c +++ b/net/trafshow/files/patch-show_dump.c @@ -1,5 +1,5 @@ ---- show_dump.c.orig Mon Jul 12 07:21:09 2004 -+++ show_dump.c Wed Feb 1 18:07:01 2006 +--- show_dump.c.orig Wed Apr 12 00:16:51 2006 ++++ show_dump.c Wed Apr 12 00:18:21 2006 @@ -21,6 +21,7 @@ #include <sys/param.h> #include <sys/types.h> @@ -12,20 +12,26 @@ bpf_u_int32 net; bpf_u_int32 mask; char name[100], buf[256]; -+ u_int v; ++ int v = 1; /* sanity check */ if (!ph || !ns) return -1; -@@ -141,6 +143,12 @@ +@@ -139,13 +141,16 @@ + if (buf[0] != '\0') + screen_status("%s: %s", ph->name, buf); if (!live_pcap) return -1; +-#ifdef notdef if (pcap_setnonblock(live_pcap, 1, buf) < 0) { screen_status("%s: %s", ph->name, buf); -+ show_dump_close(); -+ return -1; -+ } -+ v = 1; -+ if (ioctl(pcap_fileno(live_pcap), BIOCIMMEDIATE, &v) < 0) { -+ screen_status("%s: %s", ph->name, strerror(errno)); show_dump_close(); return -1; } +-#endif ++ if (ioctl(pcap_fileno(live_pcap), BIOCIMMEDIATE, &v) < 0) { ++ screen_status("%s: %s", ph->name, strerror(errno)); ++ show_dump_close(); ++ return -1; ++ } + /* setup filter expression */ + if (pcap_lookupnet(strcpy(name, ph->name), &net, &mask, buf) < 0) { + /* ignore error */ |