mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-10-14 06:07:39 +00:00
Code Issues Releases Wiki Activity

use strlcat return value; don't call time() repeatedly.

Browse Source
This commit is contained in:
Florian Westphal
2006-03-18 22:27:09 +00:00
parent 4000e01b28
commit 2a9ffe7037
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
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.190 2006/02/16 19:21:57 fw Exp $"; static char UNUSED id[] = "$Id: conn.c,v 1.191 2006/03/18 22:27:09 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@@ -92,7 +92,7 @@ static void Check_Servers PARAMS(( void ));
static void Init_Conn_Struct PARAMS(( CONN_ID Idx )); static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
static bool Init_Socket PARAMS(( int Sock )); static bool Init_Socket PARAMS(( int Sock ));
static void New_Server PARAMS(( int Server )); static void New_Server PARAMS(( int Server ));
static void Simple_Message PARAMS(( int Sock, char *Msg )); static void Simple_Message PARAMS(( int Sock, const char *Msg ));
static int Count_Connections PARAMS(( struct sockaddr_in addr )); static int Count_Connections PARAMS(( struct sockaddr_in addr ));
static int NewListener PARAMS(( const UINT16 Port )); static int NewListener PARAMS(( const UINT16 Port ));
@@ -556,6 +556,7 @@ va_dcl
#endif #endif
{ {
char buffer[COMMAND_LEN]; char buffer[COMMAND_LEN];
size_t len;
bool ok; bool ok;
va_list ap; va_list ap;
@@ -600,8 +601,9 @@ va_dcl
Log(LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer); Log(LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer);
#endif #endif
strlcat( buffer, "\r\n", sizeof( buffer )); len = strlcat( buffer, "\r\n", sizeof( buffer ));
ok = Conn_Write( Idx, buffer, strlen( buffer )); assert(len < COMMAND_LEN);
ok = Conn_Write(Idx, buffer, len);
My_Connections[Idx].msg_out++; My_Connections[Idx].msg_out++;
va_end( ap ); va_end( ap );
@@ -1103,14 +1105,16 @@ Handle_Buffer( CONN_ID Idx )
char *ptr; char *ptr;
int len, delta; int len, delta;
bool result; bool result;
time_t starttime;
#ifdef ZLIB #ifdef ZLIB
bool old_z; bool old_z;
#endif #endif
starttime = time(NULL);
result = false; result = false;
for (;;) { for (;;) {
/* Check penalty */ /* Check penalty */
if( My_Connections[Idx].delaytime > time( NULL )) return result; if( My_Connections[Idx].delaytime > starttime) return result;
#ifdef ZLIB #ifdef ZLIB
/* unpack compressed data */ /* unpack compressed data */
if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP ))
@@ -1545,8 +1549,9 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
static void static void
Simple_Message( int Sock, char *Msg ) Simple_Message( int Sock, const char *Msg )
{ {
size_t len;
char buf[COMMAND_LEN]; char buf[COMMAND_LEN];
/* Write "simple" message to socket, without using compression /* Write "simple" message to socket, without using compression
* or even the connection write buffers. Used e.g. for error * or even the connection write buffers. Used e.g. for error
@@ -1555,8 +1560,9 @@ Simple_Message( int Sock, char *Msg )
assert( Msg != NULL ); assert( Msg != NULL );
strlcpy( buf, Msg, sizeof buf - 2); strlcpy( buf, Msg, sizeof buf - 2);
strlcat( buf, "\r\n", sizeof buf); len = strlcat( buf, "\r\n", sizeof buf);
(void)write( Sock, buf, strlen( buf ) ); assert(len < COMMAND_LEN);
(void)write(Sock, buf, len);
} /* Simple_Error */ } /* Simple_Error */