* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_server.c 2733 2006-11-10 00:04:08Z jilles $
+ * $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 "ircd.h" /* me */
#include "s_log.h" /* log level defines */
#include "s_serv.h" /* server_estab, check_server */
#include "s_stats.h" /* ServerStats */
-#include "scache.h" /* find_or_add */
+#include "scache.h"
#include "send.h" /* sendto_one */
#include "msg.h"
#include "parse.h"
mapi_clist_av1 server_clist[] = { &server_msgtab, &sid_msgtab, NULL };
-DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 2733 $");
+DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 3291 $");
int bogus_host(const char *host);
-struct Client *server_exists(const char *);
static int set_server_gecos(struct Client *, const char *);
/*
hop = atoi(parv[2]);
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);
+ 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");
+ return 0;
+ }
+
/*
* Reject a direct nonTS server connection if we're TS_ONLY -orabidoo
*/
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);
break;
}
- if((target_p = server_exists(name)))
+ if((target_p = find_server(NULL, name)))
{
/*
* This link is trying feed me a server that I already have
if(has_id(client_p) && (target_p = find_id(client_p->id)) != NULL)
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Attempt to re-introduce SID %s from %s%s",
client_p->id,
EmptyString(client_p->name) ? name : "",
int hop;
int hlined = 0;
int llined = 0;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
name = parv[1];
hop = atoi(parv[2]);
strlcpy(info, parv[3], sizeof(info));
- if((target_p = server_exists(name)))
+ if((target_p = find_server(NULL, name)))
{
/*
* This link is trying feed me a server that I already have
* 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;
set_server_gecos(target_p, info);
- target_p->serv->up = find_or_add(source_p->name);
-
- if(has_id(source_p))
- target_p->serv->upid = source_p->id;
-
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);
- 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));
sendto_server(client_p, NULL, NOCAPS, NOCAPS,
":%s SERVER %s %d :%s%s",
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;
hop = atoi(parv[2]);
/* collision on the name? */
- if((target_p = server_exists(parv[1])) != NULL)
+ 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,
ilog(L_SERVER, "Link %s cancelled, SID %s already exists",
client_p->name, parv[3]);
- exit_client(NULL, client_p, &me, "Server Exists");
+ exit_client(NULL, client_p, &me, "SID Exists");
return 0;
}
* 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;
strcpy(target_p->id, parv[3]);
set_server_gecos(target_p, parv[4]);
- target_p->serv->up = find_or_add(source_p->name);
-
- if(has_id(source_p))
- target_p->serv->upid = source_p->id;
-
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));
sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
":%s SID %s %d %s :%s%s",
return 0;
}
-
-/*
- * server_exists()
- *
- * inputs - servername
- * output - 1 if server exists, 0 if doesnt exist
- */
-struct Client *
-server_exists(const char *servername)
-{
- struct Client *target_p;
- dlink_node *ptr;
-
- DLINK_FOREACH(ptr, global_serv_list.head)
- {
- target_p = ptr->data;
-
- if(match(target_p->name, servername) || match(servername, target_p->name))
- return target_p;
- }
-
- return NULL;
-}