emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: Close open UNIX and inet sockets on SIGTERM

Browse Source 
When creating Inet sockets we may get multiple struct addrinfo records.
With this patch we support up to 16 records per Internet peer.  When
closing we iterate over all peers and all records.

Refactor socket_close() to clean up any lingering socket path when
closing UNIX socket.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2019-11-13 18:41:17 +01:00
parent 4192e543a5
commit 54edca09d9
3 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/socket.c
View File

@ -186,18 +186,23 @@ err: close(sd);
int socket_close(int sd) int socket_close(int sd)
{ {
struct sockaddr_un *sun;
struct sock *entry, *tmp; struct sock *entry, *tmp;
LIST_FOREACH_SAFE(entry, &sl, link, tmp) { LIST_FOREACH_SAFE(entry, &sl, link, tmp) {
if (entry->sd == sd) { if (entry->sd != sd)
LIST_REMOVE(entry, link); continue;
close(entry->sd);
if (entry->ai.ai_family == AF_UNIX)
free(entry->ai.ai_addr);
free(entry);
return 0; LIST_REMOVE(entry, link);
close(entry->sd);
if (entry->ai.ai_family == AF_UNIX) {
sun = (struct sockaddr_un *)entry->ai.ai_addr;
(void)unlink(sun->sun_path);
} }
free(entry->ai.ai_addr);
free(entry);
return 0;
} }
errno = ENOENT; errno = ENOENT;

29
src/syslogd.c
View File

@ -572,6 +572,8 @@ static void create_unix_socket(struct peer *pe)
if (sd < 0) if (sd < 0)
goto err; goto err;
logit("Created UNIX socket %d ...\n", sd);
pe->pe_sock[pe->pe_socknum++] = sd;
return; return;
err: err:
ERR("cannot create %s", pe->pe_name); ERR("cannot create %s", pe->pe_name);
@ -658,6 +660,11 @@ static void create_inet_socket(struct peer *pe)
} }
for (r = res; r; r = r->ai_next) { for (r = res; r; r = r->ai_next) {
if (pe->pe_socknum + 1 >= NELEMS(pe->pe_sock)) {
WARN("Only %zd IP addresses per socket supported.", NELEMS(pe->pe_sock));
break;
}
if (SecureMode) if (SecureMode)
r->ai_flags |= AI_SECURE; r->ai_flags |= AI_SECURE;
else else
@ -667,7 +674,8 @@ static void create_inet_socket(struct peer *pe)
if (sd < 0) if (sd < 0)
continue; continue;
logit("Created inet socket %d ...\n", sd); logit("Created inet socket %d for %s:%s ...\n", sd, pe->pe_name, pe->pe_serv);
pe->pe_sock[pe->pe_socknum++] = sd;
} }
freeaddrinfo(res); freeaddrinfo(res);
@ -1973,6 +1981,7 @@ void die(int signo)
{ {
struct filed *f, *next; struct filed *f, *next;
int was_initialized = Initialized; int was_initialized = Initialized;
struct peer *pe, *penext;
Initialized = 0; /* Don't log SIGCHLDs in case we Initialized = 0; /* Don't log SIGCHLDs in case we
receive one during exiting */ receive one during exiting */
@ -2011,14 +2020,16 @@ void die(int signo)
free(f); free(f);
} }
/* Close the UNIX sockets. */ /*
/* XXX */ * Close all UNIX and inet sockets
*/
/* Close the inet sockets. */ SIMPLEQ_FOREACH_SAFE(pe, &pqueue, pe_link, penext) {
/* XXX */ for (size_t i = 0; i < pe->pe_socknum; i++) {
logit("Closing socket %d ...\n", pe->pe_sock[i]);
/* Clean-up UNIX sockets. */ socket_close(pe->pe_sock[i]);
/* XXX */ }
free(pe);
}
exit(0); exit(0);
} }

3
src/syslogd.h
View File

@ -190,7 +190,8 @@ struct peer {
const char *pe_name; const char *pe_name;
const char *pe_serv; const char *pe_serv;
mode_t pe_mode; mode_t pe_mode;
int pe_sock; int pe_sock[16];
size_t pe_socknum;
}; };
/* /*