diff options
| -rw-r--r-- | libexec/ftp-proxy/util.c | 4 | ||||
| -rw-r--r-- | sys/net/pf.c | 4 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 31 |
3 files changed, 19 insertions, 20 deletions
diff --git a/libexec/ftp-proxy/util.c b/libexec/ftp-proxy/util.c index 35780125c7c..976150cb5b7 100644 --- a/libexec/ftp-proxy/util.c +++ b/libexec/ftp-proxy/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.3 2001/08/28 19:35:04 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.4 2001/09/05 12:42:31 dhartmei Exp $ */ /* * Copyright (c) 1996-2001 @@ -75,7 +75,7 @@ int get_proxy_env(int connected_fd, struct sockaddr_in *real_server_sa_ptr, struct sockaddr_in *client_sa_ptr) { - struct pf_natlook natlook; + struct pfioc_natlook natlook; char *client; int slen, fd; diff --git a/sys/net/pf.c b/sys/net/pf.c index 02336cbd64c..ce8662069d6 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.144 2001/09/04 12:32:53 dhartmei Exp $ */ +/* $OpenBSD: pf.c,v 1.145 2001/09/05 12:42:31 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1502,7 +1502,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) } case DIOCNATLOOK: { - struct pf_natlook *pnl = (struct pf_natlook *)addr; + struct pfioc_natlook *pnl = (struct pfioc_natlook *)addr; struct pf_state *st; struct pf_tree_key key; int direction = pnl->direction; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 6978ef3d71e..2506d414ef4 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.48 2001/09/04 12:32:53 dhartmei Exp $ */ +/* $OpenBSD: pfvar.h,v 1.49 2001/09/05 12:42:31 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -136,20 +136,6 @@ struct pf_state { r->dst.mask, h->ip_dst.s_addr)) \ ) -struct pf_natlook { - u_int32_t saddr; - u_int32_t daddr; - u_int32_t rsaddr; - u_int32_t rdaddr; - u_int16_t sport; - u_int16_t dport; - u_int16_t rsport; - u_int16_t rdport; - u_int8_t proto; - u_int8_t direction; -}; - - struct pf_nat { char ifname[IFNAMSIZ]; struct ifnet *ifp; @@ -280,6 +266,19 @@ struct pfioc_changenat { struct pf_nat newnat; }; +struct pfioc_natlook { + u_int32_t saddr; + u_int32_t daddr; + u_int32_t rsaddr; + u_int32_t rdaddr; + u_int16_t sport; + u_int16_t dport; + u_int16_t rsport; + u_int16_t rdport; + u_int8_t proto; + u_int8_t direction; +}; + struct pfioc_rdr { u_int32_t ticket; u_int32_t nr; @@ -342,7 +341,7 @@ struct pfioc_tm { #define DIOCSETSTATUSIF _IOWR('D', 20, struct pfioc_if) #define DIOCGETSTATUS _IOWR('D', 21, struct pf_status) #define DIOCCLRSTATUS _IO ('D', 22) -#define DIOCNATLOOK _IOWR('D', 23, struct pf_natlook) +#define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) #define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_changerule) |