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

Convert CONN_ID and Conf_MaxConnections to "int" datatype 

We can't handle more connections than accept(2) can supply, and
accept(2) returns an "int" ...
This commit is contained in:
Alexander Barton 2012-08-29 17:03:41 +02:00
parent 21467c76f1
commit b68bb560e9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ngircd/conf.c
View File

@ -346,7 +346,7 @@ Conf_Test( void )
puts("[LIMITS]"); puts("[LIMITS]");
printf(" ConnectRetry = %d\n", Conf_ConnectRetry); printf(" ConnectRetry = %d\n", Conf_ConnectRetry);
printf(" MaxConnections = %ld\n", Conf_MaxConnections); printf(" MaxConnections = %d\n", Conf_MaxConnections);
printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1);
@ -1432,7 +1432,7 @@ Handle_LIMITS(int Line, char *Var, char *Arg)
return; return;
} }
if (strcasecmp(Var, "MaxConnections") == 0) { if (strcasecmp(Var, "MaxConnections") == 0) {
Conf_MaxConnections = atol(Arg); Conf_MaxConnections = atoi(Arg);
if (!Conf_MaxConnections && strcmp(Arg, "0")) if (!Conf_MaxConnections && strcmp(Arg, "0"))
Config_Error_NaN(Line, Var); Config_Error_NaN(Line, Var);
return; return;

2
src/ngircd/conf.h
View File

@ -206,7 +206,7 @@ GLOBAL bool Conf_ConnectIPv6;
GLOBAL bool Conf_ConnectIPv4; GLOBAL bool Conf_ConnectIPv4;
/** Maximum number of simultaneous connections to this server */ /** Maximum number of simultaneous connections to this server */
GLOBAL long Conf_MaxConnections; GLOBAL int Conf_MaxConnections;
/** Maximum number of channels a user can join */ /** Maximum number of channels a user can join */
GLOBAL int Conf_MaxJoins; GLOBAL int Conf_MaxJoins;

3
src/ngircd/conn.h
View File

@ -42,7 +42,7 @@
#define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ #define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */
#define CONN_SSL_FLAGS_ALL (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ) #define CONN_SSL_FLAGS_ALL (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ)
#endif #endif
typedef long CONN_ID; typedef int CONN_ID;
#include "client.h" #include "client.h"
#include "proc.h" #include "proc.h"
@ -126,6 +126,7 @@ GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd)); GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd));
GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i)); GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i));
GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i)); GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i));
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len)); GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len));
GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx)); GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx));