head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.44 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.42 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.40 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 pgoyette-compat-0625:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.38 pgoyette-compat-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.36 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.34 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 localcount-20160914:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.32 pgoyette-localcount-base:1.2 netbsd-5-2-3-RELEASE:1.2 netbsd-5-1-5-RELEASE:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 tls-earlyentropy:1.2.0.28 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-5-2-2-RELEASE:1.2 netbsd-5-1-4-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.2 netbsd-5-1-3-RELEASE:1.2 agc-symver:1.2.0.30 agc-symver-base:1.2 tls-maxphys-base:1.2 yamt-pagecache-base8:1.2 netbsd-5-2:1.2.0.26 yamt-pagecache-base7:1.2 netbsd-5-2-RELEASE:1.2 netbsd-5-2-RC1:1.2 yamt-pagecache-base6:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-5-1-2-RELEASE:1.2 netbsd-5-1-1-RELEASE:1.2 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.24 yamt-pagecache-base:1.2 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.22 bouyer-quota2-base:1.2 matt-nb5-pq3:1.2.0.20 matt-nb5-pq3-base:1.2 netbsd-5-1:1.2.0.18 netbsd-5-1-RELEASE:1.2 netbsd-5-1-RC4:1.2 netbsd-5-1-RC3:1.2 netbsd-5-1-RC2:1.2 netbsd-5-1-RC1:1.2 netbsd-5-0-2-RELEASE:1.2 netbsd-5-0-1-RELEASE:1.2 jym-xensuspend-nbase:1.2 netbsd-5-0:1.2.0.16 netbsd-5-0-RELEASE:1.2 netbsd-5-0-RC4:1.2 netbsd-5-0-RC3:1.2 netbsd-5-0-RC2:1.2 jym-xensuspend:1.2.0.14 jym-xensuspend-base:1.2 netbsd-5-0-RC1:1.2 netbsd-5:1.2.0.12 netbsd-5-base:1.2 mjf-devfs2:1.2.0.10 mjf-devfs2-base:1.2 yamt-pf42-base4:1.2 yamt-pf42-base3:1.2 hpcarm-cleanup-nbase:1.2 yamt-pf42-base2:1.2 yamt-pf42:1.2.0.8 yamt-pf42-base:1.2 keiichi-mipv6:1.2.0.6 keiichi-mipv6-base:1.2 cube-autoconf:1.2.0.4 cube-autoconf-base:1.2 hpcarm-cleanup:1.2.0.2 hpcarm-cleanup-base:1.2 BEFORE-IPF411:1.1 netbsd-1-6-PATCH002-RELEASE:1.1 netbsd-1-6-PATCH002:1.1 netbsd-1-6-PATCH002-RC4:1.1 netbsd-1-6-PATCH002-RC3:1.1 netbsd-1-6-PATCH002-RC2:1.1 netbsd-1-6-PATCH002-RC1:1.1 netbsd-1-6-PATCH001:1.1 netbsd-1-6-PATCH001-RELEASE:1.1 netbsd-1-6-PATCH001-RC3:1.1 netbsd-1-6-PATCH001-RC2:1.1 netbsd-1-6-PATCH001-RC1:1.1 fvdl_fs64_base:1.1 v3-4-29:1.1.1.1 netbsd-1-6-RELEASE:1.1 netbsd-1-6-RC3:1.1 netbsd-1-6-RC2:1.1 netbsd-1-6-RC1:1.1 netbsd-1-6:1.1.1.1.0.10 netbsd-1-6-base:1.1 v3-4-27:1.1.1.1 netbsd-1-5-PATCH003:1.1 v3-4-25:1.1.1.1 v3-4-23:1.1.1.1 netbsd-1-5-PATCH002:1.1 netbsd-1-5-PATCH001:1.1 v3-4-16:1.1.1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-5-BETA2:1.1 netbsd-1-5-BETA:1.1 netbsd-1-4-PATCH003:1.1.1.1.2.2 netbsd-1-5-ALPHA2:1.1 v3-4-9:1.1.1.1 netbsd-1-5:1.1.1.1.0.8 netbsd-1-5-base:1.1 v3-4-6:1.1.1.1 minoura-xpg4dl:1.1.1.1.0.6 minoura-xpg4dl-base:1.1 v3-4-4:1.1.1.1 v3-4-3:1.1.1.1 v3-4-2:1.1.1.1 v3-4-1:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1.2.2 v3-3-8:1.1.1.1 wrstuden-devbsize-base:1.1 v3-3-6:1.1.1.1 wrstuden-devbsize:1.1.1.1.0.4 wrstuden-devbsize-19991221:1.1 netbsd-1-4:1.1.1.1.0.2 v3-3-5:1.1.1.1 DARRENR:1.1.1; locks; strict; comment @# @; 1.2 date 2004.03.28.09.00.55; author martti; state dead; branches; next 1.1; 1.1 date 99.12.11.22.24.01; author veego; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.12.11.22.24.01; author veego; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1; next ; 1.1.1.1.2.1 date 99.12.11.22.24.01; author he; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 99.12.20.21.01.46; author he; state Exp; branches; next ; 1.1.1.1.4.1 date 99.12.27.18.27.55; author wrstuden; state Exp; branches; next ; desc @@ 1.2 log @Upgraded IPFilter to 4.1.1 @ text @*** tproxy.c.orig Fri Dec 20 10:53:24 1996 --- tproxy.c Sun Jan 3 11:33:55 1999 *************** *** 135,140 **** --- 135,144 ---- #include #include #include + #include + #include + #include + #include #include "tproxy.h" #ifdef AIX *************** *** 147,152 **** --- 151,159 ---- #define bzero(buf,size) memset(buf, '\0', size); #endif /* SYSV */ + #include "ip_compat.h" + #include "ip_fil.h" + #include "ip_nat.h" /* socket to audio server */ *************** *** 324,329 **** --- 331,369 ---- char localbuf[2048]; void timeout(); extern int errno; + /* + * IP-Filter block + */ + struct sockaddr_in laddr, faddr; + struct natlookup natlookup; + int slen, natfd; + + bzero((char *)&laddr, sizeof(laddr)); + bzero((char *)&faddr, sizeof(faddr)); + slen = sizeof(laddr); + if (getsockname(0, (struct sockaddr *)&laddr, &slen) < 0) + return -1; + slen = sizeof(faddr); + if (getpeername(0, (struct sockaddr *)&faddr, &slen) < 0) + return -1; + natlookup.nl_inport = laddr.sin_port; + natlookup.nl_outport = faddr.sin_port; + natlookup.nl_inip = laddr.sin_addr; + natlookup.nl_outip = faddr.sin_addr; + natlookup.nl_flags = IPN_TCP; + if ((natfd = open(IPL_NAT, O_RDONLY)) < 0) + return -1; + if (ioctl(natfd, SIOCGNATL, &natlookup) == -1) { + syslog(LOG_ERR, "SIOCGNATL failed: %m\n"); + close(natfd); + return -1; + } + close(natfd); + strcpy(hostname, inet_ntoa(natlookup.nl_realip)); + serverport = ntohs(natlookup.nl_realport); + /* + * End of IP-Filter block + */ /* setup a timeout in case dialog doesn't finish */ signal(SIGALRM, timeout); *************** *** 337,344 **** --- 377,386 ---- * and modify the call to (and subroutine) serverconnect() as * appropriate. */ + #if 0 strcpy(hostname, "randomhostname"); serverport = 7070; + #endif /* Can we connect to the server */ if ( (serverfd = serverconnect(hostname, serverport)) < 0 ) { /* errno may still be set from previous call */ @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Inital import of IP Filter 3.3.5 under the dist directory. @ text @@ 1.1.1.1.2.1 log @file tproxy.diff was added on branch netbsd-1-4 on 1999-12-20 21:01:46 +0000 @ text @d1 82 @ 1.1.1.1.2.2 log @Pull up revision 1.1.1.1 (new) (requested by darrenr): Update IPF to version 3.3.5. @ text @a0 82 *** tproxy.c.orig Fri Dec 20 10:53:24 1996 --- tproxy.c Sun Jan 3 11:33:55 1999 *************** *** 135,140 **** --- 135,144 ---- #include #include #include + #include + #include + #include + #include #include "tproxy.h" #ifdef AIX *************** *** 147,152 **** --- 151,159 ---- #define bzero(buf,size) memset(buf, '\0', size); #endif /* SYSV */ + #include "ip_compat.h" + #include "ip_fil.h" + #include "ip_nat.h" /* socket to audio server */ *************** *** 324,329 **** --- 331,369 ---- char localbuf[2048]; void timeout(); extern int errno; + /* + * IP-Filter block + */ + struct sockaddr_in laddr, faddr; + struct natlookup natlookup; + int slen, natfd; + + bzero((char *)&laddr, sizeof(laddr)); + bzero((char *)&faddr, sizeof(faddr)); + slen = sizeof(laddr); + if (getsockname(0, (struct sockaddr *)&laddr, &slen) < 0) + return -1; + slen = sizeof(faddr); + if (getpeername(0, (struct sockaddr *)&faddr, &slen) < 0) + return -1; + natlookup.nl_inport = laddr.sin_port; + natlookup.nl_outport = faddr.sin_port; + natlookup.nl_inip = laddr.sin_addr; + natlookup.nl_outip = faddr.sin_addr; + natlookup.nl_flags = IPN_TCP; + if ((natfd = open(IPL_NAT, O_RDONLY)) < 0) + return -1; + if (ioctl(natfd, SIOCGNATL, &natlookup) == -1) { + syslog(LOG_ERR, "SIOCGNATL failed: %m\n"); + close(natfd); + return -1; + } + close(natfd); + strcpy(hostname, inet_ntoa(natlookup.nl_realip)); + serverport = ntohs(natlookup.nl_realport); + /* + * End of IP-Filter block + */ /* setup a timeout in case dialog doesn't finish */ signal(SIGALRM, timeout); *************** *** 337,344 **** --- 377,386 ---- * and modify the call to (and subroutine) serverconnect() as * appropriate. */ + #if 0 strcpy(hostname, "randomhostname"); serverport = 7070; + #endif /* Can we connect to the server */ if ( (serverfd = serverconnect(hostname, serverport)) < 0 ) { /* errno may still be set from previous call */ @ 1.1.1.1.4.1 log @Pull up to last week's -current. @ text @@