Log message:
This should finish up conversion to the new sendcmdto_* routines except for
removing the dead (or dying) code. Hopefully once the dead code is removed,
we'll lose a few thousand lines from channel.c alone ;)
Status: Compiles, tested
Testing needed: Brute-force literally everything
git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@234
c9e4aea6-c8fd-4c43-8297-
357d70d61c8c
2000-05-04 Kevin L. Mitchell <klmitch@mit.edu>
2000-05-04 Kevin L. Mitchell <klmitch@mit.edu>
+ * ircd/channel.c (send_channel_modes): deal with one of the last
+ vestiges of sendbuf
+
* ircd/m_burst.c (ms_burst): debugged ban processing; removed
debugging hooks
* ircd/m_burst.c (ms_burst): debugged ban processing; removed
debugging hooks
#
# ChangeLog for ircu2.10.11
#
#
# ChangeLog for ircu2.10.11
#
-# $Id: ChangeLog,v 1.131 2000-05-04 15:33:35 kev Exp $
+# $Id: ChangeLog,v 1.132 2000-05-04 17:28:29 kev Exp $
#
# Insert new changes at beginning of the change list.
#
#
# Insert new changes at beginning of the change list.
#
struct SLink* lp2;
char modebuf[MODEBUFLEN];
char parabuf[MODEBUFLEN];
struct SLink* lp2;
char modebuf[MODEBUFLEN];
char parabuf[MODEBUFLEN];
+ char sndbuf[IRC_BUFSIZE];
assert(0 != cptr);
assert(0 != chptr);
assert(0 != cptr);
assert(0 != chptr);
all in one message */
/* (Continued) prefix: "<Y> B <channel> <TS>" */
all in one message */
/* (Continued) prefix: "<Y> B <channel> <TS>" */
- sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT, NumServ(&me),
- chptr->chname, chptr->creationtime);
- sblen = strlen(sendbuf);
+ /* is there any better way we can do this? */
+ sblen = ircd_snprintf(&me, sndbuf, sizeof(sndbuf), "%C " TOK_BURST
+ " %H %Tu", &me, chptr, chptr->creationtime);
if (first && modebuf[1]) /* Add simple modes (iklmnpst)
if first message */
{
/* prefix: "<Y> B <channel> <TS>[ <modes>[ <params>]]" */
if (first && modebuf[1]) /* Add simple modes (iklmnpst)
if first message */
{
/* prefix: "<Y> B <channel> <TS>[ <modes>[ <params>]]" */
- sendbuf[sblen++] = ' ';
- strcpy(sendbuf + sblen, modebuf);
+ sndbuf[sblen++] = ' ';
+ strcpy(sndbuf + sblen, modebuf);
sblen += strlen(modebuf);
if (*parabuf)
{
sblen += strlen(modebuf);
if (*parabuf)
{
- sendbuf[sblen++] = ' ';
- strcpy(sendbuf + sblen, parabuf);
+ sndbuf[sblen++] = ' ';
+ strcpy(sndbuf + sblen, parabuf);
sblen += strlen(parabuf);
}
}
sblen += strlen(parabuf);
}
}
mode. --Gte */
break; /* Do not add this member to this message */
}
mode. --Gte */
break; /* Do not add this member to this message */
}
- sendbuf[sblen++] = first ? ' ' : ',';
+ sndbuf[sblen++] = first ? ' ' : ',';
first = 0; /* From now on, us comma's to add new nicks */
first = 0; /* From now on, us comma's to add new nicks */
- sprintf_irc(sendbuf + sblen, "%s%s", NumNick(member->user));
- sblen += strlen(sendbuf + sblen);
+ sblen += ircd_snprintf(&me, sndbuf + sblen, sizeof(sndbuf) - sblen,
+ "%C", member->user);
/*
* Do we have a nick with a new mode ?
* Or are we starting a new BURST line?
/*
* Do we have a nick with a new mode ?
* Or are we starting a new BURST line?
{
new_mode = 0;
if (IsVoicedOrOpped(member)) {
{
new_mode = 0;
if (IsVoicedOrOpped(member)) {
- sendbuf[sblen++] = ':';
- sendbuf[sblen++] = 'o';
- sendbuf[sblen++] = 'v';
- sendbuf[sblen++] = ' ';
- sendbuf[sblen++] = ':'; /* Will be last parameter */
- sendbuf[sblen++] = '%'; /* To tell bans apart */
+ sndbuf[sblen++] = ' ';
+ sndbuf[sblen++] = ':'; /* Will be last parameter */
+ sndbuf[sblen++] = '%'; /* To tell bans apart */
- sendbuf[sblen++] = ' ';
- strcpy(sendbuf + sblen, lp2->value.ban.banstr);
+ sndbuf[sblen++] = ' ';
+ strcpy(sndbuf + sblen, lp2->value.ban.banstr);
- sendbuf[sblen] = '\0';
- sendbufto_one(cptr); /* Send this message */
+ sndbuf[sblen] = '\0';
+ send_buffer(cptr, sndbuf); /* Send this message */
} /* Continue when there was something
that didn't fit (full==1) */
}
} /* Continue when there was something
that didn't fit (full==1) */
}
- sprintf_irc(sendbuf,":%s NOTICE * :*** Notice -- Deop of +k user on %s by %s",
+ sprintf_irc(sendbuf,":%s NOTICE * :*** Notice -- Deop of +k user on %s by %s", /* XXX set_mode only called by old m_mode */
me.name,chptr->chname,cptr->name);
}
}
me.name,chptr->chname,cptr->name);
}
}
len[0] = strlen(ban[0]->value.ban.banstr);
cnt = 1; /* We already got one ban :) */
/* XXX sendbuf used to send ban bounces! */
len[0] = strlen(ban[0]->value.ban.banstr);
cnt = 1; /* We already got one ban :) */
/* XXX sendbuf used to send ban bounces! */
- sblen = sprintf_irc(sendbuf, ":%s MODE %s +b",
- me.name, chptr->chname) - sendbuf;
+ sblen = sprintf_irc(sendbuf, ":%s MODE %s +b", /* XXX set_mode only called by old m_mode */
+ me.name, chptr->chname) - sendbuf; /* XXX set_mode only called by old m_mode */
total_len = sblen + 1 + len[0]; /* 1 = ' ' */
/* Find more bans: */
delayed = 0;
total_len = sblen + 1 + len[0]; /* 1 = ' ' */
/* Find more bans: */
delayed = 0;
delayed = cnt + 1; /* != 0 */
break; /* Flush */
}
delayed = cnt + 1; /* != 0 */
break; /* Flush */
}
- sendbuf[sblen++] = 'b';
+ sendbuf[sblen++] = 'b'; /* XXX set_mode only called by old m_mode */
total_len += 2 + len[cnt++]; /* 2 = "b " */
}
while (cnt--)
{
total_len += 2 + len[cnt++]; /* 2 = "b " */
}
while (cnt--)
{
- sendbuf[sblen++] = ' ';
- strcpy(sendbuf + sblen, ban[cnt]->value.ban.banstr);
+ sendbuf[sblen++] = ' '; /* XXX set_mode only called by old m_mode */
+ strcpy(sendbuf + sblen, ban[cnt]->value.ban.banstr); /* XXX set_mode only called by old m_mode */
- sendbufto_one(cptr); /* Send bounce to uplink */
+ sendbufto_one(cptr); /* Send bounce to uplink */ /* XXX set_mode only called by old m_mode */
if (delayed)
ban[0] = ban[delayed - 1];
}
if (delayed)
ban[0] = ban[delayed - 1];
}
struct Client *acptr;
if (IsServer(sptr))
/* XXX sendbuf used to send ban bounces! */
struct Client *acptr;
if (IsServer(sptr))
/* XXX sendbuf used to send ban bounces! */
- psblen = sprintf_irc(sendbuf, ":%s MODE %s -b",
- sptr->name, chptr->chname) - sendbuf;
+ psblen = sprintf_irc(sendbuf, ":%s MODE %s -b", /* XXX set_mode only called by old m_mode */
+ sptr->name, chptr->chname) - sendbuf; /* XXX set_mode only called by old m_mode */
else /* We rely on IsRegistered(sptr) being true for MODE */
else /* We rely on IsRegistered(sptr) being true for MODE */
- psblen = sprintf_irc(sendbuf, ":%s!%s@%s MODE %s -b", sptr->name,
- sptr->user->username, sptr->user->host, chptr->chname) - sendbuf;
+ psblen = sprintf_irc(sendbuf, ":%s!%s@%s MODE %s -b", sptr->name, /* XXX set_mode only called by old m_mode */
+ sptr->user->username, sptr->user->host, chptr->chname) - sendbuf; /* XXX set_mode only called by old m_mode */
while (delayed || (ban = next_removed_overlapped_ban()))
{
if (!delayed)
while (delayed || (ban = next_removed_overlapped_ban()))
{
if (!delayed)
delayed = cnt + 1; /* != 0 */
break; /* Flush */
}
delayed = cnt + 1; /* != 0 */
break; /* Flush */
}
- sendbuf[sblen++] = 'b';
+ sendbuf[sblen++] = 'b'; /* XXX set_mode only called by old m_mode */
total_len += 2 + len[cnt++]; /* 2 = "b " */
}
while (cnt--)
{
total_len += 2 + len[cnt++]; /* 2 = "b " */
}
while (cnt--)
{
- sendbuf[sblen++] = ' ';
- strcpy(sendbuf + sblen, banstr[cnt]);
+ sendbuf[sblen++] = ' '; /* XXX set_mode only called by old m_mode */
+ strcpy(sendbuf + sblen, banstr[cnt]); /* XXX set_mode only called by old m_mode */
MyFree(banstr[cnt]);
sblen += len[cnt];
}
for (member_z = chptr->members; member_z; member_z = member_z->next_member) {
acptr = member_z->user;
if (MyConnect(acptr) && !IsZombie(member_z))
MyFree(banstr[cnt]);
sblen += len[cnt];
}
for (member_z = chptr->members; member_z; member_z = member_z->next_member) {
acptr = member_z->user;
if (MyConnect(acptr) && !IsZombie(member_z))
+ sendbufto_one(acptr); /* XXX set_mode only called by old m_mode */
*firstp = 0;
if (*send_itp == 0)
*send_itp = 1; /* Buffer contains data to be sent */
*firstp = 0;
if (*send_itp == 0)
*send_itp = 1; /* Buffer contains data to be sent */
- sendbuf[(*sblenp)++] = ' ';
+ sendbuf[(*sblenp)++] = ' '; /* XXX add_token_to_sendbuf only called by old m_burst */
- sendbuf[(*sblenp)++] = ':'; /* Bans are always the last "parv" */
- sendbuf[(*sblenp)++] = is_a_ban;
+ sendbuf[(*sblenp)++] = ':'; /* Bans are always the last "parv" */ /* XXX add_token_to_sendbuf only called by old m_burst */
+ sendbuf[(*sblenp)++] = is_a_ban; /* XXX add_token_to_sendbuf only called by old m_burst */
}
}
else /* Of course, 'send_it' is already set here */
/* Seperate banmasks with a space because
they can contain commas themselfs: */
}
}
else /* Of course, 'send_it' is already set here */
/* Seperate banmasks with a space because
they can contain commas themselfs: */
- sendbuf[(*sblenp)++] = is_a_ban ? ' ' : ',';
- strcpy(sendbuf + *sblenp, token);
+ sendbuf[(*sblenp)++] = is_a_ban ? ' ' : ','; /* XXX add_token_to_sendbuf only called by old m_burst */
+ strcpy(sendbuf + *sblenp, token); /* XXX add_token_to_sendbuf only called by old m_burst */
*sblenp += strlen(token);
if (!is_a_ban) /* nick list ? Need to take care
of modes for nicks: */
*sblenp += strlen(token);
if (!is_a_ban) /* nick list ? Need to take care
of modes for nicks: */
if (last_mode != mode) /* Append mode like ':ov' if changed */
{
last_mode = mode;
if (last_mode != mode) /* Append mode like ':ov' if changed */
{
last_mode = mode;
- sendbuf[(*sblenp)++] = ':';
+ sendbuf[(*sblenp)++] = ':'; /* XXX add_token_to_sendbuf only called by old m_burst */
- sendbuf[(*sblenp)++] = 'o';
+ sendbuf[(*sblenp)++] = 'o'; /* XXX add_token_to_sendbuf only called by old m_burst */
- sendbuf[(*sblenp)++] = 'v';
+ sendbuf[(*sblenp)++] = 'v'; /* XXX add_token_to_sendbuf only called by old m_burst */
- sendbuf[*sblenp] = '\0';
+ sendbuf[*sblenp] = '\0'; /* XXX add_token_to_sendbuf only called by old m_burst */
{
/* XXX sendbuf used! */
sbp = sbpi =
{
/* XXX sendbuf used! */
sbp = sbpi =
- sprintf_irc(sendbuf, ":%s MODE %s -", sptr->name, chptr->chname);
+ sprintf_irc(sendbuf, ":%s MODE %s -", sptr->name, chptr->chname); /* XXX cancel_mode only called from old ms_burst */
pb = parabuf;
*count = 0;
}
pb = parabuf;
*count = 0;
}
strcpy(sbp, parabuf);
for (member = chptr->members; member; member = member->next_member)
if (MyUser(member->user))
strcpy(sbp, parabuf);
for (member = chptr->members; member; member = member->next_member)
if (MyUser(member->user))
- sendbufto_one(member->user);
+ sendbufto_one(member->user); /* XXX cancel_mode only called from old ms_burst */
sbp = sbpi;
pb = parabuf;
*count = 0;
sbp = sbpi;
pb = parabuf;
*count = 0;
strcat(params, parv[i]);
i++;
}
strcat(params, parv[i]);
i++;
}
+ sprintf_irc(sendbuf, /* XXX send_hack_notice only called from old m_mode */
":%s NOTICE * :*** Notice -- %sHACK(%d): %s MODE %s %s%s ["
TIME_T_FMT "]", me.name, (badop == 3) ? "BOUNCE or " : "", badop,
parv[0], parv[1], parv[2], params, chptr->creationtime);
":%s NOTICE * :*** Notice -- %sHACK(%d): %s MODE %s %s%s ["
TIME_T_FMT "]", me.name, (badop == 3) ? "BOUNCE or " : "", badop,
parv[0], parv[1], parv[2], params, chptr->creationtime);
- sendbufto_op_mask((badop == 3) ? SNO_HACK3 : (badop == /* XXX DYING */
+ sendbufto_op_mask((badop == 3) ? SNO_HACK3 : (badop == /* XXX DYING */ /* XXX send_hack_notice only called from old m_mode */
4) ? SNO_HACK4 : SNO_HACK2);
if ((IsServer(sptr)) && (badop == 2))
{
4) ? SNO_HACK4 : SNO_HACK2);
if ((IsServer(sptr)) && (badop == 2))
{
- sprintf_irc(sendbuf, ":%s DESYNCH :HACK: %s MODE %s %s%s",
+ sprintf_irc(sendbuf, ":%s DESYNCH :HACK: %s MODE %s %s%s", /* XXX send_hack_notice only called from old m_mode */
me.name, parv[0], parv[1], parv[2], params);
me.name, parv[0], parv[1], parv[2], params);
- sendbufto_serv_butone(cptr); /* XXX DYING */
+ sendbufto_serv_butone(cptr); /* XXX DYING */ /* XXX send_hack_notice only called from old m_mode */
{
struct Client *acptr;
if ((acptr = findNUser(parv[2])) != NULL) /* attempt to convert nick */
{
struct Client *acptr;
if ((acptr = findNUser(parv[2])) != NULL) /* attempt to convert nick */
+ sprintf_irc(sendbuf, /* XXX send_hack_notice only called from old m_mode */
":%s NOTICE * :*** Notice -- HACK: %s KICK %s %s :%s",
me.name, sptr->name, parv[1], acptr->name, parv[3]);
else /* if conversion fails, send it 'as is' in <>'s */
":%s NOTICE * :*** Notice -- HACK: %s KICK %s %s :%s",
me.name, sptr->name, parv[1], acptr->name, parv[3]);
else /* if conversion fails, send it 'as is' in <>'s */
+ sprintf_irc(sendbuf, /* XXX send_hack_notice only called from old m_mode */
":%s NOTICE * :*** Notice -- HACK: %s KICK %s <%s> :%s",
me.name, sptr->name, parv[1], parv[2], parv[3]);
":%s NOTICE * :*** Notice -- HACK: %s KICK %s <%s> :%s",
me.name, sptr->name, parv[1], parv[2], parv[3]);
- sendbufto_op_mask(SNO_HACK4); /* XXX DYING */
+ sendbufto_op_mask(SNO_HACK4); /* XXX DYING */ /* XXX send_hack_notice only called from old m_mode */
if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
{
p =
if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
{
p =
+ sprintf_irc(sendbuf, /* XXX DYING */
":%s NOTICE * :*** Notice -- HACK(4): %s BURST %s %s", me.name,
sptr->name, parv[1], parv[2]);
for (i = 3; i < parc - 1; ++i)
p = sprintf_irc(p, " %s", parv[i]);
sprintf_irc(p, " :%s", parv[parc - 1]);
":%s NOTICE * :*** Notice -- HACK(4): %s BURST %s %s", me.name,
sptr->name, parv[1], parv[2]);
for (i = 3; i < parc - 1; ++i)
p = sprintf_irc(p, " %s", parv[i]);
sprintf_irc(p, " :%s", parv[parc - 1]);
- sendbufto_op_mask(SNO_HACK4);
+ sendbufto_op_mask(SNO_HACK4); /* XXX DYING */
*modebuf = '+';
mblen2 = 1;
cnt = 0;
*modebuf = '+';
mblen2 = 1;
cnt = 0;
- sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT,
- NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf;
+ sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT, /* XXX DYING */
+ NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf; /* XXX DYING */
/* Run over all remaining parameters */
for (n = 3; n < parc; n++)
/* Run over all remaining parameters */
for (n = 3; n < parc; n++)
} /* <-- while over all modes */
bmodebuf[mblen] = '\0';
} /* <-- while over all modes */
bmodebuf[mblen] = '\0';
+ sendbuf[sblen] = '\0'; /* XXX DYING */
if (mblen) /* Anything to send at all ? */
{
send_it = 1;
if (mblen) /* Anything to send at all ? */
{
send_it = 1;
- strcpy(sendbuf + sblen, " +");
+ strcpy(sendbuf + sblen, " +"); /* XXX DYING */
- strcpy(sendbuf + sblen, bmodebuf);
+ strcpy(sendbuf + sblen, bmodebuf); /* XXX DYING */
- strcpy(sendbuf + sblen, bparambuf);
+ strcpy(sendbuf + sblen, bparambuf); /* XXX DYING */
sblen += strlen(bparambuf);
}
break; /* Done mode part */
sblen += strlen(bparambuf);
}
break; /* Done mode part */
if (ret != -1)
/* A new ban was added or an existing one needs to be passed on.
* Also add it to sendbuf: */
if (ret != -1)
/* A new ban was added or an existing one needs to be passed on.
* Also add it to sendbuf: */
- add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0);
+ add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0); /* XXX DYING */
}
break; /* Done bans part */
}
}
break; /* Done bans part */
}
* - If sendbuf is full, send it, and prepare a new
* message in sendbuf.
*/
* - If sendbuf is full, send it, and prepare a new
* message in sendbuf.
*/
- add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0,
+ add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0, /* XXX DYING */
default_mode);
/* Let is take effect: (Note that in the case of a netride
* 'default_mode' is always CHFL_DEOPPED here). */
default_mode);
/* Let is take effect: (Note that in the case of a netride
* 'default_mode' is always CHFL_DEOPPED here). */
if (lp->value.cptr == cptr)
continue;
if (Protocol(lp->value.cptr) > 9)
if (lp->value.cptr == cptr)
continue;
if (Protocol(lp->value.cptr) > 9)
- sendbufto_one(lp->value.cptr);
+ sendbufto_one(lp->value.cptr); /* XXX DYING */
for (member = chptr->members; member; member = member->next_member)
if (IsBurstJoined(member))
{
for (member = chptr->members; member; member = member->next_member)
if (IsBurstJoined(member))
{
- sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s",
+ sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s", /* XXX DYING */
member->user->name, chptr->chname);
}
member->user->name, chptr->chname);
}
if (6 == ++cnt)
{
modebuf[mblen2] = 0;
if (6 == ++cnt)
{
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
parv[0], chptr->chname, modebuf, parabuf);
*parabuf = 0;
pblen2 = 0;
parv[0], chptr->chname, modebuf, parabuf);
*parabuf = 0;
pblen2 = 0;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
parv[0], chptr->chname, modebuf, parabuf);
}
}
parv[0], chptr->chname, modebuf, parabuf);
}
}
/* Now cancel all previous simple modes */
if ((prev_mode & MODE_SECRET))
/* Now cancel all previous simple modes */
if ((prev_mode & MODE_SECRET))
- cancel_mode(sptr, chptr, 's', 0, &count);
+ cancel_mode(sptr, chptr, 's', 0, &count); /* XXX DYING */
if ((prev_mode & MODE_PRIVATE))
if ((prev_mode & MODE_PRIVATE))
- cancel_mode(sptr, chptr, 'p', 0, &count);
+ cancel_mode(sptr, chptr, 'p', 0, &count); /* XXX DYING */
if ((prev_mode & MODE_MODERATED))
if ((prev_mode & MODE_MODERATED))
- cancel_mode(sptr, chptr, 'm', 0, &count);
+ cancel_mode(sptr, chptr, 'm', 0, &count); /* XXX DYING */
if ((prev_mode & MODE_TOPICLIMIT))
if ((prev_mode & MODE_TOPICLIMIT))
- cancel_mode(sptr, chptr, 't', 0, &count);
+ cancel_mode(sptr, chptr, 't', 0, &count); /* XXX DYING */
if ((prev_mode & MODE_INVITEONLY))
if ((prev_mode & MODE_INVITEONLY))
- cancel_mode(sptr, chptr, 'i', 0, &count);
+ cancel_mode(sptr, chptr, 'i', 0, &count); /* XXX DYING */
if ((prev_mode & MODE_NOPRIVMSGS))
if ((prev_mode & MODE_NOPRIVMSGS))
- cancel_mode(sptr, chptr, 'n', 0, &count);
+ cancel_mode(sptr, chptr, 'n', 0, &count); /* XXX DYING */
if ((prev_mode & MODE_LIMIT))
{
current_mode->limit = 0;
if ((prev_mode & MODE_LIMIT))
{
current_mode->limit = 0;
- cancel_mode(sptr, chptr, 'l', 0, &count);
+ cancel_mode(sptr, chptr, 'l', 0, &count); /* XXX DYING */
}
if ((prev_mode & MODE_KEY))
{
*current_mode->key = 0;
}
if ((prev_mode & MODE_KEY))
{
*current_mode->key = 0;
- cancel_mode(sptr, chptr, 'k', prev_key, &count);
+ cancel_mode(sptr, chptr, 'k', prev_key, &count); /* XXX DYING */
}
current_mode->mode &= ~prev_mode;
}
current_mode->mode &= ~prev_mode;
- sendto_highprot_butone(0, 10, "%s " TOK_KICK " %s %s%s :Net Rider",
+ sendto_highprot_butone(0, 10, "%s " TOK_KICK " %s %s%s :Net Rider", /* XXX DYING */
NumServ(&me), chptr->chname, NumNick(member->user));
NumServ(&me), chptr->chname, NumNick(member->user));
- sendto_channel_butserv(chptr, sptr,
+ sendto_channel_butserv(chptr, sptr, /* XXX DYING */
":%s KICK %s %s :Net Rider", me.name, chptr->chname,
member->user->name);
if (MyUser(member->user)) {
":%s KICK %s %s :Net Rider", me.name, chptr->chname,
member->user->name);
if (MyUser(member->user)) {
- sendto_lowprot_butone(0, 9, ":%s PART %s",
+ sendto_lowprot_butone(0, 9, ":%s PART %s", /* XXX DYING */
member->user->name, chptr->chname, member->user->name);
member->user->name, chptr->chname, member->user->name);
- sendto_highprot_butone(0, 10, "%s%s PART %s",
+ sendto_highprot_butone(0, 10, "%s%s PART %s", /* XXX DYING */
NumNick(member->user), chptr->chname);
remove_user_from_channel(member->user, chptr);
}
NumNick(member->user), chptr->chname);
remove_user_from_channel(member->user, chptr);
}
member->status &= ~mode;
if (mode == CHFL_CHANOP)
SetDeopped(member);
member->status &= ~mode;
if (mode == CHFL_CHANOP)
SetDeopped(member);
- cancel_mode(sptr, chptr, m, member->user->name, &count);
+ cancel_mode(sptr, chptr, m, member->user->name, &count); /* XXX DYING */
}
}
if (mode == CHFL_VOICE)
}
}
if (mode == CHFL_VOICE)
struct Membership* member_z;
*ban = tmp->next;
struct Membership* member_z;
*ban = tmp->next;
- cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count);
+ cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count); /* XXX DYING */
/* Copied from del_banid(): */
MyFree(tmp->value.ban.banstr);
/* Copied from del_banid(): */
MyFree(tmp->value.ban.banstr);
{
struct SLink *ban;
while ((ban = next_removed_overlapped_ban()))
{
struct SLink *ban;
while ((ban = next_removed_overlapped_ban()))
- cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count);
+ cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count); /* XXX DYING */
- cancel_mode(sptr, chptr, 0, 0, &count); /* flush */
+ cancel_mode(sptr, chptr, 0, 0, &count); /* flush */ /* XXX DYING */
}
if (send_it && !netride)
}
if (send_it && !netride)
{
/* Time to send buffer */
modebuf[mblen2] = 0;
{
/* Time to send buffer */
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
parv[0], chptr->chname, modebuf, parabuf);
*modebuf = deban ? '-' : '+';
mblen2 = 1;
parv[0], chptr->chname, modebuf, parabuf);
*modebuf = deban ? '-' : '+';
mblen2 = 1;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
parv[0], chptr->chname, modebuf, parabuf);
}
}
parv[0], chptr->chname, modebuf, parabuf);
}
}
if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
{
p =
if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
{
p =
+ sprintf_irc(sendbuf, /* XXX DEAD */
":%s NOTICE * :*** Notice -- HACK(4): %s BURST %s %s", me.name,
sptr->name, parv[1], parv[2]);
for (i = 3; i < parc - 1; ++i)
p = sprintf_irc(p, " %s", parv[i]);
sprintf_irc(p, " :%s", parv[parc - 1]);
":%s NOTICE * :*** Notice -- HACK(4): %s BURST %s %s", me.name,
sptr->name, parv[1], parv[2]);
for (i = 3; i < parc - 1; ++i)
p = sprintf_irc(p, " %s", parv[i]);
sprintf_irc(p, " :%s", parv[parc - 1]);
- sendbufto_op_mask(SNO_HACK4);
+ sendbufto_op_mask(SNO_HACK4); /* XXX DEAD */
*modebuf = '+';
mblen2 = 1;
cnt = 0;
*modebuf = '+';
mblen2 = 1;
cnt = 0;
- sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT,
- NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf;
+ sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT, /* XXX DEAD */
+ NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf; /* XXX DEAD */
/* Run over all remaining parameters */
for (n = 3; n < parc; n++)
/* Run over all remaining parameters */
for (n = 3; n < parc; n++)
} /* <-- while over all modes */
bmodebuf[mblen] = '\0';
} /* <-- while over all modes */
bmodebuf[mblen] = '\0';
+ sendbuf[sblen] = '\0'; /* XXX DEAD */
if (mblen) /* Anything to send at all ? */
{
send_it = 1;
if (mblen) /* Anything to send at all ? */
{
send_it = 1;
- strcpy(sendbuf + sblen, " +");
+ strcpy(sendbuf + sblen, " +"); /* XXX DEAD */
- strcpy(sendbuf + sblen, bmodebuf);
+ strcpy(sendbuf + sblen, bmodebuf); /* XXX DEAD */
- strcpy(sendbuf + sblen, bparambuf);
+ strcpy(sendbuf + sblen, bparambuf); /* XXX DEAD */
sblen += strlen(bparambuf);
}
break; /* Done mode part */
sblen += strlen(bparambuf);
}
break; /* Done mode part */
if (ret != -1)
/* A new ban was added or an existing one needs to be passed on.
* Also add it to sendbuf: */
if (ret != -1)
/* A new ban was added or an existing one needs to be passed on.
* Also add it to sendbuf: */
- add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0);
+ add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0); /* XXX DEAD */
}
break; /* Done bans part */
}
}
break; /* Done bans part */
}
* - If sendbuf is full, send it, and prepare a new
* message in sendbuf.
*/
* - If sendbuf is full, send it, and prepare a new
* message in sendbuf.
*/
- add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0,
+ add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0, /* XXX DEAD */
default_mode);
/* Let is take effect: (Note that in the case of a netride
* 'default_mode' is always CHFL_DEOPPED here). */
default_mode);
/* Let is take effect: (Note that in the case of a netride
* 'default_mode' is always CHFL_DEOPPED here). */
if (lp->value.cptr == cptr)
continue;
if (Protocol(lp->value.cptr) > 9)
if (lp->value.cptr == cptr)
continue;
if (Protocol(lp->value.cptr) > 9)
- sendbufto_one(lp->value.cptr);
+ sendbufto_one(lp->value.cptr); /* XXX DEAD */
for (member = chptr->members; member; member = member->next_member)
if (IsBurstJoined(member))
{
for (member = chptr->members; member; member = member->next_member)
if (IsBurstJoined(member))
{
- sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s",
+ sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s", /* XXX DEAD */
member->user->name, chptr->chname);
}
member->user->name, chptr->chname);
}
if (6 == ++cnt)
{
modebuf[mblen2] = 0;
if (6 == ++cnt)
{
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
parv[0], chptr->chname, modebuf, parabuf);
*parabuf = 0;
pblen2 = 0;
parv[0], chptr->chname, modebuf, parabuf);
*parabuf = 0;
pblen2 = 0;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
parv[0], chptr->chname, modebuf, parabuf);
}
}
parv[0], chptr->chname, modebuf, parabuf);
}
}
/* Now cancel all previous simple modes */
if ((prev_mode & MODE_SECRET))
/* Now cancel all previous simple modes */
if ((prev_mode & MODE_SECRET))
- cancel_mode(sptr, chptr, 's', 0, &count);
+ cancel_mode(sptr, chptr, 's', 0, &count); /* XXX DEAD */
if ((prev_mode & MODE_PRIVATE))
if ((prev_mode & MODE_PRIVATE))
- cancel_mode(sptr, chptr, 'p', 0, &count);
+ cancel_mode(sptr, chptr, 'p', 0, &count); /* XXX DEAD */
if ((prev_mode & MODE_MODERATED))
if ((prev_mode & MODE_MODERATED))
- cancel_mode(sptr, chptr, 'm', 0, &count);
+ cancel_mode(sptr, chptr, 'm', 0, &count); /* XXX DEAD */
if ((prev_mode & MODE_TOPICLIMIT))
if ((prev_mode & MODE_TOPICLIMIT))
- cancel_mode(sptr, chptr, 't', 0, &count);
+ cancel_mode(sptr, chptr, 't', 0, &count); /* XXX DEAD */
if ((prev_mode & MODE_INVITEONLY))
if ((prev_mode & MODE_INVITEONLY))
- cancel_mode(sptr, chptr, 'i', 0, &count);
+ cancel_mode(sptr, chptr, 'i', 0, &count); /* XXX DEAD */
if ((prev_mode & MODE_NOPRIVMSGS))
if ((prev_mode & MODE_NOPRIVMSGS))
- cancel_mode(sptr, chptr, 'n', 0, &count);
+ cancel_mode(sptr, chptr, 'n', 0, &count); /* XXX DEAD */
if ((prev_mode & MODE_LIMIT))
{
current_mode->limit = 0;
if ((prev_mode & MODE_LIMIT))
{
current_mode->limit = 0;
- cancel_mode(sptr, chptr, 'l', 0, &count);
+ cancel_mode(sptr, chptr, 'l', 0, &count); /* XXX DEAD */
}
if ((prev_mode & MODE_KEY))
{
*current_mode->key = 0;
}
if ((prev_mode & MODE_KEY))
{
*current_mode->key = 0;
- cancel_mode(sptr, chptr, 'k', prev_key, &count);
+ cancel_mode(sptr, chptr, 'k', prev_key, &count); /* XXX DEAD */
}
current_mode->mode &= ~prev_mode;
}
current_mode->mode &= ~prev_mode;
}
member->status = (member->status & ~mode) | CHFL_ZOMBIE;
}
member->status = (member->status & ~mode) | CHFL_ZOMBIE;
- sendto_highprot_butone(0, 10, "%s " TOK_KICK "%s %s%s :Net Rider",
+ sendto_highprot_butone(0, 10, "%s " TOK_KICK "%s %s%s :Net Rider", /* XXX DEAD */
NumServ(&me), chptr->chname, NumNick(member->user));
NumServ(&me), chptr->chname, NumNick(member->user));
- sendto_channel_butserv(chptr, sptr,
+ sendto_channel_butserv(chptr, sptr, /* XXX DEAD */
":%s KICK %s %s :Net Rider", me.name, chptr->chname,
member->user->name);
if (MyUser(member->user)) {
":%s KICK %s %s :Net Rider", me.name, chptr->chname,
member->user->name);
if (MyUser(member->user)) {
- sendto_lowprot_butone(0, 9, ":%s PART %s",
+ sendto_lowprot_butone(0, 9, ":%s PART %s", /* XXX DEAD */
member->user->name, chptr->chname, member->user->name);
member->user->name, chptr->chname, member->user->name);
- sendto_highprot_butone(0, 10, "%s%s PART %s",
+ sendto_highprot_butone(0, 10, "%s%s PART %s", /* XXX DEAD */
NumNick(member->user), chptr->chname);
remove_user_from_channel(member->user, chptr);
}
NumNick(member->user), chptr->chname);
remove_user_from_channel(member->user, chptr);
}
member->status &= ~mode;
if (mode == CHFL_CHANOP)
SetDeopped(member);
member->status &= ~mode;
if (mode == CHFL_CHANOP)
SetDeopped(member);
- cancel_mode(sptr, chptr, m, member->user->name, &count);
+ cancel_mode(sptr, chptr, m, member->user->name, &count); /* XXX DEAD */
}
}
if (mode == CHFL_VOICE)
}
}
if (mode == CHFL_VOICE)
struct Membership* member_z;
*ban = tmp->next;
struct Membership* member_z;
*ban = tmp->next;
- cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count);
+ cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count); /* XXX DEAD */
/* Copied from del_banid(): */
MyFree(tmp->value.ban.banstr);
/* Copied from del_banid(): */
MyFree(tmp->value.ban.banstr);
{
struct SLink *ban;
while ((ban = next_removed_overlapped_ban()))
{
struct SLink *ban;
while ((ban = next_removed_overlapped_ban()))
- cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count);
+ cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count); /* XXX DEAD */
- cancel_mode(sptr, chptr, 0, 0, &count); /* flush */
+ cancel_mode(sptr, chptr, 0, 0, &count); /* flush */ /* XXX DEAD */
}
if (send_it && !netride)
}
if (send_it && !netride)
{
/* Time to send buffer */
modebuf[mblen2] = 0;
{
/* Time to send buffer */
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
parv[0], chptr->chname, modebuf, parabuf);
*modebuf = deban ? '-' : '+';
mblen2 = 1;
parv[0], chptr->chname, modebuf, parabuf);
*modebuf = deban ? '-' : '+';
mblen2 = 1;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
if (cnt > 0 || mblen2 > 1)
{
modebuf[mblen2] = 0;
- sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+ sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
parv[0], chptr->chname, modebuf, parabuf);
}
}
parv[0], chptr->chname, modebuf, parabuf);
}
}
int i;
struct Client *acptr;
/* Send message to local +g clients as if it were a wallops */
int i;
struct Client *acptr;
/* Send message to local +g clients as if it were a wallops */
- sprintf_irc(sendbuf, ":%s WALLOPS :%s", parv[0], parv[parc - 1]);
+ sprintf_irc(sendbuf, ":%s WALLOPS :%s", parv[0], parv[parc - 1]); /* XXX DEAD */
for (i = 0; i <= HighestFd; i++)
if ((acptr = LocalClientArray[i]) && !IsServer(acptr) && !IsMe(acptr) &&
SendDebug(acptr))
for (i = 0; i <= HighestFd; i++)
if ((acptr = LocalClientArray[i]) && !IsServer(acptr) && !IsMe(acptr) &&
SendDebug(acptr))
if (parc < 2)
return need_more_params(sptr, "USERHOST");
if (parc < 2)
return need_more_params(sptr, "USERHOST");
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]);
+ sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]); /* XXX DEAD */
for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
s = ircd_strtok(&p, (char *)0, " "), i--)
if ((acptr = FindUser(s)))
for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
s = ircd_strtok(&p, (char *)0, " "), i--)
if ((acptr = FindUser(s)))
if (i < j)
sendbufto_one(sptr); /* XXX DEAD */
sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
if (i < j)
sendbufto_one(sptr); /* XXX DEAD */
sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]);
+ sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]); /* XXX DEAD */
if (parc < 2)
return need_more_params(sptr, "USERIP");
if (parc < 2)
return need_more_params(sptr, "USERIP");
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
+ sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
s = ircd_strtok(&p, (char *)0, " "), i--)
if ((acptr = FindUser(s)))
for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
s = ircd_strtok(&p, (char *)0, " "), i--)
if ((acptr = FindUser(s)))
if (i < j)
sendbufto_one(sptr); /* XXX DEAD */
sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
if (i < j)
sendbufto_one(sptr); /* XXX DEAD */
sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
+ sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */