* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_auth.c 1683 2006-06-20 14:26:16Z jilles $ */
+ * $Id: s_auth.c 3354 2007-04-03 09:21:31Z nenolod $ */
/*
* Changes:
static const char *HeaderMessages[] =
{
- "NOTICE AUTH :*** Looking up your hostname...",
- "NOTICE AUTH :*** Found your hostname",
- "NOTICE AUTH :*** Couldn't look up your hostname",
- "NOTICE AUTH :*** Checking Ident",
- "NOTICE AUTH :*** Got Ident response",
- "NOTICE AUTH :*** No Ident response",
- "NOTICE AUTH :*** Your hostname is too long, ignoring hostname",
- "NOTICE AUTH :*** Your forward and reverse DNS do not match, ignoring hostname",
- "NOTICE AUTH :*** Cannot verify hostname validity, ignoring hostname",
+ ":*** Looking up your hostname...",
+ ":*** Found your hostname",
+ ":*** Couldn't look up your hostname",
+ ":*** Checking Ident",
+ ":*** Got Ident response",
+ ":*** No Ident response",
+ ":*** Your hostname is too long, ignoring hostname",
+ ":*** Your forward and reverse DNS do not match, ignoring hostname",
+ ":*** Cannot verify hostname validity, ignoring hostname",
};
typedef enum
}
ReportType;
-#define sendheader(c, r) sendto_one(c, HeaderMessages[(r)])
+#define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)])
-static dlink_list auth_poll_list;
+static rb_dlink_list auth_poll_list;
static BlockHeap *auth_heap;
static EVH timeout_auth_queries_event;
return;
client->localClient->auth_request = NULL;
- dlinkDelete(&auth->node, &auth_poll_list);
+ rb_dlinkDelete(&auth->node, &auth_poll_list);
free_auth_request(auth);
- if(client->localClient->fd > highest_fd)
- highest_fd = client->localClient->fd;
+ if(client->localClient->F->fd > highest_fd)
+ highest_fd = client->localClient->F->fd;
/*
* When a client has auth'ed, we want to start reading what it sends
* -- adrian
*/
client->localClient->allow_read = MAX_FLOOD;
- comm_setflush(client->localClient->fd, 1000, flood_recalc, client);
- dlinkAddTail(client, &client->node, &global_client_list);
- read_packet(client->localClient->fd, client);
+ rb_setflush(client->localClient->F->fd, 1000, flood_recalc, client);
+ rb_dlinkAddTail(client, &client->node, &global_client_list);
+ read_packet(client->localClient->F->fd, client);
}
/*
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"auth_dns_callback(): auth->client->localClient (%s) is NULL", get_client_name(auth->client, HIDE_IP));
- dlinkDelete(&auth->node, &auth_poll_list);
+ rb_dlinkDelete(&auth->node, &auth_poll_list);
free_auth_request(auth);
/* and they will silently drop through and all will hopefully be ok... -nenolod */
{
++ServerStats->is_abad;
- comm_close(auth->fd);
+ rb_close(auth->fd);
auth->fd = -1;
ClearAuth(auth);
return 0;
family = auth->client->localClient->ip.ss_family;
- if((fd = comm_socket(family, SOCK_STREAM, 0, "ident")) == -1)
+ if((fd = rb_socket(family, SOCK_STREAM, 0, "ident")) == -1)
{
report_error("creating auth stream socket %s:%s",
get_client_name(auth->client, SHOW_IP),
++ServerStats->is_abad;
return 0;
}
- if((MAXCONNECTIONS - 10) < fd)
+
+ /*
+ * TBD: this is a pointless arbitrary limit .. we either have a socket or not. -nenolod
+ */
+ if((rb_get_maxconnections() - 10) < fd)
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Can't allocate fd for auth on %s",
get_client_name(auth->client, SHOW_IP));
- comm_close(fd);
+ rb_close(fd);
return 0;
}
* and machines with multiple IP addresses are common now
*/
memset(&localaddr, 0, locallen);
- getsockname(auth->client->localClient->fd,
+ getsockname(auth->client->localClient->F->fd,
(struct sockaddr *) &localaddr, &locallen);
mangle_mapped_sockaddr((struct sockaddr *)&localaddr);
auth->fd = fd;
SetAuthConnect(auth);
- comm_connect_tcp(fd, auth->client->sockhost, 113,
+ rb_connect_tcp(fd, auth->client->sockhost, 113,
(struct sockaddr *) &localaddr, GET_SS_LEN(localaddr),
auth_connect_callback, auth,
localaddr.ss_family, GlobalSetOptions.ident_timeout);
if(client == NULL)
return;
- /* to aid bopm which needs something unique to match against */
- sendto_one(client, "NOTICE AUTH :*** Processing connection to %s",
- me.name);
-
auth = make_auth_request(client);
auth->dns_query.ptr = auth;
if(ConfigFileEntry.disable_auth == 0)
start_auth_query(auth);
- dlinkAdd(auth, &auth->node, &auth_poll_list);
+ rb_dlinkAdd(auth, &auth->node, &auth_poll_list);
}
/*
static void
timeout_auth_queries_event(void *notused)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
struct AuthRequest *auth;
DLINK_FOREACH_SAFE(ptr, next_ptr, auth_poll_list.head)
if(auth->timeout < CurrentTime)
{
if(auth->fd >= 0)
- comm_close(auth->fd);
+ rb_close(auth->fd);
if(IsDoingAuth(auth))
{
}
/*
- * auth_connect_callback() - deal with the result of comm_connect_tcp()
+ * auth_connect_callback() - deal with the result of rb_connect_tcp()
*
* If the connection failed, we simply close the auth fd and report
* a failure. If the connection suceeded send the ident server a query
}
if(getsockname
- (auth->client->localClient->fd, (struct sockaddr *) &us,
+ (auth->client->localClient->F->fd, (struct sockaddr *) &us,
(socklen_t *) & ulen)
- || getpeername(auth->client->localClient->fd,
+ || getpeername(auth->client->localClient->F->fd,
(struct sockaddr *) &them, (socklen_t *) & tlen))
{
ilog(L_IOERROR, "auth get{sock,peer}name error for %s:%m",
auth_error(auth);
return;
}
- ircsnprintf(authbuf, sizeof(authbuf), "%u , %u\r\n",
+ rb_snprintf(authbuf, sizeof(authbuf), "%u , %u\r\n",
(unsigned int) ntohs(them.sin_port), (unsigned int) ntohs(us.sin_port));
if(write(auth->fd, authbuf, strlen(authbuf)) == -1)
if(len < 0 && ignoreErrno(errno))
{
- comm_setselect(fd, FDLIST_IDLECLIENT, COMM_SELECT_READ, read_auth_reply, auth, 0);
+ rb_setselect(fd, FDLIST_IDLECLIENT, COMM_SELECT_READ, read_auth_reply, auth, 0);
return;
}
}
}
- comm_close(auth->fd);
+ rb_close(auth->fd);
auth->fd = -1;
ClearAuth(auth);
delete_resolver_queries(&auth->dns_query);
if(auth->fd >= 0)
- comm_close(auth->fd);
+ rb_close(auth->fd);
- dlinkDelete(&auth->node, &auth_poll_list);
+ rb_dlinkDelete(&auth->node, &auth_poll_list);
free_auth_request(auth);
}
projects / irc / rqf / shadowircd.git / blobdiff