re-added the form_message() calls for public() and emote()

Author: drscholl

FAQ

@@ -1,6 +1,6 @@
 Frequently Asked Questions (FAQ) about opennap
 ==============================================
-Last updated on April 26, 2000.
+Last updated on May 30, 2000.
 
 Q:  What is opennap?
 A:  opennap is an open source server which speaks the napster protocol
@@ -52,3 +52,6 @@ A:  If you have memory to spare, you can increase the value of
     client_queue_length, or alternatively decrease the number of files
     returned by a browse command (max_browse_result) so that it does not cross
     the 100kbytes default limit.
+
+Q:  How do I get my server listed on napigator.com?
+A:  Go to www.napigator.com and look for the section on adding servers.

config.c

@@ -68,7 +68,7 @@ static struct config Vars[] = {
     {"max_channel_length", VAR_TYPE_INT, UL & Max_Channel_Length, 32},
     {"max_ignore",VAR_TYPE_INT,UL&Max_Ignore,32},
     {"max_hotlist",VAR_TYPE_INT,UL&Max_Hotlist,32},
-    {"max_topic",VAR_TYPE_INT,UL&Max_Topic,32},
+    {"max_topic",VAR_TYPE_INT,UL&Max_Topic,64},
     {"max_client_string",VAR_TYPE_INT,UL&Max_Client_String,32},
 };
 

list_users.c

@@ -19,11 +19,6 @@ HANDLER (list_users)
     (void) len;
     ASSERT (validate_connection (con));
     CHECK_USER_CLASS ("list_users");
-    if (invalid_channel (pkt))
-    {
-	invalid_channel_msg (con);
-	return;
-    }
     chan = hash_lookup (Channels, pkt);
     if (!chan)
     {

part.c

@@ -30,11 +30,6 @@ HANDLER (part)
 	log ("part(): server message is missing channel name");
 	return;
     }
-    if (invalid_channel (pkt))
-    {
-	invalid_channel_msg (con);
-	return;
-    }
     /* find the requested channel in the user's  list */
     if (!(chan = find_channel (user->channels, pkt)))
     {

public.c

@@ -12,6 +12,11 @@
 #include "opennap.h"
 #include "debug.h"
 
+/* static buffer for use by public/emote.  these get called a lot so speed
+   things up by keeping it around.  there is no chance of either of these
+   being called from eachother or used elsewhere so this is safe */
+static char PublicBuf[2048];
+
 /* [ :<sender> ] <channel> <text> */
 /*  public message to a channel */
 HANDLER (public)
@@ -23,7 +28,6 @@ HANDLER (public)
     CHANUSER *chanUser;
 
     (void) tag;
-    (void) len;
     ASSERT (validate_connection (con));
     /* save the starting position of the pkt */
     ptr = pkt;
@@ -54,11 +58,6 @@ HANDLER (public)
 	unparsable (con);
 	return;
     }
-    if (invalid_channel (pkt))
-    {
-	invalid_channel_msg (con);
-	return;
-    }
 
     /* find the channel this message is going to. look the user's joined
        channels since this should be faster than lookup in the hash table */
@@ -73,18 +72,25 @@ HANDLER (public)
     /* relay this message to peer servers */
     pass_message_args (con, tag, ":%s %s %s", sender->nick, chan->name, pkt);
 
+    /* the majority of the users in the channel will see this message, so
+       form it one time */
+    len = form_message (PublicBuf, sizeof(PublicBuf), MSG_SERVER_PUBLIC,
+			"%s %s %s", chan->name,
+			sender->cloaked ? "Operator" : sender->nick,
+			pkt);
+
     /* send this message to everyone in the channel */
     for (list = chan->users; list; list = list->next)
     {
 	chanUser = list->data;
 	ASSERT (chanUser->magic == MAGIC_CHANUSER);
 	if (ISUSER (chanUser->user->con))
 	{
-	    send_cmd (chanUser->user->con, MSG_SERVER_PUBLIC, "%s %s %s",
-		      chan->name, (!sender->cloaked
-				   || chanUser->user->level >
-				   LEVEL_USER) ? sender->nick : "Operator",
-		      pkt);
+	    if(sender->cloaked && chanUser->user->level > LEVEL_USER)
+		send_cmd(chanUser->user->con,MSG_SERVER_PUBLIC,"%s %s %s",
+			 chan->name, sender->nick, pkt);
+	    else
+		queue_data(chanUser->user->con,PublicBuf,len);
 	}
     }
 }
@@ -99,7 +105,6 @@ HANDLER (emote)
     LIST *list;
 
     (void) tag;
-    (void) len;
     ASSERT (validate_connection (con));
     ptr = pkt;			/* save initial location */
     if (pop_user (con, &pkt, &user) != 0)
@@ -126,11 +131,6 @@ HANDLER (emote)
 	unparsable (con);
 	return;
     }
-    if (invalid_channel (av[0]))
-    {
-	invalid_channel_msg (con);
-	return;
-    }
 
     /* find the channel this message is going to. look the user's joined
        channels since this should be faster than lookup in the hash table */
@@ -146,17 +146,24 @@ HANDLER (emote)
     pass_message_args (con, tag, ":%s %s \"%s\"", user->nick, chan->name,
 		       av[1]);
 
+    /* majority of the users see the same message, so form it once */
+    len=form_message(PublicBuf,sizeof(PublicBuf),tag,"%s %s \"%s\"",
+		     chan->name,
+		     user->cloaked ? "Operator" : user->nick,
+		     av[1]);
+
     /* send this message to all channel members */
     for (list = chan->users; list; list = list->next)
     {
 	chanUser = list->data;
 	ASSERT (chanUser->magic == MAGIC_CHANUSER);
 	if (ISUSER (chanUser->user->con))
 	{
-	    send_cmd (chanUser->user->con, tag, "%s %s \"%s\"", chan->name,
-		      (!user->cloaked
-		       || chanUser->user->level >
-		       LEVEL_MODERATOR) ? user->nick : "Operator", av[1]);
+	    if(user->cloaked && chanUser->user->level > LEVEL_USER)
+		send_cmd (chanUser->user->con, tag, "%s %s \"%s\"",
+			  chan->name, user->nick, av[1]);
+	    else
+		queue_data(chanUser->user->con,PublicBuf,len);
 	}
     }
 }