From: Benjamin Cama <benoar@dolka.fr>
Date: Thu, 15 Sep 2011 21:49:30 +0000 (+0200)
Subject: Merge branch 'fdn-mods'
X-Git-Tag: debian/2.2.1-1fdn2~1
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/22eed1407ab31550b4b5ce1db74c840cac1a9ad6?hp=19004791b688c20db59ad6452c1519baca26330a

Merge branch 'fdn-mods'
---

diff --git a/cli.c b/cli.c
index 9433106..3a037fa 100644
--- a/cli.c
+++ b/cli.c
@@ -286,11 +286,19 @@ void init_cli(char *hostname)
 	addr.sin_addr.s_addr = config->cli_bind_address; /* defaults to INADDR_ANY */
 	addr.sin_port = htons(23);
 	if (bind(clifd, (void *) &addr, sizeof(addr)) < 0)
+	{
+		LOG(0, 0, 0, "Error binding cli on port 23: %s\n", strerror(errno));
+		close(clifd);
+		clifd = -1;
+		return;
+	}
+	if (listen(clifd, 10) < 0)
 	{
 		LOG(0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
+		close(clifd);
+		clifd = -1;
 		return;
 	}
-	listen(clifd, 10);
 }
 
 void cli_do(int sockfd)
diff --git a/l2tpns.c b/l2tpns.c
index 581198d..90ac930 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -30,7 +30,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <stddef.h>
 #include <time.h>
 #include <dlfcn.h>
@@ -446,7 +446,11 @@ static void routeset(sessionidt s, in_addr_t ip, int prefixlen, in_addr_t gw, in
 		req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
 	}
 	else
+	{
 		req.nh.nlmsg_type = RTM_DELROUTE;
+		req.nh.nlmsg_flags = NLM_F_REQUEST;
+	}
+
 	req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
 
 	req.rt.rtm_family = AF_INET;
@@ -521,7 +525,11 @@ void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add)
 		req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
 	}
 	else
+	{
 		req.nh.nlmsg_type = RTM_DELROUTE;
+		req.nh.nlmsg_flags = NLM_F_REQUEST;
+	}
+
 	req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
 
 	req.rt.rtm_family = AF_INET6;
@@ -648,7 +656,6 @@ static char *tun_nl_phase_msg[] = {
 // Set up TUN interface
 static void inittun(void)
 {
-	struct ifinfomsg ifinfo;
 	struct ifreq ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
@@ -672,41 +679,13 @@ static void inittun(void)
 	assert(strlen(ifr.ifr_name) < sizeof(config->tundevice) - 1);
 	strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice));
 
+	tunidx = if_nametoindex(config->tundevice);
+	if (tunidx == 0)
 	{
-		// get the interface index
-		struct {
-			struct nlmsghdr nh;
-			struct ifinfomsg ifinfo;
-		} req;
-		char buf[4096];
-		ssize_t len;
-		struct nlmsghdr *resp_nh;
-
-		req.nh.nlmsg_type = RTM_GETLINK;
-		req.nh.nlmsg_flags = NLM_F_REQUEST;
-		req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifinfo));
-
-		req.ifinfo.ifi_family = AF_UNSPEC; // as the man says
-
-		netlink_addattr(&req.nh, IFLA_IFNAME, config->tundevice, strlen(config->tundevice)+1);
-
-		if(netlink_send(&req.nh) < 0 || (len = netlink_recv(buf, sizeof(buf))) < 0)
-		{
-			LOG(0, 0, 0, "Error getting tun ifindex: %s\n", strerror(errno));
-			exit(1);
-		}
-
-		resp_nh = (struct nlmsghdr *)buf;
-		if (!NLMSG_OK (resp_nh, len))
-		{
-			LOG(0, 0, 0, "Malformed answer getting tun ifindex %ld\n", len);
-			exit(1);
-		}
-
-		memcpy(&ifinfo, NLMSG_DATA(resp_nh), sizeof(ifinfo));
-		// got index
-		tunidx = ifinfo.ifi_index;
+		LOG(0, 0, 0, "Can't get tun interface index\n");
+		exit(1);
 	}
+
 	{
 		struct {
 			// interface setting
@@ -722,11 +701,12 @@ static void inittun(void)
 
 		memset(&req, 0, sizeof(req));
 
-		req.nh.nlmsg_type = RTM_SETLINK;
+		req.nh.nlmsg_type = RTM_NEWLINK;
 		req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_MULTI;
 		req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.ifmsg.ifinfo));
 
-		req.ifmsg.ifinfo = ifinfo;
+		req.ifmsg.ifinfo.ifi_family = AF_UNSPEC;
+		req.ifmsg.ifinfo.ifi_index = tunidx;
 		req.ifmsg.ifinfo.ifi_flags |= IFF_UP; // set interface up
 		req.ifmsg.ifinfo.ifi_change = IFF_UP; // only change this flag
 
@@ -749,7 +729,7 @@ static void inittun(void)
 		req.ifmsg.ifaddr.ifa_family = AF_INET;
 		req.ifmsg.ifaddr.ifa_prefixlen = 32;
 		req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_UNIVERSE;
-		req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
+		req.ifmsg.ifaddr.ifa_index = tunidx;
 
 		if (config->bind_address)
 			ip = config->bind_address;
@@ -773,7 +753,7 @@ static void inittun(void)
 			req.ifmsg.ifaddr.ifa_family = AF_INET6;
 			req.ifmsg.ifaddr.ifa_prefixlen = 64;
 			req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_LINK;
-			req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
+			req.ifmsg.ifaddr.ifa_index = tunidx;
 
 			// Link local address is FE80::1
 			memset(&ip6, 0, sizeof(ip6));
@@ -794,7 +774,7 @@ static void inittun(void)
 			req.ifmsg.ifaddr.ifa_family = AF_INET6;
 			req.ifmsg.ifaddr.ifa_prefixlen = 64;
 			req.ifmsg.ifaddr.ifa_scope = RT_SCOPE_UNIVERSE;
-			req.ifmsg.ifaddr.ifa_index = ifinfo.ifi_index;
+			req.ifmsg.ifaddr.ifa_index = tunidx;
 
 			// Global address is prefix::1
 			ip6 = config->ipv6_prefix;
@@ -2979,7 +2959,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
 					// Set multilink options before sending initial LCP packet
 					sess_local[s].mp_mrru = 1614;
-					sess_local[s].mp_epdis = config->bind_address ? config->bind_address : my_address;
+					sess_local[s].mp_epdis = ntohl(config->bind_address ? config->bind_address : my_address);
 
 					sendlcp(s, t);
 					change_state(s, lcp, RequestSent);