#include <string.h>
#include <stdarg.h>
#include <stdio.h>
+#include <inttypes.h>
MODULE_VERSION("");
}
/*
- * registerlocaluserwithuserid:
+ * registerlocaluserflags:
* 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 *registerlocaluserflags(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, flag_t accountflags, flag_t umodes, UserMessageHandler handler) {
int i;
nick *newuser,*np;
struct irc_in_addr ipaddress;
newuser->nextbyrealname=newuser->realname->nicks;
newuser->realname->nicks=newuser;
newuser->umodes=umodes;
-
+
memset(&ipaddress, 0, sizeof(ipaddress));
- ((unsigned short *)(ipaddress.in6_16))[5] = 0;
+ ((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);
+ node_increment_usercount(newuser->ipnode);
+
newuser->timestamp=getnettime();
newuser->shident=NULL;
newuser->sethost=NULL;
newuser->marker=0;
memset(newuser->exts, 0, MAXNICKEXTS * sizeof(void *));
+ if (IsOper(newuser)) {
+ newuser->opername = getsstring("-", ACCOUNTLEN);
+ } else {
+ newuser->opername = NULL;
+ }
+
+ newuser->accountts=0;
+ newuser->auth=NULL;
+ newuser->authname=NULLAUTHNAME;
if (IsAccount(newuser)) {
- strncpy(newuser->authname,authname,ACCOUNTLEN);
newuser->accountts=newuser->timestamp;
if (authid) {
- newuser->auth=findorcreateauthname(authid);
+ newuser->auth=findorcreateauthname(authid, authname);
+ newuser->authname=newuser->auth->name;
newuser->auth->usercount++;
newuser->nextbyauthname=newuser->auth->nicks;
newuser->auth->nicks=newuser;
+ newuser->auth->flags=accountflags;
} else {
- newuser->auth=NULL;
+ /*
+ this is done for three reasons:
+ 1: so I don't have to change 500 pieces of code
+ 2: so services can be authed with special reserved ids
+ 3: saves space over the old authname per user method
+ */
+ newuser->authname=malloc(strlen(authname) + 1);
+ strcpy(newuser->authname,authname);
}
- } else {
- newuser->authname[0]='\0';
- newuser->accountts=0;
- newuser->auth=NULL;
}
-
+
if (connected) {
/* Check for nick collision */
if ((np=getnickbynick(nickname))!=NULL) {
/* Case only name change */
strncpy(np->nick,newnick,NICKLEN);
np->nick[NICKLEN]='\0';
- irc_send("%s N %s %d",iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),np->nick,np->timestamp);
+ irc_send("%s N %s %jd",iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),np->nick,(intmax_t)np->timestamp);
triggerhook(HOOK_NICK_RENAME,np);
return 0;
} else {
strncpy(np->nick,newnick,NICKLEN);
np->nick[NICKLEN]='\0';
addnicktohash(np);
- irc_send("%s N %s %d",longtonumeric(np->numeric,5),np->nick,np->timestamp);
+ irc_send("%s N %s %jd",longtonumeric(np->numeric,5),np->nick,(intmax_t)np->timestamp);
triggerhook(HOOK_NICK_RENAME,np);
return 0;
*/
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';
+ }
+
+ accountbuf[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);
- } 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);
+ if(np->auth->flags) {
+ snprintf(accountbuf,sizeof(accountbuf)," %s:%ld:%lu:%"PRIu64,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->authname) {
+ snprintf(accountbuf,sizeof(accountbuf)," %s:%ld:0",np->authname,np->accountts);
}
- } 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);
}
+
+ 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];
+ char reasonstr[512];
+ void *args[2];
if (!source) {
/* If we have a null nick, use the server.. */
sprintf(sourcestring,"%s!%s",source->host->name->content, source->nick);
}
- irc_send("%s D %s :%s (%s)",senderstr,longtonumeric(target->numeric,5),sourcestring,reason);
+ snprintf(reasonstr,512,"%s (%s)",sourcestring,reason);
+ reasonstr[511]='\0';
+
+ irc_send("%s D %s :%s",senderstr,longtonumeric(target->numeric,5),reasonstr);
+
+ args[0]=target;
+ args[1]=reasonstr;
+ triggerhook(HOOK_NICK_KILL, args);
+
deletenick(target);
}
}
}
-/* Auth user */
-void localusersetaccountwithuserid(nick *np, char *accname, unsigned long accid) {
+void sendaccountmessage(nick *np) {
+ if (connected && IsAccount(np)) {
+ if (np->auth) {
+ if (np->auth->flags) {
+ irc_send("%s AC %s %s %ld %lu %"PRIu64,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 0",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts);
+ }
+ }
+}
+
+/* Auth user, don't use to set flags after authing */
+void localusersetaccount(nick *np, char *accname, unsigned long accid, u_int64_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->authname=np->auth->name;
np->nextbyauthname=np->auth->nicks;
np->auth->nicks=np;
+ np->auth->flags=accountflags;
} else {
np->auth=NULL;
+ np->authname=malloc(strlen(accname) + 1);
+ strcpy(np->authname,accname);
}
- 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);
- } else {
- irc_send("%s AC %s %s %ld",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts);
- }
- }
+ sendaccountmessage(np);
triggerhook(HOOK_NICK_ACCOUNT, np);
}
np->umodes = newmodes;
}
+
+void localusersetaccountflags(authname *anp, u_int64_t accountflags) {
+ void *arg[2];
+ nick *np;
+ u_int64_t oldflags = anp->flags;
+
+ arg[0] = anp;
+ arg[1] = &oldflags;
+ anp->flags = accountflags;
+
+ for(np=anp->nicks;np;np=np->nextbyauthname)
+ sendaccountmessage(np);
+
+ triggerhook(HOOK_AUTH_FLAGSUPDATED, arg);
+}
projects / irc / quakenet / newserv.git / blobdiff