Re: [Dnsmasq-discuss] NETLINK_NO_ENOBUFS not defined on old platforms

[Petr Gotthard]

> Thanks.
> 
> FWIW in case it gets too silent
>  resend the patch as `git format-patch` artifact

Oops, sorry. Let me resend it right away.


>From f669af70871b80ab7ecf250ea56160a3378f2d94 Mon Sep 17 00:00:00 2001
From: Petr Gotthard 
Date: Thu, 19 Mar 2020 21:47:28 +0100
Subject: [PATCH] Fix build on old platforms without NETLINK_NO_ENOBUFS

---
 src/netlink.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/netlink.c b/src/netlink.c
index a1ca5d1..0237b9c 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -79,7 +79,9 @@ void netlink_init(void)
 }

   if (daemon->netlinkfd == -1 ||
+#ifdef NETLINK_NO_ENOBUFS
   setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, 
sizeof(opt)) == -1 ||
+#endif
   getsockname(daemon->netlinkfd, (struct sockaddr *)&addr, &slen) == -1)
 die(_("cannot create netlink socket: %s"), NULL, EC_MISC);

--
2.17.1


___
Dnsmasq-discuss mailing list
Dnsmasq-discuss@lists.thekelleys.org.uk
http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss

[Dnsmasq-discuss] NETLINK_NO_ENOBUFS not defined on old platforms

[Petr Gotthard]

Hello,

The commit
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=1627d577af03cdf747285e79fa747b6aaae8033f

introduced NETLINK_NO_ENOBUFS, which is not available on some ancient platforms 
(which are however still in use).

The build of 2.81rc4 fails on these platforms now.
Would it be possible to have #ifdefs around that, please?


Regards,
Petr

diff -Nru dnsmasq-2.81rc4/src/netlink.c dnsmasq-2.81rc4.modified/src/netlink.c
--- dnsmasq-2.81rc4/src/netlink.c   2020-03-19 13:54:37.804346907 +0100
+++ dnsmasq-2.81rc4.modified/src/netlink.c  2020-03-19 13:53:14.868860449 
+0100
@@ -79,7 +79,9 @@
 }

   if (daemon->netlinkfd == -1 ||
+#ifdef NETLINK_NO_ENOBUFS
   setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, 
sizeof(opt)) == -1 ||
+#endif
   getsockname(daemon->netlinkfd, (struct sockaddr *)&addr, &slen) == -1)
 die(_("cannot create netlink socket: %s"), NULL, EC_MISC);


___
Dnsmasq-discuss mailing list
Dnsmasq-discuss@lists.thekelleys.org.uk
http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss