Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Update head to version 4.1.33 from vendor branch
details: https://anonhg.NetBSD.org/src/rev/62057c5be72c
branches: trunk
changeset: 746747:62057c5be72c
user: darrenr <darrenr%NetBSD.org@localhost>
date: Wed Aug 19 08:35:30 2009 +0000
description:
Update head to version 4.1.33 from vendor branch
diffstat:
dist/ipf/BSD/ipfadm-rcd | 350 ------------------------------
dist/ipf/HISTORY | 140 ++++++++++++
dist/ipf/Makefile | 14 +-
dist/ipf/ip_fil.c | 61 ++++-
dist/ipf/ip_lookup.c | 7 +-
dist/ipf/ip_lookup.h | 4 +-
dist/ipf/ipsend/.OLD/ip_compat.h | 244 ---------------------
dist/ipf/ipsend/iptests.c | 23 +-
dist/ipf/ipsend/sock.c | 4 +-
dist/ipf/lib/load_http.c | 35 ++-
dist/ipf/lib/printnat.c | 4 +-
dist/ipf/tools/ipf_y.y | 4 +-
dist/ipf/tools/ipfstat.c | 28 +-
dist/ipf/tools/ipmon.c | 18 +-
dist/ipf/tools/ippool_y.y | 14 +-
dist/ipf/tools/lexer.c | 4 +-
sys/dist/ipf/netinet/fil.c | 313 ++++++++++++++------------
sys/dist/ipf/netinet/ip_auth.c | 72 +++--
sys/dist/ipf/netinet/ip_compat.h | 128 ++++++++---
sys/dist/ipf/netinet/ip_fil.h | 20 +-
sys/dist/ipf/netinet/ip_fil_netbsd.c | 25 +-
sys/dist/ipf/netinet/ip_frag.c | 174 +++++++++-----
sys/dist/ipf/netinet/ip_frag.h | 14 +-
sys/dist/ipf/netinet/ip_ftp_pxy.c | 97 +++++---
sys/dist/ipf/netinet/ip_h323_pxy.c | 31 +-
sys/dist/ipf/netinet/ip_htable.c | 49 +++-
sys/dist/ipf/netinet/ip_ipsec_pxy.c | 27 +-
sys/dist/ipf/netinet/ip_irc_pxy.c | 16 +-
sys/dist/ipf/netinet/ip_log.c | 81 +++---
sys/dist/ipf/netinet/ip_lookup.c | 13 +-
sys/dist/ipf/netinet/ip_lookup.h | 6 +-
sys/dist/ipf/netinet/ip_nat.c | 399 ++++++++++++++++++----------------
sys/dist/ipf/netinet/ip_nat.h | 10 +-
sys/dist/ipf/netinet/ip_pool.c | 65 +++--
sys/dist/ipf/netinet/ip_pptp_pxy.c | 16 +-
sys/dist/ipf/netinet/ip_proxy.c | 13 +-
sys/dist/ipf/netinet/ip_proxy.h | 4 +-
sys/dist/ipf/netinet/ip_raudio_pxy.c | 24 +-
sys/dist/ipf/netinet/ip_rcmd_pxy.c | 16 +-
sys/dist/ipf/netinet/ip_rpcb_pxy.c | 17 +-
sys/dist/ipf/netinet/ip_scan.c | 6 +-
sys/dist/ipf/netinet/ip_scan.h | 4 +-
sys/dist/ipf/netinet/ip_state.c | 171 ++++++++------
sys/dist/ipf/netinet/ip_state.h | 7 +-
sys/dist/ipf/netinet/ip_sync.c | 14 +-
sys/dist/ipf/netinet/ip_sync.h | 4 +-
sys/dist/ipf/netinet/ipl.h | 8 +-
47 files changed, 1326 insertions(+), 1472 deletions(-)
diffs (truncated from 5809 to 300 lines):
diff -r c31826a7b118 -r 62057c5be72c dist/ipf/BSD/ipfadm-rcd
--- a/dist/ipf/BSD/ipfadm-rcd Wed Aug 19 08:28:39 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,350 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2006 by Darren Reed.
-#
-# See the IPFILTER.LICENCE file for details on licencing.
-#
-prog=$0
-
-RCD=/etc/rc.conf.d
-
-# This script is an interface to the following rc.d scripts:
-# /etc/rc.d/ipfilter
-# /etc/rc.d/ipfs
-# /etc/rc.d/ipnat
-# /etc/rc.d/ipmon
-
-running=`ipf -V 2>/dev/null|sed -ne 's/Running: \(.*\)/\1/p'`
-
-usage() {
- echo "$prog status"
- echo "$prog ipfilter <enable|disable|reload|resync|start|status|stop>"
- echo "$prog ipfs <enable|disable|status|start|stop>"
- echo "$prog ipmon <enable|disable|restart|start|status|stop>"
- echo "$prog ipnat <enable|disable|reload|start|status|stop>"
- exit 1
-}
-
-enable() {
- old=${RCD}/$1.old
- new=${RCD}/$1
- mkdir ${RCD}/$1.d
- if [ $? -eq 0 ] ; then
- if [ -f ${RCD}/$1 ] ; then
- cp ${RCD}/$1 ${RCD}/$1.old
- sed -e "s/^${1} *\=.*/${1}\=YES/" ${old} > ${new}
- /bin/rm ${old}
- else
- echo "$1=YES" > ${RCD}/$1
- chmod go-wx ${RCD}/$1
- fi
- rmdir ${RCD}/$1.d
- fi
-}
-
-disable() {
- old=${RCD}/$1.old
- new=${RCD}/$1
- mkdir ${RCD}/$1.d
- if [ $? -eq 0 ] ; then
- if [ -f ${RCD}/$1 ] ; then
- cp ${RCD}/$1 ${RCD}/$1.old
- sed -e "s/^${1} *\=.*/${1}\=NO/" ${old} > ${new}
- /bin/rm ${old}
- else
- echo "$1=NO" > ${RCD}/$1
- chmod go-wx ${RCD}/$1
- fi
- rmdir ${RCD}/$1.d
- fi
-}
-
-status() {
- active=`/etc/rc.d/$1 rcvar|sed -ne "s/^$""${1}\=\(.*\)$/\1/p"`
- case $active in
- NO)
- return 0
- ;;
- YES)
- return 1
- ;;
- esac
- return 2
-}
-
-status_ipmon() {
- echo -n "ipmon "
- pid=`pgrep ipmon`
- status ipmon
- case $? in
- 0)
- if [ -n "$pid" ] ; then
- echo "disabled-but-running"
- else
- echo "disabled"
- fi
- ;;
- 1)
- if [ -n "$pid" ] ; then
- echo "enabled"
- else
- echo "enabled-not-running"
- fi
- ;;
- 2)
- if [ -n "$pid" ] ; then
- echo "unknown-state-running"
- else
- echo "unknown-state"
- fi
- ;;
- esac
-}
-
-status_ipfilter() {
- if [ -z "$running" ] ; then
- rules=
- emsg="-not-in-kernel"
- dmsg=
- else
- case $running in
- yes)
- emsg=
- dmsg="-rules-loaded"
- rules=`ipfstat -io 2>/dev/null`
- if [ -z "$rules" ] ; then
- rules=`ipfstat -aio 2>/dev/null`
- if [ -z "$rules" ] ; then
- emsg="-no-rules"
- dmsg=
- fi
- fi
- ;;
- no)
- rules=
- emsg="-not-running"
- dmsg=
- ;;
- esac
- fi
-
- echo -n "ipfilter "
- status ipfilter
- case $? in
- 0)
- echo "disabled${dmsg}"
- ;;
- 1)
- echo "enabled${emsg}"
- ;;
- 2)
- if [ -n "$rules" ] ; then
- echo "unknown${dmsg}"
- else
- echo "unknown-state"
- fi
- ;;
- esac
-}
-
-status_ipnat() {
- if [ -z "$running" ] ; then
- rules=
- emsg="-not-in-kernel"
- dmsg=
- else
- case $running in
- yes)
- emsg=
- dmsg="-rules-loaded"
- rules=`ipnat -l 2>/dev/null | egrep '^map|rdr' 2>/dev/null`
- if [ -z "$rules" ] ; then
- emsg="-no-rules"
- dmsg=
- fi
- ;;
- no)
- rules=
- emsg="-not-running"
- dmsg=
- ;;
- esac
- fi
-
- echo -n "ipnat "
- status ipnat
- case $? in
- 0)
- echo "disabled${dmsg}"
- ;;
- 1)
- echo "enabled${dmsg}"
- ;;
- 2)
- if [ -n "$rules" ] ; then
- echo "unknown${dmsg}"
- else
- echo "unknown-state"
- fi
- ;;
- esac
-}
-
-status_ipfs() {
- status ipfs
- report ipfs $?
-}
-
-report() {
- echo -n "$1 "
- case $2 in
- 0)
- echo "disabled"
- ;;
- 1)
- echo "enabled"
- ;;
- 2)
- echo "unknown-status"
- ;;
- *)
- echo "$2"
- ;;
- esac
-}
-
-do_ipfilter() {
- case $1 in
- enable)
- enable ipfilter
- ;;
- disable)
- disable ipfilter
- ;;
- reload)
- /etc/rc.d/ipfilter reload
- ;;
- resync)
- /etc/rc.d/ipfilter resync
- ;;
- start)
- /etc/rc.d/ipfilter start
- ;;
- status)
- status_ipfilter
- ;;
- stop)
- /etc/rc.d/ipfilter stop
- ;;
- *)
- usage
- ;;
- esac
-}
-
-do_ipfs() {
- case $1 in
- enable)
- enable ipfs
- ;;
- disable)
- disble ipfs
- ;;
- start)
- /etc/rc.d/ipfs start
- ;;
- status)
- status_ipfs
- ;;
- stop)
- /etc/rc.d/ipfs stop
- ;;
- *)
- usage
- ;;
- esac
-}
-
-do_ipmon() {
- case $1 in
- enable)
- enable ipmon
- ;;
- disable)
- disble ipmon
- ;;
- restart)
- /etc/rc.d/ipmon restart
- ;;
- start)
- /etc/rc.d/ipmon start
- ;;
- status)
- status_ipmon
- ;;
- stop)
- /etc/rc.d/ipmon stop
- ;;
- *)
- usage
- ;;
- esac
-}
-
-do_ipnat() {
- case $1 in
- enable)
Home |
Main Index |
Thread Index |
Old Index