albino/ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed format string bug in "connection statistics" message; code cleanups.

Browse Source
This commit is contained in:
Alexander Barton 2005-08-15 23:02:40 +00:00
parent ae6e6616a6
commit c2f5399b51
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ngircd/conn.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
#include "io.h" #include "io.h"
static char UNUSED id[] = "$Id: conn.c,v 1.169 2005/08/02 22:48:57 alex Exp $"; static char UNUSED id[] = "$Id: conn.c,v 1.170 2005/08/15 23:02:40 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -736,19 +736,23 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
c = Client_GetFromConn( Idx ); c = Client_GetFromConn( Idx );
/* Should the client be informed? */ /* Should the client be informed? */
if( InformClient ) if (InformClient) {
{
#ifndef STRICT_RFC #ifndef STRICT_RFC
/* Send statistics to client if registered as user: */ /* Send statistics to client if registered as user: */
if(( c != NULL ) && ( Client_Type( c ) == CLIENT_USER )) if ((c != NULL) && (Client_Type(c) == CLIENT_USER)) {
{ Conn_WriteStr( Idx,
Conn_WriteStr( Idx, "NOTICE %s :%sConnection statistics: client %.1f kb, server %.1f kb.", Client_ThisServer( ), NOTICE_TXTPREFIX, (double)My_Connections[Idx].bytes_in / 1024, (double)My_Connections[Idx].bytes_out / 1024 ); "NOTICE %s :%sConnection statistics: client %.1f kb, server %.1f kb.",
Client_ID(Client_ThisServer()), NOTICE_TXTPREFIX,
(double)My_Connections[Idx].bytes_in / 1024,
(double)My_Connections[Idx].bytes_out / 1024);
} }
#endif #endif
/* Send ERROR to client (see RFC!) */ /* Send ERROR to client (see RFC!) */
if( FwdMsg ) Conn_WriteStr( Idx, "ERROR :%s", FwdMsg ); if (FwdMsg)
else Conn_WriteStr( Idx, "ERROR :Closing connection." ); Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
else
Conn_WriteStr(Idx, "ERROR :Closing connection.");
} }
/* Try to write out the write buffer */ /* Try to write out the write buffer */