#include "res.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"
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);
}
}
}
hook_data_client hdata;
char *host;
rb_dlink_node *ptr;
+ char note[HOSTLEN + 15];
s_assert(NULL != client_p);
if(client_p == 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(!rb_set_buffers(client_p->localClient->F->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))
/* we won't overflow FD_DESC_SZ here, as it can hold
* client_p->name + 64
*/
- rb_note(client_p->localClient->F->fd, "slink data: %s", client_p->name);
- // rb_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
- rb_note(client_p->localClient->F->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
{
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 = rb_get_maxconnections();
+ int maxconn = maxconnections;
/* set our fds as non blocking and close everything else */
for (i = 0; i < maxconn; i++)
{
- if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->F->fd))
+ if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == rb_get_fd(server->localClient->F)))
{
- rb_set_nb(i);
+ // XXX rb_set_nb(i);
}
else
{
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", server->localClient->F->fd);
+ 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
{
- rb_close(server->localClient->F->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->F = rb_add_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(!rb_set_nb(server->localClient->F->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(!rb_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");
}
- rb_open(server->localClient->ctrlfd, FD_SOCKET, NULL);
- */
-
- rb_open(server->localClient->F->fd, FD_SOCKET, NULL);
-
- read_packet(server->localClient->F->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
*
serv_connect(struct server_conf *server_p, struct Client *by)
{
struct Client *client_p;
- struct rb_sockaddr_storage myipnum;
- int fd;
- char vhoststr[HOSTIPLEN];
+ 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 = rb_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 */
- rb_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->F = rb_add_fd(fd);
+ client_p->localClient->F = F;
/*
* Set up the initial server evilness, ripped straight from
* -- adrian
*/
- if(!rb_set_buffers(client_p->localClient->F->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");
}
/*
SetConnecting(client_p);
rb_dlinkAddTail(client_p, &client_p->node, &global_client_list);
- 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)
+ if (rb_inet_pton_sock(server_p->host, (struct sockaddr *)&theiripnum) > 0)
{
- 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));
- }
+ 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
+ ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = htons(server_p->port);
+
+ return serv_connect_resolved(client_p);
+ }
else
{
- /* 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" :
+#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" : "?"));
-
- rb_connect_tcp(client_p->localClient->F->fd, server_p->host,
- server_p->port, NULL, 0, serv_connect_callback,
- client_p, server_p->aftype,
- 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)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
- server_p->aftype == AF_INET6 ? "IPv6" :
+ ((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
- (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr);
-
-
- rb_connect_tcp(client_p->localClient->F->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;
+ T_A);
+ 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;
char *errstr;
- fde_t *F = rb_locate_fd(fd);
/* First, make sure its a real client! */
s_assert(client_p != NULL);
- s_assert(client_p->localClient->F->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);
-
/* 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
{
- errstr = strerror(rb_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,
/* 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