From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12709 Path: news.gmane.org!.POSTED!not-for-mail From: Hrvoje Varga Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] add SOCK_STREAM support for syslog Date: Thu, 12 Apr 2018 15:04:31 +0200 Message-ID: <20180412150431.1f754356d4360531017e8560@sartura.hr> References: <20170821104740.10802-1-hrvoje.varga@sartura.hr> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1523538166 5866 195.159.176.226 (12 Apr 2018 13:02:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 12 Apr 2018 13:02:46 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-12725-gllmg-musl=m.gmane.org@lists.openwall.com Thu Apr 12 15:02:42 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1f6bs7-0001JO-TT for gllmg-musl@m.gmane.org; Thu, 12 Apr 2018 15:02:40 +0200 Original-Received: (qmail 22358 invoked by uid 550); 12 Apr 2018 13:04:45 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 22323 invoked from network); 12 Apr 2018 13:04:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jdVyONs/afyfwHIx/U8MPigONmK+RNTITz2cjjC2pN8=; b=oCOJTGj+QSIlhPLwV2bazz7XXeaTLnWhOD1poVoXuMlRAYWcSF6Wg7/4akckznr35O M1TfbsguWhEAPGWdXLCUst0d4j/0LKtBHn4o7hVaDrfrjmrhXpWACGfeyLoUieHf7Ymc Pyr2Anvmye/7DqmEAjjbvNFOsVNaIPa1XR2SQDd9ewoQ/xy8clyv4xdZm/cg2Av5S8mh 0Qbj2F1n97YiXiqs2BZbkPIa7/DzIhTCrrmsKE4JyjjOL/fpP3BEj0huI2eAvtXILaVh Nzqi1jk8k6fRU3rbiEzh9wnADX5PBuEyetIfC32DljOMh37z+o4wZ7zQsPp1inx1u+hw Gakg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jdVyONs/afyfwHIx/U8MPigONmK+RNTITz2cjjC2pN8=; b=RxHZruAAU5V74FQsv//106fkhstVG6GNI8iZGAC8mcRomwn++25BYJ55PobLkWEmWF WxU+5FVnBoh2E/zvfhmckcTR/8g0B2TNNDFxnu1PkKUmDiarY0Dj7UQPwlPbQ5dykwAL hYx13UfHzrXcKEXZY2vCZpHpaR1Bk50j7vnzyW7x/2S1mtx6CHDV/8beeo749/iOOedo nKzWT/jRnkvrs+2W+uYHq2r/oQXjy78Qzek9mofYUBDzUVlqd4tXMCWNUsXGo0V9+ugc 4TaYuT8J8LxBjzYuEho+NjGRAp3PCU/auEZyuE6W+b/BdaOi2Gr5LbmWjv+FwAf1YGlA WCBQ== X-Gm-Message-State: ALQs6tADcFEEJScE2lTtrkcRlcyx8dzu+sCwbCRb3HcTWFWxoh8BbPKG 4xiVhymrO4+MB+Z37iaR1UT26n8AKpo6R4OVERx6IOHV5oooy8DO73WynMZVf9LNFJ4jn8HhzT8 WNPP+dYM6NPJYQvLXP8lNwilNtJiirQxOzdOjdcUAB52mAi0R6XSnlo2/lQRPC13bQl42YIM= X-Google-Smtp-Source: AIpwx4+Rr2P6nbTVaovzjBdWG9BLfuQsaUt32k5j6z0SqJazlxfSgNZlCn8TA4RVOldCyBiJ9qZ5yg== X-Received: by 10.223.201.12 with SMTP id m12mr809422wrh.158.1523538273257; Thu, 12 Apr 2018 06:04:33 -0700 (PDT) In-Reply-To: <20170821104740.10802-1-hrvoje.varga@sartura.hr> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) Xref: news.gmane.org gmane.linux.lib.musl.general:12709 Archived-At: > 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. > > Signed-off-by: Hrvoje Varga > --- > 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) > -- > 2.14.1 > Hi, any news regarding this patch? -- br, Hrvoje