diff --git a/.gitattributes b/.gitattributes index 81e4085..bd69b92 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,6 @@ * text=auto !eol +/ChangeLog -text +/LICENSE -text /Makefile.in -text /README.opsb -text /config.status -text diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..f8ef3f5 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,9 @@ +Open Proxy Scanning Bot Module for NeoStats Changelog. +============================================================================== +* Version 1.0Beta2 * 2/8/2002 * Fish +- Added GPL headers and credit to BOPM authors +- A few fixes in a attempt to find this socket/checklist bug +- Stopped setting Glines multiple times if we find a multiple open proxies, or host is listed in OPM + +* Version 1.0Beta1 * 31/8/2002 * Fish +- Initial Release \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5131b99 --- /dev/null +++ b/LICENSE @@ -0,0 +1,341 @@ +# $Id: LICENSE,v 1.1 2002/09/04 08:52:34 fishwaldo Exp $ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/README.opsb b/README.opsb index ac82f28..97f83ad 100644 --- a/README.opsb +++ b/README.opsb @@ -131,6 +131,12 @@ already been answered in this file, or on the forums, so make sure you read both carefully. opsb is written and maintained by fish - +============================================================================== +Credits +============================================================================== +Credit for some of this code must go to the BOPM team, and in particular +Erik Fears. +Also, thanks to all our Beta Testers and People that hasle us to release +code quicker :) diff --git a/opsb.c b/opsb.c index 23eb85a..b698dad 100644 --- a/opsb.c +++ b/opsb.c @@ -1,10 +1,24 @@ -/* NetStats - IRC Statistical Services Copyright (c) 1999 Adam Rutter, -** Justin Hammond http://codeworks.kamserve.com -* -** Based from GeoStats 1.1.0 by Johnathan George net@lite.net -* -** NetStats CVS Identification -** $Id: opsb.c,v 1.2 2002/08/31 14:36:40 fishwaldo Exp $ +/* NeoStats - IRC Statistical Services Copyright (c) 1999-2002 NeoStats Group Inc. +** Copyright (c) 1999-2002 Adam Rutter, Justin Hammond +** http://www.neostats.net/ +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +** USA +** +** NeoStats CVS Identification +** $Id: opsb.c,v 1.3 2002/09/04 08:52:34 fishwaldo Exp $ */ @@ -80,6 +94,8 @@ int __Bot_Message(char *origin, char **argv, int argc) exemptinfo *exempts; int lookuptype, i; + strcpy(segv_location, "OPSB:Bot_Message"); + u = finduser(origin); if (!u) { log("Unable to find user %s (opsb)", origin); @@ -177,6 +193,7 @@ int __Bot_Message(char *origin, char **argv, int argc) return 0; } scandata = malloc(sizeof(scaninfo)); + scandata->doneban = 0; scandata->u = u; if ((u2 = finduser(argv[2])) != NULL) { /* don't scan users from my server */ @@ -302,6 +319,8 @@ int __Bot_Message(char *origin, char **argv, int argc) int do_set(User *u, char **av, int ac) { char *buf; + + strcpy(segv_location, "OPSB:do_set"); if (UserLevel(u) < 100) { prefmsg(u->nick, s_opsb, "Access Denied"); @@ -426,6 +445,8 @@ int Online(char **av, int ac) { struct sockaddr_in sa; socklen_t ulen = sizeof(struct sockaddr_in); + strcpy(segv_location, "OPSB:Online"); + if (init_bot(s_opsb,"opsb",me.name,"Proxy Scanning Bot", "+xd", my_info[0].module_name) == -1 ) { /* Nick was in use!!!! */ s_opsb = strcat(s_opsb, "_"); @@ -454,6 +475,8 @@ void unconf() { void checkqueue() { lnode_t *scannode; scaninfo *scandata; + + strcpy(segv_location, "OPSB:checkqueue"); /* exit, if the list is full */ if (list_isfull(opsbl) || list_isempty(opsbq)) @@ -470,6 +493,9 @@ void checkqueue() { void addtocache(unsigned long ipaddr) { lnode_t *cachenode; C_entry *ce; + + strcpy(segv_location, "OPSB:addtocache"); + /* pop off the oldest entry */ if (list_isfull(cache)) { #ifdef DEBUG @@ -487,7 +513,7 @@ void addtocache(unsigned long ipaddr) { #ifdef DEBUG log("OPSB: Not adding %ld to cache as it already exists", ipaddr); #endif -// return; + return; } cachenode = list_next(cache, cachenode); } @@ -503,6 +529,9 @@ int checkcache(scaninfo *scandata) { lnode_t *node, *node2; C_entry *ce; exemptinfo *exempts; + + strcpy(segv_location, "OPSB:checkcache"); + node = list_first(exempt); while (node) { exempts = lnode_get(node); @@ -561,6 +590,8 @@ void savecache() { exemptinfo *exempts; FILE *fp = fopen("data/opsb.db", "w"); + strcpy(segv_location, "OPSB:savecache"); + if (!fp) { log("OPSB: warning, Can not open cache file for writting"); chanalert(s_opsb, "Warning, Can not open cache file for writting"); @@ -604,6 +635,8 @@ void loadcache() { FILE *fp = fopen("data/opsb.db", "r"); char *tmp; + strcpy(segv_location, "OPSB:loadcache"); + if (!fp) { log("OPSB: Warning, Can not open Cache file for Reading"); chanalert(s_opsb, "Warning, Can not open Cache file for Reading"); @@ -681,6 +714,8 @@ static int ScanNick(char **av, int ac) { User *u; scaninfo *scandata; lnode_t *scannode; + + strcpy(segv_location, "OPSB:ScanNick"); u = finduser(av[0]); if (!u) { @@ -709,6 +744,7 @@ static int ScanNick(char **av, int ac) { prefmsg(u->nick, s_opsb, "%s", opsb.scanmsg); scandata = malloc(sizeof(scaninfo)); scandata->u = NULL; + scandata->doneban = 0; strncpy(scandata->who, u->nick, MAXHOST); strncpy(scandata->lookup, u->hostname, MAXHOST); strncpy(scandata->server, u->server->name, MAXHOST); @@ -742,6 +778,9 @@ int startscan(scaninfo *scandata) { char *buf; int buflen; int i; + + strcpy(segv_location, "OPSB:Startscan"); + i = checkcache(scandata); if ((i > 0) && (!scandata->u)) { free(scandata); @@ -835,6 +874,8 @@ void dnsblscan(char *data, adns_answer *a) { char *show; int len, ri; + strcpy(segv_location, "OPSB:dnsblscan"); + scannode = list_find(opsbl, data, findscan); if (!scannode) { log("dnsblscan(): Ehhh, Something is wrong here"); @@ -868,18 +909,22 @@ void dnsblscan(char *data, adns_answer *a) { list_delete(opsbl, scannode); lnode_destroy(scannode); startscan(scandata); - break; } else { log("DNS: dnsblscan() GETNICKIP failed-> %s", show); + list_delete(opsbl, scannode); + lnode_destroy(scannode); + free(scandata); checkqueue(); } + } else { + log("DNS: dnsblscan GETNICKIP rr_info failed"); + list_delete(opsbl, scannode); + lnode_destroy(scannode); + free(scandata); + checkqueue(); } - log("DNS: dnsblscan GETNICKIP rr_info failed"); - list_delete(opsbl, scannode); - lnode_destroy(scannode); - free(scandata); - checkqueue(); + free(show); break; case DO_OPM_LOOKUP: if (a->nrrs > 0) { @@ -893,11 +938,21 @@ void dnsblscan(char *data, adns_answer *a) { break; default: log("Warning, Unknown Status in dnsblscan()"); + list_delete(opsbl, scannode); + lnode_destroy(scannode); + free(scandata); return; } return; - } + } else { + log("OPSP() Answer is Empty!"); + list_delete(opsbl, scannode); + lnode_destroy(scannode); + free(scandata); + } + checkqueue(); + } /* this function is to send the results to the user after a lookup command */ @@ -907,7 +962,9 @@ void reportdns(char *data, adns_answer *a) { scaninfo *dnsinfo; char *show; int i, len, ri; - + + strcpy(segv_location, "OPSB:reportdns"); + dnslookup = list_find(opsbl, data, findscan); if (!dnslookup) { log("reportdns(): Ehhh, something wrong here"); diff --git a/opsb.h b/opsb.h index 1d8ac4d..a2b5ab3 100644 --- a/opsb.h +++ b/opsb.h @@ -4,7 +4,7 @@ ** Based from GeoStats 1.1.0 by Johnathan George net@lite.net * ** NetStats CVS Identification -** $Id: opsb.h,v 1.1 2002/08/31 09:28:35 fishwaldo Exp $ +** $Id: opsb.h,v 1.2 2002/09/04 08:52:34 fishwaldo Exp $ */ @@ -43,6 +43,7 @@ struct scanq { int doreport; list_t *socks; time_t started; + int doneban; }; typedef struct scanq scaninfo; diff --git a/opsb_help.c b/opsb_help.c index f618d3a..3801113 100644 --- a/opsb_help.c +++ b/opsb_help.c @@ -1,8 +1,24 @@ -/* NeoStats - IRC Statistical Services Copryight (c) 1999-2002 NeoStats Group. -* -** Module: opsb -** Author: Fish -** $Id: opsb_help.c,v 1.1 2002/08/31 09:28:35 fishwaldo Exp $ +/* NeoStats - IRC Statistical Services Copyright (c) 1999-2002 NeoStats Group Inc. +** Copyright (c) 1999-2002 Adam Rutter, Justin Hammond +** http://www.neostats.net/ +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +** USA +** +** NeoStats CVS Identification +** $Id: opsb_help.c,v 1.2 2002/09/04 08:52:34 fishwaldo Exp $ */ #include "stats.h" diff --git a/proxy.c b/proxy.c index 99ab0ea..f3da517 100644 --- a/proxy.c +++ b/proxy.c @@ -1,10 +1,26 @@ -/* NetStats - IRC Statistical Services Copyright (c) 1999 Adam Rutter, -** Justin Hammond http://codeworks.kamserve.com -* -** Based from GeoStats 1.1.0 by Johnathan George net@lite.net -* -** NetStats CVS Identification -** $Id: proxy.c,v 1.2 2002/08/31 14:36:40 fishwaldo Exp $ +/* NeoStats - IRC Statistical Services Copyright (c) 1999-2002 NeoStats Group Inc. +** Copyright (c) 1999-2002 Adam Rutter, Justin Hammond +** http://www.neostats.net/ +** +** Portions Copyright (c) 2002 Erik Fears +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +** USA +** +** NeoStats CVS Identification +** $Id: proxy.c,v 1.3 2002/09/04 08:52:34 fishwaldo Exp $ */ @@ -52,6 +68,12 @@ void do_ban(scaninfo *scandata) { int doneban = 0; FILE *fp; + strcpy(segv_location, "OPSB:dns_lookup"); + + if (scandata->doneban == 1) + return; + + ++opsb.open; @@ -59,28 +81,23 @@ void do_ban(scaninfo *scandata) { socknode = list_first(scandata->socks); while (socknode) { sockdata = lnode_get(socknode); - if ((sockdata->flags != OPENPROXY) || (doneban == 1)) { + if (sockdata->flags != OPENPROXY) { socknode = list_next(scandata->socks, socknode); break; } + scandata->doneban = 1; log("OPSB: Banning %s (%s) for Open Proxy - %s(%d)", scandata->who, inet_ntoa(scandata->ipaddr), proxy_list[sockdata->type].type, proxy_list[sockdata->type].port); chanalert(s_opsb, "Banning %s (%s) for Open Proxy - %s(%d)", scandata->who, inet_ntoa(scandata->ipaddr), proxy_list[sockdata->type].type, proxy_list[sockdata->type].port); globops(s_opsb, "Banning %s (%s) for Open Proxy - %s(%d)", scandata->who, inet_ntoa(scandata->ipaddr), proxy_list[sockdata->type].type, proxy_list[sockdata->type].port); if (scandata->u) prefmsg(scandata->u->nick, s_opsb, "Banning %s (%s) for Open Proxy - %s(%d)", scandata->who, inet_ntoa(scandata->ipaddr), proxy_list[sockdata->type].type, proxy_list[sockdata->type].port); sakill_cmd(inet_ntoa(scandata->ipaddr), "*", s_opsb, opsb.bantime, "Open Proxy found on your host. Please visit the following website for more info: www.blitzed.org/proxy?ip=%s", inet_ntoa(scandata->ipaddr)); - if (doneban != 1) { - if ((fp = fopen("logs/opsb.log", "a")) == NULL) return; - fprintf(fp, "%s: %s\n", proxy_list[sockdata->type].type, inet_ntoa(scandata->ipaddr)); - fclose(fp); - } else { - doneban = 1; - } + if ((fp = fopen("logs/opsb.log", "a")) == NULL) return; + fprintf(fp, "%s: %s\n", proxy_list[sockdata->type].type, inet_ntoa(scandata->ipaddr)); + fclose(fp); socknode = list_next(scandata->socks, socknode); } - if (doneban == 1) - return; - if (scandata->dnsstate == OPMLIST) { + scandata->doneban = 1; log("OPSB: Banning %s (%s) as its listed in %s", scandata->who, inet_ntoa(scandata->ipaddr), opsb.opmdomain); chanalert(s_opsb, "Banning %s (%s) as its listed in %s", scandata->who, inet_ntoa(scandata->ipaddr), opsb.opmdomain); globops(s_opsb, "Banning %s (%s) as its listed in %s", scandata->who, inet_ntoa(scandata->ipaddr), opsb.opmdomain); @@ -116,6 +133,8 @@ void cleanlist() { char sockname[64]; int savescan, timedout = 0, finished; + strcpy(segv_location, "OPSB:cleanlist"); + scannode = list_first(opsbl); while (scannode) { timedout = 0; @@ -185,6 +204,9 @@ void send_status(User *u) { lnode_t *node, *socknode; scaninfo *scandata; socklist *sockinfo; + + strcpy(segv_location, "OPSB:send_status"); + prefmsg(u->nick, s_opsb, "Proxy Results:"); prefmsg(u->nick, s_opsb, "Hosts Scanned: %d Hosts found Open: %d Exceptions %d", opsb.scanned, opsb.open, list_count(exempt)); prefmsg(u->nick, s_opsb, "Cache Entries: %d", list_count(cache)); @@ -256,6 +278,8 @@ void start_proxy_scan(lnode_t *scannode) { char *sockname; int i, j; + strcpy(segv_location, "OPSB:start_proxy_scan"); + scandata = lnode_get(scannode); if (scandata->u) chanalert(s_opsb, "Starting proxy scan on %s (%s) by Request of %s", scandata->who, scandata->lookup, scandata->u->nick); @@ -285,6 +309,13 @@ void start_proxy_scan(lnode_t *scannode) { scandata->started = time(NULL); } +/* the following functions (http_proxy, sock4_proxy, sock5_proxy, cisco_proxy and wingate_proxy +** were borrowed from the BOPM proxy scanning bot. +** This code is Copyrighted by Erik Fears (strtok@blitzed.org) and is used with thanks +** this code is used under the GPL license, as the original BOPM is licensed under +*/ + + int http_proxy(int sock) { char *buf; int i; @@ -396,7 +427,8 @@ int proxy_read(int socknum, char *sockname) { scaninfo *scandata; lnode_t *socknode; socklist *sockdata = NULL; - + + strcpy(segv_location, "OPSB:proxy_read"); scandata = find_scandata(sockname); if (!scandata) { @@ -484,6 +516,9 @@ int proxy_write(int socknum, char *sockname) { lnode_t *socknode; socklist *sockdata = NULL; + strcpy(segv_location, "OPSB:proxy_write"); + + scandata = find_scandata(sockname); if (!scandata) { log("ehh, wtf, can find scan data");