Merge branch 'master' of https://github.com/7u83/actube

FossilOrigin-Name: 7d47a14c478879afb6501e691081f1974d6ab11966cfc3065104dad2acea6a65

.travis.yml

@@ -3,46 +3,23 @@ compiler:
   - clang
   - gcc
 sudo: require
-addons:
+dist: trusty
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-4.9
-    - libstdc++-4.9-dev
-    - autoconf
-    - automake
-    - autotools-dev
-    - libtool
-    - libgmp-dev
-    - libconfuse-dev
-    - lua5.1
-    - liblua5.1-0-dev
-# No yet whitelisted for Travis
-#    - libgnutls28-dev
-#    - libnl-3-dev
-#    - libnl-genl-3-dev
 before_install:
+  - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
+  - sudo apt-get -qq install g++-4.9 libstdc++-4.9-dev
+  - sudo apt-get -qq install cmake lua5.2 libnl-genl-3-dev
+  - sudo apt-get -qq install nettle-dev libgnutls28-dev libssl-dev
+  - sudo apt-get -qq install libconfuse-dev libsqlite3-dev
   - $CC --version
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
   - $CC --version
   - $CXX --version
-  - sudo apt-get install libgnutls28-dev libnl-genl-3-dev libnl-3-dev
-before_script:
-  - cd src/contrib
-  - sudo ./install_libuci.sh
-  - cd jsmn
-  - make
-  - cd ..
-  - cd ..
 script:
-  - cd capwap
   - make
+  - cd src
+  - cd ac 
+  - ./actube &
   - cd ..
   - cd wtp
-  - make
   - ./wtp &
-  - cd ..
-  - cd ac
-  - make
-  - ./actube &

src/cw/capwap.h

@@ -626,7 +626,7 @@ extern struct cw_strlist_elem mbag_item_strings[];
 #define cw_strerror(rc) cw_strrc(rc)
 */
 
-static inline const char * cw_strerror(rc) {
+static inline const char * cw_strerror(int rc) {
 	if (rc<0){
 		if (errno==EAGAIN)
 			return "Timed out";

src/cw/dtls_openssl.c

@@ -72,9 +72,6 @@ static void dtls_debug_cb(int write_p,int version,int type, const void * buf,siz
 static void dtls_info_cb (const SSL *ssl, int where, int ret)
 {
 	const char *str = NULL;
-	int w;
-
-	w = where & ~SSL_ST_MASK;
 
 	str = where & SSL_ST_CONNECT ? "connect" : where & SSL_ST_ACCEPT ? "accept" : "undefined";
 	if (where & SSL_CB_LOOP)

src/cw/format_is_utf8.c

@@ -33,11 +33,9 @@
 int format_is_utf8(unsigned char *str, size_t len)
 {
 	size_t i = 0;
-	size_t j = 0;
 	size_t bytes = 0;
 
 	while (i < len) {
-		j = i;
 		if (str[i] < 0x20) {
 			return 0;
 		}