ok?
Index: filter.c
===================================================================
RCS file: /cvs/src/libexec/tftp-proxy/filter.c,v
retrieving revision 1.2
diff -u -p -r1.2 filter.c
--- filter.c 23 Jun 2007 15:51:21 -0000 1.2
+++ filter.c 30 Jul 2009 19:47:45 -0000
@@ -78,40 +78,6 @@ add_filter(u_int32_t id, u_int8_t dir, s
}
int
-add_nat(u_int32_t id, struct sockaddr *src, struct sockaddr *dst,
- u_int16_t d_port, struct sockaddr *nat, u_int16_t nat_range_low,
- u_int16_t nat_range_high, u_int8_t proto)
-{
- if (!src || !dst || !d_port || !nat || !nat_range_low || !proto ||
- (src->sa_family != nat->sa_family)) {
- errno = EINVAL;
- return (-1);
- }
-
- if (prepare_rule(id, PF_RULESET_NAT, src, dst, d_port, proto) == -1)
- return (-1);
-
- if (nat->sa_family == AF_INET) {
- memcpy(&pfp.addr.addr.v.a.addr.v4,
- &satosin(nat)->sin_addr.s_addr, 4);
- memset(&pfp.addr.addr.v.a.mask.addr8, 255, 4);
- } else {
- memcpy(&pfp.addr.addr.v.a.addr.v6,
- &satosin6(nat)->sin6_addr.s6_addr, 16);
- memset(&pfp.addr.addr.v.a.mask.addr8, 255, 16);
- }
- if (ioctl(dev, DIOCADDADDR, &pfp) == -1)
- return (-1);
-
- pfr.rule.rpool.proxy_port[0] = nat_range_low;
- pfr.rule.rpool.proxy_port[1] = nat_range_high;
- if (ioctl(dev, DIOCADDRULE, &pfr) == -1)
- return (-1);
-
- return (0);
-}
-
-int
add_rdr(u_int32_t id, struct sockaddr *src, struct sockaddr *dst,
u_int16_t d_port, struct sockaddr *rdr, u_int16_t rdr_port, u_int8_t proto)
{
Index: filter.h
===================================================================
RCS file: /cvs/src/libexec/tftp-proxy/filter.h,v
retrieving revision 1.1
diff -u -p -r1.1 filter.h
--- filter.h 28 Dec 2005 19:07:07 -0000 1.1
+++ filter.h 30 Jul 2009 19:47:45 -0000
@@ -20,8 +20,6 @@
int add_filter(u_int32_t, u_int8_t, struct sockaddr *, struct sockaddr *,
u_int16_t, u_int8_t);
-int add_nat(u_int32_t, struct sockaddr *, struct sockaddr *, u_int16_t,
- struct sockaddr *, u_int16_t, u_int16_t, u_int8_t);
int add_rdr(u_int32_t, struct sockaddr *, struct sockaddr *, u_int16_t,
struct sockaddr *, u_int16_t, u_int8_t);
int do_commit(void);