diff -crN ../ircu2.10.06-DBH8-noproxy3/CAMBIOS ../ircu2.10.06-DBH8-noproxy4/CAMBIOS *** ../ircu2.10.06-DBH8-noproxy3/CAMBIOS Thu Jul 29 12:11:41 1999 --- ../ircu2.10.06-DBH8-noproxy4/CAMBIOS Thu Jul 29 14:56:16 1999 *************** *** 1,3 **** --- 1,10 ---- + * 1999/07/29 savage@apostols.org (patch.noproxy4) + ----------------------------------------------------------------------- + Se corrige el tema caida por timeout si tienes el 1080 cerrado sin aviso + mediante firewall. Ahora deja al usuario enganchado 90 segundos antes de + dejarle entrar. + Queda reflejado como PX4+ o PX4- en el /VERSION + * 1999/07/29 savage@apostols.org (patch.noproxy3) ----------------------------------------------------------------------- Se elimina el chekeo de Socks y el de Ident sobre puerto de servers diff -crN ../ircu2.10.06-DBH8-noproxy3/ircd/s_bsd.c ../ircu2.10.06-DBH8-noproxy4/ircd/s_bsd.c *** ../ircu2.10.06-DBH8-noproxy3/ircd/s_bsd.c Thu Jul 29 12:08:45 1999 --- ../ircu2.10.06-DBH8-noproxy4/ircd/s_bsd.c Thu Jul 29 13:54:09 1999 *************** *** 1368,1374 **** --- 1368,1378 ---- { static struct hostent lhe = { "localhost", NULL, 0, 0, NULL }; acptr->hostp = &lhe; + #ifdef PROXY_PROTECTION + if (!DoingAuth(acptr) && !DoingSocks(acptr)) + #else if (!DoingAuth(acptr)) + #endif SetAccess(acptr); } else *************** *** 1936,1941 **** --- 1940,1946 ---- nfds--; read_socksports(cptr); } + } #endif /* PROXY_PROTECTION */ for (i = HIGHEST_INDEX; i >= 0; i--) *************** *** 2019,2026 **** if (!(cptr = LOC_CLIENTS(i)) || IsMe(cptr)) continue; #ifdef USE_POLL if (DoingDNS(cptr) || DoingAuth(cptr) || !(cptr = loc_clients[LOC_FD(i)])) ! continue; #endif /* USE_POLL */ #ifdef DEBUGMODE if (IsLog(cptr)) --- 2024,2035 ---- if (!(cptr = LOC_CLIENTS(i)) || IsMe(cptr)) continue; #ifdef USE_POLL + #ifdef PROXY_PROTECTION + if (DoingSocks(cptr) || DoingDNS(cptr) || DoingAuth(cptr) || !(cptr = loc_clients[LOC_FD(i)])) + #else if (DoingDNS(cptr) || DoingAuth(cptr) || !(cptr = loc_clients[LOC_FD(i)])) ! #endif /* PROXY_PROTECTION */ ! continue; #endif /* USE_POLL */ #ifdef DEBUGMODE if (IsLog(cptr)) *************** *** 2679,2685 **** { del_queries((char *)cptr); ClearDNS(cptr); ! if (!DoingAuth(cptr)) SetAccess(cptr); cptr->hostp = hp; } --- 2688,2698 ---- { del_queries((char *)cptr); ClearDNS(cptr); ! #ifdef PROXY_PROTECTION ! if (!DoingSocks(cptr) && !DoingAuth(cptr)) ! #else ! if (!DoingAuth(cptr)) ! #endif SetAccess(cptr); cptr->hostp = hp; } diff -crN ../ircu2.10.06-DBH8-noproxy3/ircd/s_debug.c ../ircu2.10.06-DBH8-noproxy4/ircd/s_debug.c *** ../ircu2.10.06-DBH8-noproxy3/ircd/s_debug.c Thu Jul 29 12:07:47 1999 --- ../ircu2.10.06-DBH8-noproxy4/ircd/s_debug.c Thu Jul 29 13:54:27 1999 *************** *** 218,224 **** #else '-', #endif ! 'P','X','3', #ifdef PROXY_PROTECTION '+', #else --- 218,224 ---- #else '-', #endif ! 'P','X','4', #ifdef PROXY_PROTECTION '+', #else