* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_serv.c 3181 2007-02-01 00:49:07Z jilles $
+ * $Id: s_serv.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
#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 "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();
void
collect_zipstats(void *unused)
{
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct Client *target_p;
- DLINK_FOREACH(ptr, serv_list.head)
+ RB_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 = rb_malloc(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);
+ send_queued_slink_write(target_p->localClient->ctrlF, target_p);
}
}
}
{
struct Client *target_p;
int wilds;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
const char *old;
char *new;
* Assume it's me, if no server
*/
if(parc <= server || EmptyString(parv[server]) ||
- match(me.name, parv[server]) || match(parv[server], me.name) ||
- (strcmp(parv[server], me.id) == 0))
+ match(parv[server], me.name) || (strcmp(parv[server], me.id) == 0))
return (HUNTED_ISME);
new = LOCAL_COPY(parv[server]);
{
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;
* 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
{
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(cap->cap & cap_can_send)
{
- tl = ircsprintf(t, "%s ", cap->name);
+ tl = rb_sprintf(t, "%s ", cap->name);
t += tl;
}
}
* 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)
+burst_modes_TS5(struct Client *client_p, char *chname, rb_dlink_list *list, char flag)
{
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct Ban *banptr;
char mbuf[MODEBUFLEN];
char pbuf[BUFSIZE];
char *pp;
int count = 0;
- mlen = ircsprintf(buf, ":%s MODE %s +", me.name, chname);
+ mlen = rb_sprintf(buf, ":%s MODE %s +", me.name, chname);
cur_len = mlen;
mp = mbuf;
pp = pbuf;
- DLINK_FOREACH(ptr, list->head)
+ RB_DLINK_FOREACH(ptr, list->head)
{
banptr = ptr->data;
tlen = strlen(banptr->banstr) + 3;
*mp++ = flag;
*mp = '\0';
- pp += ircsprintf(pp, "%s ", banptr->banstr);
+ pp += rb_sprintf(pp, "%s ", banptr->banstr);
cur_len += tlen;
count++;
}
*/
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;
}
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;
target_p->name, target_p->hopcount + 1,
(long) target_p->tsinfo, ubuf,
target_p->username, target_p->host,
- target_p->user->server, target_p->info);
+ target_p->servptr->name, target_p->info);
if(IsDynSpoof(target_p))
sendto_one(client_p, ":%s ENCAP * REALHOST %s",
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.name,
+ cur_len = mlen = rb_sprintf(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)
+ 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),
msptr->client_p->name);
cur_len += tlen;
t += tlen;
}
- if (dlink_list_length(&chptr->members) > 0)
+ if (rb_dlink_list_length(&chptr->members) > 0)
{
/* remove trailing space */
t--;
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;
(long) target_p->tsinfo,
ubuf,
target_p->username, target_p->host,
- target_p->user->server, target_p->info);
+ target_p->servptr->name, target_p->info);
if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID))
{
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)
int tl;
t = msgbuf;
- tl = ircsprintf(msgbuf, "TS ");
+ tl = rb_sprintf(msgbuf, "TS ");
t += tl;
if(!IsServer(target_p) || !target_p->serv->caps) /* short circuit if no caps */
{
if(cap->cap & target_p->serv->caps)
{
- tl = ircsprintf(t, "%s ", cap->name);
+ tl = rb_sprintf(t, "%s ", cap->name);
t += tl;
}
}
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");
}
*/
if(!EmptyString(server_p->spasswd))
{
- /* kludge, if we're not using TS6, dont ever send
- * ourselves as being TS6 capable.
- */
- if(ServerInfo.use_ts6)
- sendto_one(client_p, "PASS %s TS %d :%s",
- server_p->spasswd, TS_CURRENT, me.id);
- else
- sendto_one(client_p, "PASS %s :TS",
- server_p->spasswd);
+ sendto_one(client_p, "PASS %s TS %d :%s",
+ server_p->spasswd, TS_CURRENT, me.id);
}
/* pass info to new server */
(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 */
if(IsCapable(client_p, CAP_ZIP))
SetServlink(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, 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);
- 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);
+ del_unknown_ip(client_p);
+ 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);
add_to_client_hash(client_p->name, client_p);
/* doesnt duplicate client_p->serv if allocated this struct already */
make_server(client_p);
- client_p->serv->up = me.name;
- client_p->serv->upid = me.id;
client_p->serv->caps = client_p->localClient->caps;
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;
}
- /* add it to scache */
- find_or_add(client_p->name);
- client_p->localClient->firsttime = CurrentTime;
+ client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p));
+ client_p->localClient->firsttime = rb_current_time();
/* fixing eob timings.. -gnp */
+ if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) >
+ (unsigned long)MaxConnectionCount)
+ 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",
/* 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);
+ rb_snprintf(note, sizeof note, "slink data: %s", client_p->name);
+ rb_note(client_p->localClient->F, note);
+ rb_snprintf(note, sizeof note, "slink ctrl: %s", client_p->name);
+ rb_note(client_p->localClient->ctrlF, note);
}
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;
/* presumption, if target has an id, so does its uplink */
if(has_id(client_p) && has_id(target_p))
sendto_one(client_p, ":%s SID %s %d %s :%s%s",
- target_p->serv->upid, target_p->name,
+ target_p->servptr->id, target_p->name,
target_p->hopcount + 1, target_p->id,
IsHidden(target_p) ? "(H) " : "", target_p->info);
else
sendto_one(client_p, ":%s SERVER %s %d :%s%s",
- target_p->serv->up,
+ target_p->servptr->name,
target_p->name, target_p->hopcount + 1,
IsHidden(target_p) ? "(H) " : "", target_p->info);
int linecount = 0;
int linelen;
- iobuf = MyMalloc(256); /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
+ iobuf = rb_malloc(256); /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
if(IsCapable(server, CAP_ZIP))
{
{
linecount++;
- iobuf = MyRealloc(iobuf, (c + READBUF_SIZE + 64));
+ iobuf = rb_realloc(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 */
+ linelen = rb_linebuf_get(&server->localClient->buf_recvq, (char *) (iobuf + c + 3), READBUF_SIZE, LINEBUF_PARTIAL, LINEBUF_RAW); /* include partial lines */
if(linelen)
{
{
linecount++;
- iobuf = MyRealloc(iobuf, (c + BUF_DATA_SIZE + 64));
+ iobuf = rb_realloc(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,
+ linelen = rb_linebuf_get(&server->localClient->buf_sendq,
(char *) (iobuf + c + 3), READBUF_SIZE,
LINEBUF_PARTIAL, LINEBUF_PARSED); /* include partial lines */
server->localClient->slinkq_len = c;
/* schedule a write */
- send_queued_slink_write(server->localClient->ctrlfd, server);
+ send_queued_slink_write(server->localClient->ctrlF, server);
}
/*
goto fork_error;
else if(ret == 0)
{
+ int maxconn = maxconnections;
+
/* set our fds as non blocking and close everything else */
- for (i = 0; i < HARD_FDLIMIT; i++)
+ for (i = 0; i < maxconn; i++)
{
- if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->fd))
+ if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == rb_get_fd(server->localClient->F)))
{
- comm_set_nb(i);
+ // XXX rb_set_nb(i);
}
else
{
}
}
- 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);
+ rb_snprintf(fd_str[0], sizeof(fd_str[0]), "%d", ctrl_fds[1]);
+ rb_snprintf(fd_str[1], sizeof(fd_str[1]), "%d", data_fds[1]);
+ rb_snprintf(fd_str[2], sizeof(fd_str[2]), "%d", rb_get_fd(server->localClient->F));
kid_argv[0] = slink;
kid_argv[1] = fd_str[0];
kid_argv[2] = fd_str[1];
}
else
{
- comm_close(server->localClient->fd);
+ rb_close(server->localClient->F);
/* 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];
+ server->localClient->ctrlF = rb_open(ctrl_fds[0], RB_FD_PIPE, "servlink ctrl");
+ server->localClient->F = rb_open(data_fds[0], RB_FD_PIPE, "servlink data");
- if(!comm_set_nb(server->localClient->fd))
+ if(!rb_set_nb(server->localClient->ctrlF))
{
- report_error(NONB_ERROR_MSG,
- get_server_name(server, SHOW_IP),
- log_client_name(server, SHOW_IP),
- errno);
+ ilog_error("setting a slink fd nonblocking");
}
- if(!comm_set_nb(server->localClient->ctrlfd))
+ if(!rb_set_nb(server->localClient->F))
{
- report_error(NONB_ERROR_MSG,
- get_server_name(server, SHOW_IP),
- log_client_name(server, SHOW_IP),
- errno);
+ ilog_error("setting a slink fd nonblocking");
}
- comm_open(server->localClient->ctrlfd, FD_SOCKET, NULL);
- comm_open(server->localClient->fd, FD_SOCKET, NULL);
-
- read_ctrl_packet(server->localClient->ctrlfd, server);
- read_packet(server->localClient->fd, server);
+ read_ctrl_packet(server->localClient->ctrlF, server);
+ read_packet(server->localClient->F, server);
}
return 0;
* -- adrian
*/
+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((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));
+ exit_client(client_p, client_p, &me, "Lost connect{} block");
+ return 0;
+ }
+
+#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(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 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
+ else
+ {
+ /* 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" : "?"));
+
+ 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;
+ }
+
+ /* log */
+ inetntop_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);
+
+
+ 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);
+
+ return 1;
+}
+
+static void
+serv_connect_dns_callback(void *vptr, struct DNSReply *reply)
+{
+ struct Client *client_p = vptr;
+ uint16_t port;
+
+ rb_free(client_p->localClient->dnsquery);
+ client_p->localClient->dnsquery = NULL;
+
+ if (reply == NULL)
+ {
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Cannot resolve hostname for %s",
+ get_server_name(client_p, HIDE_IP));
+ 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;
+ }
+#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 */
+ inetntop_sock((struct sockaddr *)&client_p->localClient->ip,
+ client_p->sockhost, sizeof client_p->sockhost);
+ serv_connect_resolved(client_p);
+}
+
/*
* 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)
}
/* 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);
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;
+ client_p->localClient->F = F;
/*
* 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");
}
/*
free_user(client_p->serv->user, NULL);
client_p->serv->user = NULL;
}
- client_p->serv->up = me.name;
- client_p->serv->upid = me.id;
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;
}
/*
* 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;
/* 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, &fd_table[fd].connect.hostaddr, sizeof client_p->localClient->ip);
- /* Set sockhost properly now -- jilles */
- inetntop_sock((struct sockaddr *)&fd_table[fd].connect.hostaddr,
- client_p->sockhost, sizeof client_p->sockhost);
-
/* 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",
#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,
#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(!EmptyString(server_p->spasswd))
{
- if(ServerInfo.use_ts6)
- sendto_one(client_p, "PASS %s TS %d :%s",
- server_p->spasswd, TS_CURRENT, me.id);
- else
- sendto_one(client_p, "PASS %s :TS",
- server_p->spasswd);
+ sendto_one(client_p, "PASS %s TS %d :%s",
+ server_p->spasswd, TS_CURRENT, me.id);
}
/* pass my info to the new server */
/* 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