if(F == NULL)
{
- report_error("opening listener socket %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("opening listener socket");
return 0;
}
else if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus*/
{
- report_error("no more connections left for listener %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("no more connections left for listener");
rb_close(F);
return 0;
}
*/
if(setsockopt(rb_get_fd(F), SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
{
- report_error("setting SO_REUSEADDR for listener %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("setting SO_REUSEADDR for listener");
rb_close(F);
return 0;
}
if(bind(rb_get_fd(F), (struct sockaddr *) &listener->addr, GET_SS_LEN(&listener->addr)))
{
- report_error("binding listener socket %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("binding listener socket");
rb_close(F);
return 0;
}
if((ret = rb_listen(F, RATBOX_SOMAXCONN)))
{
- report_error("listen failed for %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("listen()");
rb_close(F);
return 0;
}
family = auth->client->localClient->ip.ss_family;
if((F = rb_socket(family, SOCK_STREAM, 0, "ident")) == NULL)
{
- report_error("creating auth stream socket %s:%s",
- get_client_name(auth->client, SHOW_IP),
- log_client_name(auth->client, SHOW_IP), errno);
+ ilog_error("creating auth stream socket");
++ServerStats->is_abad;
return 0;
}
void
ilog_error(const char *error)
{
- ilog(L_IOERROR, "%s: %d (%s)", buf, errno, strerror(errno));
+ ilog(L_IOERROR, "%s: %d (%s)", error, errno, strerror(errno));
- sendto_opers_snomask(SNO_DEBUG, L_ALL, "%s: %d (%s)", buf, errno, strerror(errno));
+ sendto_realops_snomask(SNO_DEBUG, L_ALL, "%s: %d (%s)", error, errno, strerror(errno));
}
}
if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
- report_error("rb_set_buffers failed for server %s:%s",
- get_server_name(client_p, SHOW_IP),
- log_client_name(client_p, SHOW_IP), errno);
+ ilog_error("rb_set_buffers failed for server");
/* Hand the server off to servlink now */
if(IsCapable(client_p, CAP_ZIP))
if(!rb_set_nb(server->localClient->F))
{
- report_error("Cannot set slink fd nonblocking for server %s:%s",
- 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))
{
- report_error("Cannot set slink fd nonblocking for server %s:%s",
- 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);
/* create a socket for the server connection */
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;
}
if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
{
- report_error("rb_set_buffers failed for server %s:%s",
- 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");
}
/*