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

Author: Fish
Date: Thu Mar 31 18:32:37 2005
New Revision: 348

Modified:
   branches/3.0/ChangeLog
   branches/3.0/SecureServ.c
   branches/3.0/SecureServ.h
   branches/3.0/scan.c
   branches/3.0/update.c
Log:
update SecureServ to send IP address, not hostname to secure.irc-chat.net for dnsbl support

Modified: branches/3.0/ChangeLog
==============================================================================
--- branches/3.0/ChangeLog	(original)
+++ branches/3.0/ChangeLog	Thu Mar 31 18:32:37 2005
@@ -2,6 +2,8 @@
 Fish (F), Mark (M), DeadNotBuried (D)
 ==============================================================================
 3.0.a3-dev - Mark (M)
+ - Fix up dns_lookup prototype (F)
+ - we send IP address, not hostname, to secure.irc-chat.net to aid for DNSBL support (F)
  - Update to FetchRows handlers to take size parameter. (M)
  - Fix auth level for username and password. (M)
  - stop channels being scanned when global exclude list enabled and

Modified: branches/3.0/SecureServ.c
==============================================================================
--- branches/3.0/SecureServ.c	(original)
+++ branches/3.0/SecureServ.c	Thu Mar 31 18:32:37 2005
@@ -407,7 +407,7 @@
 	/* kick of the autojoin timer */
 	AddTimer (TIMER_TYPE_INTERVAL, JoinNewChan, "JoinNewChan", SecureServ.stayinchantime);
 	AddTimer (TIMER_TYPE_INTERVAL, MonBotCycle, "MonBotCycle", SecureServ.monchancycletime);
-	dns_lookup("secure.irc-chat.net",  adns_r_a, GotHTTPAddress, "SecureServ Update Server");
+	dns_lookup("secure.irc-chat.net",  adns_r_a, GotHTTPAddress, NULL);
 	LoadMonChans();
 	if (SecureServ.autoupgrade == 1) {
 		AddTimer (TIMER_TYPE_INTERVAL, AutoUpdate, "AutoUpdate", SecureServ.autoupgradetime);

Modified: branches/3.0/SecureServ.h
==============================================================================
--- branches/3.0/SecureServ.h	(original)
+++ branches/3.0/SecureServ.h	Thu Mar 31 18:32:37 2005
@@ -134,7 +134,7 @@
 int ss_cmd_set_updateinfo(CmdParams *cmdparams, SET_REASON reason);
 int ss_cmd_set_autoupdate_cb (CmdParams *cmdparams, SET_REASON reason);
 int ss_cmd_set_autoupdatetime_cb (CmdParams *cmdparams, SET_REASON reason);
-void GotHTTPAddress(char *data, adns_answer *a);
+void GotHTTPAddress(void *data, adns_answer *a);
 int AutoUpdate(void);
 
 /* OnJoin.c */

Modified: branches/3.0/scan.c
==============================================================================
--- branches/3.0/scan.c	(original)
+++ branches/3.0/scan.c	Thu Mar 31 18:32:37 2005
@@ -426,7 +426,7 @@
 	/* send an update to secure.irc-chat.net */
 	if ((SecureServ.sendtosock > 0) && (SecureServ.report == 1)) {
 		ircsnprintf(buf2, 3, "%c%c", SecureServ.updateuname[0], SecureServ.updateuname[1]);
-		ircsnprintf(buf, 1400, "%s\n%s\n%s\n%s\n%s\n%d\n", SecureServ.updateuname, crypt(SecureServ.updatepw, buf2), ve->name, u->user->hostname, "TODO", SecureServ.datfileversion);
+		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));
 	}	
 }

Modified: branches/3.0/update.c
==============================================================================
--- branches/3.0/update.c	(original)
+++ branches/3.0/update.c	Thu Mar 31 18:32:37 2005
@@ -35,7 +35,6 @@
 
 void datver(void *data, int status, char *ver, int versize);
 void datdownload(void *data, int status, char *ver, int versize);
-void GotHTTPAddress(char *data, adns_answer *a);
 static int DownLoadDat(void);
 
 static char ss_buf[SS_BUF_SIZE];
@@ -165,7 +164,7 @@
 	}
 }
 	
-void GotHTTPAddress(char *data, adns_answer *a) 
+void GotHTTPAddress(void *data, adns_answer *a) 
 {
 	char *url;
 	int i, len, ri;