������!
���, ���� ����.
����� ����� ��������...
--- Makefile.ORIG Wed Aug 4 21:29:52 1999
+++ Makefile Wed Feb 2 08:43:46 2000
@@ -7,9 +7,9 @@
#
# $Id: Makefile,v 2.2 1999/08/04 17:29:52 darrenr Exp $
#
-BINDEST=/usr/local/bin
+BINDEST=/usr/sbin
SBINDEST=/sbin
-MANDIR=/usr/local/man
+MANDIR=/usr/share/man
#To test prototyping
CC=gcc -Wstrict-prototypes -Wmissing-prototypes
#CC=gcc
@@ -29,7 +29,7 @@
#
# The facility you wish to log messages from ipmon to syslogd with.
#
-LOGFAC=-DLOGFAC=LOG_LOCAL0
+LOGFAC=-DLOGFAC=LOG_LOCAL1
#
# For packets which don't match any pass rules or any block rules, set either
# FR_PASS or FR_BLOCK (respectively). It defaults to FR_PASS if left
--- fil.c.ORIG Thu Jan 27 11:49:37 2000
+++ fil.c Tue Feb 1 17:56:02 2000
@@ -1,4 +1,4 @@
-/*
+/* 3.3.8
* Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
@@ -1287,7 +1287,8 @@
frgroup_t *fr_findgroup(num, flags, which, set, fgpp)
-u_int num;
+/* u_int num; */
+u_short num;
u_32_t flags;
minor_t which;
int set;
@@ -1317,7 +1318,8 @@
frgroup_t *fr_addgroup(num, fp, which, set)
-u_int num;
+/*u_int num; */
+u_short num;
frentry_t *fp;
minor_t which;
int set;
@@ -1340,7 +1342,8 @@
void fr_delgroup(num, flags, which, set)
-u_int num;
+/* u_int num; */
+u_short num;
u_32_t flags;
minor_t which;
int set;
@@ -1395,15 +1398,16 @@
return freed;
}
-
-int frflush(unit, flags)
-minor_t unit;
-int flags;
+void frflush(unit, result)
+int unit;
+int *result;
{
- int flushed = 0, set;
+ int flags = *result, flushed = 0, set = fr_active;
+
+/* int flushed = 0, set; */
if (unit != IPL_LOGIPF)
- return 0;
+ *result = 0;
WRITE_ENTER(&ipf_mutex);
bzero((char *)frcache, sizeof(frcache[0]) * 2);
@@ -1420,8 +1424,9 @@
(void) frflushlist(set, unit, &flushed, &ipacct[0][set]);
}
RWLOCK_EXIT(&ipf_mutex);
- return flushed;
+ *result = flushed;
}
+
char *memstr(src, dst, slen, dlen)
--- ip_fil.c.ORIG Sun Jan 16 13:12:42 2000
+++ ip_fil.c Tue Feb 1 18:19:31 2000
@@ -317,7 +317,7 @@
}
fr_checkp = fr_savep;
- i = frflush(IPL_LOGIPF, i);
+ frflush(IPL_LOGIPF, &i);
fr_running = 0;
# ifdef NETBSD_PF
@@ -530,7 +530,7 @@
error = EPERM;
else {
IRCOPY(data, (caddr_t)&tmp, sizeof(tmp));
- tmp = frflush(unit, tmp);
+ frflush(unit, &tmp);
IWCOPY((caddr_t)&tmp, data, sizeof(tmp));
}
break;
--- ip_fil.h.ORIG Thu Jan 27 11:49:41 2000
+++ ip_fil.h Wed Feb 2 08:45:15 2000
@@ -1,4 +1,4 @@
-/*
+/* 3.3.8
* Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
@@ -544,11 +544,11 @@
extern u_short ipf_cksum __P((u_short *, int));
extern int fr_copytolog __P((int, char *, int));
extern void fr_forgetifp __P((void *));
-extern int frflush __P((minor_t, int));
+extern void frflush __P((int, int *));
extern void frsync __P((void));
-extern frgroup_t *fr_addgroup __P((u_int, frentry_t *, minor_t, int));
-extern frgroup_t *fr_findgroup __P((u_int, u_32_t, minor_t, int, frgroup_t
***));
-extern void fr_delgroup __P((u_int, u_32_t, minor_t, int));
+extern frgroup_t *fr_addgroup __P((u_short, frentry_t *, int, int));
+extern frgroup_t *fr_findgroup __P((u_short, u_32_t, int, int, frgroup_t ***));
+extern void fr_delgroup __P((u_short, u_32_t, int, int));
extern void fr_makefrip __P((int, ip_t *, fr_info_t *));
extern int fr_ifpaddr __P((void *, struct in_addr *));
extern char *memstr __P((char *, char *, int, int));
Alexander A. Karpoff
Systems Administrator
WESTCOM Communications, Pskov, Russia
=====================================================================
If you would like to unsubscribe from this list send message to
[EMAIL PROTECTED] with "unsubscribe oops" in message body.
Archive is accessible on http://www.paco.net/oops/
