From 600b81b935032579e80dd4e01e41116e82a5a01f Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Thu, 28 Jul 2022 02:41:47 +0200 Subject: [PATCH] sript to install libmavl in contrib directory --- src/CWConfig.mak | 4 --- src/Config.default.mak | 50 ---------------------------- src/Macros.mak | 51 ----------------------------- src/contrib/install_libmav.sh | 10 ++++++ src/contrib/libmavl-LocalDefs.mak | 6 ++++ src/mod/Mod.mak | 54 ------------------------------- src/wtp/cisco.ktv | 4 +-- src/wtp/wtp_main.c | 2 ++ 8 files changed, 20 insertions(+), 161 deletions(-) delete mode 100644 src/CWConfig.mak delete mode 100644 src/Config.default.mak delete mode 100644 src/Macros.mak create mode 100755 src/contrib/install_libmav.sh create mode 100644 src/contrib/libmavl-LocalDefs.mak delete mode 100644 src/mod/Mod.mak diff --git a/src/CWConfig.mak b/src/CWConfig.mak deleted file mode 100644 index 1706c863..00000000 --- a/src/CWConfig.mak +++ /dev/null @@ -1,4 +0,0 @@ -include ../Config.default.mak - -WITH_GNUTLS=1 -WITH_OPENSSL=0 diff --git a/src/Config.default.mak b/src/Config.default.mak deleted file mode 100644 index 1857b0ad..00000000 --- a/src/Config.default.mak +++ /dev/null @@ -1,50 +0,0 @@ -# -# OpenSSL definitions -# Chose either the contrib version or the system installed version -# - -#OPENSSL_VERSION=openssl-1.0.1i -#OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl -#OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ - - -ARCH != uname -m - -OPENSSL_LIBS=-lssl -lcrypto #-ldl -OPENSSL_CFLAGS= - - - -# GnuTLS definitions -# GNUTLS_VERSION=3.3.9 - -USE_CONTRIB_GNUTLS=0 - - -COMPDEFS=-DWITH_CW_LOG -COMPDEFS+=-DWITH_CW_LOG_DEBUG - -# -# LIBCW settings - -# WITH_GNUTLS -# compile in support for GnuTLS -# -WITH_GNUTLS=1 - -# -# Compile in openssl support -# -WITH_OPENSSL=1 - -# -# -LIBDIR=lib - -OPTFLAGS := -g -O0 -#CFLAGS := -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE=1 -pedantic -std=c99 -Wall - - - - - diff --git a/src/Macros.mak b/src/Macros.mak deleted file mode 100644 index 93068b07..00000000 --- a/src/Macros.mak +++ /dev/null @@ -1,51 +0,0 @@ -ifeq (${USE_CONTRIB_OPENSSL},1) -OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl -OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ -else -OPENSSL_LDFLAGS= -OPENSSL_CFLAGS= -OPENSSL_LIBS=-lssl -lcrypto #-ldl -endif - -ifeq ($(USE_CONTRIB_GNUTLS),1) -GNUTLS_CFLAGS=-I../contrib/gnutls-${GNUTLS_VERSION}/lib/includes -GNUTLS_LIBS=-lgmp -lgnutls -lnettle -GNUTLS_LDFLAGS=-L../contrib/gnutls-${GNUTLS_VERSION}/lib/.libs/ -else -GNUTLS_CFLAGS= -GNUTLS_LIBS=-lgnutls -lnettle -lgmp -GNUTLS_LDFLAGS= -endif - - -ifeq ($(CC),clang) -LDFLAGS += -g -L/usr/local/lib -CFLAGS += -fPIC $(OPTFLAGS) -D_REENTRANT -I /usr/local/include -I../ -LD = clang -endif - -ifeq ($(CC),gcc) -LDFLAGS += -g -L/usr/local/lib -CFLAGS += -fPIC $(OPTFLAGS) -D_REENTRANT -I /usr/local/include -I../ -LD = gcc -endif - -ifeq ($(CC),tcc) -LDFLAGS += -g -L/usr/local/lib -CFLAGS += -Wall $(OPTFLAGS) -Wunusupported -Wimplicit-function-declaration -I /usr/local/include -I../ -LD = tcc -endif - -ifeq ($(CC),cc) -LDFLAGS += -g -L/usr/local/lib -CFLAGS += -fPIC $(OPTFLAGS) -D_REENTRANT -I /usr/local/include -I../ -LD = cc -endif - - - -CFLAGS += -DWITH_IPV6 -DWITH_RMAC_SUPPORT - - - - diff --git a/src/contrib/install_libmav.sh b/src/contrib/install_libmav.sh new file mode 100755 index 00000000..45c787e7 --- /dev/null +++ b/src/contrib/install_libmav.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +VERSION="1.1.0a" + +wget ftp://ftp.planix.org/pub/planix/libmavl-${VERSION}.tgz +tar xzvf libmavl-${VERSION}.tgz +cd libmavl-${VERSION} +cp ../libmavl-LocalDefs.mak . +make install + diff --git a/src/contrib/libmavl-LocalDefs.mak b/src/contrib/libmavl-LocalDefs.mak new file mode 100644 index 00000000..d3f1303e --- /dev/null +++ b/src/contrib/libmavl-LocalDefs.mak @@ -0,0 +1,6 @@ +include ../../Defs.mak + +PREFIX=../../.. +INSTALL_LIB_DIR := /lib/$(KERNEL)/$(ARCH) +INSTALL_INCLUDE_DIR := /include + diff --git a/src/mod/Mod.mak b/src/mod/Mod.mak deleted file mode 100644 index 649804eb..00000000 --- a/src/mod/Mod.mak +++ /dev/null @@ -1,54 +0,0 @@ -include ../../Config.mak --include ../../Config.local.mak -include ../../Macros.mak - -OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS)) - - -#CFLAGS = -fPIC -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 $(COMPDEFS) -DWITH_RMAC_SUPPORT - -CFLAGS+= -I ../../ -I../ -I../../include - -ifeq ($(SSL_LIBRARY),GNUTLS) -CFLAGS+=-DWITH_GNUTLS -endif - -ifeq ($(SSL_LIBRARY),OPENSSL) -CFLAGS+=-DWITH_OPENSSL -endif - - - -SRCS = $(OBJS:.o=.c) - -all: $(SNAME) $(DNAME) $(MODNAME) - -$(OBJDIR)/%.o:%.c - @mkdir -p $(OBJDIR) - @echo " $(CC) "$< - @$(CC) -c $(CFLAGS) $< -o $@ - - -$(SNAME) : $(OBJS) $(MODOBJS) - @mkdir -p $(LIBARCHDIR) - @echo " $(AR) $(SNAME)" - @$(AR) rcs $(SNAME) $(OBJS) $(MODOBJS) - -$(DNAME) : $(OBJS) $(MODOBJS) - @mkdir -p $(LIBARCHDIR) - @echo " $(CC) $(DNAME)" - @$(LD) -L$(LIBARCHDIR) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(MODOBJS) $(SLIBS) $(LIBS) - -$(MODNAME) : $(DNAME) - cp $(DNAME) $(MODNAME) - -# $(CC) -L$(LIBARCHDIR) $(OBJS) $(MODOBJS) $(SLIBS) -v -shared -o ../../../lib/actube/capwap.so - - - -clean: - rm -rf $(OBJDIR) - rm -f $(SNAME) - rm -f $(DNAME) - rm -f $(MODNAME) - diff --git a/src/wtp/cisco.ktv b/src/wtp/cisco.ktv index d23280ff..856e8e71 100644 --- a/src/wtp/cisco.ktv +++ b/src/wtp/cisco.ktv @@ -61,7 +61,7 @@ cisco/ap-regulatory-domain.1/slot :Byte: 0 cisco/ap-sub-mode :Byte: 0 cisco/ap-telnet-ssh/ssh :Bool: false cisco/ap-telnet-ssh/telnet :Bool: false -cisco/ap-timesync/timestamp :Dword: 1469608260 +cisco/ap-timesync/timestamp :Dword: 1469663405 cisco/ap-timesync/type :Byte: 0 cisco/ap-username-and-password/802.1x-credentials/option :Word: 2 cisco/ap-username-and-password/802.1x-credentials/password :Str: @@ -196,7 +196,7 @@ radio.0/wlan.0/add-wlan/scan-defer-time :Word: 100 radio.0/wlan.0/add-wlan/session-timout :Word: 1800 radio.0/wlan.0/add-wlan/ssid :Str: radio.0/wlan.0/add-wlan/wep-encryption :Bool: false -radio.0/wlan.0/add-wlan/wep-key :Bstr16: .x5b2a9f4c8b4d28d8f5dbbc0660 +radio.0/wlan.0/add-wlan/wep-key :Bstr16: .x0c1dfebf4fe85062a9104d37b4 radio.0/wlan.0/add-wlan/wep-key-index :Byte: 1 radio.0/wlan.0/add-wlan/wlan-capability :Word: 1073 radio.0/wlan.0/add-wlan/wlan-id :Byte: 1 diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index f8e7f752..3eb03fd9 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -224,11 +224,13 @@ exit(0); } mavl_del_all(conn->remote_cfg); +printf("JOIN\n"); join(conn,&dis); clean_cfg(conn->remote_cfg); mavl_merge(conn->local_cfg,conn->remote_cfg); mavl_del_all(conn->remote_cfg); +printf("JOIN CONF\n"); configure(conn); clean_cfg(conn->remote_cfg); mavl_merge(conn->local_cfg,conn->remote_cfg);