Changed Numerics 265 and 266 to follow ircd 2.11.x "standards".

This commit is contained in:
Alexander Barton 2006-10-01 19:13:32 +00:00
parent 27d947fb7d
commit 257312b102
3 changed files with 19 additions and 7 deletions

View File

@ -12,6 +12,7 @@
ngIRCd HEAD ngIRCd HEAD
- Changed Numerics 265 and 266 to follow ircd 2.11.x "standards".
- Allow PASS syntax defined in RFC 1459 for server links, too. - Allow PASS syntax defined in RFC 1459 for server links, too.
- Enhanced ISUPPORT message (005 numeric). - Enhanced ISUPPORT message (005 numeric).
@ -666,4 +667,4 @@ ngIRCd 0.0.1, 31.12.2001
-- --
$Id: ChangeLog,v 1.306 2006/10/01 19:05:00 alex Exp $ $Id: ChangeLog,v 1.307 2006/10/01 19:13:32 alex Exp $

View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-info.c,v 1.34 2006/09/16 12:22:09 fw Exp $"; static char UNUSED id[] = "$Id: irc-info.c,v 1.35 2006/10/01 19:13:32 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -833,6 +833,9 @@ GLOBAL bool
IRC_Send_LUSERS( CLIENT *Client ) IRC_Send_LUSERS( CLIENT *Client )
{ {
long cnt; long cnt;
#ifndef STRICT_RFC
long max;
#endif
assert( Client != NULL ); assert( Client != NULL );
@ -861,9 +864,17 @@ IRC_Send_LUSERS( CLIENT *Client )
#ifndef STRICT_RFC #ifndef STRICT_RFC
/* Maximum number of local users */ /* Maximum number of local users */
if( ! IRC_WriteStrClient( Client, RPL_LOCALUSERS_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyMaxUserCount( ))) return DISCONNECTED; cnt = Client_MyUserCount();
max = Client_MyMaxUserCount();
if (! IRC_WriteStrClient(Client, RPL_LOCALUSERS_MSG, Client_ID(Client),
cnt, max, cnt, max))
return DISCONNECTED;
/* Maximum number of users in the network */ /* Maximum number of users in the network */
if( ! IRC_WriteStrClient( Client, RPL_NETUSERS_MSG, Client_ID( Client ), Client_UserCount( ), Client_MaxUserCount( ))) return DISCONNECTED; cnt = Client_UserCount();
max = Client_MaxUserCount();
if(! IRC_WriteStrClient(Client, RPL_NETUSERS_MSG, Client_ID(Client),
cnt, max, cnt, max))
return DISCONNECTED;
#endif #endif
return CONNECTED; return CONNECTED;

View File

@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * Please read the file COPYING, README and AUTHORS for more information.
* *
* $Id: messages.h,v 1.68 2006/10/01 19:03:05 alex Exp $ * $Id: messages.h,v 1.69 2006/10/01 19:13:32 alex Exp $
* *
* IRC numerics (Header) * IRC numerics (Header)
*/ */
@ -42,8 +42,8 @@
#define RPL_ADMINLOC2_MSG "258 %s :%s" #define RPL_ADMINLOC2_MSG "258 %s :%s"
#define RPL_ADMINEMAIL_MSG "259 %s :%s" #define RPL_ADMINEMAIL_MSG "259 %s :%s"
#define RPL_TRACEEND_MSG "262 %s %s %s-%s.%s :End of TRACE" #define RPL_TRACEEND_MSG "262 %s %s %s-%s.%s :End of TRACE"
#define RPL_LOCALUSERS_MSG "265 %s :Current local users: %ld, Max: %ld" #define RPL_LOCALUSERS_MSG "265 %s %ld %ld :Current local users: %ld, Max: %ld"
#define RPL_NETUSERS_MSG "266 %s :Current global users: %ld, Max: %ld" #define RPL_NETUSERS_MSG "266 %s %ld %ld :Current global users: %ld, Max: %ld"
#define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_AWAY_MSG "301 %s %s :%s"
#define RPL_USERHOST_MSG "302 %s :" #define RPL_USERHOST_MSG "302 %s :"