* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_server.c 3291 2007-03-28 14:30:10Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "client.h" /* client struct */
#include "common.h" /* TRUE bleah */
-#include "event.h"
#include "hash.h" /* add_to_client_hash */
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h" /* me */
#include "numeric.h" /* ERR_xxx */
#include "s_conf.h" /* struct ConfItem */
#include "s_newconf.h"
-#include "s_log.h" /* log level defines */
+#include "logger.h" /* log level defines */
#include "s_serv.h" /* server_estab, check_server */
#include "s_stats.h" /* ServerStats */
#include "scache.h"
/*
* mr_server - SERVER message handler
- * parv[0] = sender prefix
* parv[1] = servername
* parv[2] = serverinfo/hopcount
* parv[3] = serverinfo
const char *name;
struct Client *target_p;
int hop;
+ struct Capability *cap;
name = parv[1];
hop = atoi(parv[2]);
- strlcpy(info, parv[3], sizeof(info));
+ rb_strlcpy(info, parv[3], sizeof(info));
if (IsHandshake(client_p) && irccmp(client_p->name, name))
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Server %s has unexpected name %s",
- get_server_name(client_p, HIDE_IP), name);
+ client_p->name, name);
ilog(L_SERVER, "Server %s has unexpected name %s",
log_client_name(client_p, SHOW_IP), name);
exit_client(client_p, client_p, client_p, "Server name mismatch");
if(!DoesTS(client_p))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server",
- get_server_name(client_p, HIDE_IP));
+ client_p->name);
exit_client(client_p, client_p, client_p, "Non-TS server");
return 0;
}
return 0;
}
+ /* check to ensure any "required" caps are set. --nenolod */
+ for (cap = captab; cap->name; cap++)
+ {
+ if (!cap->required)
+ continue;
+
+ if (!(client_p->localClient->caps & cap->cap))
+ {
+ char exitbuf[BUFSIZE];
+
+ rb_snprintf(exitbuf, BUFSIZE, "Missing required CAPAB [%s]", cap->name);
+ exit_client(client_p, client_p, client_p, exitbuf);
+
+ return 0;
+ }
+ }
+
/* Now we just have to call check_server and everything should be
* check for us... -A1kmm. */
switch (check_server(name, client_p))
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Unauthorised server connection attempt from %s: "
"No entry for servername %s",
- get_server_name(client_p, HIDE_IP), name);
+ "[@255.255.255.255]", name);
ilog(L_SERVER, "Access denied, no connect block for server %s%s",
EmptyString(client_p->name) ? name : "",
break;
case -2:
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Unauthorised server connection attempt from %s: "
"Bad password for server %s",
- get_server_name(client_p, HIDE_IP), name);
+ "[@255.255.255.255]", name);
ilog(L_SERVER, "Access denied, invalid password for server %s%s",
EmptyString(client_p->name) ? name : "",
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Unauthorised server connection attempt from %s: "
"Invalid host for server %s",
- get_server_name(client_p, HIDE_IP), name);
+ "[@255.255.255.255]", name);
ilog(L_SERVER, "Access denied, invalid host for server %s%s",
EmptyString(client_p->name) ? name : "",
case -4:
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Invalid servername %s from %s",
- name, get_server_name(client_p, HIDE_IP));
+ name, "[@255.255.255.255]");
ilog(L_SERVER, "Access denied, invalid servername from %s",
log_client_name(client_p, SHOW_IP));
return 0;
/* NOT REACHED */
break;
+ case -5:
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Connection from servername %s requires SSL/TLS but is plaintext",
+ name);
+ ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s",
+ log_client_name(client_p, SHOW_IP));
+
+ exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");
+ return 0;
+ }
+
+ /* require TS6 for direct links */
+ if(!IsCapable(client_p, CAP_TS6))
+ {
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+ "Link %s dropped, TS6 protocol is required", name);
+ exit_client(client_p, client_p, client_p, "Incompatible TS version");
+ return 0;
}
if((target_p = find_server(NULL, name)))
* Definitely don't do that here. This is from an unregistered
* connect - A1kmm.
*/
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Attempt to re-introduce server %s from %s",
- name, get_server_name(client_p, HIDE_IP));
- ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
- name, log_client_name(client_p, SHOW_IP));
+ if (target_p->servptr->flags & FLAGS_SERVICE)
+ {
+ /* Assume any servers introduced by services
+ * are jupes.
+ * -- jilles
+ */
+ sendto_one(client_p, "ERROR :Server juped.");
+ }
+ else
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Attempt to re-introduce server %s from %s",
+ name, "[@255.255.255.255]");
+ ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
+ name, log_client_name(client_p, SHOW_IP));
- sendto_one(client_p, "ERROR :Server already exists.");
+ sendto_one(client_p, "ERROR :Server already exists.");
+ }
exit_client(client_p, client_p, client_p, "Server Exists");
return 0;
}
if(has_id(client_p) && (target_p = find_id(client_p->id)) != NULL)
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Attempt to re-introduce SID %s from %s%s",
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+ "Attempt to re-introduce SID %s from %s%s (already in use by %s)",
client_p->id,
EmptyString(client_p->name) ? name : "",
- get_server_name(client_p, HIDE_IP));
- ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s",
+ client_p->name, target_p->name);
+ ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s (already in use by %s)",
client_p->id,
EmptyString(client_p->name) ? name : "",
- log_client_name(client_p, SHOW_IP));
+ log_client_name(client_p, SHOW_IP),
+ target_p->name);
sendto_one(client_p, "ERROR :SID already exists.");
exit_client(client_p, client_p, client_p, "SID Exists");
* C:line in client_p->name
*/
- strlcpy(client_p->name, name, sizeof(client_p->name));
+ rb_strlcpy(client_p->name, name, sizeof(client_p->name));
set_server_gecos(client_p, info);
client_p->hopcount = hop;
server_estab(client_p);
/*
* ms_server - SERVER message handler
- * parv[0] = sender prefix
* parv[1] = servername
* parv[2] = serverinfo/hopcount
* parv[3] = serverinfo
int hop;
int hlined = 0;
int llined = 0;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
+ char squitreason[160];
name = parv[1];
hop = atoi(parv[2]);
- strlcpy(info, parv[3], sizeof(info));
+ rb_strlcpy(info, parv[3], sizeof(info));
if((target_p = find_server(NULL, name)))
{
* doesnt exist, although ircd can handle it, its not a realistic
* solution.. --fl_
*/
- /* It is behind a host-masked server. Completely ignore the
- * server message(don't propagate or we will delink from whoever
- * we propagate to). -A1kmm */
- if(irccmp(target_p->name, name) && target_p->from == client_p)
- return 0;
-
- sendto_one(client_p, "ERROR :Server %s already exists", name);
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Link %s cancelled, server %s already exists",
- get_server_name(client_p, SHOW_IP), name);
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, name);
- exit_client(client_p, client_p, &me, "Server Exists");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Server %s already exists",
+ name);
+ exit_client(client_p, client_p, &me, squitreason);
return 0;
}
sendto_one(client_p, "ERROR :Nickname %s already exists!", name);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled: Server/nick collision on %s",
- get_server_name(client_p, HIDE_IP), name);
+ client_p->name, name);
ilog(L_SERVER, "Link %s cancelled: Server/nick collision on %s",
client_p->name, name);
* add it to list and propagate word to my other
* server links...
*/
- if(parc == 1 || EmptyString(info))
- {
- sendto_one(client_p, "ERROR :No server info specified for %s", name);
- return 0;
- }
/*
* See if the newly found server is behind a guaranteed
* leaf. If so, close the link.
*
*/
- DLINK_FOREACH(ptr, hubleaf_conf_list.head)
+ RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
{
hub_p = ptr->data;
* .edu's
*/
- /* Ok, check client_p can hub the new server, and make sure it's not a LL */
+ /* Ok, check client_p can hub the new server */
if(!hlined)
{
/* OOOPs nope can't HUB */
sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.",
- get_server_name(client_p, HIDE_IP), name);
+ client_p->name, name);
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, name);
- exit_client(NULL, client_p, &me, "No matching hub_mask.");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "No matching hub_mask for %s",
+ name);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
/* OOOPs nope can't HUB this leaf */
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s introduced leafed server %s.",
- get_server_name(client_p, HIDE_IP), name);
+ client_p->name, name);
ilog(L_SERVER, "Link %s introduced leafed server %s.",
client_p->name, name);
- exit_client(NULL, client_p, &me, "Leafed Server.");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Matching leaf_mask for %s",
+ name);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s introduced server with invalid servername %s",
- get_server_name(client_p, HIDE_IP), name);
+ client_p->name, name);
ilog(L_SERVER, "Link %s introduced server with invalid servername %s",
client_p->name, name);
make_server(target_p);
target_p->hopcount = hop;
- strlcpy(target_p->name, name, sizeof(target_p->name));
+ rb_strlcpy(target_p->name, name, sizeof(target_p->name));
set_server_gecos(target_p, info);
SetServer(target_p);
- dlinkAddTail(target_p, &target_p->node, &global_client_list);
- dlinkAddTailAlloc(target_p, &global_serv_list);
+ rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+ rb_dlinkAddTailAlloc(target_p, &global_serv_list);
add_to_client_hash(target_p->name, target_p);
- dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+ rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
struct Client *target_p;
struct remote_conf *hub_p;
hook_data_client hdata;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
int hop;
int hlined = 0;
int llined = 0;
+ char squitreason[160];
hop = atoi(parv[2]);
/* collision on the name? */
if((target_p = find_server(NULL, parv[1])) != NULL)
{
- sendto_one(client_p, "ERROR :Server %s already exists", parv[1]);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Link %s cancelled, server %s already exists",
- get_server_name(client_p, SHOW_IP), parv[1]);
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, parv[1]);
- exit_client(NULL, client_p, &me, "Server Exists");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Server %s already exists",
+ parv[1]);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
/* collision on the SID? */
if((target_p = find_id(parv[3])) != NULL)
{
- sendto_one(client_p, "ERROR :SID %s already exists", parv[3]);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Link %s cancelled, SID %s already exists",
- get_server_name(client_p, SHOW_IP), parv[3]);
- ilog(L_SERVER, "Link %s cancelled, SID %s already exists",
- client_p->name, parv[3]);
-
- exit_client(NULL, client_p, &me, "Server Exists");
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "Link %s cancelled, SID %s for server %s already in use by %s",
+ client_p->name, parv[3], parv[1], target_p->name);
+ sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+ ":%s WALLOPS :Link %s cancelled, SID %s for server %s already in use by %s",
+ me.id, client_p->name, parv[3], parv[1], target_p->name);
+ ilog(L_SERVER, "Link %s cancelled, SID %s for server %s already in use by %s",
+ client_p->name, parv[3], parv[1], target_p->name);
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "SID %s for %s already in use by %s",
+ parv[3], parv[1], target_p->name);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
sendto_one(client_p, "ERROR :Invalid servername");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, servername %s invalid",
- get_server_name(client_p, SHOW_IP), parv[1]);
+ client_p->name, parv[1]);
ilog(L_SERVER, "Link %s cancelled, servername %s invalid",
client_p->name, parv[1]);
sendto_one(client_p, "ERROR :Invalid SID");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, SID %s invalid",
- get_server_name(client_p, SHOW_IP), parv[3]);
+ client_p->name, parv[3]);
ilog(L_SERVER, "Link %s cancelled, SID %s invalid",
client_p->name, parv[3]);
* H: allows it to introduce a server matching that mask
* L: disallows it introducing a server matching that mask
*/
- DLINK_FOREACH(ptr, hubleaf_conf_list.head)
+ RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
{
hub_p = ptr->data;
/* no matching hub_mask */
if(!hlined)
{
- sendto_one(client_p, "ERROR :No matching hub_mask");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Non-Hub link %s introduced %s.",
- get_server_name(client_p, SHOW_IP), parv[1]);
+ client_p->name, parv[1]);
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, parv[1]);
- exit_client(NULL, client_p, &me, "No matching hub_mask.");
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "No matching hub_mask for %s",
+ parv[1]);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
/* matching leaf_mask */
if(llined)
{
- sendto_one(client_p, "ERROR :Matching leaf_mask");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s introduced leafed server %s.",
- get_server_name(client_p, SHOW_IP), parv[1]);
+ client_p->name, parv[1]);
ilog(L_SERVER, "Link %s introduced leafed server %s.",
client_p->name, parv[1]);
- exit_client(NULL, client_p, &me, "Leafed Server.");
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Matching leaf_mask for %s",
+ parv[1]);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
target_p = make_client(client_p);
make_server(target_p);
- strlcpy(target_p->name, parv[1], sizeof(target_p->name));
+ rb_strlcpy(target_p->name, parv[1], sizeof(target_p->name));
target_p->hopcount = atoi(parv[2]);
strcpy(target_p->id, parv[3]);
set_server_gecos(target_p, parv[4]);
target_p->servptr = source_p;
SetServer(target_p);
- dlinkAddTail(target_p, &target_p->node, &global_client_list);
- dlinkAddTailAlloc(target_p, &global_serv_list);
+ rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+ rb_dlinkAddTailAlloc(target_p, &global_serv_list);
add_to_client_hash(target_p->name, target_p);
add_to_id_hash(target_p->id, target_p);
- dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+ rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
":%s SID %s %d %s :%s%s",
source_p->id, target_p->name, target_p->hopcount + 1,
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,
"Server %s being introduced by %s", target_p->name, source_p->name);
{
char *p;
char *s;
- char *t;
s = LOCAL_COPY(info);
*p = '\0';
/* check for a ] which would symbolise an [IP] */
- if((t = strchr(s, ']')))
+ if(strchr(s, ']'))
{
/* set s to after the first space */
if(p)
/* if there was a trailing space, s could point to \0, so check */
if(s && (*s != '\0'))
{
- strlcpy(client_p->info, s, sizeof(client_p->info));
+ rb_strlcpy(client_p->info, s, sizeof(client_p->info));
return 1;
}
}
}
- strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
+ rb_strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
return 1;
}
projects / irc / rqf / shadowircd.git / blobdiff