Commit Graph

183 Commits

Author SHA1 Message Date
mrg 8ad67291ce document -F s (from darren reed). 1997-11-17 14:57:47 +00:00
mrg d2143111bd merge ip-filter 3.2.1 1997-11-14 12:57:55 +00:00
mrg 61cbfaca09 import ip-filter 3.2.1 1997-11-14 08:03:01 +00:00
veego 84123ddbb6 - s/samples\/ipf/examples\/ipf/
- Added missing ipf examples from the import of 3.2
1997-11-13 09:46:41 +00:00
veego 67ed3b4d0c Add the ipftest.1 manpage. 1997-11-11 10:14:42 +00:00
veego 5048b71642 Fix some manpage section numbers and remove the SEE ALSO entry for
snoop(1m).
1997-11-11 10:11:19 +00:00
mrg dc05f41d80 add missing .Nm sections 1997-11-11 10:07:34 +00:00
veego 13cfd2b17f Updated for the missing ipftest.1 manpage. 1997-11-11 10:07:31 +00:00
veego 525c710d19 import a missing manpage from ip-filter 3.2 1997-11-11 10:02:25 +00:00
thorpej 3d2b522093 Don't prototype ether_aton() here if __NetBSD__. 1997-11-08 05:57:15 +00:00
enami af29cb2306 Sync with release branch so that it compiles.
- include arpa/inet.h in ipsopt.c
- declare yyerror() in iplang_l.l
1997-11-01 09:12:21 +00:00
mrg 60c28e1f95 sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake. 1997-10-30 16:08:54 +00:00
mrg 44c002beb1 import ip-filter 3.2 1997-10-30 05:27:24 +00:00
lukem 0a94f4f077 use CPPFLAGS instead of CFLAGS 1997-10-25 06:57:53 +00:00
lukem f5bf267d90 enable WARNS=1 by default, but disable in unclean 3rd party code 1997-10-18 06:42:25 +00:00
mrg 74f573d85d remove advertising clause from all my licenses. 1997-10-10 05:39:47 +00:00
mycroft b1f70b30ce Byte-swap the ethernet type field as required. From Dave Huang in PR 4215. 1997-10-08 16:57:04 +00:00
thorpej d10050d5b9 sizeof() returns a size_t which is an unsigned long on the Alpha. We have
to use %lu and a cast to u_long to print these in a portable way.
1997-09-25 01:45:14 +00:00
veego 968d3837cd We no longer need this header file. 1997-09-21 18:13:28 +00:00
veego c505e9ce05 GC. 1997-09-21 18:12:01 +00:00
veego 4508fb4354 Resolve conflicts from the merge of ipf 3.2beta5. 1997-09-21 18:00:54 +00:00
veego 6a116d459c Resolve conflicts from the merge of ipf 3.2beta5. 1997-09-21 17:02:33 +00:00
veego 985ac74a98 Import ip-filter 3.2beta5 1997-09-21 16:47:50 +00:00
veego 4f72ff44fd Changes for ipf 3.2beta5:
- Add the main Makefile and Makefile.inc for src/usr.sbin/ipf
- New rules subdirectory
- Remove a include directory from ipftest/Makefile
- Add a MLINKS for ipnat.5 -> ipnat.conf.5
- Add new Manpages: ipresend.1, ipsend.1, ipsend.5, iptest.1
- Add new iplang files for src/usr.sbin/ipf/ipsend
- Copy the tcpip.h. It has now a BSD license and remove a comment about it
- Add ip_log.c to sys/lkm/netinet/Makefile
- Add *.y and *.l files to the list of transformed files
- Remove the ipsend.h fix because we now use only one ip_compat.h
- Fix file and directory permissions during the import
1997-09-21 16:34:31 +00:00
mrg f4d8afa436 make a link from ipf.5 to ipf.conf.5 1997-09-16 02:06:41 +00:00
thorpej d190114742 Use the _correct_ version of ip_compat.h. (Why there are two very different
files in the IP Filter distribution called "ip_compat.h", please don't
even get me started on.)
1997-07-06 22:48:19 +00:00
thorpej 808fe191ef Need ip_auth.o 1997-07-06 22:34:34 +00:00
thorpej 3eb73cbc72 ipftest needs ip_auth.o 1997-07-06 22:33:46 +00:00
thorpej 7a42fa660c Update for new ip_auth.* files. (This should be done BEFORE running
it on a tree for import.)
1997-07-06 05:09:04 +00:00
darrenr 7cf4820f1c these files are already found in /sys/netinet 1997-07-05 06:46:10 +00:00
darrenr 729f0dc597 fix conflicts from import 1997-07-05 05:38:14 +00:00
darrenr 3c3c919d28 import 3.2beta1 IP Filter sources 1997-07-05 05:12:39 +00:00
thorpej 153eb09cc6 Avoid type-size problems converting a pointer (in kernel memory) to
an off_t passed to lseek() (used for reading kernel memory).
1997-05-28 03:08:40 +00:00
thorpej 643e2915e1 Add a comment about why we don't copy ipfilter's tcpip.h. 1997-05-28 03:05:55 +00:00
thorpej 30c04b997f We cannot use the tcpip.h that comes with ipfilter, as the license on
that file does not allow redistribution; use the version in <netinet/tcpip.h>
instead.  FIXME WHEN A NEW tcpip.h IS INCLUDED WITH IPFILTER!
1997-05-28 03:04:44 +00:00
thorpej c4aac2cbce Resolve conflicts from merge of 3.2a7, take 2. 1997-05-27 22:51:36 +00:00
thorpej 57d41e13fb Resolve conflicts from merge of 3.2a7, take 2. 1997-05-27 22:34:05 +00:00
thorpej f265273d8b Correct several mistakes:
- Don't make copies of ip_frag.c, ip_state.c, and ip_nat.c for ipftest.
  These should be .PATH'd in from sys/netinet.
- Get paths to ipmon and ipnat correct when we copy the manual pages.
- ipsend/ipresend/iptest actually live in the "ipsend" subdirectory
  of the ipfilter distribution.  Take this into account when copying
  the sources.
- Add ip_proxy.h to the list of #include directives that we fixup.
- ipsend.h needs to include a copy of ip_compat.h that is private
  to ipsend/ipresend/iptest.  Perform a fixup on that file to take
  that into account.
- Clean up any CVS residue from the conversion process.
- Update Makefile output to reflect new .PATH directives, etc.
1997-05-27 22:24:25 +00:00
thorpej a920c55e26 ipfilter2netbsd did not produce correct output for last import of
3.2a7.  Re-import it now that ipfilter2netbsd is fixed.
1997-05-27 22:16:47 +00:00
thorpej 772cb9b986 Don't make separate copies of these files; .PATH them in from sys/netinet. 1997-05-27 22:01:47 +00:00
mrg a307477d27 strip dollar signs from incoming RCSids 1997-05-27 07:16:24 +00:00
darrenr 24ca7d0e94 fix rcsid conflicts 1997-05-26 15:16:38 +00:00
darrenr 87427f3d2e fix conflicts 1997-05-25 12:04:53 +00:00
darrenr 2cae843bdc Import version 3.2alpha7 1997-05-25 11:45:50 +00:00
gwr 10e180cc49 Back out the .PATH.c changes. The .depend problem (and others)
will be fixed using the new .NOPATH make feature instead.
1997-05-08 21:11:01 +00:00
mrg 78c51899a9 use ${.CURDIR} correctly. from enami tsugutomo in pr#3582 1997-05-07 13:20:40 +00:00
gwr 012e528f2e Use .PATH.c: ... 1997-05-06 20:44:56 +00:00
mrg a3ca95f80d move ipfilter2netbsd, and remove extra copies of opt.c that got added. 1997-05-04 15:10:36 +00:00
veego 8071a0d69a Remove a . 1997-05-04 09:52:49 +00:00
thorpej e612682b6c getopt() returns an int, not a char. 1997-04-19 06:27:03 +00:00
thorpej 95a1173e37 icmpcode() returns an int, and, more importantly, -1 on failure. So,
make this work on systems with unsigned chars by placing the return
value of icmpcode() in a temporary variable, checking for failure, and
then only setting fil.fr_icode (a char) upon success.
1997-04-19 06:25:10 +00:00
veego b97a9a425b ipf is build with -static and installed in /sbin 1997-04-13 18:42:20 +00:00
veego 5386901ec4 build it static. 1997-04-13 18:31:07 +00:00
mrg f1467295f1 look for ipf sources in ../ipf 1997-04-13 14:49:38 +00:00
mrg c4f6f69f43 install this in /sbin still. 1997-04-13 02:06:04 +00:00
mrg d459462a6c ipf is now here. 1997-04-12 23:57:37 +00:00
mrg bf62e97c3b ipf goes into src/usr.sbin/ipf/ipf now. 1997-04-12 23:51:04 +00:00
cgd ecaada7dec fix up various bogons (bogus casts, missing prototypes for functions
which return pointers, incorrect types for variables) that kept this from
compiling on the Alpha.
1997-04-04 01:52:45 +00:00
thorpej c18ae5ec1d Bring this in touch with reality. 1997-03-29 20:28:17 +00:00
thorpej 9620a4f12a remove unneeded -I directive from CFLAGS 1997-03-29 20:23:31 +00:00
thorpej 7d74a4ae8d remove unneeded -I diretive from CFLAGS 1997-03-29 20:19:48 +00:00
thorpej 2acf8851b4 remove unneeded -I directive from CFLAGS 1997-03-29 20:07:26 +00:00
thorpej 6acb22838b Remove unneeded -I directive from CFLAGS. 1997-03-29 20:00:36 +00:00
thorpej 2e11c06394 - Use IPL_NAME defined in <netinet/ip_fil.h>
- Make these compile in light of is-newarp
1997-03-29 19:49:02 +00:00
darrenr fa592ade6f fixup changes from import 1997-03-29 04:31:10 +00:00
darrenr e7fbefddb2 add extra ipfilter programs 1997-03-29 04:30:30 +00:00
darrenr 4632a3d666 add extra directories to CFLAGS and PATH to pickup all the required .h and .c
files for these programs.
1997-03-29 04:28:28 +00:00
darrenr e8fb8bd3a9 Properly import usr.sbin/ipf updates 1997-03-29 02:49:40 +00:00
thorpej 91d0b1474b Resolve conflicts from import of 3.2alpha2. 1997-03-28 21:54:38 +00:00
darrenr fe3bc025d0 Bring in entire 3.2alpha2 source tree 1997-03-27 15:13:58 +00:00
mrg 1cf9e54f49 link ipl.4 to ipfilter.4 1997-02-18 21:28:53 +00:00
mrg cda4cfcedd note that ipfilter also includes PFIL_HOOKS. 1997-02-18 21:28:19 +00:00
veego 8a514d0afa Remove the last change. fil.fr_icode ist char and NOT unsigned char.
Fix pr#3169
1997-01-31 10:10:11 +00:00
mark ab4940de30 Cast -1 to an unsigned char for the test with fil.fr_icode as the fr_icode
field is declared as an unsigned char.
1997-01-29 18:39:47 +00:00
mark 3d14bc1b12 Use an integer rather than a char for the getopt() return value in order
to make it work with architectures that use unsigned chars.
1997-01-29 01:49:25 +00:00
mark 2ab96deb9a Use an integer rather than a char for the getopt() return value in main()
in order to make it work with architectures that use unsigned chars.
1997-01-29 01:29:09 +00:00
mycroft af2068bc6a Use ${.CURDIR} to find Makefile.inc. 1997-01-20 07:33:57 +00:00
cgd 7bd18db5e6 pointer cast fixups for 64-bit cleanliness 1997-01-14 06:47:10 +00:00
cgd bf31af7965 pointer cast/printf fixups for 64-bit cleanliness 1997-01-14 06:45:01 +00:00
mrg eafab1cbd3 ipl -> ipfilter 1997-01-07 11:32:24 +00:00
veego a3a8d0aba7 Add includes for 'struct tcpiphdr'.
Add $NetBSD$ id and restore the orginal Id.
1997-01-05 16:42:41 +00:00
mrg 3460d5fc46 update this for "pseudo-device ipl" 1997-01-05 14:53:55 +00:00
mrg 4810e839ab initial import of darren reed's ip-filter, version 3.1.2. 1997-01-05 13:06:38 +00:00