9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core modules: no more TS5.

Browse source
This commit is contained in:
William Pitcock 2008-06-08 01:25:42 -05:00
parent 7bb8c655ec
commit d38d07f030
6 changed files with 0 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/core/m_join.c
View file

@ -343,10 +343,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
":%s SJOIN %ld %s +nt :@%s", ":%s SJOIN %ld %s +nt :@%s",
me.id, (long) chptr->channelts, me.id, (long) chptr->channelts,
chptr->chname, source_p->id); chptr->chname, source_p->id);
sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
":%s SJOIN %ld %s +nt :@%s",
me.name, (long) chptr->channelts,
chptr->chname, source_p->name);
} }
} }
else else
@ -355,11 +351,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
":%s JOIN %ld %s +", ":%s JOIN %ld %s +",
use_id(source_p), (long) chptr->channelts, use_id(source_p), (long) chptr->channelts,
chptr->chname); chptr->chname);
sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
":%s SJOIN %ld %s + :%s",
me.name, (long) chptr->channelts,
chptr->chname, source_p->name);
} }
del_invite(chptr, source_p); del_invite(chptr, source_p);
@ -518,18 +509,12 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
sendto_server(client_p, chptr, CAP_TS6, NOCAPS, sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
":%s JOIN %ld %s +", ":%s JOIN %ld %s +",
source_p->id, (long) chptr->channelts, chptr->chname); source_p->id, (long) chptr->channelts, chptr->chname);
sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
":%s SJOIN %ld %s %s :%s",
source_p->servptr->name, (long) chptr->channelts,
chptr->chname, keep_new_modes ? "+" : "0",
source_p->name);
return 0; return 0;
} }
static int static int
ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
static char buf_nick[BUFSIZE];
static char buf_uid[BUFSIZE]; static char buf_uid[BUFSIZE];
static const char empty_modes[] = "0"; static const char empty_modes[] = "0";
struct Channel *chptr; struct Channel *chptr;
@ -549,7 +534,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
int len; int len;
int joins = 0; int joins = 0;
const char *s; const char *s;
char *ptr_nick;
char *ptr_uid; char *ptr_uid;
char *p; char *p;
int i, joinc = 0, timeslice = 0; int i, joinc = 0, timeslice = 0;
@ -729,9 +713,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
":%s KICK %s %s :Net Rider", ":%s KICK %s %s :Net Rider",
me.id, chptr->chname, me.id, chptr->chname,
who->id); who->id);
sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
":%s KICK %s %s :Net Rider",
me.name, chptr->chname, who->name);
remove_user_from_channel(msptr); remove_user_from_channel(msptr);
if (--l == 0) if (--l == 0)
break; break;
@ -816,10 +797,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
else else
modes = empty_modes; modes = empty_modes;
mlen_nick = rb_sprintf(buf_nick, ":%s SJOIN %ld %s %s :",
source_p->name, (long) chptr->channelts, parv[2], modes);
ptr_nick = buf_nick + mlen_nick;
/* working on the presumption eventually itll be more efficient to /* working on the presumption eventually itll be more efficient to
* build a TS6 buffer without checking its needed.. * build a TS6 buffer without checking its needed..
*/ */
@ -869,14 +846,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
/* we assume for these we can fit at least one nick/uid in.. */ /* we assume for these we can fit at least one nick/uid in.. */
/* check we can fit another status+nick+space into a buffer */ /* check we can fit another status+nick+space into a buffer */
if((mlen_nick + len_nick + NICKLEN + 3) > (BUFSIZE - 3))
{
*(ptr_nick - 1) = '\0';
sendto_server(client_p->from, NULL, NOCAPS, CAP_TS6, "%s", buf_nick);
ptr_nick = buf_nick + mlen_nick;
len_nick = 0;
}
if((mlen_uid + len_uid + IDLEN + 3) > (BUFSIZE - 3)) if((mlen_uid + len_uid + IDLEN + 3) > (BUFSIZE - 3))
{ {
*(ptr_uid - 1) = '\0'; *(ptr_uid - 1) = '\0';
@ -889,14 +858,12 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
{ {
if(fl & CHFL_CHANOP) if(fl & CHFL_CHANOP)
{ {
*ptr_nick++ = '@';
*ptr_uid++ = '@'; *ptr_uid++ = '@';
len_nick++; len_nick++;
len_uid++; len_uid++;
} }
if(fl & CHFL_VOICE) if(fl & CHFL_VOICE)
{ {
*ptr_nick++ = '+';
*ptr_uid++ = '+'; *ptr_uid++ = '+';
len_nick++; len_nick++;
len_uid++; len_uid++;
@ -904,9 +871,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
} }
/* copy the nick to the two buffers */ /* copy the nick to the two buffers */
len = rb_sprintf(ptr_nick, "%s ", target_p->name);
ptr_nick += len;
len_nick += len;
len = rb_sprintf(ptr_uid, "%s ", use_id(target_p)); len = rb_sprintf(ptr_uid, "%s ", use_id(target_p));
ptr_uid += len; ptr_uid += len;
len_uid += len; len_uid += len;
@ -1013,12 +977,10 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
/* Keep the colon if we're sending an SJOIN without nicks -- jilles */ /* Keep the colon if we're sending an SJOIN without nicks -- jilles */
if (joins) if (joins)
{ {
*(ptr_nick - 1) = '\0';
*(ptr_uid - 1) = '\0'; *(ptr_uid - 1) = '\0';
} }
sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid); sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
sendto_server(client_p->from, NULL, NOCAPS, CAP_TS6, "%s", buf_nick);
/* if the source does TS6 we have to remove our bans. Its now safe /* if the source does TS6 we have to remove our bans. Its now safe
* to issue -b's to the non-ts6 servers, as the sjoin we've just * to issue -b's to the non-ts6 servers, as the sjoin we've just
@ -1068,9 +1030,7 @@ do_join_0(struct Client *client_p, struct Client *source_p)
if(MyClient(source_p) && !IsFloodDone(source_p)) if(MyClient(source_p) && !IsFloodDone(source_p))
flood_endgrace(source_p); flood_endgrace(source_p);
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p)); sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s JOIN 0", source_p->name);
if(source_p->user->channel.head && MyConnect(source_p) && if(source_p->user->channel.head && MyConnect(source_p) &&
!IsOper(source_p) && !IsExemptSpambot(source_p)) !IsOper(source_p) && !IsExemptSpambot(source_p))

3
modules/core/m_kick.c
View file

@ -181,9 +181,6 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_server(client_p, chptr, CAP_TS6, NOCAPS, sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
":%s KICK %s %s :%s", ":%s KICK %s %s :%s",
use_id(source_p), chptr->chname, use_id(who), comment); use_id(source_p), chptr->chname, use_id(who), comment);
sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
":%s KICK %s %s :%s",
source_p->name, chptr->chname, who->name, comment);
remove_user_from_channel(msptr); remove_user_from_channel(msptr);
} }
else if (MyClient(source_p)) else if (MyClient(source_p))

9
modules/core/m_nick.c
View file

@ -801,8 +801,6 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
{ {
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld", sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
use_id(source_p), nick, (long) source_p->tsinfo); use_id(source_p), nick, (long) source_p->tsinfo);
sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
source_p->name, nick, (long) source_p->tsinfo);
} }
} }
@ -862,8 +860,6 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
{ {
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld", sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
use_id(source_p), nick, (long) source_p->tsinfo); use_id(source_p), nick, (long) source_p->tsinfo);
sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
source_p->name, nick, (long) source_p->tsinfo);
} }
} }
@ -1327,8 +1323,6 @@ save_user(struct Client *client_p, struct Client *source_p,
source_p->id, target_p->id, (long)target_p->tsinfo); source_p->id, target_p->id, (long)target_p->tsinfo);
sendto_server(client_p, NULL, CAP_TS6, CAP_SAVE, ":%s NICK %s :%ld", sendto_server(client_p, NULL, CAP_TS6, CAP_SAVE, ":%s NICK %s :%ld",
target_p->id, target_p->id, (long)SAVE_NICKTS); target_p->id, target_p->id, (long)SAVE_NICKTS);
sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
target_p->name, target_p->id, (long)SAVE_NICKTS);
if (!IsMe(client_p)) if (!IsMe(client_p))
sendto_realops_snomask(SNO_SKILL, L_ALL, sendto_realops_snomask(SNO_SKILL, L_ALL,
"Received SAVE message for %s from %s", "Received SAVE message for %s from %s",
@ -1354,9 +1348,6 @@ static void bad_nickname(struct Client *client_p, const char *nick)
sendto_server(NULL, NULL, CAP_TS6, NOCAPS, sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)", ":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
me.id, client_p->name, nick); me.id, client_p->name, nick);
sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
me.name, client_p->name, nick);
rb_snprintf(squitreason, sizeof squitreason, rb_snprintf(squitreason, sizeof squitreason,
"Bad nickname introduced [%s]", nick); "Bad nickname introduced [%s]", nick);

4
modules/core/m_part.c
View file

@ -132,8 +132,6 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
{ {
sendto_server(client_p, chptr, CAP_TS6, NOCAPS, sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
":%s PART %s :%s", use_id(source_p), chptr->chname, reason); ":%s PART %s :%s", use_id(source_p), chptr->chname, reason);
sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
":%s PART %s :%s", source_p->name, chptr->chname, reason);
sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s", sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
source_p->name, source_p->username, source_p->name, source_p->username,
source_p->host, chptr->chname, reason); source_p->host, chptr->chname, reason);
@ -142,8 +140,6 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
{ {
sendto_server(client_p, chptr, CAP_TS6, NOCAPS, sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
":%s PART %s", use_id(source_p), chptr->chname); ":%s PART %s", use_id(source_p), chptr->chname);
sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
":%s PART %s", source_p->name, chptr->chname);
sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s", sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
source_p->name, source_p->username, source_p->name, source_p->username,
source_p->host, chptr->chname); source_p->host, chptr->chname);

4
modules/core/m_server.c
View file

@ -589,10 +589,6 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
":%s SID %s %d %s :%s%s", ":%s SID %s %d %s :%s%s",
source_p->id, target_p->name, target_p->hopcount + 1, source_p->id, target_p->name, target_p->hopcount + 1,
target_p->id, IsHidden(target_p) ? "(H) " : "", target_p->info); target_p->id, IsHidden(target_p) ? "(H) " : "", target_p->info);
sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
":%s SERVER %s %d :%s%s",
source_p->name, target_p->name, target_p->hopcount + 1,
IsHidden(target_p) ? "(H) " : "", target_p->info);
sendto_realops_snomask(SNO_EXTERNAL, L_ALL, sendto_realops_snomask(SNO_EXTERNAL, L_ALL,
"Server %s being introduced by %s", target_p->name, source_p->name); "Server %s being introduced by %s", target_p->name, source_p->name);

5
modules/core/m_squit.c
View file

@ -148,12 +148,7 @@ ms_squit(struct Client *client_p, struct Client *source_p, int parc, const char
":%s WALLOPS :Remote SQUIT %s from %s (%s)", ":%s WALLOPS :Remote SQUIT %s from %s (%s)",
me.id, target_p->name, source_p->name, comment); me.id, target_p->name, source_p->name, comment);
sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
":%s WALLOPS :Remote SQUIT %s from %s (%s)",
me.name, target_p->name, source_p->name, comment);
ilog(L_SERVER, "SQUIT From %s : %s (%s)", parv[0], target_p->name, comment); ilog(L_SERVER, "SQUIT From %s : %s (%s)", parv[0], target_p->name, comment);
} }
exit_client(client_p, target_p, source_p, comment); exit_client(client_p, target_p, source_p, comment);
return 0; return 0;