Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SNAFU in 509afcd1d2

Browse Source
This commit is contained in:
Simon Kelley
2025-01-12 22:28:12 +00:00
parent 7d915a0bb9
commit b7156116c2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dnsmasq.c
View File

@@ -32,7 +32,7 @@ static volatile int pipewrite;
static void set_dns_listeners(void); static void set_dns_listeners(void);
static void set_tftp_listeners(void); static void set_tftp_listeners(void);
static void check_dns_listeners(time_t now); static void check_dns_listeners(time_t now);
static void do_tcp_connection(struct listener *listener, time_t now); static void do_tcp_connection(struct listener *listener, time_t now, int slot);
static void sig_handler(int sig); static void sig_handler(int sig);
static void async_event(int pipe, time_t now); static void async_event(int pipe, time_t now);
static void fatal_event(struct event_desc *ev, char *msg); static void fatal_event(struct event_desc *ev, char *msg);
@@ -1906,12 +1906,12 @@ static void check_dns_listeners(time_t now)
for (listener = daemon->listeners; listener; listener = listener->next) for (listener = daemon->listeners; listener; listener = listener->next)
if (listener->tcpfd != -1 && poll_check(listener->tcpfd, POLLIN)) if (listener->tcpfd != -1 && poll_check(listener->tcpfd, POLLIN))
{ {
do_tcp_connection(listener, now); do_tcp_connection(listener, now, i);
return; return;
} }
} }
static void do_tcp_connection(struct listener *listener, time_t now) static void do_tcp_connection(struct listener *listener, time_t now, int slot)
{ {
int confd, client_ok = 1; int confd, client_ok = 1;
struct irec *iface = NULL; struct irec *iface = NULL;
@@ -1920,7 +1920,7 @@ static void do_tcp_connection(struct listener *listener, time_t now)
socklen_t tcp_len = sizeof(union mysockaddr); socklen_t tcp_len = sizeof(union mysockaddr);
unsigned char *buff; unsigned char *buff;
struct server *s; struct server *s;
int flags, auth_dns, i; int flags, auth_dns;
struct in_addr netmask; struct in_addr netmask;
int pipefd[2]; int pipefd[2];
@@ -2035,9 +2035,9 @@ static void do_tcp_connection(struct listener *listener, time_t now)
read_write(pipefd[0], buff, 1, RW_READ); read_write(pipefd[0], buff, 1, RW_READ);
#endif #endif
/* i holds index of free slot */
daemon->tcp_pids[i] = p; daemon->tcp_pids[slot] = p;
daemon->tcp_pipes[i] = pipefd[0]; daemon->tcp_pipes[slot] = pipefd[0];
daemon->metrics[METRIC_TCP_CONNECTIONS]++; daemon->metrics[METRIC_TCP_CONNECTIONS]++;
if (daemon->metrics[METRIC_TCP_CONNECTIONS] > daemon->max_procs_used) if (daemon->metrics[METRIC_TCP_CONNECTIONS] > daemon->max_procs_used)
daemon->max_procs_used = daemon->metrics[METRIC_TCP_CONNECTIONS]; daemon->max_procs_used = daemon->metrics[METRIC_TCP_CONNECTIONS];