diff -crN ../ircu2.10.06-DBH7-noproxy/CAMBIOS ../ircu2.10.06-DBH7-noproxy2/CAMBIOS *** ../ircu2.10.06-DBH7-noproxy/CAMBIOS Wed Jul 28 16:05:25 1999 --- ../ircu2.10.06-DBH7-noproxy2/CAMBIOS Thu Jul 29 01:28:13 1999 *************** *** 1,3 **** --- 1,9 ---- + * 1999/07/28 savage@apostols.org (patch.noproxy2) + ----------------------------------------------------------------------- + Algunos cambios cosmeticos en los textos enviados al usuario. + El patch.noproxy no compila modo DEBUG, este lo arregla. + Queda reflejado como PX2+ o PX2- en el /VERSION + * 1999/07/28 savage@apostols.org (patch.noproxy) ----------------------------------------------------------------------- Implemento un checker de Socks4-Proxies (wingates incluido). diff -crN ../ircu2.10.06-DBH7-noproxy/ircd/ircd.c ../ircu2.10.06-DBH7-noproxy2/ircd/ircd.c *** ../ircu2.10.06-DBH7-noproxy/ircd/ircd.c Wed Jul 28 05:46:22 1999 --- ../ircu2.10.06-DBH7-noproxy2/ircd/ircd.c Thu Jul 29 01:09:50 1999 *************** *** 349,355 **** if (!IsRegistered(cptr) && (DoingDNS(cptr) || DoingAuth(cptr) || DoingSocks(cptr))) { Debug((DEBUG_NOTICE, "%s/%s/%s timeout %s", DoingDNS(cptr) ? "DNS" : "", ! DoingAuth(cptr) ? "AUTH" : "", DoingSOCKS(cptr) ? "SOCKS" : "", get_client_name(cptr, TRUE))); #else if (!IsRegistered(cptr) && (DoingDNS(cptr) || DoingAuth(cptr))) --- 349,355 ---- if (!IsRegistered(cptr) && (DoingDNS(cptr) || DoingAuth(cptr) || DoingSocks(cptr))) { Debug((DEBUG_NOTICE, "%s/%s/%s timeout %s", DoingDNS(cptr) ? "DNS" : "", ! DoingAuth(cptr) ? "AUTH" : "", DoingSocks(cptr) ? "SOCKS" : "", get_client_name(cptr, TRUE))); #else if (!IsRegistered(cptr) && (DoingDNS(cptr) || DoingAuth(cptr))) diff -crN ../ircu2.10.06-DBH7-noproxy/ircd/s_debug.c ../ircu2.10.06-DBH7-noproxy2/ircd/s_debug.c *** ../ircu2.10.06-DBH7-noproxy/ircd/s_debug.c Wed Jul 28 16:03:51 1999 --- ../ircu2.10.06-DBH7-noproxy2/ircd/s_debug.c Thu Jul 29 01:21:55 1999 *************** *** 218,224 **** #else '-', #endif ! 'P','X', #ifdef PROXY_PROTECTION '+', #else --- 218,224 ---- #else '-', #endif ! 'P','X','2', #ifdef PROXY_PROTECTION '+', #else diff -crN ../ircu2.10.06-DBH7-noproxy/ircd/s_socks.c ../ircu2.10.06-DBH7-noproxy2/ircd/s_socks.c *** ../ircu2.10.06-DBH7-noproxy/ircd/s_socks.c Wed Jul 28 15:18:21 1999 --- ../ircu2.10.06-DBH7-noproxy2/ircd/s_socks.c Thu Jul 29 01:21:07 1999 *************** *** 115,121 **** sock.sin_port = htons(1080); sock.sin_family = AF_INET; ! sprintf_irc(text, ":%s NOTICE SOCKS4 :*** Checking SocksProxy & WinGates...\r\n", me.name ); write(cptr->fd, text, strlen(text)); alarm((unsigned)4); if (connect(cptr->socksfd, (struct sockaddr *)&sock, --- 115,121 ---- sock.sin_port = htons(1080); sock.sin_family = AF_INET; ! sprintf_irc(text, ":%s NOTICE SOCKS4 :*** Checking WinGate/SocksProxy security...\r\n", me.name ); write(cptr->fd, text, strlen(text)); alarm((unsigned)4); if (connect(cptr->socksfd, (struct sockaddr *)&sock, *************** *** 184,190 **** sk->dstip=us.sin_addr.s_addr; strcpy(uname, pw->pw_name); ! Debug((DEBUG_SEND, "sending connect request to socks port %s.1080", inetntoa(them.sin_addr))); if (write(cptr->socksfd, socksbuf, sizeof(struct socks4)+strlen(uname)+1) != (int)(sizeof(struct socks4)+strlen(uname)+1) ) --- 184,190 ---- sk->dstip=us.sin_addr.s_addr; strcpy(uname, pw->pw_name); ! Debug((DEBUG_SEND, "sending connection request to socks port %s.1080", inetntoa(them.sin_addr))); if (write(cptr->socksfd, socksbuf, sizeof(struct socks4)+strlen(uname)+1) != (int)(sizeof(struct socks4)+strlen(uname)+1) ) *************** *** 233,239 **** /* close connection */ close(cptr->socksfd); close(cptr->authfd); ! exit_client(cptr, cptr, &me, "SocksProxy o WinGate inseguro"); return; default: break; --- 233,239 ---- /* close connection */ close(cptr->socksfd); close(cptr->authfd); ! exit_client(cptr, cptr, &me, "Unsecured SocksProxy or WinGate"); return; default: break;