}
/*
- * registerlocaluserwithuserid:
+ * registerlocaluserwithuseridflags:
* This function creates a local user, and broadcasts it's existence to the net (if connected).
*/
-nick *registerlocaluserwithuserid(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, 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;
((unsigned char *)(ipaddress.in6_16))[15] = (currentlocalunum%253)+1;
newuser->ipnode = refnode(iptree, &ipaddress, PATRICIA_MAXBITS);
- newuser->ipnode->usercount++;
+ node_increment_usercount(newuser->ipnode);
newuser->timestamp=getnettime();
newuser->shident=NULL;
strncpy(newuser->authname,authname,ACCOUNTLEN);
newuser->accountts=newuser->timestamp;
if (authid) {
- newuser->auth=findorcreateauthname(authid);
+ newuser->auth=findorcreateauthname(authid, newuser->authname);
newuser->auth->usercount++;
newuser->nextbyauthname=newuser->auth->nicks;
newuser->auth->nicks=newuser;
+ newuser->auth->flags=accountflags;
} else {
newuser->auth=NULL;
}
*/
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;
void sendnickmsg(nick *np) {
char numericbuf[6];
- char ipbuf[25];
+ char ipbuf[25], operbuf[ACCOUNTLEN + 5];
+ char accountbuf[100];
strncpy(numericbuf,longtonumeric(np->numeric,5),5);
numericbuf[5]='\0';
-
+
+ if(IsOper(np) && (serverlist[myhub].flags & SMODE_OPERNAME)) {
+ snprintf(operbuf,sizeof(operbuf)," %s",np->opername?np->opername->content:"-");
+ } else {
+ operbuf[0] = '\0';
+ }
+
if (IsAccount(np)) {
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);
+ if(np->auth->flags) {
+ snprintf(accountbuf,sizeof(accountbuf)," %s:%ld:%lu:" FLAG_T_SPECIFIER,np->authname,np->accountts,np->auth->userid,np->auth->flags);
+ } else {
+ snprintf(accountbuf,sizeof(accountbuf)," %s:%ld:%lu",np->authname,np->accountts,np->auth->userid);
+ }
} 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);
+ snprintf(accountbuf,sizeof(accountbuf)," %s:%ld",np->authname,np->accountts);
} 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);
+ snprintf(accountbuf,sizeof(accountbuf)," %s",np->authname);
}
} 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);
+ accountbuf[0]='\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),operbuf,accountbuf,iptobase64(ipbuf,&(np->p_ipaddr),
+ sizeof(ipbuf),1),numericbuf,np->realname->name->content);
}
void sendnickburst(int hooknum, void *arg) {
}
}
+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[HOSTLEN+NICKLEN+3];
}
/* Auth user */
-void localusersetaccountwithuserid(nick *np, char *accname, unsigned long accid) {
+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=getnettime();
+ np->accountts=authTS?authTS:getnettime();
if (accid) {
- np->auth=findorcreateauthname(accid);
+ np->auth=findorcreateauthname(accid, accname);
np->auth->usercount++;
np->nextbyauthname=np->auth->nicks;
np->auth->nicks=np;
+ np->auth->flags=accountflags;
} else {
np->auth=NULL;
}
if (connected) {
if (np->auth) {
- irc_send("%s AC %s %s %ld %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth->userid);
+ if (np->auth->flags) {
+ irc_send("%s AC %s %s %ld %lu %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth->userid, np->auth->flags);
+ } else {
+ 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);
}