Make WriteServ use WriteServ_NoFormat, code duplication = bad >:/

Change some weirdness using a stringstream for a simple append.
Force a flush of all opers' write buffers after they get the oper notice about a /DIE



git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3842 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 23 insertions, 32 deletions

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 3966021b5..bc8f58099 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -34,20 +34,35 @@ using namespace std;
 #include "cmd_die.h"
 
 extern ServerConfig* Config;
+extern std::vector<userrec*> all_opers;
 
 void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
 {
-	log(DEBUG,"die: %s",user->nick);
 	if (!strcmp(parameters[0],Config->diepass))
 	{
-		WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host);
+		log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, Config->DieDelay);
+		
+		/* This would just be WriteOpers(), but as we just sleep() and then die then the write buffers never get flushed.
+		 * so we iterate the oper list, writing the message and immediately trying to flush their write buffer.
+		 */
+		
+		for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+		{
+			userrec* a = *i;
+			
+			if (IS_LOCAL(a) && (a->modebits & UM_SERVERNOTICE))
+			{
+				WriteServ(a->fd, "NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
+				a->FlushWriteBuf();
+			}
+		}
+		
 		sleep(Config->DieDelay);
 		Exit(ERROR);
 	}
 	else
 	{
+		log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
 		WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
 	}
 }
-
-
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 46a85da2c..c467172d8 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -293,31 +293,8 @@ void WriteServ(int sock, char* text, ...)
 	va_start(argsPtr, text);
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
-	bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer);
-	chop(tb);
-
-	if (fd_ref_table[sock])
-	{
-		if (Config->GetIOHook(fd_ref_table[sock]->port))
-		{
-			try
-			{
-				Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-			}
-			catch (ModuleException& modexcept)
-			{
-				log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-			}
-		}
-		else
-		{
-			fd_ref_table[sock]->AddWriteBuf(tb);
-		}
-
-		ServerInstance->stats->statsSent += bytes;
-	}
-	else
-		log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+	
+	WriteServ_NoFormat(sock, textbuffer);
 }
 
 /** WriteFrom_NoFormat()
diff --git a/src/users.cpp b/src/users.cpp
index be24db697..d6ee1d3bd 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -404,9 +404,8 @@ void userrec::AddWriteBuf(const std::string &data)
 		WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
 		return;
 	}
-	std::stringstream stream;
-	stream << sendq << data;
-	sendq = stream.str();
+	
+	sendq.append(data);
 }
 
 // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)