Update to 5.2.3

This commit is contained in:
Jean-Yves Lefort 2006-04-11 22:26:38 +00:00
parent 66586dd1ca
commit 4b372dfdbb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=159352
4 changed files with 30 additions and 26 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= trafshow
PORTVERSION= 5.2.2
PORTVERSION= 5.2.3
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/RinetSoftware/
@ -15,7 +15,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= jylefort@FreeBSD.org
COMMENT= Full screen visualization of network traffic
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
ALL_TARGET= trafshow

View file

@ -1,3 +1,3 @@
MD5 (trafshow-5.2.2.tgz) = 6fbf6668b87415ff0baa75021204a264
SHA256 (trafshow-5.2.2.tgz) = 7b6b014d9e67c9a09e66caa002208071d603067782c3b86e1ddb9a6aefe5ff25
SIZE (trafshow-5.2.2.tgz) = 124191
MD5 (trafshow-5.2.3.tgz) = 0b2f0bb23b7832138b7d841437b9e182
SHA256 (trafshow-5.2.3.tgz) = ea7e22674a66afcc7174779d0f803c1f25b42271973b4f75fab293b8d7db11fc
SIZE (trafshow-5.2.3.tgz) = 142615

View file

@ -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 */

View file

@ -1,22 +1,22 @@
--- trafshow.c.orig Sun Jan 8 08:05:29 2006
+++ trafshow.c Wed Feb 1 18:07:33 2006
--- trafshow.c.orig Wed Apr 12 00:10:18 2006
+++ trafshow.c Wed Apr 12 00:12:49 2006
@@ -20,6 +20,7 @@
#endif
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/ioctl.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
@@ -281,6 +282,7 @@
pcap_t *pd;
#ifdef HAVE_PCAP_GET_SELECTABLE_FD
#include <sys/select.h>
#endif
@@ -307,6 +308,7 @@
const pcap_addr_t *ap;
PCAP_HANDLER *ph, *ph_prev = 0;
char buf[256];
+ u_int v;
char *cp, buf[256];
+ int v = 1;
if (!ph_list) return -1;
@@ -307,6 +309,13 @@
@@ -334,6 +336,12 @@
}
if (pcap_setnonblock(pd, 1, buf) < 0) {
fprintf(stderr, "%s: %s\n", dp->name, buf);
@ -24,7 +24,6 @@
+ err++;
+ continue;
+ }
+ v = 1;
+ if (ioctl(pcap_fileno(pd), BIOCIMMEDIATE, &v) < 0) {
+ fprintf(stderr, "%s: %s\n", dp->name, strerror(errno));
pcap_close(pd);