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

Author: Mark
Date: Sun Apr 10 06:17:35 2005
New Revision: 349

Removed:
   branches/3.0/FloodCheck.c
Modified:
   branches/3.0/Helpers.c
   branches/3.0/OnJoinBot.c
   branches/3.0/SecureServ.c
   branches/3.0/SecureServ.h
   branches/3.0/scan.c
   branches/3.0/secureserv.vcproj
Log:
remove redunant file and some tidy ups

Modified: branches/3.0/Helpers.c
==============================================================================
--- branches/3.0/Helpers.c	(original)
+++ branches/3.0/Helpers.c	Sun Apr 10 06:17:35 2005
@@ -30,6 +30,12 @@
 	Client *u;
 }Helper;
 
+int ss_cmd_login(CmdParams *cmdparams);
+int ss_cmd_logout(CmdParams *cmdparams);
+int ss_cmd_assist(CmdParams *cmdparams);
+int ss_cmd_helpers(CmdParams *cmdparams);
+int ss_cmd_chpass(CmdParams *cmdparams);
+
 static hash_t *helperhash;
 
 static bot_cmd helper_commands[]=
@@ -52,7 +58,7 @@
 
 void HelpersStatus (CmdParams *cmdparams)
 {
-	irc_prefmsg (ss_bot, cmdparams->source, "AV Channel Helpers Logged in: %d", SecureServ.helpcount);
+	irc_prefmsg (ss_bot, cmdparams->source, "Helpers logged in: %d", SecureServ.helpcount);
 }
 
 int LoadHelper (void *data, int size)
@@ -254,7 +260,7 @@
 		return NS_ERR_NEED_MORE_PARAMS;
 	}
 	if (hash_lookup(helperhash, cmdparams->av[1])) {
-		irc_prefmsg (ss_bot, cmdparams->source, "A Helper with login %s already exists", cmdparams->av[1]);
+		irc_prefmsg (ss_bot, cmdparams->source, "Helper login %s already exists", cmdparams->av[1]);
 		return NS_SUCCESS;
 	}
 	helper = ns_malloc (sizeof(Helper));
@@ -266,7 +272,7 @@
 
 	/* ok, now save the helper */
 	DBAStore ("helpers", helper->nick, (void *)helper, sizeof (Helper));
-	irc_prefmsg (ss_bot, cmdparams->source, "Successfully added Helper %s with Password %s to Helpers List", helper->nick, helper->pass);
+	irc_prefmsg (ss_bot, cmdparams->source, "Helper %s added with password %s", helper->nick, helper->pass);
 	return NS_SUCCESS;
 }
 
@@ -284,9 +290,9 @@
 		ns_free (hnode_get(node));
 		hnode_destroy(node);
 		DBADelete ("helpers", cmdparams->av[1]);
-		irc_prefmsg (ss_bot, cmdparams->source, "Deleted %s from Helpers List", cmdparams->av[1]);
+		irc_prefmsg (ss_bot, cmdparams->source, "Helper %s deleted", cmdparams->av[1]);
 	} else {
-		irc_prefmsg (ss_bot, cmdparams->source, "Error, Could not find %s in helpers list. /msg %s helpers list", cmdparams->av[1], ss_bot->name);
+		irc_prefmsg (ss_bot, cmdparams->source, "Error, helper %s not found. /msg %s helpers list", cmdparams->av[1], ss_bot->name);
 	}
 	return NS_SUCCESS;
 }
@@ -298,13 +304,13 @@
 	Helper *helper;
 
 	SET_SEGV_LOCATION();
-	irc_prefmsg (ss_bot, cmdparams->source, "Helpers List (%d):", (int)hash_count(helperhash));
+	irc_prefmsg (ss_bot, cmdparams->source, "Helpers list (%d):", (int)hash_count(helperhash));
 	hash_scan_begin(&hlps, helperhash);
 	while ((node = hash_scan_next(&hlps)) != NULL) {
 		helper = hnode_get(node);
 		irc_prefmsg (ss_bot, cmdparams->source, "%s (%s)", helper->nick, helper->u ? helper->u->name : "Not Logged In");
 	}
-	irc_prefmsg (ss_bot, cmdparams->source, "End of List.");	
+	irc_prefmsg (ss_bot, cmdparams->source, "End of list.");	
 	return NS_SUCCESS;
 }
 

Modified: branches/3.0/OnJoinBot.c
==============================================================================
--- branches/3.0/OnJoinBot.c	(original)
+++ branches/3.0/OnJoinBot.c	Sun Apr 10 06:17:35 2005
@@ -599,7 +599,7 @@
 		irc_prefmsg (ss_bot, cmdparams->source, "%s", (char*)lnode_get(node));
 		node = list_next(monchans, node);
 	}
-	irc_prefmsg (ss_bot, cmdparams->source, "End of List");
+	irc_prefmsg (ss_bot, cmdparams->source, "End of list");
 	return 1;
 }
 
@@ -722,7 +722,7 @@
 		irc_prefmsg (ss_bot, cmdparams->source, "%s (%s@%s) - %s", bots->nick, bots->user, bots->host, bots->realname);
  		node = list_next(nicks, node);
 	}
-	irc_prefmsg (ss_bot, cmdparams->source, "End of List.");
+	irc_prefmsg (ss_bot, cmdparams->source, "End of list.");
 	CommandReport(ss_bot, "%s requested Bot List", cmdparams->source->name);
 	return NS_SUCCESS;
 }

Modified: branches/3.0/SecureServ.c
==============================================================================
--- branches/3.0/SecureServ.c	(original)
+++ branches/3.0/SecureServ.c	Sun Apr 10 06:17:35 2005
@@ -95,7 +95,9 @@
 	{"HELPERS",		&SecureServ.helpers,	SET_TYPE_BOOLEAN,	0,	0,			NS_ULEVEL_ADMIN,NULL,	ts_help_set_helpers, ss_cmd_set_helpers_cb, (void *)1 },
 	{"VERSION",		&SecureServ.doscan,		SET_TYPE_BOOLEAN,	0,	0,			NS_ULEVEL_ADMIN,NULL,	ts_help_set_version, NULL, (void *)0 },
 	{"HELPCHAN",	&SecureServ.HelpChan,	SET_TYPE_CHANNEL,	0,	MAXCHANLEN,	NS_ULEVEL_ADMIN,NULL,	ts_help_set_helpchan, NULL, (void *)"#nohack" },
+#ifdef HAVE_CRYPT_H
 	{"REPORT",		&SecureServ.report,		SET_TYPE_BOOLEAN,	0,	0,			NS_ULEVEL_ADMIN,NULL,	ts_help_set_report, NULL, (void *)1 },
+#endif /* HAVE_CRYPT_H */
 	{"DOPRIVCHAN",	&SecureServ.doprivchan,	SET_TYPE_BOOLEAN,	0,	0,			NS_ULEVEL_ADMIN,NULL,	ts_help_set_doprivchan, NULL, (void *)1 },
 	{"CHECKFIZZER",	&SecureServ.dofizzer,	SET_TYPE_BOOLEAN,	0,	0,			NS_ULEVEL_ADMIN,NULL,	ts_help_set_checkfizzer, NULL, (void *)1 },
 	{"MULTICHECK",	&SecureServ.breakorcont,SET_TYPE_BOOLEAN,	0,	0,			NS_ULEVEL_ADMIN,NULL,	ts_help_set_multicheck, NULL, (void *)1 },
@@ -175,7 +177,7 @@
 	ScanStatus (cmdparams);
 	HelpersStatus (cmdparams);
 	OnJoinBotStatus (cmdparams);
-	irc_prefmsg (ss_bot, cmdparams->source, "End of List.");
+	irc_prefmsg (ss_bot, cmdparams->source, "End of list.");
 	return NS_SUCCESS;
 }
 

Modified: branches/3.0/SecureServ.h
==============================================================================
--- branches/3.0/SecureServ.h	(original)
+++ branches/3.0/SecureServ.h	Sun Apr 10 06:17:35 2005
@@ -179,11 +179,6 @@
 /* Helpers.c */
 int InitHelpers(void);
 void FiniHelpers(void);
-int ss_cmd_login(CmdParams *cmdparams);
-int ss_cmd_logout(CmdParams *cmdparams);
-int ss_cmd_assist(CmdParams *cmdparams);
-int ss_cmd_helpers(CmdParams *cmdparams);
-int ss_cmd_chpass(CmdParams *cmdparams);
 int HelpersSignoff(CmdParams *cmdparams);
 int HelpersAway(CmdParams *cmdparams);
 void HelpersStatus (CmdParams *cmdparams);

Modified: branches/3.0/scan.c
==============================================================================
--- branches/3.0/scan.c	(original)
+++ branches/3.0/scan.c	Sun Apr 10 06:17:35 2005
@@ -292,7 +292,7 @@
 		}
 	}
 	if (fout) {
-		irc_prefmsg (ss_bot, cmdparams->source, "End of List.");
+		irc_prefmsg (ss_bot, cmdparams->source, "End of list.");
 	} else {
 		irc_prefmsg (ss_bot, cmdparams->source, "No definitions found.");
 	}
@@ -416,9 +416,9 @@
 	return Scan(DET_TOPIC, u, buf);
 }
 
-#ifndef WIN32
 static void report_positive (Client *u, virientry *ve)
 {
+#ifdef HAVE_CRYPT_H
 	char buf[1400];
 	char buf2[3];
 	int i;
@@ -429,8 +429,8 @@
 		ircsnprintf(buf, 1400, "%s\n%s\n%s\n%s\n%s\n%d\n", SecureServ.updateuname, crypt(SecureServ.updatepw, buf2), ve->name, u->hostip, MODULE_VERSION, SecureServ.datfileversion);
 		i = sendto(SecureServ.sendtosock, buf, strlen(buf), 0,  (struct sockaddr *) &SecureServ.sendtohost, sizeof(SecureServ.sendtohost));
 	}	
-}
 #endif
+}
 
 void gotpositive(Client *u, virientry *ve, int type) 
 {
@@ -544,7 +544,5 @@
 			nlog (LOG_NOTICE, "Warned %s about %s Bot/Trojan/Virus", u->name, ve->name);
 			break;
 	}
-#ifndef WIN32
 	report_positive (u, ve);
-#endif
 }

Modified: branches/3.0/secureserv.vcproj
==============================================================================
--- branches/3.0/secureserv.vcproj	(original)
+++ branches/3.0/secureserv.vcproj	Sun Apr 10 06:17:35 2005
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\dev\include;..\dev\lib\adnswin32;..\dev\lib\keeper;..\dev\lib\curl;..\dev\lib\pcre"
+				AdditionalIncludeDirectories="..\dev\include;..\dev\lib\adns;..\dev\lib\curl;..\dev\lib\pcre"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;secureserv_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\dev\include;..\dev\lib\adnswin32;..\dev\lib\keeper;..\dev\lib\curl;..\dev\lib\pcre"
+				AdditionalIncludeDirectories="..\dev\include;..\dev\lib\adns;..\dev\lib\curl;..\dev\lib\pcre"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;secureserv_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"