#include <openssl/rsa.h>
#endif
-#include "tools.h"
#include "s_serv.h"
#include "class.h"
#include "client.h"
#include "common.h"
-#include "event.h"
#include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
#include "ircd_defs.h"
#include "numeric.h"
#include "packet.h"
#include "res.h"
-#include "commio.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_stats.h"
#include "s_user.h"
#include "scache.h"
#include "send.h"
#include "client.h"
-#include "memory.h"
#include "channel.h" /* chcap_usage_counts stuff... */
#include "hook.h"
#include "msg.h"
#include "reject.h"
-
-extern char *crypt();
+#include "sslproc.h"
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
static char buf[BUFSIZE];
-static void start_io(struct Client *server);
-
-static SlinkRplHnd slink_error;
-static SlinkRplHnd slink_zipstats;
/*
* list of recognized server capabilities. "TS" is not on the list
* because all servers that we talk to already do TS, and the kludged
{ "CHW", CAP_CHW},
{ "IE", CAP_IE},
{ "KLN", CAP_KLN},
- { "GLN", CAP_GLN},
{ "KNOCK", CAP_KNOCK},
{ "ZIP", CAP_ZIP},
{ "TB", CAP_TB},
{0, 0}
};
-struct SlinkRplDef slinkrpltab[] = {
- {SLINKRPL_ERROR, slink_error, SLINKRPL_FLAG_DATA},
- {SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA},
- {0, 0, 0},
-};
-
-static int fork_server(struct Client *client_p);
-
static CNCB serv_connect_callback;
-
-void
-slink_error(unsigned int rpl, unsigned int len, unsigned char *data, struct Client *server_p)
-{
- char squitreason[256];
-
- s_assert(rpl == SLINKRPL_ERROR);
-
- s_assert(len < 256);
- data[len - 1] = '\0';
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "SlinkError for %s: %s", server_p->name, data);
- snprintf(squitreason, sizeof squitreason, "servlink error: %s", data);
- exit_client(server_p, server_p, &me, squitreason);
-}
-
-void
-slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data, struct Client *server_p)
-{
- struct ZipStats zipstats;
- u_int32_t in = 0, in_wire = 0, out = 0, out_wire = 0;
- int i = 0;
-
- s_assert(rpl == SLINKRPL_ZIPSTATS);
- s_assert(len == 16);
- s_assert(IsCapable(server_p, CAP_ZIP));
-
- /* Yes, it needs to be done this way, no we cannot let the compiler
- * work with the pointer to the structure. This works around a GCC
- * bug on SPARC that affects all versions at the time of this writing.
- * I will feed you to the creatures living in RMS's beard if you do
- * not leave this as is, without being sure that you are not causing
- * regression for most of our installed SPARC base.
- * -jmallett, 04/27/2002
- */
- memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
-
- in |= (data[i++] << 24);
- in |= (data[i++] << 16);
- in |= (data[i++] << 8);
- in |= (data[i++]);
-
- in_wire |= (data[i++] << 24);
- in_wire |= (data[i++] << 16);
- in_wire |= (data[i++] << 8);
- in_wire |= (data[i++]);
-
- out |= (data[i++] << 24);
- out |= (data[i++] << 16);
- out |= (data[i++] << 8);
- out |= (data[i++]);
-
- out_wire |= (data[i++] << 24);
- out_wire |= (data[i++] << 16);
- out_wire |= (data[i++] << 8);
- out_wire |= (data[i++]);
-
- zipstats.in += in;
- zipstats.inK += zipstats.in >> 10;
- zipstats.in &= 0x03ff;
-
- zipstats.in_wire += in_wire;
- zipstats.inK_wire += zipstats.in_wire >> 10;
- zipstats.in_wire &= 0x03ff;
-
- zipstats.out += out;
- zipstats.outK += zipstats.out >> 10;
- zipstats.out &= 0x03ff;
-
- zipstats.out_wire += out_wire;
- zipstats.outK_wire += zipstats.out_wire >> 10;
- zipstats.out_wire &= 0x03ff;
-
- if(zipstats.inK > 0)
- zipstats.in_ratio =
- (((double) (zipstats.inK - zipstats.inK_wire) /
- (double) zipstats.inK) * 100.00);
- else
- zipstats.in_ratio = 0;
-
- if(zipstats.outK > 0)
- zipstats.out_ratio =
- (((double) (zipstats.outK - zipstats.outK_wire) /
- (double) zipstats.outK) * 100.00);
- else
- zipstats.out_ratio = 0;
-
- memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
-}
-
-void
-collect_zipstats(void *unused)
-{
- dlink_node *ptr;
- struct Client *target_p;
-
- DLINK_FOREACH(ptr, serv_list.head)
- {
- target_p = ptr->data;
- if(IsCapable(target_p, CAP_ZIP))
- {
- /* only bother if we haven't already got something queued... */
- if(!target_p->localClient->slinkq)
- {
- target_p->localClient->slinkq = MyMalloc(1); /* sigh.. */
- target_p->localClient->slinkq[0] = SLINKCMD_ZIPSTATS;
- target_p->localClient->slinkq_ofs = 0;
- target_p->localClient->slinkq_len = 1;
- send_queued_slink_write(target_p->localClient->ctrlfd, target_p);
- }
- }
- }
-}
+static CNCB serv_connect_ssl_callback;
/*
* hunt_server - Do the basic thing in delivering the message (command)
{
struct Client *target_p;
int wilds;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
const char *old;
char *new;
{
target_p = NULL;
- DLINK_FOREACH(ptr, global_client_list.head)
+ RB_DLINK_FOREACH(ptr, global_client_list.head)
{
if(match(new, ((struct Client *) (ptr->data))->name))
{
return (HUNTED_PASS);
}
- if(!IsDigit(parv[server][0]))
+ if(MyClient(source_p) || !IsDigit(parv[server][0]))
sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
form_str(ERR_NOSUCHSERVER), parv[server]);
return (HUNTED_NOSUCH);
struct server_conf *server_p = NULL;
struct server_conf *tmp_p;
struct Class *cltmp;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
int connecting = FALSE;
int confrq = 0;
time_t next = 0;
- DLINK_FOREACH(ptr, server_conf_list.head)
+ RB_DLINK_FOREACH(ptr, server_conf_list.head)
{
tmp_p = ptr->data;
if(ServerConfIllegal(tmp_p) || !ServerConfAutoconn(tmp_p))
continue;
+ /* don't allow ssl connections if ssl isn't setup */
+ if(ServerConfSSL(tmp_p) && (!ssl_ok || !get_ssld_count()))
+ continue;
+
cltmp = tmp_p->class;
/*
* made one successfull connection... [this algorithm is
* a bit fuzzy... -- msa >;) ]
*/
- if(tmp_p->hold > CurrentTime)
+ if(tmp_p->hold > rb_current_time())
{
if(next > tmp_p->hold || next == 0)
next = tmp_p->hold;
}
confrq = get_con_freq(cltmp);
- tmp_p->hold = CurrentTime + confrq;
+ tmp_p->hold = rb_current_time() + confrq;
/*
* Found a CONNECT config with port specified, scan clients
return;
/* move this connect entry to end.. */
- dlinkDelete(&server_p->node, &server_conf_list);
- dlinkAddTail(server_p, &server_p->node, &server_conf_list);
+ rb_dlinkDelete(&server_p->node, &server_conf_list);
+ rb_dlinkAddTail(server_p, &server_p->node, &server_conf_list);
/*
* We used to only print this if serv_connect() actually
- * suceeded, but since comm_tcp_connect() can call the callback
+ * suceeded, but since rb_tcp_connect() can call the callback
* immediately if there is an error, we were getting error messages
* in the wrong order. SO, we just print out the activated line,
* and let serv_connect() / serv_connect_callback() print an
* error afterwards if it fails.
* -- adrian
*/
-#ifndef HIDE_SERVERS_IPS
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Connection to %s[%s] activated.",
- server_p->name, server_p->host);
-#else
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Connection to %s activated",
server_p->name);
-#endif
serv_connect(server_p, 0);
}
{
struct server_conf *server_p = NULL;
struct server_conf *tmp_p;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
int error = -1;
s_assert(NULL != client_p);
if(strlen(name) > HOSTLEN)
return -4;
- DLINK_FOREACH(ptr, server_conf_list.head)
+ RB_DLINK_FOREACH(ptr, server_conf_list.head)
{
tmp_p = ptr->data;
if(ServerConfEncrypted(tmp_p))
{
- if(!strcmp(tmp_p->passwd, crypt(client_p->localClient->passwd,
+ if(!strcmp(tmp_p->passwd, rb_crypt(client_p->localClient->passwd,
tmp_p->passwd)))
{
server_p = tmp_p;
if(server_p == NULL)
return error;
+ if(ServerConfSSL(server_p) && client_p->localClient->ssl_ctl == NULL)
+ {
+ return -5;
+ }
+
attach_server_conf(client_p, server_p);
/* clear ZIP/TB if they support but we dont want them */
{
if(cap->cap & cap_can_send)
{
- tl = ircsprintf(t, "%s ", cap->name);
+ tl = rb_sprintf(t, "%s ", cap->name);
t += tl;
}
}
sendto_one(client_p, "CAPAB :%s", msgbuf);
}
-/* burst_modes_TS5()
- *
- * input - client to burst to, channel name, list to burst, mode flag
- * output -
- * side effects - client is sent a list of +b, or +e, or +I modes
- */
-static void
-burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char flag)
-{
- dlink_node *ptr;
- struct Ban *banptr;
- char mbuf[MODEBUFLEN];
- char pbuf[BUFSIZE];
- int tlen;
- int mlen;
- int cur_len;
- char *mp;
- char *pp;
- int count = 0;
-
- mlen = ircsprintf(buf, ":%s MODE %s +", me.name, chname);
- cur_len = mlen;
-
- mp = mbuf;
- pp = pbuf;
-
- DLINK_FOREACH(ptr, list->head)
- {
- banptr = ptr->data;
- tlen = strlen(banptr->banstr) + 3;
-
- /* uh oh */
- if(tlen > MODEBUFLEN)
- continue;
-
- if((count >= MAXMODEPARAMS) || ((cur_len + tlen + 2) > (BUFSIZE - 3)))
- {
- sendto_one(client_p, "%s%s %s", buf, mbuf, pbuf);
-
- mp = mbuf;
- pp = pbuf;
- cur_len = mlen;
- count = 0;
- }
-
- *mp++ = flag;
- *mp = '\0';
- pp += ircsprintf(pp, "%s ", banptr->banstr);
- cur_len += tlen;
- count++;
- }
-
- if(count != 0)
- sendto_one(client_p, "%s%s %s", buf, mbuf, pbuf);
-}
-
/* burst_modes_TS6()
*
* input - client to burst to, channel name, list to burst, mode flag
*/
static void
burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
- dlink_list *list, char flag)
+ rb_dlink_list *list, char flag)
{
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct Ban *banptr;
char *t;
int tlen;
int mlen;
int cur_len;
- cur_len = mlen = ircsprintf(buf, ":%s BMASK %ld %s %c :",
+ cur_len = mlen = rb_sprintf(buf, ":%s BMASK %ld %s %c :",
me.id, (long) chptr->channelts, chptr->chname, flag);
t = buf + mlen;
- DLINK_FOREACH(ptr, list->head)
+ RB_DLINK_FOREACH(ptr, list->head)
{
banptr = ptr->data;
t = buf + mlen;
}
- ircsprintf(t, "%s ", banptr->banstr);
+ rb_sprintf(t, "%s ", banptr->banstr);
t += tlen;
cur_len += tlen;
}
sendto_one(client_p, "%s", buf);
}
-/*
- * burst_TS5
- *
- * inputs - client (server) to send nick towards
- * - client to send nick for
- * output - NONE
- * side effects - NICK message is sent towards given client_p
- */
-static void
-burst_TS5(struct Client *client_p)
-{
- static char ubuf[12];
- struct Client *target_p;
- struct Channel *chptr;
- struct membership *msptr;
- hook_data_client hclientinfo;
- hook_data_channel hchaninfo;
- dlink_node *ptr;
- dlink_node *uptr;
- char *t;
- int tlen, mlen;
- int cur_len = 0;
-
- hclientinfo.client = hchaninfo.client = client_p;
-
- DLINK_FOREACH(ptr, global_client_list.head)
- {
- target_p = ptr->data;
-
- if(!IsPerson(target_p))
- continue;
-
- send_umode(NULL, target_p, 0, 0, ubuf);
- if(!*ubuf)
- {
- ubuf[0] = '+';
- ubuf[1] = '\0';
- }
-
- sendto_one(client_p, "NICK %s %d %ld %s %s %s %s :%s",
- target_p->name, target_p->hopcount + 1,
- (long) target_p->tsinfo, ubuf,
- target_p->username, target_p->host,
- target_p->servptr->name, target_p->info);
-
- if(IsDynSpoof(target_p))
- sendto_one(client_p, ":%s ENCAP * REALHOST %s",
- target_p->name, target_p->orighost);
- if(!EmptyString(target_p->user->suser))
- sendto_one(client_p, ":%s ENCAP * LOGIN %s",
- target_p->name, target_p->user->suser);
-
- if(ConfigFileEntry.burst_away && !EmptyString(target_p->user->away))
- sendto_one(client_p, ":%s AWAY :%s",
- target_p->name, target_p->user->away);
-
- hclientinfo.target = target_p;
- call_hook(h_burst_client, &hclientinfo);
- }
-
- DLINK_FOREACH(ptr, global_channel_list.head)
- {
- chptr = ptr->data;
-
- if(*chptr->chname != '#')
- continue;
-
- cur_len = mlen = ircsprintf(buf, ":%s SJOIN %ld %s %s :", me.name,
- (long) chptr->channelts, chptr->chname,
- channel_modes(chptr, client_p));
-
- t = buf + mlen;
-
- DLINK_FOREACH(uptr, chptr->members.head)
- {
- msptr = uptr->data;
-
- tlen = strlen(msptr->client_p->name) + 1;
- if(is_chanop(msptr))
- tlen++;
- if(is_voiced(msptr))
- tlen++;
-
- if(cur_len + tlen >= BUFSIZE - 3)
- {
- t--;
- *t = '\0';
- sendto_one(client_p, "%s", buf);
- cur_len = mlen;
- t = buf + mlen;
- }
-
- ircsprintf(t, "%s%s ", find_channel_status(msptr, 1),
- msptr->client_p->name);
-
- cur_len += tlen;
- t += tlen;
- }
-
- if (dlink_list_length(&chptr->members) > 0)
- {
- /* remove trailing space */
- t--;
- *t = '\0';
- }
- sendto_one(client_p, "%s", buf);
-
- burst_modes_TS5(client_p, chptr->chname, &chptr->banlist, 'b');
-
- if(IsCapable(client_p, CAP_EX))
- burst_modes_TS5(client_p, chptr->chname, &chptr->exceptlist, 'e');
-
- if(IsCapable(client_p, CAP_IE))
- burst_modes_TS5(client_p, chptr->chname, &chptr->invexlist, 'I');
-
- burst_modes_TS5(client_p, chptr->chname, &chptr->quietlist, 'q');
-
- if(IsCapable(client_p, CAP_TB) && chptr->topic != NULL)
- sendto_one(client_p, ":%s TB %s %ld %s%s:%s",
- me.name, chptr->chname, (long) chptr->topic_time,
- ConfigChannel.burst_topicwho ? chptr->topic_info : "",
- ConfigChannel.burst_topicwho ? " " : "",
- chptr->topic);
-
- hchaninfo.chptr = chptr;
- call_hook(h_burst_channel, &hchaninfo);
- }
-
- hclientinfo.target = NULL;
- call_hook(h_burst_finished, &hclientinfo);
-}
-
/*
* burst_TS6
*
struct membership *msptr;
hook_data_client hclientinfo;
hook_data_channel hchaninfo;
- dlink_node *ptr;
- dlink_node *uptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *uptr;
char *t;
int tlen, mlen;
int cur_len = 0;
hclientinfo.client = hchaninfo.client = client_p;
- DLINK_FOREACH(ptr, global_client_list.head)
+ RB_DLINK_FOREACH(ptr, global_client_list.head)
{
target_p = ptr->data;
call_hook(h_burst_client, &hclientinfo);
}
- DLINK_FOREACH(ptr, global_channel_list.head)
+ RB_DLINK_FOREACH(ptr, global_channel_list.head)
{
chptr = ptr->data;
if(*chptr->chname != '#')
continue;
- cur_len = mlen = ircsprintf(buf, ":%s SJOIN %ld %s %s :", me.id,
+ cur_len = mlen = rb_sprintf(buf, ":%s SJOIN %ld %s %s :", me.id,
(long) chptr->channelts, chptr->chname,
channel_modes(chptr, client_p));
t = buf + mlen;
- DLINK_FOREACH(uptr, chptr->members.head)
+ RB_DLINK_FOREACH(uptr, chptr->members.head)
{
msptr = uptr->data;
t = buf + mlen;
}
- ircsprintf(t, "%s%s ", find_channel_status(msptr, 1),
+ rb_sprintf(t, "%s%s ", find_channel_status(msptr, 1),
use_id(msptr->client_p));
cur_len += tlen;
t += tlen;
}
- if (dlink_list_length(&chptr->members) > 0)
+ if (rb_dlink_list_length(&chptr->members) > 0)
{
/* remove trailing space */
*(t-1) = '\0';
}
sendto_one(client_p, "%s", buf);
- if(dlink_list_length(&chptr->banlist) > 0)
+ if(rb_dlink_list_length(&chptr->banlist) > 0)
burst_modes_TS6(client_p, chptr, &chptr->banlist, 'b');
if(IsCapable(client_p, CAP_EX) &&
- dlink_list_length(&chptr->exceptlist) > 0)
+ rb_dlink_list_length(&chptr->exceptlist) > 0)
burst_modes_TS6(client_p, chptr, &chptr->exceptlist, 'e');
if(IsCapable(client_p, CAP_IE) &&
- dlink_list_length(&chptr->invexlist) > 0)
+ rb_dlink_list_length(&chptr->invexlist) > 0)
burst_modes_TS6(client_p, chptr, &chptr->invexlist, 'I');
- if(dlink_list_length(&chptr->quietlist) > 0)
+ if(rb_dlink_list_length(&chptr->quietlist) > 0)
burst_modes_TS6(client_p, chptr, &chptr->quietlist, 'q');
if(IsCapable(client_p, CAP_TB) && chptr->topic != NULL)
{
static char msgbuf[BUFSIZE];
struct Capability *cap;
- char *t;
- int tl;
- t = msgbuf;
- tl = ircsprintf(msgbuf, "TS ");
- t += tl;
+ if(has_id(target_p))
+ rb_strlcpy(msgbuf, " TS6", sizeof(msgbuf));
+
+ if(IsSSL(target_p))
+ rb_strlcat(msgbuf, " SSL", sizeof(msgbuf));
if(!IsServer(target_p) || !target_p->serv->caps) /* short circuit if no caps */
- {
- msgbuf[2] = '\0';
- return msgbuf;
- }
+ return msgbuf + 1;
for (cap = captab; cap->cap; ++cap)
{
if(cap->cap & target_p->serv->caps)
- {
- tl = ircsprintf(t, "%s ", cap->name);
- t += tl;
- }
+ rb_snprintf_append(msgbuf, sizeof(msgbuf), " %s", cap->name);
}
- t--;
- *t = '\0';
-
- return msgbuf;
+ return msgbuf + 1;
}
/*
struct server_conf *server_p;
hook_data_client hdata;
char *host;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
+ char note[HOSTLEN + 15];
s_assert(NULL != client_p);
if(client_p == NULL)
return -1;
- ClearAccess(client_p);
host = client_p->name;
if(client_p->localClient->passwd)
{
memset(client_p->localClient->passwd, 0, strlen(client_p->localClient->passwd));
- MyFree(client_p->localClient->passwd);
+ rb_free(client_p->localClient->passwd);
client_p->localClient->passwd = NULL;
}
{
if(client_p != serv_list.head->data || serv_list.head->next)
{
- ServerStats->is_ref++;
+ ServerStats.is_ref++;
sendto_one(client_p, "ERROR :I'm a leaf not a hub");
return exit_client(client_p, client_p, client_p, "I'm a leaf");
}
(me.info[0]) ? (me.info) : "IRCers United");
}
- if(!comm_set_buffers(client_p->localClient->fd, READBUF_SIZE))
- report_error(SETBUF_ERROR_MSG,
- get_server_name(client_p, SHOW_IP),
- log_client_name(client_p, SHOW_IP), errno);
+ if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
+ ilog_error("rb_set_buffers failed for server");
- /* Hand the server off to servlink now */
+ /* Enable compression now */
if(IsCapable(client_p, CAP_ZIP))
{
- if(fork_server(client_p) < 0)
- {
- sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
- "Warning: fork failed for server %s -- check servlink_path (%s)",
- get_server_name(client_p, HIDE_IP),
- ConfigFileEntry.servlink_path);
- return exit_client(client_p, client_p, client_p, "Fork failed");
- }
- start_io(client_p);
- SetServlink(client_p);
+ start_zlib_session(client_p);
}
-
- sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, CurrentTime);
+ sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, (long int)rb_current_time());
client_p->servptr = &me;
/* Update the capability combination usage counts */
set_chcap_usage_counts(client_p);
- dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
- del_unknown_ip(client_p);
- dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list);
- dlinkAddTailAlloc(client_p, &global_serv_list);
+ rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
+ rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list);
+ rb_dlinkAddTailAlloc(client_p, &global_serv_list);
if(has_id(client_p))
add_to_id_hash(client_p->id, client_p);
if(client_p->localClient->fullcaps)
{
- DupString(client_p->serv->fullcaps, client_p->localClient->fullcaps);
- MyFree(client_p->localClient->fullcaps);
+ client_p->serv->fullcaps = rb_strdup(client_p->localClient->fullcaps);
+ rb_free(client_p->localClient->fullcaps);
client_p->localClient->fullcaps = NULL;
}
client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p));
- client_p->localClient->firsttime = CurrentTime;
+ client_p->localClient->firsttime = rb_current_time();
/* fixing eob timings.. -gnp */
- if((dlink_list_length(&lclient_list) + dlink_list_length(&serv_list)) >
+ if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) >
(unsigned long)MaxConnectionCount)
- MaxConnectionCount = dlink_list_length(&lclient_list) +
- dlink_list_length(&serv_list);
+ MaxConnectionCount = rb_dlink_list_length(&lclient_list) +
+ rb_dlink_list_length(&serv_list);
/* Show the real host/IP to admins */
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link with %s established: (%s) link",
- get_server_name(client_p, SHOW_IP),
+ client_p->name,
show_capabilities(client_p));
ilog(L_SERVER, "Link with %s established: (%s) link",
hdata.target = client_p;
call_hook(h_server_introduced, &hdata);
- if(HasServlink(client_p))
- {
- /* we won't overflow FD_DESC_SZ here, as it can hold
- * client_p->name + 64
- */
- comm_note(client_p->localClient->fd, "slink data: %s", client_p->name);
- comm_note(client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
- }
- else
- comm_note(client_p->localClient->fd, "Server: %s", client_p->name);
+ rb_snprintf(note, sizeof(note), "Server: %s", client_p->name);
+ rb_note(client_p->localClient->F, note);
/*
** Old sendto_serv_but_one() call removed because we now
** need to send different names to different servers
** (domain name matching) Send new server to other servers.
*/
- DLINK_FOREACH(ptr, serv_list.head)
+ RB_DLINK_FOREACH(ptr, serv_list.head)
{
target_p = ptr->data;
** see previous *WARNING*!!! (Also, original inpath
** is destroyed...)
*/
- DLINK_FOREACH(ptr, global_serv_list.head)
+ RB_DLINK_FOREACH(ptr, global_serv_list.head)
{
target_p = ptr->data;
target_p->serv->fullcaps);
}
- if(has_id(client_p))
- burst_TS6(client_p);
- else
- burst_TS5(client_p);
+ burst_TS6(client_p);
/* Always send a PING after connect burst is done */
sendto_one(client_p, "PING :%s", get_id(&me, client_p));
free_pre_client(client_p);
+ send_pop_queue(client_p);
+
return 0;
}
-static void
-start_io(struct Client *server)
-{
- unsigned char *iobuf;
- int c = 0;
- int linecount = 0;
- int linelen;
+/*
+ * New server connection code
+ * Based upon the stuff floating about in s_bsd.c
+ * -- adrian
+ */
- iobuf = MyMalloc(256); /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
+static int
+serv_connect_resolved(struct Client *client_p)
+{
+ struct rb_sockaddr_storage myipnum;
+ char vhoststr[HOSTIPLEN];
+ struct server_conf *server_p;
+ uint16_t port;
- if(IsCapable(server, CAP_ZIP))
+ if((server_p = client_p->localClient->att_sconf) == NULL)
{
- /* ziplink */
- iobuf[c++] = SLINKCMD_SET_ZIP_OUT_LEVEL;
- iobuf[c++] = 0; /* | */
- iobuf[c++] = 1; /* \ len is 1 */
- iobuf[c++] = ConfigFileEntry.compression_level;
- iobuf[c++] = SLINKCMD_START_ZIP_IN;
- iobuf[c++] = SLINKCMD_START_ZIP_OUT;
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Lost connect{} block for %s",
+ client_p->name);
+ exit_client(client_p, client_p, &me, "Lost connect{} block");
+ return 0;
}
- while (MyConnect(server))
- {
- linecount++;
-
- iobuf = MyRealloc(iobuf, (c + READBUF_SIZE + 64));
-
- /* store data in c+3 to allow for SLINKCMD_INJECT_RECVQ and len u16 */
- linelen = linebuf_get(&server->localClient->buf_recvq, (char *) (iobuf + c + 3), READBUF_SIZE, LINEBUF_PARTIAL, LINEBUF_RAW); /* include partial lines */
+#ifdef RB_IPV6
+ if(client_p->localClient->ip.ss_family == AF_INET6)
+ port = ntohs(((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port);
+ else
+#endif
+ port = ntohs(((struct sockaddr_in *)&client_p->localClient->ip)->sin_port);
- if(linelen)
- {
- iobuf[c++] = SLINKCMD_INJECT_RECVQ;
- iobuf[c++] = (linelen >> 8);
- iobuf[c++] = (linelen & 0xff);
- c += linelen;
- }
- else
- break;
+ if(ServerConfVhosted(server_p))
+ {
+ memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum));
+ ((struct sockaddr_in *)&myipnum)->sin_port = 0;
+ myipnum.ss_family = server_p->aftype;
+
}
-
- while (MyConnect(server))
+ else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
{
- linecount++;
-
- iobuf = MyRealloc(iobuf, (c + BUF_DATA_SIZE + 64));
-
- /* store data in c+3 to allow for SLINKCMD_INJECT_RECVQ and len u16 */
- linelen = linebuf_get(&server->localClient->buf_sendq,
- (char *) (iobuf + c + 3), READBUF_SIZE,
- LINEBUF_PARTIAL, LINEBUF_PARSED); /* include partial lines */
-
- if(linelen)
- {
- iobuf[c++] = SLINKCMD_INJECT_SENDQ;
- iobuf[c++] = (linelen >> 8);
- iobuf[c++] = (linelen & 0xff);
- c += linelen;
- }
- else
- break;
+ memcpy(&myipnum, &ServerInfo.ip, sizeof(myipnum));
+ ((struct sockaddr_in *)&myipnum)->sin_port = 0;
+ myipnum.ss_family = AF_INET;
+ SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in));
}
-
- /* start io */
- iobuf[c++] = SLINKCMD_INIT;
-
- server->localClient->slinkq = iobuf;
- server->localClient->slinkq_ofs = 0;
- server->localClient->slinkq_len = c;
-
- /* schedule a write */
- send_queued_slink_write(server->localClient->ctrlfd, server);
-}
-
-/*
- * fork_server
- *
- * inputs - struct Client *server
- * output - success: 0 / failure: -1
- * side effect - fork, and exec SERVLINK to handle this connection
- */
-static int
-fork_server(struct Client *server)
-{
- int ret;
- int i;
- int ctrl_fds[2];
- int data_fds[2];
-
- char fd_str[4][6];
- char *kid_argv[7];
- char slink[] = "-slink";
-
-
- /* ctrl */
-#ifdef HAVE_SOCKETPAIR
- if(socketpair(AF_UNIX, SOCK_STREAM, 0, ctrl_fds) < 0)
-#else
- if(inet_socketpair(AF_INET,SOCK_STREAM, 0, ctrl_fds) < 0)
-#endif
- goto fork_error;
-
-
- /* data */
-#ifdef HAVE_SOCKETPAIR
- if(socketpair(AF_UNIX, SOCK_STREAM, 0, data_fds) < 0)
-#else
- if(inet_socketpair(AF_INET,SOCK_STREAM, 0, data_fds) < 0)
-#endif
- goto fork_error;
-
-
-#ifdef __CYGWIN__
- if((ret = vfork()) < 0)
-#else
- if((ret = fork()) < 0)
+#ifdef RB_IPV6
+ else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
+ {
+ memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum));
+ ((struct sockaddr_in6 *)&myipnum)->sin6_port = 0;
+ myipnum.ss_family = AF_INET6;
+ SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in6));
+ }
#endif
- goto fork_error;
- else if(ret == 0)
+ else
{
- int maxconn = comm_get_maxconnections();
+ /* log */
+ ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", client_p->name, client_p->sockhost, port,
+#ifdef RB_IPV6
+ server_p->aftype == AF_INET6 ? "IPv6" :
+#endif
+ (server_p->aftype == AF_INET ? "IPv4" : "?"));
- /* set our fds as non blocking and close everything else */
- for (i = 0; i < maxconn; i++)
+ if(ServerConfSSL(server_p))
{
-
-
- if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->fd))
- {
- comm_set_nb(i);
- }
- else
- {
-#ifdef __CYGWIN__
- if(i > 2) /* don't close std* */
-#endif
- close(i);
- }
+ rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip,
+ NULL, 0, serv_connect_ssl_callback,
+ client_p, ConfigFileEntry.connect_timeout);
}
+ else
+ rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip,
+ NULL, 0, serv_connect_callback,
+ client_p, ConfigFileEntry.connect_timeout);
+ return 1;
+ }
- ircsnprintf(fd_str[0], sizeof(fd_str[0]), "%d", ctrl_fds[1]);
- ircsnprintf(fd_str[1], sizeof(fd_str[1]), "%d", data_fds[1]);
- ircsnprintf(fd_str[2], sizeof(fd_str[2]), "%d", server->localClient->fd);
- kid_argv[0] = slink;
- kid_argv[1] = fd_str[0];
- kid_argv[2] = fd_str[1];
- kid_argv[3] = fd_str[2];
- kid_argv[4] = NULL;
+ /* log */
+ rb_inet_ntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
+ ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", client_p->name, client_p->sockhost, port,
+#ifdef RB_IPV6
+ server_p->aftype == AF_INET6 ? "IPv6" :
+#endif
+ (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr);
- /* exec servlink program */
- execv(ConfigFileEntry.servlink_path, kid_argv);
- /* We're still here, abort. */
- _exit(1);
- }
+ if(ServerConfSSL(server_p))
+ rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip,
+ (struct sockaddr *) &myipnum,
+ GET_SS_LEN(&myipnum), serv_connect_ssl_callback, client_p,
+ ConfigFileEntry.connect_timeout);
else
- {
- comm_close(server->localClient->fd);
-
- /* close the childs end of the pipes */
- close(ctrl_fds[1]);
- close(data_fds[1]);
-
- s_assert(server->localClient);
- server->localClient->ctrlfd = ctrl_fds[0];
- server->localClient->fd = data_fds[0];
+ rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip,
+ (struct sockaddr *) &myipnum,
+ GET_SS_LEN(&myipnum), serv_connect_callback, client_p,
+ ConfigFileEntry.connect_timeout);
- if(!comm_set_nb(server->localClient->fd))
- {
- report_error(NONB_ERROR_MSG,
- get_server_name(server, SHOW_IP),
- log_client_name(server, SHOW_IP),
- errno);
- }
+ return 1;
+}
- if(!comm_set_nb(server->localClient->ctrlfd))
- {
- report_error(NONB_ERROR_MSG,
- get_server_name(server, SHOW_IP),
- log_client_name(server, SHOW_IP),
- errno);
- }
+static void
+serv_connect_dns_callback(void *vptr, struct DNSReply *reply)
+{
+ struct Client *client_p = vptr;
+ uint16_t port;
- comm_open(server->localClient->ctrlfd, FD_SOCKET, NULL);
- comm_open(server->localClient->fd, FD_SOCKET, NULL);
+ rb_free(client_p->localClient->dnsquery);
+ client_p->localClient->dnsquery = NULL;
- read_ctrl_packet(server->localClient->ctrlfd, server);
- read_packet(server->localClient->fd, server);
+ if (reply == NULL)
+ {
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Cannot resolve hostname for %s",
+ client_p->name);
+ ilog(L_SERVER, "Cannot resolve hostname for %s",
+ log_client_name(client_p, HIDE_IP));
+ exit_client(client_p, client_p, &me, "Cannot resolve hostname");
+ return;
}
-
- return 0;
-
- fork_error:
- /* this is ugly, but nicer than repeating
- * about 50 close() statements everywhre... */
- close(data_fds[0]);
- close(data_fds[1]);
- close(ctrl_fds[0]);
- close(ctrl_fds[1]);
- return -1;
+#ifdef RB_IPV6
+ if(reply->addr.ss_family == AF_INET6)
+ port = ((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port;
+ else
+#endif
+ port = ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port;
+ memcpy(&client_p->localClient->ip, &reply->addr, sizeof(client_p->localClient->ip));
+#ifdef RB_IPV6
+ if(reply->addr.ss_family == AF_INET6)
+ ((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port = port;
+ else
+#endif
+ ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = port;
+ /* Set sockhost properly now -- jilles */
+ rb_inet_ntop_sock((struct sockaddr *)&client_p->localClient->ip,
+ client_p->sockhost, sizeof client_p->sockhost);
+ serv_connect_resolved(client_p);
}
-/*
- * New server connection code
- * Based upon the stuff floating about in s_bsd.c
- * -- adrian
- */
-
/*
* serv_connect() - initiate a server connection
*
* This code initiates a connection to a server. It first checks to make
* sure the given server exists. If this is the case, it creates a socket,
* creates a client, saves the socket information in the client, and
- * initiates a connection to the server through comm_connect_tcp(). The
+ * initiates a connection to the server through rb_connect_tcp(). The
* completion of this goes through serv_completed_connection().
*
* We return 1 if the connection is attempted, since we don't know whether
serv_connect(struct server_conf *server_p, struct Client *by)
{
struct Client *client_p;
- struct irc_sockaddr_storage myipnum;
- int fd;
+ struct rb_sockaddr_storage theiripnum;
+ rb_fde_t *F;
+ char note[HOSTLEN + 10];
s_assert(server_p != NULL);
if(server_p == NULL)
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Server %s already present from %s",
- server_p->name, get_server_name(client_p, SHOW_IP));
+ server_p->name, client_p->name);
if(by && IsPerson(by) && !MyClient(by))
sendto_one_notice(by, ":Server %s already present from %s",
- server_p->name, get_server_name(client_p, SHOW_IP));
+ server_p->name, client_p->name);
return 0;
}
/* create a socket for the server connection */
- if((fd = comm_socket(server_p->aftype, SOCK_STREAM, 0, NULL)) < 0)
+ if((F = rb_socket(server_p->aftype, SOCK_STREAM, 0, NULL)) == NULL)
{
- /* Eek, failure to create the socket */
- report_error("opening stream socket to %s: %s",
- server_p->name, server_p->name, errno);
+ ilog_error("opening a stream socket");
return 0;
}
- /* servernames are always guaranteed under HOSTLEN chars */
- comm_note(fd, "Server: %s", server_p->name);
+ rb_snprintf(note, sizeof note, "Server: %s", server_p->name);
+ rb_note(F, note);
/* Create a local client */
client_p = make_client(NULL);
* The sockhost may be a hostname, this will be corrected later
* -- jilles
*/
- strlcpy(client_p->name, server_p->name, sizeof(client_p->name));
- strlcpy(client_p->host, server_p->host, sizeof(client_p->host));
- strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost));
- client_p->localClient->fd = fd;
+ rb_strlcpy(client_p->name, server_p->name, sizeof(client_p->name));
+ rb_strlcpy(client_p->host, server_p->host, sizeof(client_p->host));
+ rb_strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost));
+ client_p->localClient->F = F;
+ add_to_cli_fd_hash(client_p);
/*
* Set up the initial server evilness, ripped straight from
* -- adrian
*/
- if(!comm_set_buffers(client_p->localClient->fd, READBUF_SIZE))
+ if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
{
- report_error(SETBUF_ERROR_MSG,
- get_server_name(client_p, SHOW_IP),
- log_client_name(client_p, SHOW_IP),
- errno);
+ ilog_error("setting the buffer size for a server connection");
}
/*
client_p->serv->user = NULL;
}
SetConnecting(client_p);
- dlinkAddTail(client_p, &client_p->node, &global_client_list);
+ rb_dlinkAddTail(client_p, &client_p->node, &global_client_list);
- /* log */
- ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
- server_p->aftype == AF_INET6 ? "IPv6" :
+ if (rb_inet_pton_sock(server_p->host, (struct sockaddr *)&theiripnum) > 0)
+ {
+ memcpy(&client_p->localClient->ip, &theiripnum, sizeof(client_p->localClient->ip));
+#ifdef RB_IPV6
+ if(theiripnum.ss_family == AF_INET6)
+ ((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port = htons(server_p->port);
+ else
#endif
- (server_p->aftype == AF_INET ? "IPv4" : "?"));
+ ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = htons(server_p->port);
- if(ServerConfVhosted(server_p))
- {
- memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum));
- ((struct sockaddr_in *)&myipnum)->sin_port = 0;
- myipnum.ss_family = server_p->aftype;
-
- }
- else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
- {
- memcpy(&myipnum, &ServerInfo.ip, sizeof(myipnum));
- ((struct sockaddr_in *)&myipnum)->sin_port = 0;
- myipnum.ss_family = AF_INET;
- SET_SS_LEN(myipnum, sizeof(struct sockaddr_in));
- }
-
-#ifdef IPV6
- else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
- {
- memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum));
- ((struct sockaddr_in6 *)&myipnum)->sin6_port = 0;
- myipnum.ss_family = AF_INET6;
- SET_SS_LEN(myipnum, sizeof(struct sockaddr_in6));
+ return serv_connect_resolved(client_p);
}
-#endif
else
{
- comm_connect_tcp(client_p->localClient->fd, server_p->host,
- server_p->port, NULL, 0, serv_connect_callback,
- client_p, server_p->aftype,
- ConfigFileEntry.connect_timeout);
- return 1;
+#ifdef RB_IPV6
+ if(theiripnum.ss_family == AF_INET6)
+ ((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port = htons(server_p->port);
+ else
+#endif
+ ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = htons(server_p->port);
+
+ client_p->localClient->dnsquery = rb_malloc(sizeof(struct DNSQuery));
+ client_p->localClient->dnsquery->ptr = client_p;
+ client_p->localClient->dnsquery->callback = serv_connect_dns_callback;
+ gethost_byname_type(server_p->host, client_p->localClient->dnsquery,
+#ifdef RB_IPV6
+ server_p->aftype == AF_INET6 ? T_AAAA :
+#endif
+ T_A);
+ return 1;
}
+}
- comm_connect_tcp(client_p->localClient->fd, server_p->host,
- server_p->port, (struct sockaddr *) &myipnum,
- GET_SS_LEN(myipnum), serv_connect_callback, client_p,
- myipnum.ss_family, ConfigFileEntry.connect_timeout);
-
- return 1;
+static void
+serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
+{
+ struct Client *client_p = data;
+ rb_fde_t *xF[2];
+ rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip));
+ if(status != RB_OK)
+ {
+ /* Print error message, just like non-SSL. */
+ serv_connect_callback(F, status, data);
+ return;
+ }
+ rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection");
+ del_from_cli_fd_hash(client_p);
+ client_p->localClient->F = xF[0];
+ add_to_cli_fd_hash(client_p);
+
+ client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0]));
+ SetSSL(client_p);
+ serv_connect_callback(client_p->localClient->F, RB_OK, client_p);
}
/*
* marked for reading.
*/
static void
-serv_connect_callback(int fd, int status, void *data)
+serv_connect_callback(rb_fde_t *F, int status, void *data)
{
struct Client *client_p = data;
struct server_conf *server_p;
char *errstr;
- fde_t *F = comm_locate_fd(fd);
/* First, make sure its a real client! */
s_assert(client_p != NULL);
- s_assert(client_p->localClient->fd == fd);
+ s_assert(client_p->localClient->F == F);
if(client_p == NULL)
return;
return;
}
- /* Next, for backward purposes, record the ip of the server */
- memcpy(&client_p->localClient->ip, &F->connect.hostaddr, sizeof client_p->localClient->ip);
- /* Set sockhost properly now -- jilles */
- inetntop_sock((struct sockaddr *)&F->connect.hostaddr,
- client_p->sockhost, sizeof client_p->sockhost);
-
+ if(client_p->localClient->ssl_ctl == NULL)
+ rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip));
+
/* Check the status */
- if(status != COMM_OK)
+ if(status != RB_OK)
{
/* COMM_ERR_TIMEOUT wont have an errno associated with it,
* the others will.. --fl
*/
- if(status == COMM_ERR_TIMEOUT)
+ if(status == RB_ERR_TIMEOUT)
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Error connecting to %s[%s]: %s",
client_p->name,
-#ifdef HIDE_SERVERS_IPS
"255.255.255.255",
-#else
- client_p->host,
-#endif
- comm_errstr(status));
+ rb_errstr(status));
ilog(L_SERVER, "Error connecting to %s[%s]: %s",
client_p->name, client_p->sockhost,
- comm_errstr(status));
+ rb_errstr(status));
}
else
{
- errstr = strerror(comm_get_sockerr(fd));
+ errstr = strerror(rb_get_sockerr(F));
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Error connecting to %s[%s]: %s (%s)",
client_p->name,
-#ifdef HIDE_SERVERS_IPS
"255.255.255.255",
-#else
- client_p->host,
-#endif
- comm_errstr(status), errstr);
+ rb_errstr(status), errstr);
ilog(L_SERVER, "Error connecting to %s[%s]: %s (%s)",
client_p->name, client_p->sockhost,
- comm_errstr(status), errstr);
+ rb_errstr(status), errstr);
}
- exit_client(client_p, client_p, &me, comm_errstr(status));
+ exit_client(client_p, client_p, &me, rb_errstr(status));
return;
}
if((server_p = client_p->localClient->att_sconf) == NULL)
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Lost connect{} block for %s",
- get_server_name(client_p, HIDE_IP));
+ client_p->name);
exit_client(client_p, client_p, &me, "Lost connect{} block");
return;
}
/* don't move to serv_list yet -- we haven't sent a burst! */
/* If we get here, we're ok, so lets start reading some data */
- read_packet(fd, client_p);
+ read_packet(F, client_p);
}
#ifndef HAVE_SOCKETPAIR
projects / irc / rqf / shadowircd.git / blobdiff