* 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;
sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s :%s", me.name,
me.serv->timestamp, cptr->serv->timestamp, MAJOR_PROTOCOL,
NumServCap(&me), *me.info ? me.info : "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
- */
- IPcheck_connect_fail(cptr->ip);
}
det_confs_butmask(cptr, CONF_LEAF | CONF_HUB | CONF_SERVER | CONF_UWORLD);
continue;
if (!match(me.name, cptr->name))
continue;
- sendcmdto_one(&me, CMD_SERVER, acptr, "%s 2 0 %Tu J%02u %s%s 0 :%s",
- cptr->name, cptr->serv->timestamp, 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", cptr->name,
+ cptr->serv->timestamp, Protocol(cptr), NumServCap(cptr),
+ JupeLastMod(ajupe), cptr->info);
+ else
+ sendcmdto_one(&me, CMD_SERVER, acptr,
+ "%s 2 0 %Tu J%02u %s%s 0 :%s", cptr->name,
+ cptr->serv->timestamp, Protocol(cptr), NumServCap(cptr),
+ cptr->info);
}
/*
split = (MyConnect(acptr) &&
0 != ircd_strcmp(acptr->name, acptr->sockhost) &&
0 != ircd_strncmp(acptr->info, "JUPE", 4));
- sendcmdto_one(&me, CMD_SERVER, cptr, "%s %d 0 %Tu %s%u %s%s 0 :%s",
- acptr->name, acptr->hopcount + 1, acptr->serv->timestamp,
- protocol_str, Protocol(acptr), NumServCap(acptr),
- acptr->info);
+ if ((ajupe = jupe_find(acptr->name)) && !JupeIsLocal(ajupe))
+ sendcmdto_one(acptr->serv->up, CMD_SERVER, cptr,
+ "%s %d 0 %Tu %s%u %s%s 0 %%%Tu :%s", acptr->name,
+ acptr->hopcount + 1, acptr->serv->timestamp,
+ protocol_str, Protocol(acptr), NumServCap(acptr),
+ JupeLastMod(ajupe), acptr->info);
+ else
+ sendcmdto_one(acptr->serv->up, CMD_SERVER, cptr,
+ "%s %d 0 %Tu %s%u %s%s 0 :%s", acptr->name,
+ acptr->hopcount + 1, acptr->serv->timestamp,
+ protocol_str, Protocol(acptr), NumServCap(acptr),
+ acptr->info);
}
}
{
char xxx_buf[8];
char *s = umode_str(acptr);
- sendcmdto_one(acptr->user->server, CMD_NICK, cptr, *s ?
- "%s %d %Tu %s %s +%s %s %s%s :%s" :
- "%s %d %Tu %s %s %s%s %s%s :%s",
- 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(acptr->user->server, CMD_NICK, cptr,
+ "%s %d %Tu %s %s %s%s%s%%%Tu:%s@%s %s %s%s :%s",
+ acptr->name, acptr->hopcount + 1, acptr->lastnick,
+ acptr->user->username, acptr->user->host,
+ *s ? "+" : "", s, *s ? " " : "",
+ GlineLastMod(agline), GlineUser(agline),
+ GlineHost(agline),
+ inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
+ NumNick(acptr), acptr->info);
+ else
+ sendcmdto_one(acptr->user->server, CMD_NICK, cptr,
+ "%s %d %Tu %s %s %s%s%s%s %s%s :%s",
+ acptr->name, acptr->hopcount + 1, acptr->lastnick,
+ acptr->user->username, acptr->user->host,
+ *s ? "+" : "", s, *s ? " " : "",
+ inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
+ NumNick(acptr), acptr->info);
}
}
/*