[Pkg-voip-commits] [kamailio] 03/05: add upstream patches from 4.4 branch

[Victor Seva]

This is an automated email from the git hooks/post-receive script.

vseva pushed a commit to branch master
in repository kamailio.

commit 9463fb43b75b69e4ff0014519419d25f9b42e918
Author: Victor Seva <vseva at debian.org>
Date:   Mon Apr 4 18:37:29 2016 +0200

    add upstream patches from 4.4 branch
---
 debian/patches/series                              |  2 ++
 ...-address-family-AF_PACKET-on-l-iface_name.patch | 29 ++++++++++++++++
 ...t-if-AF_PACKET-is-defined-at-compile-time.patch | 39 ++++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index bd738c2..11208ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+upstream/0001-core-skip-address-family-AF_PACKET-on-l-iface_name.patch
+upstream/0002-core-test-if-AF_PACKET-is-defined-at-compile-time.patch
 no_lib64_on_64_bits.patch
 no_INSTALL_file.patch
 fix_export.patch
diff --git a/debian/patches/upstream/0001-core-skip-address-family-AF_PACKET-on-l-iface_name.patch b/debian/patches/upstream/0001-core-skip-address-family-AF_PACKET-on-l-iface_name.patch
new file mode 100644
index 0000000..edea666
--- /dev/null
+++ b/debian/patches/upstream/0001-core-skip-address-family-AF_PACKET-on-l-iface_name.patch
@@ -0,0 +1,29 @@
+From 4992dfbb9f15cfb8ade99be4e6d3087146cb8e22 Mon Sep 17 00:00:00 2001
+From: schoberw <walter.schober at neotel.at>
+Date: Fri, 1 Apr 2016 10:34:11 +0200
+Subject: [PATCH] core: skip address family AF_PACKET on -l iface_name
+
+- socket_info.c: getifaddrs() returns AF_PACKET, AF_INET and AF_INET6 addressed of an interface.
+  AF_PACKET are of no use and breaks startup with an -l eth0:5060 cmd line param
+(cherry picked from commit d7fca53e8c5409849ec044098a143e7254129c00)
+---
+ socket_info.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/socket_info.c b/socket_info.c
+index d06fdcf..1d28977 100644
+--- a/socket_info.c
++++ b/socket_info.c
+@@ -1205,6 +1205,9 @@ int add_interfaces(char* if_name, int family, unsigned short port,
+ 
+ 	for (ifa = ifap; ifa; ifa = ifa->ifa_next)
+ 	{
++		/* skip AF_PACKET addr family since it is of no use later on */
++		if (ifa->ifa_addr->sa_family == AF_PACKET)
++			continue;
+ 		if (if_name && strcmp(if_name, ifa->ifa_name))
+ 			continue;
+ 		if (family && family != ifa->ifa_addr->sa_family)
+-- 
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0002-core-test-if-AF_PACKET-is-defined-at-compile-time.patch b/debian/patches/upstream/0002-core-test-if-AF_PACKET-is-defined-at-compile-time.patch
new file mode 100644
index 0000000..1d295b4
--- /dev/null
+++ b/debian/patches/upstream/0002-core-test-if-AF_PACKET-is-defined-at-compile-time.patch
@@ -0,0 +1,39 @@
+From e6dd2c172be3712e8c468cbe7e55ba94d81a7b62 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 1 Apr 2016 11:10:46 +0200
+Subject: [PATCH] core: test if AF_PACKET is defined at compile time
+
+- mac os x (and perhaps *BSDs) doesn't have it
+
+(cherry picked from commit 8543993e1f702aef80887c0e72b9bf67c62c1617)
+---
+ socket_info.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/socket_info.c b/socket_info.c
+index 1d28977..cecfef9 100644
+--- a/socket_info.c
++++ b/socket_info.c
+@@ -1205,16 +1205,18 @@ int add_interfaces(char* if_name, int family, unsigned short port,
+ 
+ 	for (ifa = ifap; ifa; ifa = ifa->ifa_next)
+ 	{
++#ifdef AF_PACKET
+ 		/* skip AF_PACKET addr family since it is of no use later on */
+ 		if (ifa->ifa_addr->sa_family == AF_PACKET)
+ 			continue;
++#endif
+ 		if (if_name && strcmp(if_name, ifa->ifa_name))
+ 			continue;
+ 		if (family && family != ifa->ifa_addr->sa_family)
+ 			continue;
+ 		sockaddr2ip_addr(&addr, (struct sockaddr*)ifa->ifa_addr);
+ 		tmp=ip_addr2a(&addr);
+-		if (ifa->ifa_flags & IFF_LOOPBACK) 
++		if (ifa->ifa_flags & IFF_LOOPBACK)
+ 			flags = SI_IS_LO;
+ 		else
+ 			flags = SI_NONE;
+-- 
+2.8.0.rc3
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git