aboutsummaryrefslogtreecommitdiff
path: root/net/pfflowd
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2004-11-10 21:06:49 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2004-11-10 21:06:49 +0000
commit5ce6698fd43e11d99adce5d623620cbdfd294701 (patch)
tree305fa13ffaaecce604d501a2285dd560372cf5d9 /net/pfflowd
parent86413a1c8a7454cde643024d3a9e7567c4d896b3 (diff)
downloadports-5ce6698fd43e11d99adce5d623620cbdfd294701.tar.gz
ports-5ce6698fd43e11d99adce5d623620cbdfd294701.zip
Notes
Diffstat (limited to 'net/pfflowd')
-rw-r--r--net/pfflowd/Makefile2
-rw-r--r--net/pfflowd/distinfo4
-rw-r--r--net/pfflowd/files/patch-pfflowd.c66
3 files changed, 30 insertions, 42 deletions
diff --git a/net/pfflowd/Makefile b/net/pfflowd/Makefile
index 3231b1bd97d9..7303ed12dace 100644
--- a/net/pfflowd/Makefile
+++ b/net/pfflowd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pfflowd
-PORTVERSION= 0.5
+PORTVERSION= 0.6
CATEGORIES= net
MASTER_SITES= http://www.mindrot.org/files/pfflowd/
diff --git a/net/pfflowd/distinfo b/net/pfflowd/distinfo
index c1450d0110dc..2abe5530ac1e 100644
--- a/net/pfflowd/distinfo
+++ b/net/pfflowd/distinfo
@@ -1,2 +1,2 @@
-MD5 (pfflowd-0.5.tar.gz) = d25ea182952c6da381e81be05a81475f
-SIZE (pfflowd-0.5.tar.gz) = 12001
+MD5 (pfflowd-0.6.tar.gz) = c2d7bfff10594ffd3f50a7c54f8d9304
+SIZE (pfflowd-0.6.tar.gz) = 12925
diff --git a/net/pfflowd/files/patch-pfflowd.c b/net/pfflowd/files/patch-pfflowd.c
index 4c91ffa9ec4b..940ff354585c 100644
--- a/net/pfflowd/files/patch-pfflowd.c
+++ b/net/pfflowd/files/patch-pfflowd.c
@@ -1,6 +1,6 @@
---- pfflowd.c Thu May 6 16:06:45 2004
-+++ pfflowd.c Tue Jun 15 09:40:46 2004
-@@ -43,7 +43,11 @@
+--- pfflowd.c.orig Tue Sep 7 00:25:57 2004
++++ pfflowd.c Wed Nov 10 13:46:53 2004
+@@ -40,7 +40,11 @@
#include <syslog.h>
#include <time.h>
#include <unistd.h>
@@ -9,49 +9,37 @@
+#else
#include <util.h>
+#endif
+ #include <netdb.h>
+ #include "pfflowd.h"
- #define PROGNAME "pfflowd"
- #define PROGVER "0.5"
-@@ -189,6 +193,9 @@
- parse_hostport(const char *s, struct sockaddr_in *addr)
+@@ -115,9 +119,7 @@
+ /* Signal handlers */
+ static void sighand_exit(int signum)
{
- char *host, *port;
-+#if defined(__FreeBSD__)
-+ int val;
-+#endif
+- struct syslog_data sd = SYSLOG_DATA_INIT;
+-
+- syslog_r(LOG_INFO, &sd, "%s exiting on signal %d", PROGNAME, signum);
++ syslog(LOG_INFO, "%s exiting on signal %d", PROGNAME, signum);
- if ((host = strdup(s)) == NULL) {
- fprintf(stderr, "Out of memory\n");
-@@ -201,12 +208,22 @@
- }
- *(port - 1) = '\0';
- addr->sin_family = AF_INET;
-+#if defined(__FreeBSD__)
-+ val = atoi(port);
-+ if (val <= 0 || val >= 65536) {
-+ fprintf(stderr, "Invalid -n port.\n");
-+ usage();
-+ exit(1);
-+ }
-+ addr->sin_port = (in_port_t)val;
-+#else
- addr->sin_port = atoi(port);
- if (addr->sin_port <= 0 || addr->sin_port >= 65536) {
- fprintf(stderr, "Invalid -n port.\n");
- usage();
- exit(1);
- }
+ _exit(0);
+ }
+@@ -366,7 +368,9 @@
+ strlcat(dst_s, pbuf, sizeof(dst_s));
+ }
+
++#ifndef OLD_PFSYNC
+ syslog(LOG_DEBUG, "IFACE %s", st[i].ifname);
+#endif
- addr->sin_port = htons(addr->sin_port);
- if (inet_aton(host, &addr->sin_addr) == 0) {
- fprintf(stderr, "Invalid -n host.\n");
-@@ -425,7 +442,9 @@
+ syslog(LOG_DEBUG, "GWY %s", rt_s);
+ syslog(LOG_DEBUG, "FLOW proto %d direction %d",
+ st[i].proto, st[i].direction);
+@@ -538,7 +542,9 @@
strlcat(dst_s, pbuf, sizeof(dst_s));
}
+#ifndef OLD_PFSYNC
- syslog(LOG_DEBUG, "IFACE %s\n", st->ifname);
+ syslog(LOG_DEBUG, "IFACE %s", st[i].ifname);
+#endif
- syslog(LOG_DEBUG, "GWY %s\n", rt_s);
+ syslog(LOG_DEBUG, "GWY %s", rt_s);
syslog(LOG_DEBUG, "FLOW proto %d direction %d",
- st->proto, st->direction);
+ st[i].proto, st[i].direction);