void irc_svsmode(struct userNode *target, char *modes, unsigned long stamp);
struct server *
-AddServer(struct server *uplink, const char *name, int hops, time_t boot, time_t link, UNUSED_ARG(const char *numeric), const char *description) {
+AddServer(struct server *uplink, const char *name, int hops, unsigned long boot, unsigned long link_time, UNUSED_ARG(const char *numeric), const char *description) {
struct server* sNode;
sNode = calloc(1, sizeof(*sNode));
safestrncpy(sNode->name, name, sizeof(sNode->name));
sNode->hops = hops;
sNode->boot = boot;
- sNode->link = link;
+ sNode->link_time = link_time;
sNode->users = dict_new();
safestrncpy(sNode->description, description, sizeof(sNode->description));
serverList_init(&sNode->children);
}
struct userNode *
-AddUser(struct server* uplink, const char *nick, const char *ident, const char *hostname, const char *modes, const char *userinfo, time_t timestamp, irc_in_addr_t realip, const char *stamp) {
+AddUser(struct server* uplink, const char *nick, const char *ident, const char *hostname, const char *modes, const char *userinfo, unsigned long timestamp, irc_in_addr_t realip, unsigned long stamp) {
struct userNode *uNode, *oldUser;
unsigned int nn, dummy;
mod_usermode(uNode, modes);
if (dummy) uNode->modes |= FLAGS_DUMMY;
- if (stamp) call_account_func(uNode, stamp);
+ if (stamp) call_account_func(uNode, NULL, 0, stamp);
if (IsLocal(uNode)) irc_user(uNode);
- for (nn=0; nn<nuf_used; nn++) {
- if (nuf_list[nn](uNode)) break;
- }
+ for (nn=0; (nn<nuf_used) && !uNode->dead; nn++)
+ nuf_list[nn](uNode);
return uNode;
}
struct userNode *
AddLocalUser(const char *nick, const char *ident, const char *hostname, const char *desc, const char *modes)
{
- time_t timestamp = now;
+ unsigned long timestamp = now;
struct userNode *old_user = GetUserH(nick);
static const irc_in_addr_t ipaddr;
if (IsReggedNick(user)) modes[modelen++] = 'r';
if (IsGlobal(user)) modes[modelen++] = 'g';
modes[modelen] = 0;
- putsock("NICK %s %d "FMT_TIME_T" +%s %s %s %s %d %u :%s",
- user->nick, user->uplink->hops+2, user->timestamp, modes,
- user->ident, user->hostname, user->uplink->name, 0, ntohl(user->ip.in6_32[3]), user->info);
+ putsock("NICK %s %d %lu +%s %s %s %s %d %u :%s",
+ user->nick, user->uplink->hops+2, (unsigned long)user->timestamp,
+ modes, user->ident, user->hostname, user->uplink->name, 0,
+ ntohl(user->ip.in6_32[3]), user->info);
}
void
-irc_account(struct userNode *user, const char *stamp)
+irc_account(struct userNode *user, UNUSED_ARG(const char *stamp), UNUSED_ARG(unsigned long timestamp), unsigned long serial)
{
if (IsReggedNick(user)) {
- irc_svsmode(user, "+rd", base64toint(stamp, IDLEN));
+ irc_svsmode(user, "+rd", serial);
} else {
- irc_svsmode(user, "+d", base64toint(stamp, IDLEN));
+ irc_svsmode(user, "+d", serial);
}
}
dict_insert(service_msginfo_dict, user->nick, smi);
}
}
- putsock(":%s NICK %s :"FMT_TIME_T, old_nick, user->nick, user->timestamp);
+ putsock(":%s NICK %s :%lu", old_nick, user->nick, (unsigned long)user->timestamp);
}
void
void
irc_svinfo() {
- putsock("SVINFO 3 3 0 :"FMT_TIME_T, now);
+ putsock("SVINFO 3 3 0 :%lu", (unsigned long)now);
}
void
irc_introduce(const char *passwd) {
- extern time_t burst_begin;
+ extern unsigned long burst_begin;
irc_pass(passwd);
irc_capab();
void
irc_join(struct userNode *who, struct chanNode *what) {
if (what->members.used == 1) {
- putsock(":%s SJOIN "FMT_TIME_T" %s + :@%s", self->name, what->timestamp, what->name, who->nick);
+ putsock(":%s SJOIN %lu %s + :@%s", self->name, (unsigned long)what->timestamp, what->name, who->nick);
} else {
- putsock(":%s SJOIN "FMT_TIME_T" %s", who->nick, what->timestamp, what->name);
+ putsock(":%s SJOIN %lu %s", who->nick, (unsigned long)what->timestamp, what->name);
}
}
void
irc_mode(struct userNode *who, struct chanNode *target, const char *modes) {
- putsock(":%s MODE %s "FMT_TIME_T" %s", who->nick, target->name, target->timestamp, modes);
+ putsock(":%s MODE %s %lu %s", who->nick, target->name, (unsigned long)target->timestamp, modes);
}
void
irc_svsmode(struct userNode *target, char *modes, unsigned long stamp) {
extern struct userNode *nickserv;
if (stamp) {
- putsock(":%s SVSMODE %s "FMT_TIME_T" %s %lu", nickserv->nick, target->nick, target->timestamp, modes, stamp);
+ putsock(":%s SVSMODE %s %lu %s %lu", nickserv->nick, target->nick, (unsigned long)target->timestamp, modes, stamp);
} else {
- putsock(":%s SVSMODE %s "FMT_TIME_T" %s", nickserv->nick, target->nick, target->timestamp, modes);
+ putsock(":%s SVSMODE %s %lu %s", nickserv->nick, target->nick, (unsigned long)target->timestamp, modes);
}
}
if (len > ArrayLength(ident)) len = ArrayLength(ident);
safestrncpy(ident, gline->target, len);
safestrncpy(host, sep+1, ArrayLength(host));
- putsock(":%s AKILL %s %s "FMT_TIME_T" %s "FMT_TIME_T" :%s", self->name, host, ident, gline->expires-gline->issued, gline->issuer, gline->issued, gline->reason);
+ putsock(":%s AKILL %s %s %lu %s %lu :%s", self->name, host, ident, (unsigned long)(gline->expires-gline->issued), gline->issuer, (unsigned long)gline->issued, gline->reason);
}
void
-irc_settime(UNUSED_ARG(const char *srv_name_mask), UNUSED_ARG(time_t new_time))
+irc_settime(UNUSED_ARG(const char *srv_name_mask), UNUSED_ARG(unsigned long new_time))
{
/* Bahamut has nothing like this, so ignore it. */
}
void
irc_svsnick(struct userNode *from, struct userNode *target, const char *newnick)
{
- putsock(":%s SVSNICK %s %s :"FMT_TIME_T, from->nick, target->nick, newnick, now);
+ putsock(":%s SVSNICK %s %s :%lu", from->nick, target->nick, newnick, (unsigned long)now);
}
void
if (!chan->members.used) return;
/* send list of users in the channel.. */
- base_len = sprintf(line, ":%s SJOIN "FMT_TIME_T" %s ", self->name, chan->timestamp, chan->name);
+ base_len = sprintf(line, ":%s SJOIN %lu %s ", self->name, (unsigned long)chan->timestamp, chan->name);
len = irc_make_chanmode(chan, line+base_len);
pos = base_len + len;
line[pos++] = ' ';
line[pos] = 0;
putsock("%s", line);
/* now send the bans.. */
- base_len = sprintf(line, ":%s MODE "FMT_TIME_T" %s +", self->name, chan->timestamp, chan->name);
+ base_len = sprintf(line, ":%s MODE %lu %s +", self->name, (unsigned long)chan->timestamp, chan->name);
pos = sizeof(line)-1;
line[pos] = 0;
for (nn=queued=0; nn<chan->banlist.used; nn++) {
NickChange(un, argv[1], 1);
} else {
/* new nick from a server */
- char id[8];
unsigned long stamp;
irc_in_addr_t ip;
if (argc < 10) return 0;
stamp = strtoul(argv[8], NULL, 0);
- if (stamp) inttobase64(id, stamp, IDLEN);
if (argc > 10)
ip.in6_32[3] = htonl(atoi(argv[9]));
- un = AddUser(GetServerH(argv[7]), argv[1], argv[5], argv[6], argv[4], argv[argc-1], atoi(argv[3]), ip, (stamp ? id : 0));
+ un = AddUser(GetServerH(argv[7]), argv[1], argv[5], argv[6], argv[4], argv[argc-1], atoi(argv[3]), ip, stamp);
}
return 1;
}
return 1;
}
-static oper_func_t *of_list;
-static unsigned int of_size = 0, of_used = 0;
-
void parse_cleanup(void) {
unsigned int nn;
- if (of_list) free(of_list);
+ free(of_list);
dict_delete(irc_func_dict);
dict_delete(service_msginfo_dict);
free(mcf_list);
}
}
-void
-reg_oper_func(oper_func_t handler)
-{
- if (of_used == of_size) {
- if (of_size) {
- of_size <<= 1;
- of_list = realloc(of_list, of_size*sizeof(oper_func_t));
- } else {
- of_size = 8;
- of_list = malloc(of_size*sizeof(oper_func_t));
- }
- }
- of_list[of_used++] = handler;
-}
-
-static void
-call_oper_funcs(struct userNode *user)
-{
- unsigned int n;
- if (IsLocal(user)) return;
- for (n=0; n<of_used; n++)
- {
- of_list[n](user);
- }
-}
-
void mod_usermode(struct userNode *user, const char *mode_change) {
int add = 1;
projects / srvx.git / blobdiff