Merge lp:~shamrin/rohc/iprohc into lp:rohc/iprohc-main

[ash]

Ubuntu 14.04 compatibility.

P.S. Sorry for creating an erroneous proposal to merge iprohc into rohc. I've removed it and I hope this merge proposal is correct.

[lp:~shamrin/rohc/iprohc]

186. By ash on 2014-12-22

Move iproute debian dependency from build-time to run-time

187. By ash on 2014-12-22

add {misc:depends}

Unmerged revisions

187. By ash on 2014-12-22

add {misc:depends}

186. By ash on 2014-12-22

Move iproute debian dependency from build-time to run-time

185. By ash on 2014-12-22

Ubuntu 14.04+ compatibility

Get rid of iproute-dev/libnetlink.h dependency, replacing it with
system("ip addr add...") call. Ubuntu 14.04 doesn't provide iproute-dev
package anymore. In contrast, `ip` command (from `iproute2` package)
seems to be available everywhere.

As a bonus this greatly simplifies set_ip4 function.

=== modified file 'configure.ac'
--- configure.ac	2014-02-18 19:19:05 +0000
+++ configure.ac	2014-12-22 19:40:17 +0000
@@ -249,17 +249,6 @@
 fi
 
 
-# libnetlink.h is required
-AC_CHECK_HEADERS([libnetlink.h], [], [], [[#include <sys/socket.h>
-#include <stdio.h>]])
-if test "x$ac_cv_header_libnetlink_h" != "xyes" ; then
-	echo
-	echo "ERROR: libnetlink.h header not found"
-	echo
-	echo "Please install iproute2 and its header files."
-	echo
-	exit 1
-fi
 # check whether rtnl_talk() takes 5 or 7 arguments
 AC_MSG_CHECKING([how many arguments rtnl_talk takes])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>

=== modified file 'contrib/packaging/debian/control'
--- contrib/packaging/debian/control	2013-09-20 12:44:57 +0000
+++ contrib/packaging/debian/control	2014-12-22 19:40:17 +0000
@@ -1,7 +1,8 @@
 Source: iprohc
 Priority: optional
 Maintainer: Viveris Technologies
-Build-Depends: debhelper (>= 7.0.15), libtool, iproute-dev, librohc-dev, libgnutls-dev, libyaml-dev
+Build-Depends: debhelper (>= 7.0.15), libtool, librohc-dev, libgnutls-dev, libyaml-dev
+Depends: ${misc:Depends}, iproute
 Standards-Version: 3.8.4
 Section: libs
 

=== modified file 'src/client/messages.c'
--- src/client/messages.c	2014-03-07 16:18:54 +0000
+++ src/client/messages.c	2014-12-22 19:40:17 +0000
@@ -231,7 +231,7 @@
 	}
 
 	/* set the IPv4 address on the TUN interface */
-	is_ok = set_ip4(client->tun_itf_id, tp.local_address, 24);
+	is_ok = set_ip4(client->tun_name, tp.local_address, 24);
 	if(!is_ok)
 	{
 		trace(LOG_ERR, "failed to set IP address on TUN interface");

=== modified file 'src/common/Makefile.am'
--- src/common/Makefile.am	2013-12-12 16:09:48 +0000
+++ src/common/Makefile.am	2014-12-22 19:40:17 +0000
@@ -15,8 +15,7 @@
 
 libiprohc_common_la_LIBADD = \
 	-lgnutls \
-	-lrohc \
-	-lnetlink
+	-lrohc
 
 libiprohc_common_la_LDFLAGS = \
 	$(configure_ldflags)

=== modified file 'src/common/tun_helpers.c'
--- src/common/tun_helpers.c	2013-12-12 16:15:24 +0000
+++ src/common/tun_helpers.c	2014-12-22 19:40:17 +0000
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <netinet/ip.h>
-#include <libnetlink.h>
 
 #include "log.h"
 #include "tun_helpers.h"
@@ -256,72 +255,26 @@
 }
 
 
-bool set_ip4(int iface_index, uint32_t address, uint8_t network)
+bool set_ip4(const char * const iface_name, uint32_t address, uint8_t network)
 {
-	bool is_success = false;
+	char set_ip_cmd[128];
 	int ret;
-	struct {
-		struct nlmsghdr nh;
-		struct ifaddrmsg ip;
-		char buf[256];
-	} req;
-	struct rtnl_handle rth = { .fd = -1 };
-	uint32_t *ip_data;
-
-	ret = rtnl_open(&rth, 0);
-	if(ret < 0)
-	{
-		trace(LOG_ERR, "failed to open RTNL socket (code %d)", ret);
-		goto error;
-	}
-
-	ip_data = calloc(8, sizeof(uint32_t));
-	if(ip_data == NULL)
-	{
-		trace(LOG_ERR, "failed to allocate memory for setting IPv4 address");
-		goto close_rtnl;
-	}
-	ip_data[0] = address;
-
-	/* initialize netlink request */
-	memset(&req, 0, sizeof(req));
-	req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
-	req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL;
-	req.nh.nlmsg_type = RTM_NEWADDR;
-
-	/* ifaddrmsg info */
-	req.ip.ifa_family = AF_INET;         /* IPv4 */
-	req.ip.ifa_prefixlen = network;
-	req.ip.ifa_index = iface_index;
-
-	addattr_l(&req.nh, sizeof(req), IFA_LOCAL,   ip_data, 4);
-	addattr_l(&req.nh, sizeof(req), IFA_ADDRESS, ip_data, 4);
-
-	/* GOGOGO */
-#if RTNL_TALK_PARAMS == 5
-	ret = rtnl_talk(&rth, &req.nh, 0, 0, NULL);
-#elif RTNL_TALK_PARAMS == 7
-	ret = rtnl_talk(&rth, &req.nh, 0, 0, NULL, NULL, NULL);
-#else
-#  error "unsupported version of rtnl_talk()"
-#endif
-	if(ret < 0)
-	{
-		trace(LOG_ERR, "failed to set IPv4 address %u.%u.%u.%u/%u (code %d)",
-		      (ntohl(address) >> 24) & 0xff, (ntohl(address) >> 16) & 0xff,
-		      (ntohl(address) >>  8) & 0xff, (ntohl(address) >>  0) & 0xff,
-		      network, ret);
-		goto free_ip_data;
-	}
-
-	is_success = true;
-
-free_ip_data:
-	free(ip_data);
-close_rtnl:
-	rtnl_close(&rth);
-error:
-	return is_success;
+
+	if((ret = snprintf(set_ip_cmd, sizeof set_ip_cmd,
+			   "ip addr add %u.%u.%u.%u/%u dev %s",
+			   (ntohl(address) >> 24) & 0xff, (ntohl(address) >> 16) & 0xff,
+			   (ntohl(address) >>  8) & 0xff, (ntohl(address) >>  0) & 0xff,
+			   network, iface_name)) < 0) {
+		trace(LOG_ERR, "set_ip4: snprintf(set_ip_cmd, ...) returned %d", ret);
+		return false;
+	}
+
+       	if((ret = system(set_ip_cmd)) != 0) {
+		trace(LOG_ERR, "set_ip4: failed to run `%s` (code %d)", set_ip_cmd, ret);
+		return false;
+	}
+
+	return true;
 }
 
 

=== modified file 'src/common/tun_helpers.h'
--- src/common/tun_helpers.h	2013-12-12 16:15:24 +0000
+++ src/common/tun_helpers.h	2014-12-22 19:40:17 +0000
@@ -29,7 +29,7 @@
                size_t *const tun_itf_mtu)
 	__attribute__((warn_unused_result));
 
-bool set_ip4(int iface_index, uint32_t address, uint8_t network);
+bool set_ip4(const char * const iface_name, uint32_t address, uint8_t network);
 
 int create_raw(const int fwmark);
 

=== modified file 'src/server/server.c'
--- src/server/server.c	2014-03-07 16:18:54 +0000
+++ src/server/server.c	2014-12-22 19:40:17 +0000
@@ -58,6 +58,8 @@
 	} \
 	while(0)
 
+#define TUN_IF_NAME "tun_ipip"
+
 
 int log_max_priority = LOG_INFO;
 bool iprohc_log_stderr = true;
@@ -456,7 +458,7 @@
 
 	/* TUN create */
 	trace(LOG_INFO, "[main] create TUN interface");
-	tun = create_tun("tun_ipip", server_opts.basedev,
+	tun = create_tun(TUN_IF_NAME, server_opts.basedev,
 	                 &tun_itf_id, &basedev_mtu, &tun_itf_mtu);
 	if(tun < 0)
 	{
@@ -464,7 +466,7 @@
 		goto close_tcp;
 	}
 
-	is_ok = set_ip4(tun_itf_id, server_opts.local_address, 24);
+	is_ok = set_ip4(TUN_IF_NAME, server_opts.local_address, 24);
 	if(!is_ok)
 	{
 		trace(LOG_ERR, "[main] failed to set IPv4 address on TUN interface");