[NeoStats-Devel] [Commits] r2699 - in trunk: include src

Author: Fish
Date: Fri Aug 12 20:36:23 2005
New Revision: 2699

Modified:
   trunk/include/neostats.h
   trunk/include/services.h
   trunk/src/ctcp.c
   trunk/src/services.c
   trunk/src/users.c
Log:
fix versionscans for SecureServ

Modified: trunk/include/neostats.h
==============================================================================
--- trunk/include/neostats.h	(original)
+++ trunk/include/neostats.h	Fri Aug 12 20:36:23 2005
@@ -637,10 +637,14 @@
 	struct sockaddr_in srvip;
 	time_t tslastping;
 	time_t ulag;
+	unsigned int versionscan;
 } tme;
 
 EXPORTVAR extern tme me;
 
+
+
+
 /** @brief Bans structure
  *  
  */

Modified: trunk/include/services.h
==============================================================================
--- trunk/include/services.h	(original)
+++ trunk/include/services.h	Fri Aug 12 20:36:23 2005
@@ -48,7 +48,6 @@
 	time_t splittime;
 	time_t msgsampletime;
 	unsigned int msgthreshold;
-	unsigned int versionscan;
 	unsigned int r_time;
 	char pass[MAXPASS];
 	unsigned int debug;

Modified: trunk/src/ctcp.c
==============================================================================
--- trunk/src/ctcp.c	(original)
+++ trunk/src/ctcp.c	Fri Aug 12 20:36:23 2005
@@ -141,7 +141,8 @@
 static int ctcp_rpl_version( CmdParams* cmdparams )
 {
 	dlog( DEBUG5, "RX: CTCP VERSION reply from %s to %s", cmdparams->source->name, cmdparams->bot->name );
-	SendModuleEvent( EVENT_CTCPVERSIONRPL, cmdparams, cmdparams->bot->moduleptr );
+	/* because all modules might be interested */
+	SendAllModuleEvent( EVENT_CTCPVERSIONRPL, cmdparams);
 	return NS_SUCCESS;
 }
 
@@ -162,7 +163,7 @@
 static int ctcp_rpl_finger( CmdParams* cmdparams )
 {
 	dlog( DEBUG5, "RX: CTCP FINGER reply from %s to %s", cmdparams->source->name, cmdparams->bot->name );
-	SendModuleEvent( EVENT_CTCPFINGERRPL, cmdparams, cmdparams->bot->moduleptr );
+	SendAllModuleEvent( EVENT_CTCPFINGERRPL, cmdparams);
 	return NS_SUCCESS;
 }
 
@@ -218,7 +219,7 @@
 static int ctcp_rpl_time( CmdParams* cmdparams )
 {
 	dlog( DEBUG5, "RX: CTCP TIME reply from %s to %s", cmdparams->source->name, cmdparams->bot->name );
-	SendModuleEvent( EVENT_CTCPTIMERPL, cmdparams, cmdparams->bot->moduleptr );
+	SendAllModuleEvent( EVENT_CTCPTIMERPL, cmdparams);
 	return NS_SUCCESS;
 }
 
@@ -239,7 +240,7 @@
 static int ctcp_rpl_ping( CmdParams* cmdparams )
 {
 	dlog( DEBUG5, "RX: CTCP PING reply from %s to %s", cmdparams->source->name, cmdparams->bot->name );
-	SendModuleEvent( EVENT_CTCPPINGRPL, cmdparams, cmdparams->bot->moduleptr );
+	SendAllModuleEvent( EVENT_CTCPPINGRPL, cmdparams);
 	return NS_SUCCESS;
 }
 

Modified: trunk/src/services.c
==============================================================================
--- trunk/src/services.c	(original)
+++ trunk/src/services.c	Fri Aug 12 20:36:23 2005
@@ -126,7 +126,7 @@
 	{"SPLITTIME",		&nsconfig.splittime,		SET_TYPE_INT,		0,	1000,		NS_ULEVEL_ADMIN, NULL,	ns_help_set_splittime, NULL,( void * )300 },
 	{"JOINSERVICESCHAN",&nsconfig.joinserviceschan, SET_TYPE_BOOLEAN,	0, 0, 			NS_ULEVEL_ADMIN, NULL,	ns_help_set_joinserviceschan, NULL,( void* )1 },
 	{"PINGTIME",		&nsconfig.pingtime,			SET_TYPE_INT,		0, 0, 			NS_ULEVEL_ADMIN, NULL,	ns_help_set_pingtime, NULL,( void* )120 },
-	{"VERSIONSCAN",		&nsconfig.versionscan,		SET_TYPE_BOOLEAN,	0, 0, 			NS_ULEVEL_ADMIN, NULL,	ns_help_set_versionscan, NULL,( void* )1 },
+	{"VERSIONSCAN",		&me.versionscan,		SET_TYPE_BOOLEAN,	0, 0, 			NS_ULEVEL_ADMIN, NULL,	ns_help_set_versionscan, NULL,( void* )1 },
 	{"SERVICECMODE",	me.servicescmode,			SET_TYPE_STRING,	0, MODESIZE, 	NS_ULEVEL_ADMIN, NULL,	ns_help_set_servicecmode, NULL, NULL },
 	{"SERVICEUMODE",	me.servicesumode,			SET_TYPE_STRING,	0, MODESIZE, 	NS_ULEVEL_ADMIN, NULL,	ns_help_set_serviceumode, NULL, NULL },
 	{"CMDCHAR",			nsconfig.cmdchar,			SET_TYPE_STRING,	0, 2, 			NS_ULEVEL_ADMIN, NULL,	ns_help_set_cmdchar, NULL,( void* )"!" },

Modified: trunk/src/users.c
==============================================================================
--- trunk/src/users.c	(original)
+++ trunk/src/users.c	Fri Aug 12 20:36:23 2005
@@ -161,7 +161,7 @@
 	}
 	ns_free (cmdparams);
 	/* Send CTCP VERSION request if we are configured to do so */
-	if (IsNeoStatsSynched() && nsconfig.versionscan && !IsExcluded(u) && !IsMe(u)) {
+	if (IsNeoStatsSynched() && me.versionscan && !IsExcluded(u) && !IsMe(u)) {
 		irc_ctcp_version_req (ns_botptr, u);
 	}
 	return u;