Author: Mark
Date: Fri May 13 08:19:07 2005
New Revision: 168
Modified:
branches/3.0/ChangeLog
branches/3.0/modconfig.h.in
branches/3.0/modconfigwin32.h
branches/3.0/opsb.c
branches/3.0/proxy.c
Log:
tidy includes and configure
Modified: branches/3.0/ChangeLog
==============================================================================
--- branches/3.0/ChangeLog (original)
+++ branches/3.0/ChangeLog Fri May 13 08:19:07 2005
@@ -1,5 +1,11 @@
Open Proxy Scanning Bot Module for NeoStats Changelog.
==============================================================================
+3.0.a3-dev - Mark (M) & Fish (F)
+ - Fix event and command return values. (M)
+ - Clean up config.h entries. (M)
+ - Fix Win32 CRT calls. (M)
+ - Port to new socket code. (F)
+
3.0.a2 - Mark (M)
- Add option to use NeoStats global excludes. (M)
- Update settings table to a2 compatible format. (M)
Modified: branches/3.0/modconfig.h.in
==============================================================================
--- branches/3.0/modconfig.h.in (original)
+++ branches/3.0/modconfig.h.in Fri May 13 08:19:07 2005
@@ -3,63 +3,6 @@
/* Enable Debugging */
#undef DEBUG
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `gethostbyname' function. */
-#undef HAVE_GETHOSTBYNAME
-
-/* Define to 1 if you have the `gethostbyname2' function. */
-#undef HAVE_GETHOSTBYNAME2
-
-/* Define to 1 if you have the `inet_aton' function. */
-#undef HAVE_INET_ATON
-
-/* Define to 1 if you have the `inet_pton' function. */
-#undef HAVE_INET_PTON
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `select' function. */
-#undef HAVE_SELECT
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
/* Version number of package */
#undef MODULE_VERSION
@@ -71,40 +14,3 @@
/* Revision */
#undef MODULE_REV
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* "enable replacement (v)snprintf if system (v)snprintf is broken" */
-#undef PREFER_PORTABLE_SNPRINTF
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* "have socklet_t defined?" */
-#undef socklen_t
Modified: branches/3.0/modconfigwin32.h
==============================================================================
--- branches/3.0/modconfigwin32.h (original)
+++ branches/3.0/modconfigwin32.h Fri May 13 08:19:07 2005
@@ -15,117 +15,6 @@
#define MODULE_MINOR "0"
/* Revision */
-#define MODULE_REV "a3"
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `gethostbyname' function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the `gethostbyname2' function. */
-/* #undef HAVE_GETHOSTBYNAME2 */
-
-/* Define to 1 if you have the `inet_aton' function. */
-/*#define HAVE_INET_ATON 1*/
-
-/* Define to 1 if you have the `inet_pton' function. */
-/* #undef HAVE_INET_PTON */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `select' function. */
-/* #undef HAVE_SELECT */
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/*#define HAVE_STRINGS_H 1*/
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-/*#define HAVE_SYS_POLL_H 1*/
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/*#define HAVE_SYS_TIME_H 1*/
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/*#define HAVE_UNISTD_H 1*/
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Name of package */
-/* #undef PACKAGE */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* "enable replacement (v)snprintf if system (v)snprintf is broken" */
-/* #undef PREFER_PORTABLE_SNPRINTF */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-/*#define TIME_WITH_SYS_TIME 1*/
-
-/* Version number of package */
-/* #undef VERSION */
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-#ifndef POLLIN
-#define snprintf _snprintf
-struct pollfd { int fd; short events; short revents; };
-#define POLLIN 1
-#define POLLPRI 2
-#define POLLOUT 4
-#define POLLERR 8
-#define POLLHUP 16
-#define POLLNVAL 32
-#endif
+#define MODULE_REV "a3-dev"
#endif /* _MODCONFIGWIN32_H_ */
Modified: branches/3.0/opsb.c
==============================================================================
--- branches/3.0/opsb.c (original)
+++ branches/3.0/opsb.c Fri May 13 08:19:07 2005
@@ -22,9 +22,6 @@
*/
#include "neostats.h"
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_ARPA_NAMESER_H
#include <arpa/nameser.h>
#endif
@@ -132,10 +129,10 @@
if (dns_lookup(scandata->lookup, adns_r_a, dnsblscan, (void *)scandata) != 1) {
nlog (LOG_WARNING, "DNS: startscan() DO_DNS_HOST_LOOKUP dns_lookup() failed");
ns_free(scandata);
- return 0;
+ return NS_SUCCESS;
}
irc_prefmsg (opsb_bot, cmdparams->source, "Checking %s for open Proxies", cmdparams->av[0]);
- return 0;
+ return NS_SUCCESS;
}
}
irc_prefmsg (opsb_bot, cmdparams->source, "Checking %s for open Proxies", cmdparams->av[0]);
@@ -467,17 +464,17 @@
/* don't scan users from a server that is excluded */
if (ModIsServerExcluded (cmdparams->source->uplink))
{
- return -1;
+ return NS_SUCCESS;
}
if (IsNetSplit(cmdparams->source)) {
dlog (DEBUG1, "Ignoring netsplit nick %s", cmdparams->source->name);
- return -1;
+ return NS_SUCCESS;
}
scannode = list_find(opsbl, cmdparams->source->name, findscan);
if (!scannode) scannode = list_find(opsbq, cmdparams->source->name, findscan);
if (scannode) {
dlog (DEBUG1, "ss_event_signon(): Not scanning %s as we are already scanning them", cmdparams->source->name);
- return -1;
+ return NS_SUCCESS;
}
irc_prefmsg (opsb_bot, cmdparams->source, "%s", opsb.scanmsg);
scandata = ns_malloc(sizeof(scaninfo));
@@ -492,7 +489,7 @@
irc_chanalert (opsb_bot, "Warning Can't scan %s", cmdparams->source->name);
nlog (LOG_WARNING, "OBSB ss_event_signon(): Can't scan %s. Check logs for possible errors", cmdparams->source->name);
}
- return 1;
+ return NS_SUCCESS;
}
/* this function is the entry point for all scans. Any scan you want to kick off is started with this function. */
@@ -515,7 +512,7 @@
if (list_isfull(opsbl)) {
if (list_isfull(opsbq)) {
irc_chanalert (opsb_bot, "Warning, Both Current and queue lists are full. Not Adding additional scans");
- dlog (DEBUG1, "OPSB: dropped scaning of %s, as queue is full", scandata->who);
+ dlog (DEBUG1, "OPSB: dropped scanning of %s, as queue is full", scandata->who);
if (scandata->reqclient) irc_prefmsg (opsb_bot, scandata->reqclient, "To Busy. Try again later");
ns_free(scandata);
return 0;
@@ -621,8 +618,6 @@
if (init_scanengine() != NS_SUCCESS) {
return NS_FAILURE;
}
- /* tell NeoStats we want nickip */
- me.want_nickip = 1;
return NS_SUCCESS;
}
Modified: branches/3.0/proxy.c
==============================================================================
--- branches/3.0/proxy.c (original)
+++ branches/3.0/proxy.c Fri May 13 08:19:07 2005
@@ -25,9 +25,6 @@
#include "neostats.h"
#include "event.h"
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_ARPA_NAMESER_H
#include <arpa/nameser.h>
#endif
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.