kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.6

Browse source 
PR:		73752
Submitted by:	Andrew Thompson <andy@fud.org.nz>
This commit is contained in:
Tilman Keskinoz 2004-11-10 21:06:49 +00:00
parent 86413a1c8a
commit 5ce6698fd4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=121335
3 changed files with 31 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/pfflowd/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= pfflowd
PORTVERSION= 0.5
PORTVERSION= 0.6
CATEGORIES= net
MASTER_SITES= http://www.mindrot.org/files/pfflowd/

4
net/pfflowd/distinfo
View file

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

68
net/pfflowd/files/patch-pfflowd.c
View file

@ -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);
}
+#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 @@
_exit(0);
}
@@ -366,7 +368,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);
@@ -538,7 +542,9 @@
strlcat(dst_s, pbuf, sizeof(dst_s));
}
+#ifndef OLD_PFSYNC
syslog(LOG_DEBUG, "IFACE %s", st[i].ifname);
+#endif
syslog(LOG_DEBUG, "GWY %s", rt_s);
syslog(LOG_DEBUG, "FLOW proto %d direction %d",
st[i].proto, st[i].direction);