added stats reporting for total bytes sent/received

server_usage() now reports searches/sec and total bytes in/out

Author: drscholl

ChangeLog

@@ -1,3 +1,119 @@
+2000-07-28  drscholl  <[email protected]>
+
+	* browse.c: reverted previous changes
+
+	* add_file.c, download.c, init.c, main.c, opennap.h, remove_file.c, search.c, upload_complete.c, util.c:
+	reverted back to storing full pathnames in the DATUM struct.  it was causing
+	too much load having to regenerate the filename every time match() needed to
+	be called.
+
+	* config.c, join.c, main.c, opennap.h, search.c, server_usage.c:
+	added `search_timeout' variable to set the expiration time of remote
+	searches (default: 180 secs)
+
+	bytes in/out was not time averaged in server_usage()
+
+	* channel.c, free_user.c, login.c, main.c, opennap.h, remove_connection.c, synch.c:
+	cache the server names so that each USER struct can reference it a single
+	time instead of once for each user
+
+	* configure, configure.in:
+	fixed bug in configure which causes DEBUG to always be set
+
+	* download.c, upload_complete.c:
+	reorganized code in download() to lookup the user's file only once
+
+	* TODO, add_file.c, download.c, opennap.h, remove_file.c, search.c, upload_complete.c, util.c:
+	added more strict checking to make sure the directory name also matches when
+	looking up a file by its basename
+
+	* browse.c, download.c, opennap.h, remove_file.c, upload_complete.c, util.c, add_file.c:
+	modified hash table of user's files to index by only the pathname instead of
+	the full directory name since that is no longer available
+
+	* add_file.c, browse.c, download.c, resume.c:
+	fixed many other places where the full filename was not returned
+
+	* search.c:
+	search did not return the full pathname of the shared files
+
+	* add_file.c, browse.c, init.c, main.c, opennap.h, search.c, TODO:
+	created new hash table `Paths' for storing the directory components of
+	shared files a single time for all files in the same directory.
+
+2000-07-27  drscholl  <[email protected]>
+
+	* channel.c, sample.channels:
+	altered channels file so that # is no longer considered a comment in
+	`version 1' files.
+
+	* NEWS, join.c, login.c:
+	channel names must now begin with # or &.  join will automatically prepend a
+	hash (#) if missing
+
+	* configure, configure.in:
+	debugging is no longer enabled by default.  use `configure --enable-debug'
+	to turn it on
+
+	* add_file.c, main.c, opennap.h:
+	change Num_Gigs to a double.  unsigned int was running out at 4096 GB.
+
+	* Makefile.am, Makefile.in, NEWS, README, ban.c, channel.c, configure, configure.in, download.c, glob.c, join.c, list_users.c, login.c, napster.txt, opennap.h, resume.c, search.c, synch.c, upload_complete.c, util.c, whois.c:
+	imported changes from adns branch, without adns support
+
+	* NEWS, join.c:
+	fixed bug in channel rollover code causing an infinite loop
+
+2000-07-26  drscholl  <[email protected]>
+
+	* channel.c:
+	fixed bug which prevented registered channels from being dropped
+
+	* remove_connection.c:
+	check to make sure con->dns != 0 before calling adns_cancel()
+
+	* upload_complete.c:
+	fixed bug with downloads not working.  forgot to switch .host to .ip
+	in the download responses
+
+2000-07-25  drscholl  <[email protected]>
+
+	* main.c:
+	added adns_if_noserverwarn to adns_init() to turn off warnings
+
+	* login.c, main.c:
+	login() did not convert the uint32 ip address to dot-quad before using it
+	as the host name
+
+	* server_connect.c:
+	.resolved should be set when making an outgoing server connection so the
+	connection doesnt time out waiting for a nonexistent dns lookup
+
+	* configure, configure.in:
+	configure should use `if test' rather than `if ['
+
+	* README, list_users.c, whois.c:
+	added the client ip address in dot-quad format to the end of the global user
+	list response, and the whois response
+
+	* configure, configure.in:
+	configure should look for -ladns in /usr/local/lib as well
+
+	* glob.c: New file.
+
+	* glob.c: forgot to add glob.c
+
+	* Makefile.am, Makefile.in, NEWS, ban.c, channel.c, configure, configure.in, download.c, join.c, list_users.c, login.c, main.c, napster.txt, opennap.h, remove_connection.c, resume.c, search.c, synch.c, whois.c:
+	added initial support for adns to add reverse dns lookups for client
+	connections.
+
+2000-07-23  drscholl  <[email protected]>
+
+	* ChangeLog, Makefile.in, README, configure, setup.c:
+	fixed setup.c to compile under win32
+
+	updated ChangeLog with recent CVS log entries.
+
 2000-07-20  drscholl  <[email protected]>
 
 	* login.c:

NEWS

@@ -13,6 +13,12 @@ Removed the USER_IP server numeric.  This version of opennap will not
 interoperate with other opennap servers < 0.33, but will use less
 bandwidth for server->server links
 
+Added new config variable `search_timeout' which controls how long pending
+searches will be considered valid before timing out.
+
+Added new config variable `stats_port' to make the port 8889 stats
+configurable since napigator now supports alternate ports.
+
 [opennap 0.35]
 
 added `max_clones' configuration variable to control how many clients may

config.c

@@ -74,6 +74,7 @@ static struct config Vars[] = {
     {"max_reason",VAR_TYPE_INT,UL&Max_Reason,64},
     {"max_clones",VAR_TYPE_INT,UL&Max_Clones,0},
     {"search_timeout",VAR_TYPE_INT,UL&Search_Timeout,180},
+    {"stats_port",VAR_TYPE_INT,UL&Stats_Port,8889},
 };
 
 static int Vars_Size = sizeof (Vars) / sizeof (struct config);

main.c

@@ -36,6 +36,7 @@ int Max_User_Channels;		/* default, can be changed in config */
 int Stat_Click;			/* interval (in seconds) to send server stats */
 LIST *Server_Ports = 0;		/* which port(s) to listen on for connections */
 int Server_Queue_Length;
+int Stats_Port;			/* port to listen on for stats info */
 int Client_Queue_Length;
 int Max_Search_Results;
 int Max_Shared;
@@ -59,6 +60,8 @@ int Max_Client_String;
 int Max_Reason;
 int Max_Clones;
 int Search_Timeout;
+unsigned int Total_Bytes_In = 0;		/* bytes received */
+unsigned int Total_Bytes_Out = 0;		/* bytes sent */
 
 #ifndef WIN32
 int Uid;
@@ -133,6 +136,10 @@ update_stats (void)
     log ("update_stats(): %d channels", Channels->dbsize);
     log ("update_stats(): %.2f kbytes/sec in, %.2f kbytes/sec out",
 	 (float) Bytes_In / 1024. / delta, (float) Bytes_Out / 1024. / delta);
+    Total_Bytes_In += Bytes_In;
+    Total_Bytes_Out += Bytes_Out;
+    log ("update_stats(): %u bytes sent, %u bytes received",
+	    Total_Bytes_Out, Total_Bytes_In);
 
     /* reset counters */
     Bytes_In = 0;
@@ -437,7 +444,7 @@ main (int argc, char **argv)
 	/* listen on port 8889 for stats reporting */
 	if ((sp = new_tcp_socket (ON_REUSEADDR)) == -1)
 	    exit (1);
-	if (bind_interface (sp, Interface, 8889))
+	if (bind_interface (sp, Interface, Stats_Port))
 	    exit (1);
 	if (listen (sp, BACKLOG))
 	{

opennap.h

@@ -379,7 +379,10 @@ extern LIST *Server_Ports;
 extern int Server_Queue_Length;
 extern int SigCaught;		/* flag to control main loop */
 extern int Stat_Click;
+extern int Stats_Port;
 extern time_t Server_Start;
+extern unsigned int Total_Bytes_In;
+extern unsigned int Total_Bytes_Out;
 extern int User_Db_Interval;
 extern int Max_Channel_Length;
 extern int Max_Ignore;

sample.conf

@@ -96,6 +96,9 @@ server_password opensource
 # maximum number of connnections from a single ip (default: 0 [unlimited])
 #max_clones 3
 
+# port to listen on for stats reporting (useful to napigator)
+#stats_port 8889
+
 # END of Win32 configuration.  What follows is only for the Unix versions
 
 # if your operating system has a small limit for the maxium amount of data

server_usage.c

@@ -33,7 +33,7 @@ HANDLER (server_usage)
 
 	numServers = list_count (Servers);
 	send_user (user, MSG_SERVER_USAGE_STATS,
-		  "%d %d %d %d %.0f %d %d %d %d %d %.2f %.2f",
+		  "%d %d %d %d %.0f %d %d %d %d %d %.2f %.2f %.2f %u %u",
 		  Num_Clients - numServers,
 		  numServers,
 		  Users->dbsize,
@@ -45,7 +45,10 @@ HANDLER (server_usage)
 		  mem_used,
 		  User_Db->dbsize,
 		  (float) Bytes_In / 1024. / delta,
-		  (float) Bytes_Out / 1024. / delta);
+		  (float) Bytes_Out / 1024. / delta,
+		  (float) Search_Count / delta,
+		  Total_Bytes_In,
+		  Total_Bytes_Out);
     }
     else
 	pass_message_args (con, tag, ":%s %s", user->nick, pkt);