currentlocalunum=1;
pendingkilllist=NULL;
registerhook(HOOK_IRC_SENDBURSTNICKS,&sendnickburst);
- registerhook(HOOK_NICK_LOSTNICK,&checklocalkill);
- registerhook(HOOK_NICK_LOSTNICK,&checkpendingkills);
+ registerhook(HOOK_NICK_KILL,&checklocalkill);
+ registerhook(HOOK_NICK_LOSTNICK,&checkpendingkills); /* CHECK ME -> should this hook KILL or LOSTNICK or BOTH */
registerhook(HOOK_CORE_ENDOFHOOKSQUEUE,&clearpendingkills);
registerserverhandler("P",&handleprivatemsgcmd,2);
registerserverhandler("O",&handleprivatenoticecmd, 2);
freesstring(pk->reason);
free(pk);
}
+
+ deregisterhook(HOOK_IRC_SENDBURSTNICKS,&sendnickburst);
+ deregisterhook(HOOK_NICK_KILL,&checklocalkill);
+ deregisterhook(HOOK_NICK_LOSTNICK,&checkpendingkills); /* CHECK ME -> should this hook KILL or LOSTNICK or BOTH */
+ deregisterhook(HOOK_CORE_ENDOFHOOKSQUEUE,&clearpendingkills);
+
+ deregisterserverhandler("P",&handleprivatemsgcmd);
+ deregisterserverhandler("O",&handleprivatenoticecmd);
}
/*
- * registerlocaluser:
+ * registerlocaluserwithuseridflags:
* This function creates a local user, and broadcasts it's existence to the net (if connected).
*/
-nick *registerlocaluser(char *nickname, char *ident, char *host, char *realname, char *authname, flag_t umodes, UserMessageHandler handler) {
+nick *registerlocaluserwithuseridflags(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, flag_t umodes, flag_t accountflags, UserMessageHandler handler) {
int i;
nick *newuser,*np;
struct irc_in_addr ipaddress;
newuser->nextbyrealname=newuser->realname->nicks;
newuser->realname->nicks=newuser;
newuser->umodes=umodes;
+ newuser->accountflags=accountflags;
- /* XXX shroud: need to port original code */
memset(&ipaddress, 0, sizeof(ipaddress));
- ((char *)ipaddress.in6_16)[15] = 1;
+ ((unsigned short *)(ipaddress.in6_16))[5] = 65535;
+ ((unsigned short *)(ipaddress.in6_16))[6] = 127;
+ ((unsigned char *)(ipaddress.in6_16))[14] = 1;
+ ((unsigned char *)(ipaddress.in6_16))[15] = (currentlocalunum%253)+1;
newuser->ipnode = refnode(iptree, &ipaddress, PATRICIA_MAXBITS);
-#if 0
- newuser->ipaddress=(127<<24)+(1<<8)+((currentlocalunum%253)+1); /* Make it look like a valid addr on 127.0.1.0/24 */
-#endif
+ node_increment_usercount(newuser->ipnode);
+
newuser->timestamp=getnettime();
newuser->shident=NULL;
newuser->sethost=NULL;
if (IsAccount(newuser)) {
strncpy(newuser->authname,authname,ACCOUNTLEN);
+ newuser->accountts=newuser->timestamp;
+ if (authid) {
+ newuser->auth=findorcreateauthname(authid);
+ newuser->auth->usercount++;
+ newuser->nextbyauthname=newuser->auth->nicks;
+ newuser->auth->nicks=newuser;
+ } else {
+ newuser->auth=NULL;
+ }
} else {
newuser->authname[0]='\0';
+ newuser->accountts=0;
+ newuser->auth=NULL;
}
if (connected) {
*/
int deregisterlocaluser(nick *np, char *reason) {
- int defaultreason=0;
long numeric;
+ char reasonstr[512];
+ void *harg[2];
if (np==NULL || (homeserver(np->numeric)!=mylongnum)) {
/* Non-existent user, or user not on this server */
}
if (reason==NULL || *reason=='\0') {
- defaultreason=1;
+ sprintf(reasonstr,"Quit");
+ } else {
+ snprintf(reasonstr,510,"Quit: %s",reason);
}
+ harg[0]=np;
+ harg[1]=reasonstr;
+
+ triggerhook(HOOK_NICK_QUIT, harg);
+
numeric=np->numeric;
umhandlers[np->numeric&MAXLOCALUSER]=NULL;
deletenick(np);
if (connected) {
- irc_send("%s Q :Quit: %s",longtonumeric(numeric,5),(defaultreason?"Leaving":reason));
+ irc_send("%s Q :%s",longtonumeric(numeric,5),reasonstr);
}
return 0;
strncpy(numericbuf,longtonumeric(np->numeric,5),5);
numericbuf[5]='\0';
- irc_send("%s N %s 1 %ld %s %s %s%s%s %s %s :%s",
- mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
- printflags(np->umodes,umodeflags),IsAccount(np)?" ":"",
- np->authname,iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,
- np->realname->name->content);
+ if (IsAccount(np)) {
+ if(np->accountflags) {
+ irc_send("%s N %s 1 %ld %s %s %s %s:%ld:%lu:" FLAG_T_SPECIFIER " %s %s :%s",
+ mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
+ printflags(np->umodes,umodeflags),np->authname,np->accountts,np->auth?np->auth->userid:0,np->accountflags,
+ iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,np->realname->name->content);
+ } else if (np->auth) {
+ irc_send("%s N %s 1 %ld %s %s %s %s:%ld:%lu %s %s :%s",
+ mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
+ printflags(np->umodes,umodeflags),np->authname,np->accountts,np->auth->userid,
+ iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,np->realname->name->content);
+ } else if (np->accountts) {
+ irc_send("%s N %s 1 %ld %s %s %s %s:%ld %s %s :%s",
+ mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
+ printflags(np->umodes,umodeflags),np->authname,np->accountts,
+ iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,np->realname->name->content);
+ } else {
+ irc_send("%s N %s 1 %ld %s %s %s %s %s %s :%s",
+ mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
+ printflags(np->umodes,umodeflags),np->authname,
+ iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,np->realname->name->content);
+ }
+ } else {
+ irc_send("%s N %s 1 %ld %s %s %s %s %s :%s",
+ mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
+ printflags(np->umodes,umodeflags),iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),
+ numericbuf,np->realname->name->content);
+ }
}
void sendnickburst(int hooknum, void *arg) {
}
/* Check for a kill of a local user */
-void checklocalkill(int hooknum, void *target) {
+void checklocalkill(int hooknum, void *arg) {
+ void **args=arg;
+ nick *target=args[0];
+ char *reason=args[1];
long numeric;
- void *args[1];
-
- args[0]=NULL;
+
+ void *myargs[1];
+ myargs[0]=reason;
+
numeric=((nick *)target)->numeric;
if (homeserver(numeric)==mylongnum) {
if (umhandlers[(numeric)&MAXLOCALUSER]!=NULL) {
- (umhandlers[(numeric)&MAXLOCALUSER])((nick *)target,LU_KILLED,args);
+ (umhandlers[(numeric)&MAXLOCALUSER])((nick *)target,LU_KILLED,myargs);
}
}
}
if (pk->target == target)
return;
- Error("localuser", ERR_INFO, "Adding pending kill for %s", target->nick);
+ Error("localuser", ERR_DEBUG, "Adding pending kill for %s", target->nick);
pk = (pendingkill *)malloc(sizeof(pendingkill));
pk->source = source;
pk->target = target;
}
}
+void sethostuser(nick *target, char *ident, char *host) {
+ irc_send("%s SH %s %s %s", mynumeric->content, longtonumeric(target->numeric, 5), ident, host);
+}
+
void _killuser(nick *source, nick *target, char *reason) {
char senderstr[6];
- char sourcestring[NICKLEN+USERLEN+3];
+ char sourcestring[HOSTLEN+NICKLEN+3];
if (!source) {
/* If we have a null nick, use the server.. */
pendingkilllist = pk->next;
if (pk->target) {
- Error("localuser", ERR_INFO, "Processing pending kill for %s", pk->target->nick);
+ Error("localuser", ERR_DEBUG, "Processing pending kill for %s", pk->target->nick);
_killuser(pk->source, pk->target, pk->reason->content);
}
}
/* Auth user */
-void localusersetaccount(nick *np, char *accname) {
+void localusersetaccountwithuseridflagsts(nick *np, char *accname, unsigned long accid, flag_t accountflags, time_t authTS) {
if (IsAccount(np)) {
Error("localuser",ERR_WARNING,"Tried to set account on user %s already authed", np->nick);
return;
SetAccount(np);
strncpy(np->authname, accname, ACCOUNTLEN);
np->authname[ACCOUNTLEN]='\0';
+ np->accountts=authTS?authTS:getnettime();
+ np->accountflags=accountflags;
+
+ if (accid) {
+ np->auth=findorcreateauthname(accid);
+ np->auth->usercount++;
+ np->nextbyauthname=np->auth->nicks;
+ np->auth->nicks=np;
+ } else {
+ np->auth=NULL;
+ }
if (connected) {
- irc_send("%s AC %s %s %ld",mynumeric->content, longtonumeric(np->numeric,5), np->authname, getnettime());
+ if (np->accountflags) {
+ irc_send("%s AC %s %s %ld %lu %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth?np->auth->userid:0, np->accountflags);
+ } else if (np->auth) {
+ irc_send("%s AC %s %s %ld %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth->userid);
+ } else {
+ irc_send("%s AC %s %s %ld",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts);
+ }
}
triggerhook(HOOK_NICK_ACCOUNT, np);
}
+void localusersetumodes(nick *np, flag_t newmodes) {
+ if (connected) {
+ irc_send("%s M %s %s", longtonumeric(np->numeric,5), np->nick, printflagdiff(np->umodes, newmodes, umodeflags));
+ }
+
+ np->umodes = newmodes;
+}
projects / irc / quakenet / newserv.git / blobdiff