*/
#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 "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"
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);
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;
}
if((target_p = find_server(NULL, name)))
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]);
* 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;
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;
* 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;
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));