pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-30 08:46:38 +02:00
Code Activity

split all the local client stuff to acptr->local. makes it a lot easier to catch bugs.

Browse Source 
If the IRCd crashes then it's likely not by this change but rather an existing issue that was previously gone unnoticed.
This commit is contained in:
Bram Matthys
2015-07-19 12:48:18 +02:00
parent 19ad342a73
commit 13fffa4e1a
47 changed files with 580 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/h.h
+2 -2
View File
@@ -44,9 +44,9 @@ extern MODVAR int bootopt;
extern MODVAR time_t TSoffset;
extern MODVAR time_t timeofday;
/* newconf */
#define get_sendq(x) ((x)->class ? (x)->class->sendq : MAXSENDQLENGTH)
#define get_sendq(x) ((x)->local->class ? (x)->local->class->sendq : MAXSENDQLENGTH)
/* get_recvq is only called in send.c for local connections */
#define get_recvq(x) ((x)->class->recvq ? (x)->class->recvq : CLIENT_FLOOD)
#define get_recvq(x) ((x)->local->class->recvq ? (x)->local->class->recvq : CLIENT_FLOOD)
#define CMD_FUNC(x) int (x) (aClient *cptr, aClient *sptr, int parc, char *parv[])
include/struct.h
+26 -30
View File
@@ -400,10 +400,10 @@ typedef OperPermission (*OperClassEntryEvalCallback)(OperClassACLEntryVar* varia
#define IsSetHost(x) ((x)->umodes & UMODE_SETHOST)
#define IsHideOper(x) ((x)->umodes & UMODE_HIDEOPER)
#define IsSSL(x) IsSecure(x)
#define IsNotSpoof(x) ((x)->nospoof == 0)
#define IsNotSpoof(x) ((x)->local->nospoof == 0)
#define GetHost(x) (IsHidden(x) ? (x)->user->virthost : (x)->user->realhost)
#define GetIP(x) ((x->user && x->user->ip_str) ? x->user->ip_str : (MyConnect(x) ? Inet_ia2p(&x->ip) : "255.255.255.255"))
#define GetIP(x) ((x->user && x->user->ip_str) ? x->user->ip_str : (MyConnect(x) ? Inet_ia2p(&x->local->ip) : "255.255.255.255"))
#define SetKillsF(x) ((x)->user->snomask |= SNO_KILLS)
#define SetClientF(x) ((x)->user->snomask |= SNO_CLIENT)
@@ -441,7 +441,7 @@ typedef OperPermission (*OperClassEntryEvalCallback)(OperClassACLEntryVar* varia
* ProtoCtl options
*/
#ifndef DEBUGMODE
#define CHECKPROTO(x,y) ((x)->proto & y)
#define CHECKPROTO(x,y) ((x)->local->proto & y)
#else
#define CHECKPROTO(x,y) (checkprotoflags(x, y, __FILE__, __LINE__))
#endif
@@ -462,30 +462,30 @@ typedef OperPermission (*OperClassEntryEvalCallback)(OperClassACLEntryVar* varia
#define SupportUHNAMES(x) (CHECKPROTO(x, PROTO_UHNAMES))
#define SupportSID(x) (CHECKPROTO(x, PROTO_SID))
#define SetSJOIN(x) ((x)->proto |= PROTO_SJOIN)
#define SetNoQuit(x) ((x)->proto |= PROTO_NOQUIT)
#define SetNICKv2(x) ((x)->proto |= PROTO_NICKv2)
#define SetSJOIN2(x) ((x)->proto |= PROTO_SJOIN2)
#define SetUMODE2(x) ((x)->proto |= PROTO_UMODE2)
#define SetVL(x) ((x)->proto |= PROTO_VL)
#define SetSJ3(x) ((x)->proto |= PROTO_SJ3)
#define SetVHP(x) ((x)->proto |= PROTO_VHP)
#define SetTKLEXT(x) ((x)->proto |= PROTO_TKLEXT)
#define SetTKLEXT2(x) ((x)->proto |= PROTO_TKLEXT2)
#define SetNAMESX(x) ((x)->proto |= PROTO_NAMESX)
#define SetCLK(x) ((x)->proto |= PROTO_CLK)
#define SetUHNAMES(x) ((x)->proto |= PROTO_UHNAMES)
#define SetSJOIN(x) ((x)->local->proto |= PROTO_SJOIN)
#define SetNoQuit(x) ((x)->local->proto |= PROTO_NOQUIT)
#define SetNICKv2(x) ((x)->local->proto |= PROTO_NICKv2)
#define SetSJOIN2(x) ((x)->local->proto |= PROTO_SJOIN2)
#define SetUMODE2(x) ((x)->local->proto |= PROTO_UMODE2)
#define SetVL(x) ((x)->local->proto |= PROTO_VL)
#define SetSJ3(x) ((x)->local->proto |= PROTO_SJ3)
#define SetVHP(x) ((x)->local->proto |= PROTO_VHP)
#define SetTKLEXT(x) ((x)->local->proto |= PROTO_TKLEXT)
#define SetTKLEXT2(x) ((x)->local->proto |= PROTO_TKLEXT2)
#define SetNAMESX(x) ((x)->local->proto |= PROTO_NAMESX)
#define SetCLK(x) ((x)->local->proto |= PROTO_CLK)
#define SetUHNAMES(x) ((x)->local->proto |= PROTO_UHNAMES)
#define ClearSJOIN(x) ((x)->proto &= ~PROTO_SJOIN)
#define ClearNoQuit(x) ((x)->proto &= ~PROTO_NOQUIT)
#define ClearNICKv2(x) ((x)->proto &= ~PROTO_NICKv2)
#define ClearSJOIN2(x) ((x)->proto &= ~PROTO_SJOIN2)
#define ClearUMODE2(x) ((x)->proto &= ~PROTO_UMODE2)
#define ClearVL(x) ((x)->proto &= ~PROTO_VL)
#define ClearVHP(x) ((x)->proto &= ~PROTO_VHP)
#define ClearSJ3(x) ((x)->proto &= ~PROTO_SJ3)
#define ClearTKLEXT(x) ((x)->proto &= ~PROTO_TKLEXT)
#define ClearTKLEXT2(x) ((x)->proto &= ~PROTO_TKLEXT2)
#define ClearSJOIN(x) ((x)->local->proto &= ~PROTO_SJOIN)
#define ClearNoQuit(x) ((x)->local->proto &= ~PROTO_NOQUIT)
#define ClearNICKv2(x) ((x)->local->proto &= ~PROTO_NICKv2)
#define ClearSJOIN2(x) ((x)->local->proto &= ~PROTO_SJOIN2)
#define ClearUMODE2(x) ((x)->local->proto &= ~PROTO_UMODE2)
#define ClearVL(x) ((x)->local->proto &= ~PROTO_VL)
#define ClearVHP(x) ((x)->local->proto &= ~PROTO_VHP)
#define ClearSJ3(x) ((x)->local->proto &= ~PROTO_SJ3)
#define ClearTKLEXT(x) ((x)->local->proto &= ~PROTO_TKLEXT)
#define ClearTKLEXT2(x) ((x)->local->proto &= ~PROTO_TKLEXT2)
/*
* defined debugging levels
@@ -888,10 +888,6 @@ struct LocalClient {
long sendK; /* Statistics: total k-bytes send */
long receiveM; /* Statistics: protocol messages received */
SSL *ssl;
#ifndef NO_FDLIST
long lastrecvM; /* to check for activity --Mika */
int priority;
#endif
long receiveK; /* Statistics: total k-bytes received */
u_short sendB; /* counters to count upto 1-k lots of bytes */
u_short receiveB; /* sent and received. */