9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

listener: refactor to use rb_dlink like the other lists in ircd

Browse source
This commit is contained in:
Ariadne Conill 2021-06-19 04:51:50 -06:00 committed by Doug Freed
parent 0ab6dbbc65
commit e2ade30437
2 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/listener.h
View file

@ -31,7 +31,7 @@ struct Client;
struct Listener struct Listener
{ {
struct Listener *next; /* list node pointer */ rb_dlink_node lnode; /* list node */
const char *name; /* listener name */ const char *name; /* listener name */
rb_fde_t *F; /* file descriptor */ rb_fde_t *F; /* file descriptor */
int ref_count; /* number of connection references */ int ref_count; /* number of connection references */

53
ircd/listener.c
View file

@ -5,6 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2005 ircd-ratbox development team * Copyright (C) 2002-2005 ircd-ratbox development team
* Copyright (C) 2021 Ariadne Conill
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -43,7 +44,7 @@
#include "s_assert.h" #include "s_assert.h"
#include "logger.h" #include "logger.h"
static struct Listener *ListenerPollList = NULL; static rb_dlink_list listener_list = {};
static int accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, void *data); static int accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, void *data);
static void accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data); static void accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data);
static SSL_OPEN_CB accept_sslcallback; static SSL_OPEN_CB accept_sslcallback;
@ -57,7 +58,6 @@ make_listener(struct rb_sockaddr_storage *addr)
listener->F = NULL; listener->F = NULL;
memcpy(&listener->addr, addr, sizeof(listener->addr)); memcpy(&listener->addr, addr, sizeof(listener->addr));
listener->next = NULL;
return listener; return listener;
} }
@ -67,25 +67,8 @@ free_listener(struct Listener *listener)
s_assert(NULL != listener); s_assert(NULL != listener);
if(listener == NULL) if(listener == NULL)
return; return;
/*
* remove from listener list
*/
if(listener == ListenerPollList)
ListenerPollList = listener->next;
else
{
struct Listener *prev = ListenerPollList;
for (; prev; prev = prev->next)
{
if(listener == prev->next)
{
prev->next = listener->next;
break;
}
}
}
/* free */ rb_dlinkDelete(&listener->lnode, &listener_list);
rb_free(listener); rb_free(listener);
} }
@ -122,10 +105,12 @@ get_listener_name(const struct Listener *listener)
void void
show_ports(struct Client *source_p) show_ports(struct Client *source_p)
{ {
struct Listener *listener = 0; rb_dlink_node *n;
for (listener = ListenerPollList; listener; listener = listener->next) RB_DLINK_FOREACH(n, listener_list.head)
{ {
struct Listener *listener = n->data;
sendto_one_numeric(source_p, RPL_STATSPLINE, sendto_one_numeric(source_p, RPL_STATSPLINE,
form_str(RPL_STATSPLINE), 'P', form_str(RPL_STATSPLINE), 'P',
get_listener_port(listener), get_listener_port(listener),
@ -237,10 +222,12 @@ inetport(struct Listener *listener)
static struct Listener * static struct Listener *
find_listener(struct rb_sockaddr_storage *addr, int sctp) find_listener(struct rb_sockaddr_storage *addr, int sctp)
{ {
struct Listener *listener = NULL; rb_dlink_node *n;
struct Listener *last_closed = NULL; struct Listener *last_closed = NULL;
for (listener = ListenerPollList; listener; listener = listener->next) { RB_DLINK_FOREACH(n, listener_list.head) {
struct Listener *listener = n->data;
if (listener->sctp != sctp) if (listener->sctp != sctp)
continue; continue;
@ -353,8 +340,7 @@ add_tcp_listener(int port, const char *vhost_ip, int family, int ssl, int defer_
return; return;
} else { } else {
listener = make_listener(vaddr); listener = make_listener(vaddr);
listener->next = ListenerPollList; rb_dlinkAdd(listener, &listener->lnode, &listener_list);
ListenerPollList = listener;
} }
listener->F = NULL; listener->F = NULL;
@ -424,8 +410,7 @@ add_sctp_listener(int port, const char *vhost_ip1, const char *vhost_ip2, int ss
return; return;
} else { } else {
listener = make_listener(vaddr); listener = make_listener(vaddr);
listener->next = ListenerPollList; rb_dlinkAdd(listener, &listener->lnode, &listener_list);
ListenerPollList = listener;
} }
listener->F = NULL; listener->F = NULL;
@ -468,18 +453,20 @@ close_listener(struct Listener *listener)
* close_listeners - close and free all listeners that are not being used * close_listeners - close and free all listeners that are not being used
*/ */
void void
close_listeners() close_listeners(void)
{ {
struct Listener *listener; rb_dlink_node *n, *tn;
struct Listener *listener_next = 0;
/* /*
* close all 'extra' listening ports we have * close all 'extra' listening ports we have
*/ */
for (listener = ListenerPollList; listener; listener = listener_next) RB_DLINK_FOREACH_SAFE(n, tn, listener_list.head)
{ {
listener_next = listener->next; struct Listener *listener = n->data;
close_listener(listener); close_listener(listener);
} }
rb_close_pending_fds(); rb_close_pending_fds();
} }