From 35efcf3781152ff71bc19a05cee62f4abd31749d Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Mon, 27 Apr 2015 11:04:07 +0000 Subject: [PATCH 1/2] Enhance documentation Add packages name for Ubuntu 14.04 FossilOrigin-Name: fce6739c5f05cf6382c18fc47f502ee5a5901ba2ac25c94e79b8c5b8d3e7f0c0 --- INSTALL | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 76b0c2fd..a1ef279c 100644 --- a/INSTALL +++ b/INSTALL @@ -5,25 +5,33 @@ On a fresh Ubuntu 14.04: apt-get install git git clone https://github.com/7u83/actube.git -apt-get install build-essential +apt-get install build-essential clang libcapwap: - + +nettle (http://www.lysator.liu.se/~nisse/nettle/) +(apt-get install nettle-dev) gnutls (http://www.gnutls.org/) +(apt-get install libgnutls28-dev) openssl (https://www.openssl.org/) +(apt-get install libssl-dev) ac: libconfuse (http://www.nongnu.org/confuse/) +(apt-get install libconfuse-dev) libsqlite3 (http://www.sqlite.org/) +(apt-get install libsqlite3-dev) wtp: libuci (http://wiki.openwrt.org/doc/techref/uci) to build conten of contrib directory: cmake (http://www.cmake.org) +(apt-get install cmake) lua (http://www.lua.org/) - - +(apt-get install lua5.2) +libnl3 +(apt-get install libnl-genl-3-dev) From 155e4e77aeffba57af04e504882d6ac24b22bbfc Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Mon, 27 Apr 2015 16:54:13 +0000 Subject: [PATCH 2/2] Fix Segmentation fault when ifa_addr is NULL FossilOrigin-Name: a8a048f9712810e9d9f3cacfe41b27a786b86e14db65998ccbc2416efbf9bcec --- src/capwap/sock_get_primary_if.c | 3 +++ src/capwap/sock_getifaddr.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/capwap/sock_get_primary_if.c b/src/capwap/sock_get_primary_if.c index d1a7229c..375e06f9 100644 --- a/src/capwap/sock_get_primary_if.c +++ b/src/capwap/sock_get_primary_if.c @@ -37,6 +37,9 @@ char * sock_get_primary_if(int family) continue; } + if (ifa->ifa_addr == NULL) + continue; + if (ifa->ifa_addr->sa_family != family) continue; diff --git a/src/capwap/sock_getifaddr.c b/src/capwap/sock_getifaddr.c index 07919cca..5942dbe9 100644 --- a/src/capwap/sock_getifaddr.c +++ b/src/capwap/sock_getifaddr.c @@ -37,6 +37,9 @@ int sock_getifaddr(const char * ifname,int family, int type,struct sockaddr * sa if (strcmp(ifname,ifa->ifa_name)) continue; + if (ifa->ifa_addr == NULL) + continue; + if (ifa->ifa_addr->sa_family != family) continue;