[NeoStats-Devel] [Commits] r170 - branches/3.0

Author: Mark
Date: Sun May 22 05:54:48 2005
New Revision: 170

Modified:
   branches/3.0/opsb.c
   branches/3.0/opsb.h
   branches/3.0/opsb_help.c
   branches/3.0/proxy.c
Log:
help and unused var tidy ups

Modified: branches/3.0/opsb.c
==============================================================================
--- branches/3.0/opsb.c	(original)
+++ branches/3.0/opsb.c	Sun May 22 05:54:48 2005
@@ -606,7 +606,6 @@
 	opsb.open = 0;
 	opsb.scanned = 0;
 	opsb.cachehits = 0;
-	opsb.opmhits = 0;
 	if (load_ports() != 1) {
 		nlog (LOG_WARNING, "Can't Load opsb. No Ports Defined for Scanner. Did you install Correctly?");
 		return NS_FAILURE;

Modified: branches/3.0/opsb.h
==============================================================================
--- branches/3.0/opsb.h	(original)
+++ branches/3.0/opsb.h	Sun May 22 05:54:48 2005
@@ -62,8 +62,6 @@
 } scaninfo;
 
 struct opsb {
-	char opmdomain[MAXHOST];
-	int init;
 	char targetip[MAXHOST];
 	char openstring[BUFSIZE];
 	int targetport;
@@ -77,9 +75,7 @@
 	int confed;
 	int cachetime;
 	int cachesize;
-	int doscan;
 	int cachehits;
-	int opmhits;
 	int doakill;
 	int verbose;
 	int exclusions;
@@ -103,9 +99,9 @@
 typedef struct proxy_type {
 	int type;
 	char name[MAXNICK];
-         sockcb writefunc;
-         int scanned;
-         int noopen;
+	sockcb writefunc;
+	int scanned;
+	int noopen;
 } proxy_type;
 
 /* these are some state flags */
@@ -151,7 +147,6 @@
 extern const char opsb_help_ports_oneline[];
 extern const char opsb_help_set_oneline[];
 
-extern const char *opsb_help_set_doscan [];
 extern const char *opsb_help_set_akill [];
 extern const char *opsb_help_set_targetip [];
 extern const char *opsb_help_set_targetport [];

Modified: branches/3.0/opsb_help.c
==============================================================================
--- branches/3.0/opsb_help.c	(original)
+++ branches/3.0/opsb_help.c	Sun May 22 05:54:48 2005
@@ -61,7 +61,7 @@
 };
 
 const char *opsb_help_check[] = {
-	"Syntax: \2CHECK <nick|ip|hostname>\2",
+	"Syntax: \2CHECK <NICK|IP|HOSTNAME>\2",
 	"",
 	"This option will scan either a user connected to your",
 	"network, an IP address, or Hostname for Insecure proxies,",
@@ -77,33 +77,26 @@
 	NULL
 };
 
-const char *opsb_help_set_doscan [] = {
-	"\2SCAN <ON|OFF>\2",
-	"Disables the proxy scan and only do a lookup in the DNS",
-	"blacklist to see if this host is listed as an open proxy",
-	NULL
-};
-
 const char *opsb_help_set_akill [] = {
 	"\2AKILL <ON|OFF>\2",
-	" ",
+	"Whether to issue an akill for positive lookups",
 	NULL
 };
 
 const char *opsb_help_set_targetip [] = {
-	"\2TARGETIP <ip>\2",
+	"\2TARGETIP <IP>\2",
 	"IP address of server we try to make the proxies connect to",
 	NULL
 };
 
 const char *opsb_help_set_targetport [] = {
-	"\2TARGETPORT <port>\2",
+	"\2TARGETPORT <PORT>\2",
 	"IRCd port number we try to make proxies connect to.",
 	NULL
 };
 
 const char *opsb_help_set_opmdomain [] = {
-	"\2OPMDOMAIN <domain>\2",
+	"\2OPMDOMAIN <DOMAIN>\2",
 	"Domain used for blacklists.",
 	"This setting should not be changed unless you know the",
 	"effects in full",
@@ -111,7 +104,7 @@
 };
 
 const char *opsb_help_set_maxbytes [] = {
-	"\2MAXBYTES <max>\2",
+	"\2MAXBYTES <MAX>\2",
 	"Maximum number of bytes we receive from a proxy before disconnecting",
 	"This setting should not be changed unless you know the",
 	"effects in full",
@@ -119,7 +112,7 @@
 };
 
 const char *opsb_help_set_timeout [] = {
-	"\2TIMEOUT <time>\2",
+	"\2TIMEOUT <TIME>\2",
 	"Time we wait for a proxy to respond to our servers before",
 	"disconnecting and assuming its not an open proxy.",
 	"This setting should not be changed unless you know the",
@@ -128,7 +121,7 @@
 };
 
 const char *opsb_help_set_openstring [] = {
-	"\2OPENSTRING <string>\2",
+	"\2OPENSTRING <STRING>\2",
 	"The string we expect to see if there is an open proxy",
 	"This setting should not be changed unless you know the",
 	"effects in full",
@@ -136,25 +129,25 @@
 };
 
 const char *opsb_help_set_scanmsg [] = {
-	"\2SCANMSG <msg>\2",
+	"\2SCANMSG <MSG>\2",
 	"Message sent to a user when we scan their hosts",
 	NULL
 };
 
 const char *opsb_help_set_akilltime [] = {
-	"\2AKILLTIME <time>\2",
+	"\2AKILLTIME <TIME>\2",
 	"How long the user will be banned from the network for",
 	NULL
 };
 
 const char *opsb_help_set_cachetime [] = {
-	"\2CACHETIME <time>\2",
+	"\2CACHETIME <TIME>\2",
 	"Time (in seconds) that an entry will be cached",
 	NULL
 };
 
 const char *opsb_help_set_cachesize [] = {
-	"\2CACHESIZE <size>\2",
+	"\2CACHESIZE <SIZE>\2",
 	"The total number of clean hosts that OPSB will cache",
 	"Setting this too large may cause NeoStats to Lag",
 	NULL
@@ -205,7 +198,7 @@
 };
 
 const char *opsb_help_remove[] = {
-	"Syntax: \2REMOVE <ip|hostname>\2",
+	"Syntax: \2REMOVE <IP|HOSTNAME>\2",
 	"",
 	"Remove akills that have been set by opsb.",
 	"",

Modified: branches/3.0/proxy.c
==============================================================================
--- branches/3.0/proxy.c	(original)
+++ branches/3.0/proxy.c	Sun May 22 05:54:48 2005
@@ -426,7 +426,7 @@
 
 
 void open_proxy(conninfo *connection)
-      {
+{
 	scaninfo *scandata = connection->scandata;
 
 	SET_SEGV_LOCATION();
@@ -464,7 +464,6 @@
 	irc_prefmsg (opsb_bot, cmdparams->source, "Hosts Scanned: %d Hosts found Open: %d", opsb.scanned, opsb.open);
 	irc_prefmsg (opsb_bot, cmdparams->source, "Cache Entries: %d", (int)list_count(cache));
 	irc_prefmsg (opsb_bot, cmdparams->source, "Cache Hits: %d", opsb.cachehits);
-	irc_prefmsg (opsb_bot, cmdparams->source, "Blacklist Hits: %d", opsb.opmhits);
 	for (i = 0; proxy_list[i].type != 0; i++) {
 		irc_prefmsg (opsb_bot, cmdparams->source, "Proxy %s Found %d Open %d", proxy_list[i].name, proxy_list[i].scanned, proxy_list[i].noopen);
 	}