*
* $Id$
*/
+#include "config.h"
+
#include "s_serv.h"
#include "IPcheck.h"
#include "channel.h"
#include "client.h"
-#include "crule.h"
+#include "gline.h"
#include "hash.h"
#include "ircd.h"
#include "ircd_alloc.h"
#include "ircd_reply.h"
#include "ircd_string.h"
+#include "ircd_snprintf.h"
#include "ircd_xopen.h"
#include "jupe.h"
#include "list.h"
-#include "msg.h"
#include "match.h"
+#include "msg.h"
+#include "msgq.h"
#include "numeric.h"
#include "numnicks.h"
#include "parse.h"
unsigned int max_connection_count = 0;
unsigned int max_client_count = 0;
-int exit_new_server(struct Client *cptr, struct Client *sptr,
- char *host, time_t timestamp, char *fmt, ...)
+int exit_new_server(struct Client *cptr, struct Client *sptr, const char *host,
+ time_t timestamp, const char *pattern, ...)
{
- va_list vl;
- char *buf =
- (char*) MyMalloc(strlen(me.name) + strlen(host) + 22 + strlen(fmt));
- assert(0 != buf);
- va_start(vl, fmt);
+ struct VarData vd;
+ int retval = 0;
+
+ vd.vd_format = pattern;
+ va_start(vd.vd_args, pattern);
+
if (!IsServer(sptr))
- return vexit_client_msg(cptr, cptr, &me, fmt, vl);
- sprintf_irc(buf, ":%s " TOK_SQUIT " %s " TIME_T_FMT " :", me.name, host, timestamp);
- strcat(buf, fmt);
- vsendto_one(cptr, buf, vl);
- va_end(vl);
- MyFree(buf);
- return 0;
+ retval = vexit_client_msg(cptr, cptr, &me, pattern, vd.vd_args);
+ else
+ sendcmdto_one(&me, CMD_SQUIT, cptr, "%s %Tu :%v", host, timestamp, &vd);
+
+ va_end(vd.vd_args);
+
+ return retval;
}
int a_kills_b_too(struct Client *a, struct Client *b)
{
- for (; b != a && b != &me; b = b->serv->up);
+ for (; b != a && b != &me; b = cli_serv(b)->up);
return (a == b ? 1 : 0);
}
* May only be called after a SERVER was received from cptr,
* and thus make_server was called, and serv->prot set. --Run
*/
-int server_estab(struct Client *cptr, struct ConfItem *aconf)
+int server_estab(struct Client *cptr, struct ConfItem *aconf,
+ struct Jupe *ajupe)
{
struct Client* acptr = 0;
const char* inpath;
int split, i;
assert(0 != cptr);
- assert(0 != cptr->local);
+ assert(0 != cli_local(cptr));
- split = (0 != ircd_strcmp(cptr->name, cptr->sockhost)
- && 0 != ircd_strncmp(cptr->info, "JUPE", 4));
- inpath = cptr->name;
+ split = (0 != ircd_strcmp(cli_name(cptr), cli_sockhost(cptr))
+ && 0 != ircd_strncmp(cli_info(cptr), "JUPE", 4));
+ inpath = cli_name(cptr);
if (IsUnknown(cptr)) {
if (aconf->passwd[0])
- sendto_one(cptr, "PASS :%s", aconf->passwd);
+ sendrawto_one(cptr, MSG_PASS " :%s", aconf->passwd);
/*
* Pass my info to the new server
*/
- sendto_one(cptr, "SERVER %s 1 " TIME_T_FMT " " TIME_T_FMT " J%s %s%s :%s",
- me.name, me.serv->timestamp, cptr->serv->timestamp,
- MAJOR_PROTOCOL, NumServCap(&me),
- (me.info[0]) ? (me.info) : "IRCers United");
+ sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s :%s", cli_name(&me),
+ cli_serv(&me)->timestamp, cli_serv(cptr)->timestamp, MAJOR_PROTOCOL,
+ NumServCap(&me), *(cli_info(&me)) ? cli_info(&me) : "IRCers United");
/*
* Don't charge this IP# for connecting
* XXX - if this comes from a server port, it will not have been added
- * to the IP check registry, see add_connection in s_bsd.c
+ * to the IP check registry, see add_connection in s_bsd.c
*/
- IPcheck_connect_fail(cptr->ip);
+ IPcheck_connect_fail(cli_ip(cptr));
}
det_confs_butmask(cptr, CONF_LEAF | CONF_HUB | CONF_SERVER | CONF_UWORLD);
if (!IsHandshake(cptr))
hAddClient(cptr);
SetServer(cptr);
- cptr->handler = SERVER_HANDLER;
+ cli_handler(cptr) = SERVER_HANDLER;
Count_unknownbecomesserver(UserStats);
release_dns_reply(cptr);
* NOTE: check for acptr->user == cptr->serv->user is necessary to insure
* that we got the same one... bleah
*/
- if (cptr->serv->user && *cptr->serv->by &&
- (acptr = findNUser(cptr->serv->by))) {
- if (acptr->user == cptr->serv->user) {
- if (MyUser(acptr))
- sendto_one(acptr, ":%s NOTICE %s :Link with %s established.",
- me.name, acptr->name, inpath);
- else
- sendto_one(acptr, "%s NOTICE %s%s :Link with %s established.",
- NumServ(&me), NumNick(acptr), inpath);
+ if (cli_serv(cptr)->user && *(cli_serv(cptr))->by &&
+ (acptr = findNUser(cli_serv(cptr)->by))) {
+ if (cli_user(acptr) == cli_serv(cptr)->user) {
+ sendcmdto_one(&me, CMD_NOTICE, acptr, "%C :Link with %s established.",
+ acptr, inpath);
}
else {
/*
* if not the same client, set by to empty string
*/
acptr = 0;
- *cptr->serv->by = '\0';
+ *(cli_serv(cptr))->by = '\0';
}
}
- sendto_lops_butone(acptr, "Link with %s established.", inpath);
- cptr->serv->up = &me;
- cptr->serv->updown = add_dlink(&me.serv->down, cptr);
- sendto_op_mask(SNO_NETWORK, "Net junction: %s %s", me.name, cptr->name);
+ sendto_opmask_butone(acptr, SNO_OLDSNO, "Link with %s established.", inpath);
+ cli_serv(cptr)->up = &me;
+ cli_serv(cptr)->updown = add_dlink(&(cli_serv(&me))->down, cptr);
+ sendto_opmask_butone(0, SNO_NETWORK, "Net junction: %s %s", cli_name(&me),
+ cli_name(cptr));
SetJunction(cptr);
/*
* Old sendto_serv_but_one() call removed because we now
if (!(acptr = LocalClientArray[i]) || !IsServer(acptr) ||
acptr == cptr || IsMe(acptr))
continue;
- if (!match(me.name, cptr->name))
+ if (!match(cli_name(&me), cli_name(cptr)))
continue;
- if (split)
- {
- sendto_one(acptr, "%s " TOK_SERVER " %s 2 0 " TIME_T_FMT " %s%u %s%s 0 :%s",
- NumServ(&me), cptr->name, cptr->serv->timestamp,
- (Protocol(cptr) > 9) ? "J" : "J0", Protocol(cptr),
- NumServCap(cptr), cptr->info);
- }
+ if (ajupe)
+ sendcmdto_one(&me, CMD_SERVER, acptr,
+ "%s 2 0 %Tu J%02u %s%s 0 %%%Tu :%s", cli_name(cptr),
+ cli_serv(cptr)->timestamp, Protocol(cptr), NumServCap(cptr),
+ JupeLastMod(ajupe), cli_info(cptr));
else
- {
- sendto_one(acptr, "%s " TOK_SERVER " %s 2 0 " TIME_T_FMT " %s%u %s%s 0 :%s",
- NumServ(&me), cptr->name, cptr->serv->timestamp,
- (Protocol(cptr) > 9) ? "J" : "J0", Protocol(cptr),
- NumServCap(cptr), cptr->info);
- }
+ sendcmdto_one(&me, CMD_SERVER, acptr,
+ "%s 2 0 %Tu J%02u %s%s 0 :%s", cli_name(cptr),
+ cli_serv(cptr)->timestamp, Protocol(cptr), NumServCap(cptr),
+ cli_info(cptr));
}
/*
* a race condition, not the normal way of operation...
*/
- for (acptr = &me; acptr; acptr = acptr->prev) {
+ for (acptr = &me; acptr; acptr = cli_prev(acptr)) {
/* acptr->from == acptr for acptr == cptr */
- if (acptr->from == cptr)
+ if (cli_from(acptr) == cptr)
continue;
if (IsServer(acptr)) {
const char* protocol_str;
else
protocol_str = IsBurst(acptr) ? "J0" : "P0";
- if (0 == match(me.name, acptr->name))
+ if (0 == match(cli_name(&me), cli_name(acptr)))
continue;
split = (MyConnect(acptr) &&
- 0 != ircd_strcmp(acptr->name, acptr->sockhost) &&
- 0 != ircd_strncmp(acptr->info, "JUPE", 4));
- if (split)
- {
- sendto_one(cptr,
- "%s " TOK_SERVER " %s %d 0 " TIME_T_FMT " %s%u %s%s 0 :%s",
- NumServ(acptr->serv->up), acptr->name,
- acptr->hopcount + 1, acptr->serv->timestamp,
- protocol_str, Protocol(acptr),
- NumServCap(acptr), acptr->info);
- }
+ 0 != ircd_strcmp(cli_name(acptr), cli_sockhost(acptr)) &&
+ 0 != ircd_strncmp(cli_info(acptr), "JUPE", 4));
+ if ((ajupe = jupe_find(cli_name(acptr))) && !JupeIsLocal(ajupe))
+ sendcmdto_one(cli_serv(acptr)->up, CMD_SERVER, cptr,
+ "%s %d 0 %Tu %s%u %s%s 0 %%%Tu :%s", cli_name(acptr),
+ cli_hopcount(acptr) + 1, cli_serv(acptr)->timestamp,
+ protocol_str, Protocol(acptr), NumServCap(acptr),
+ JupeLastMod(ajupe), cli_info(acptr));
else
- {
- sendto_one(cptr,
- "%s " TOK_SERVER " %s %d 0 " TIME_T_FMT " %s%u %s%s 0 :%s",
- NumServ(acptr->serv->up), acptr->name,
- acptr->hopcount + 1, acptr->serv->timestamp,
- protocol_str, Protocol(acptr),
- NumServCap(acptr), acptr->info);
- }
+ sendcmdto_one(cli_serv(acptr)->up, CMD_SERVER, cptr,
+ "%s %d 0 %Tu %s%u %s%s 0 :%s", cli_name(acptr),
+ cli_hopcount(acptr) + 1, cli_serv(acptr)->timestamp,
+ protocol_str, Protocol(acptr), NumServCap(acptr),
+ cli_info(acptr));
}
}
- for (acptr = &me; acptr; acptr = acptr->prev)
+ for (acptr = &me; acptr; acptr = cli_prev(acptr))
{
/* acptr->from == acptr for acptr == cptr */
- if (acptr->from == cptr)
+ if (cli_from(acptr) == cptr)
continue;
if (IsUser(acptr))
{
char xxx_buf[8];
char *s = umode_str(acptr);
- sendto_one(cptr, *s ?
- "%s N %s %d " TIME_T_FMT " %s %s +%s %s %s%s :%s" :
- "%s N %s %d " TIME_T_FMT " %s %s %s%s %s%s :%s",
- NumServ(acptr->user->server),
- acptr->name, acptr->hopcount + 1, acptr->lastnick,
- acptr->user->username, acptr->user->host,
- s, inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
- NumNick(acptr), acptr->info);
+ struct Gline *agline = 0;
+ if ((agline = gline_lookup(acptr, GLINE_GLOBAL | GLINE_LASTMOD)))
+ sendcmdto_one(cli_user(acptr)->server, CMD_NICK, cptr,
+ "%s %d %Tu %s %s %s%s%s%%%Tu:%s@%s %s %s%s :%s",
+ cli_name(acptr), cli_hopcount(acptr) + 1, cli_lastnick(acptr),
+ cli_user(acptr)->username, cli_user(acptr)->host,
+ *s ? "+" : "", s, *s ? " " : "",
+ GlineLastMod(agline), GlineUser(agline),
+ GlineHost(agline),
+ inttobase64(xxx_buf, ntohl(cli_ip(acptr).s_addr), 6),
+ NumNick(acptr), cli_info(acptr));
+ else
+ sendcmdto_one(cli_user(acptr)->server, CMD_NICK, cptr,
+ "%s %d %Tu %s %s %s%s%s%s %s%s :%s",
+ cli_name(acptr), cli_hopcount(acptr) + 1, cli_lastnick(acptr),
+ cli_user(acptr)->username, cli_user(acptr)->host,
+ *s ? "+" : "", s, *s ? " " : "",
+ inttobase64(xxx_buf, ntohl(cli_ip(acptr).s_addr), 6),
+ NumNick(acptr), cli_info(acptr));
}
}
/*
send_channel_modes(cptr, chptr);
}
jupe_burst(cptr);
- sendto_one(cptr, "%s EB", NumServ(&me));
+ gline_burst(cptr);
+ sendcmdto_one(&me, CMD_END_OF_BURST, cptr, "");
return 0;
}
projects / ircu2.10.12-pk.git / blobdiff