diff options
Diffstat (limited to '')
| -rw-r--r-- | irc/tircproxy/files/patch-ad | 102 |
1 files changed, 43 insertions, 59 deletions
diff --git a/irc/tircproxy/files/patch-ad b/irc/tircproxy/files/patch-ad index f37ddbba3403..3f46c3ba27fb 100644 --- a/irc/tircproxy/files/patch-ad +++ b/irc/tircproxy/files/patch-ad @@ -1,59 +1,43 @@ -*** tircproxy.c.orig Thu May 4 22:53:30 2000 ---- tircproxy.c Wed Aug 22 13:42:46 2001 -*************** -*** 1065,1074 **** - { - struct sockaddr_in to_addr; - int to_len; - #if IPF -! struct sockaddr_in socketin, sloc; -! natlookup_t natlook; -! int fd; - #endif - - /* Give this thing 10 minutes to get started (paranoia). ---- 1065,1084 ---- - { - struct sockaddr_in to_addr; - int to_len; -+ - #if IPF -! struct sockaddr_in socketin, sloc; -! natlookup_t natlook; -! -! #if __FreeBSD__ >= 2 -! #include <osreldate.h> -! #if __FreeBSD_version >= 430000 -! -! natlookup_t *natlookp = &natlook; -! -! #endif -! #endif -! int fd; - #endif - - /* Give this thing 10 minutes to get started (paranoia). -*************** -*** 1152,1158 **** - natlook.nl_inport = sloc.sin_port; - - fd = open(IPL_NAT, O_RDONLY); -! if (ioctl(fd, SIOCGNATL, &natlook) == -1) - { - perror("ioctl"); - exit(-1); ---- 1162,1175 ---- - natlook.nl_inport = sloc.sin_port; - - fd = open(IPL_NAT, O_RDONLY); -! #if __FreeBSD__ >= 2 -! #include <osreldate.h> -! #if __FreeBSD_version >= 430000 -! if (ioctl(fd, SIOCGNATL, &natlookp) == -1) -! #else -! if (ioctl(fd, SIOCGNATL, &natlook) == -1) -! #endif -! #endif - { - perror("ioctl"); - exit(-1); +--- tircproxy.c.orig Wed Jun 5 19:13:00 2002 ++++ tircproxy.c Wed Jun 5 19:14:46 2002 +@@ -131,6 +131,8 @@ + # include <netinet/ip_compat.h> + # endif + # include <netinet/ip_fil.h> ++# include <netinet/ip_nat.h> ++# include <netinet/ip_state.h> + # include <netinet/ip_proxy.h> + # include <netinet/ip_nat.h> + # define TRANS 1 +@@ -1066,9 +1068,10 @@ + struct sockaddr_in to_addr; + int to_len; + #if IPF +- struct sockaddr_in socketin, sloc; +- natlookup_t natlook; +- int fd; ++ struct sockaddr_in socketin, sloc; ++ natlookup_t natlook; ++ natlookup_t *natlookp = &natlook; ++ int fd; + #endif + + /* Give this thing 10 minutes to get started (paranoia). +@@ -1148,13 +1151,13 @@ + natlook.nl_outip = socketin.sin_addr; + natlook.nl_inip = sloc.sin_addr; + natlook.nl_flags = IPN_TCP; +- natlook.nl_outport = socketin.sin_port; +- natlook.nl_inport = sloc.sin_port; ++ natlook.nl_outport = ntohs(socketin.sin_port); ++ natlook.nl_inport = ntohs(sloc.sin_port); + + fd = open(IPL_NAT, O_RDONLY); +- if (ioctl(fd, SIOCGNATL, &natlook) == -1) ++ if (ioctl(fd, SIOCGNATL, &natlookp) == -1) + { +- perror("ioctl"); ++ perror("ioctl(SIOCGNATL)"); + exit(-1); + } + close(fd); |