diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-06-16 23:26:00 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-06-16 23:26:00 +0000 |
| commit | a5725614a74c5e7e57dee0cda1a81ab91810a418 (patch) | |
| tree | 4fec78418e07596814acd179ad425fa9253ec365 /contrib/pf/ftp-proxy | |
| parent | 5eba7986748fd69671d135d7c2e6c08545799d55 (diff) | |
| parent | 6a32f6ec2e479ff91d30ed651bcb24ad8d14e84e (diff) | |
| download | FreeBSD-src-a5725614a74c5e7e57dee0cda1a81ab91810a418.zip FreeBSD-src-a5725614a74c5e7e57dee0cda1a81ab91810a418.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r130614,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/pf/ftp-proxy')
| -rw-r--r-- | contrib/pf/ftp-proxy/util.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/contrib/pf/ftp-proxy/util.c b/contrib/pf/ftp-proxy/util.c index 3c8b20e..17a88ca 100644 --- a/contrib/pf/ftp-proxy/util.c +++ b/contrib/pf/ftp-proxy/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.16 2003/06/28 01:04:57 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.18 2004/01/22 16:10:30 beck Exp $ */ /* * Copyright (c) 1996-2001 @@ -58,6 +58,7 @@ int Debug_Level; int Use_Rdns; +in_addr_t Bind_Addr = INADDR_NONE; void debuglog(int debug_level, const char *fmt, ...); @@ -77,7 +78,8 @@ get_proxy_env(int connected_fd, struct sockaddr_in *real_server_sa_ptr, struct sockaddr_in *client_sa_ptr) { struct pfioc_natlook natlook; - int slen, fd; + socklen_t slen; + int fd; slen = sizeof(*real_server_sa_ptr); if (getsockname(connected_fd, (struct sockaddr *)real_server_sa_ptr, @@ -257,10 +259,13 @@ get_backchannel_socket(int type, int min_port, int max_port, int start_port, bzero(&sa, sizeof sa); sa.sin_family = AF_INET; - if (sap == NULL) - sa.sin_addr.s_addr = INADDR_ANY; + if (Bind_Addr == INADDR_NONE) + if (sap == NULL) + sa.sin_addr.s_addr = INADDR_ANY; + else + sa.sin_addr.s_addr = sap->sin_addr.s_addr; else - sa.sin_addr.s_addr = sap->sin_addr.s_addr; + sa.sin_addr.s_addr = Bind_Addr; /* * Indicate that we want to reuse a port if it happens that the |
