Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv3347/src
Modified Files:
Tag: rel-1_0
hash.c parse.c
Log Message:
use num_local instead of recalculating numerics everywhere
Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.121.2.14
retrieving revision 1.121.2.15
diff -C2 -r1.121.2.14 -r1.121.2.15
*** hash.c 2001/09/04 18:39:36 1.121.2.14
--- hash.c 2001/09/04 21:30:19 1.121.2.15
***************
*** 407,411 ****
pol_params = IsOper(uNode) ? oper_policer_params : luser_policer_params;
uNode->command_policer = policer_new(pol_params, uNode->timestamp);
! uNode->num_local = base64toint(numeric+SERVER_NUMERIC_LEN, USER_NUMERIC_LEN);
/* insert into global nick dictionary */
--- 407,411 ----
pol_params = IsOper(uNode) ? oper_policer_params : luser_policer_params;
uNode->command_policer = policer_new(pol_params, uNode->timestamp);
! uNode->num_local = base64toint(numeric+SERVER_NUMERIC_LEN, USER_NUMERIC_LEN) & uNode->uplink->num_mask;
/* insert into global nick dictionary */
***************
*** 416,420 ****
}
! GetServer(numeric)->users[base64toint(numeric+SERVER_NUMERIC_LEN, USER_NUMERIC_LEN) & uplink->num_mask]=uNode;
if (IsLocal(numeric)) irc_user(uNode);
--- 416,420 ----
}
! GetServer(numeric)->users[uNode->num_local]=uNode;
if (IsLocal(numeric)) irc_user(uNode);
***************
*** 439,443 ****
user->uplink->clients--;
! user->uplink->users[base64toint(user->numeric+SERVER_NUMERIC_LEN, USER_NUMERIC_LEN) & user->uplink->num_mask] = NULL;
if (IsOper(user)) userList_remove(&curr_opers, user);
/* remove from global dictionary */
--- 439,443 ----
user->uplink->clients--;
! user->uplink->users[user->num_local] = NULL;
if (IsOper(user)) userList_remove(&curr_opers, user);
/* remove from global dictionary */
Index: parse.c
===================================================================
RCS file: /cvsroot/srvx/services/src/Attic/parse.c,v
retrieving revision 1.113.2.17
retrieving revision 1.113.2.18
diff -C2 -r1.113.2.17 -r1.113.2.18
*** parse.c 2001/09/04 18:39:36 1.113.2.17
--- parse.c 2001/09/04 21:30:19 1.113.2.18
***************
*** 674,678 ****
{
struct privmsg_desc *pd = data;
! int num = base64toint(un->numeric+SERVER_NUMERIC_LEN, USER_NUMERIC_LEN);
if (!pd->is_notice) {
if (privmsg_funcs[num]) {
--- 674,678 ----
{
struct privmsg_desc *pd = data;
! int num = un->num_local;
if (!pd->is_notice) {
if (privmsg_funcs[num]) {
|
