diff options
author | mlaier <mlaier@FreeBSD.org> | 2007-07-03 12:46:08 +0000 |
---|---|---|
committer | mlaier <mlaier@FreeBSD.org> | 2007-07-03 12:46:08 +0000 |
commit | 83807ec50da2dec25df74073d007a33ae79d8bfd (patch) | |
tree | d26897c8727f97369ee43f6b4684d5cfc7558dce /usr.sbin | |
parent | edb0b6417988e1d0a2c39481b4ca6c7c2005ed9e (diff) | |
download | FreeBSD-src-83807ec50da2dec25df74073d007a33ae79d8bfd.zip FreeBSD-src-83807ec50da2dec25df74073d007a33ae79d8bfd.tar.gz |
Link pf 4.1 to the build:
- move ftp-proxy from libexec to usr.sbin
- add tftp-proxy
- new altq mtag link
Approved by: re (kensmith)
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 51 | ||||
-rw-r--r-- | usr.sbin/ftp-proxy/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/ftp-proxy/Makefile.inc | 5 | ||||
-rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy/Makefile | 18 | ||||
-rw-r--r-- | usr.sbin/ftp-proxy/libevent/Makefile | 25 |
6 files changed, 83 insertions, 26 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 6beb157..aabfac2 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -56,6 +56,7 @@ SUBDIR= ac \ fdwrite \ flowctl \ freebsd-update \ + ${_ftp-proxy} \ fwcontrol \ getfmac \ getpmac \ @@ -228,6 +229,10 @@ _bluetooth= bluetooth _keyserv= keyserv .endif +.if ${MK_PF} != "no" +_ftp-proxy= ftp-proxy +.endif + .if ${MK_INET6} != "no" _faithd= faithd _ip6addrctl= ip6addrctl diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 226394f..e12e283 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -60,7 +60,7 @@ enum { PASS, BLOCK }; #define PFI_IFTYPE_DETACHED 2 struct pfi_entry { - struct pfi_if pfi; + struct pfi_kif pfi; u_int index; TAILQ_ENTRY(pfi_entry) link; }; @@ -544,83 +544,83 @@ pf_iftable(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfInterfacesIfDescr: - return (string_get(val, e->pfi.pfif_name, -1)); + return (string_get(val, e->pfi.pfik_name, -1)); case LEAF_pfInterfacesIfType: val->v.integer = PFI_IFTYPE_INSTANCE; break; case LEAF_pfInterfacesIfTZero: val->v.uint32 = - (time(NULL) - e->pfi.pfif_tzero) * 100; + (time(NULL) - e->pfi.pfik_tzero) * 100; break; case LEAF_pfInterfacesIfRefsState: - val->v.uint32 = e->pfi.pfif_states; + val->v.uint32 = e->pfi.pfik_states; break; case LEAF_pfInterfacesIfRefsRule: - val->v.uint32 = e->pfi.pfif_rules; + val->v.uint32 = e->pfi.pfik_rules; break; case LEAF_pfInterfacesIf4BytesInPass: val->v.counter64 = - e->pfi.pfif_bytes[IPV4][IN][PASS]; + e->pfi.pfik_bytes[IPV4][IN][PASS]; break; case LEAF_pfInterfacesIf4BytesInBlock: val->v.counter64 = - e->pfi.pfif_bytes[IPV4][IN][BLOCK]; + e->pfi.pfik_bytes[IPV4][IN][BLOCK]; break; case LEAF_pfInterfacesIf4BytesOutPass: val->v.counter64 = - e->pfi.pfif_bytes[IPV4][OUT][PASS]; + e->pfi.pfik_bytes[IPV4][OUT][PASS]; break; case LEAF_pfInterfacesIf4BytesOutBlock: val->v.counter64 = - e->pfi.pfif_bytes[IPV4][OUT][BLOCK]; + e->pfi.pfik_bytes[IPV4][OUT][BLOCK]; break; case LEAF_pfInterfacesIf4PktsInPass: val->v.counter64 = - e->pfi.pfif_packets[IPV4][IN][PASS]; + e->pfi.pfik_packets[IPV4][IN][PASS]; break; case LEAF_pfInterfacesIf4PktsInBlock: val->v.counter64 = - e->pfi.pfif_packets[IPV4][IN][BLOCK]; + e->pfi.pfik_packets[IPV4][IN][BLOCK]; break; case LEAF_pfInterfacesIf4PktsOutPass: val->v.counter64 = - e->pfi.pfif_packets[IPV4][OUT][PASS]; + e->pfi.pfik_packets[IPV4][OUT][PASS]; break; case LEAF_pfInterfacesIf4PktsOutBlock: val->v.counter64 = - e->pfi.pfif_packets[IPV4][OUT][BLOCK]; + e->pfi.pfik_packets[IPV4][OUT][BLOCK]; break; case LEAF_pfInterfacesIf6BytesInPass: val->v.counter64 = - e->pfi.pfif_bytes[IPV6][IN][PASS]; + e->pfi.pfik_bytes[IPV6][IN][PASS]; break; case LEAF_pfInterfacesIf6BytesInBlock: val->v.counter64 = - e->pfi.pfif_bytes[IPV6][IN][BLOCK]; + e->pfi.pfik_bytes[IPV6][IN][BLOCK]; break; case LEAF_pfInterfacesIf6BytesOutPass: val->v.counter64 = - e->pfi.pfif_bytes[IPV6][OUT][PASS]; + e->pfi.pfik_bytes[IPV6][OUT][PASS]; break; case LEAF_pfInterfacesIf6BytesOutBlock: val->v.counter64 = - e->pfi.pfif_bytes[IPV6][OUT][BLOCK]; + e->pfi.pfik_bytes[IPV6][OUT][BLOCK]; break; case LEAF_pfInterfacesIf6PktsInPass: val->v.counter64 = - e->pfi.pfif_packets[IPV6][IN][PASS]; + e->pfi.pfik_packets[IPV6][IN][PASS]; break; case LEAF_pfInterfacesIf6PktsInBlock: val->v.counter64 = - e->pfi.pfif_packets[IPV6][IN][BLOCK]; + e->pfi.pfik_packets[IPV6][IN][BLOCK]; break; case LEAF_pfInterfacesIf6PktsOutPass: val->v.counter64 = - e->pfi.pfif_packets[IPV6][OUT][PASS]; + e->pfi.pfik_packets[IPV6][OUT][PASS]; break; case LEAF_pfInterfacesIf6PktsOutBlock: val->v.counter64 = - e->pfi.pfif_packets[IPV6][OUT][BLOCK]; + e->pfi.pfik_packets[IPV6][OUT][BLOCK]; break; default: @@ -911,7 +911,7 @@ static int pfi_refresh(void) { struct pfioc_iface io; - struct pfi_if *p = NULL; + struct pfi_kif *p = NULL; struct pfi_entry *e; int i, numifs = 1; @@ -925,11 +925,10 @@ pfi_refresh(void) } bzero(&io, sizeof(io)); - io.pfiio_flags = PFI_FLAG_INSTANCE; - io.pfiio_esize = sizeof(struct pfi_if); + io.pfiio_esize = sizeof(struct pfi_kif); for (;;) { - p = reallocf(p, numifs * sizeof(struct pfi_if)); + p = reallocf(p, numifs * sizeof(struct pfi_kif)); if (p == NULL) { syslog(LOG_ERR, "pfi_refresh(): reallocf() numifs=%d: %s", numifs, strerror(errno)); @@ -955,7 +954,7 @@ pfi_refresh(void) if (e == NULL) goto err1; e->index = i + 1; - memcpy(&e->pfi, p+i, sizeof(struct pfi_if)); + memcpy(&e->pfi, p+i, sizeof(struct pfi_kif)); TAILQ_INSERT_TAIL(&pfi_table, e, link); } diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile new file mode 100644 index 0000000..67660c8 --- /dev/null +++ b/usr.sbin/ftp-proxy/Makefile @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= libevent ftp-proxy + +.include <bsd.subdir.mk> diff --git a/usr.sbin/ftp-proxy/Makefile.inc b/usr.sbin/ftp-proxy/Makefile.inc new file mode 100644 index 0000000..5abb7c0 --- /dev/null +++ b/usr.sbin/ftp-proxy/Makefile.inc @@ -0,0 +1,5 @@ +# $FreeBSD$ + +LIBEVENT= ${.OBJDIR}/../libevent/libevent.a + +.include "../Makefile.inc"
\ No newline at end of file diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile new file mode 100644 index 0000000..773c25d --- /dev/null +++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../contrib/pf/ftp-proxy + +PROG= ftp-proxy +MAN= ftp-proxy.8 + +SRCS= ftp-proxy.c filter.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf + +DPADD= ${LIBEVENT} +LDADD= ${LIBEVENT} + +WARNS?= 2 + +.include <bsd.prog.mk> diff --git a/usr.sbin/ftp-proxy/libevent/Makefile b/usr.sbin/ftp-proxy/libevent/Makefile new file mode 100644 index 0000000..acc546f --- /dev/null +++ b/usr.sbin/ftp-proxy/libevent/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../contrib/pf/libevent + + +LIB= event +INTERNALLIB=yes +SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c +HDRS= event.h + +CFLAGS+= -I${.CURDIR} \ + -DHAVE_CLOCK_GETTIME \ + -DHAVE_FCNTL_H \ + -DHAVE_POLL \ + -DHAVE_SELECT \ + -DHAVE_SETFD \ + -DHAVE_STDARG_H \ + -DHAVE_SYS_IOCTL_H \ + -DHAVE_SYS_TIME_H \ + -DHAVE_UNISTD_H \ + -DHAVE_VASPRINTF \ + -DHAVE_WORKING_KQUEUE \ + -DVERSION='"1.3b"' + +.include <bsd.lib.mk> |