From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: Re: [PATCH] add SOCK_STREAM support for syslog
Date: Thu, 12 Apr 2018 20:39:40 -0400 [thread overview]
Message-ID: <20180413003940.GR3094@brightrain.aerifal.cx> (raw)
In-Reply-To: <20180412150431.1f754356d4360531017e8560@sartura.hr>
On Thu, Apr 12, 2018 at 03:04:31PM +0200, Hrvoje Varga wrote:
> > To be consistent with glibc and uClibc since both glibc and uClibc
> > have a support for connecting to SOCK_STREAM socket in case
> > when connection to a SOCK_DGRAM is unsuccessful. This patch mimics the
> > same behavior.
> >
> > There was a discussion whether the musl should support the SOCK_STREAM
> > on musl mailing list http://www.openwall.com/lists/musl/2015/08/10/1.
Yes, and it never really concluded. I think it's probably harmless to
support SOCK_STREAM if users want it though. But the patch is probably
insufficient.
One question I had that never got answered: are SOCK_DGRAM and
SOCK_STREAM unix socket addresses mutually exclusive, or can the same
name be listening as both types? This affects how we handle certain
error cases I think..
> > Signed-off-by: Hrvoje Varga <hrvoje.varga@sartura.hr>
> > ---
> > src/misc/syslog.c | 18 ++++++++++++++++--
> > 1 file changed, 16 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/misc/syslog.c b/src/misc/syslog.c
> > index 9dd1ddb5..101847a4 100644
> > --- a/src/misc/syslog.c
> > +++ b/src/misc/syslog.c
> > @@ -48,8 +48,22 @@ void closelog(void)
> >
> > static void __openlog()
> > {
> > - log_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
> > - if (log_fd >= 0) connect(log_fd, (void *)&log_addr, sizeof log_addr);
> > + int retry = 0;
> > + int sock_type = SOCK_DGRAM;
> > + while (retry < 2) {
> > + retry++;
> > + log_fd = socket(AF_UNIX, sock_type|SOCK_CLOEXEC, 0);
> > + if (log_fd >= 0) {
> > + if (connect(log_fd, (void *)&log_addr, sizeof log_addr) != -1) {
> > + return;
> > + }
> > + if (errno == EPROTOTYPE) {
> > + sock_type = SOCK_STREAM;
> > + }
> > + close(log_fd);
> > + log_fd = -1;
> > + }
> > + }
> > }
> >
> > void openlog(const char *ident, int opt, int facility)
This only covers opening, not reconnection on loss, which happens in
_vsyslog. The way reconnection would have to be handled for
SOCK_STREAM is different and less robust, I think, so we probably
can't just replace the existing code but would need a new code path
for it.
Rich
next prev parent reply other threads:[~2018-04-13 0:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 10:47 Hrvoje Varga
2018-04-12 13:04 ` Hrvoje Varga
2018-04-13 0:39 ` Rich Felker [this message]
2018-04-13 1:54 ` Laurent Bercot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180413003940.GR3094@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).