planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Experimenting with modules

Browse Source 
FossilOrigin-Name: 02076431dabccef850cba729d5eb3c26c0bf7c4334b47649b04e0bc232433a64
This commit is contained in:
7u83@mail.ru 2016-02-14 16:30:14 +00:00
parent e5158696c4
commit b393486b4b
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Macros.mak
View File

@ -1,7 +1,6 @@
ifeq (${USE_CONTRIB_OPENSSL},1)
ifeq ($(USE_CONTRIB_OPENSSL),1) OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl
OPENSSL_LIBS=../contrib/$(OPENSSL_VERSION)/libssl.a ../contrib/$(OPENSSL_VERSION)/libcrypto.a -ldl OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/
OPENSSL_CFLAGS=../contrib/$(OPENSSL_VERSION)/include/
else else
OPENSSL_LDFLAGS=-lssl -lcrypto -ldl OPENSSL_LDFLAGS=-lssl -lcrypto -ldl
OPENSSL_CFLAGS= OPENSSL_CFLAGS=

17
src/ac/Makefile
View File

@ -45,12 +45,19 @@ CFLAGS += -DWITH_IPV6
RM = /bin/rm -f RM = /bin/rm -f
AC_MODULES = mod_cipwap.o
# list of generated object files for AC. # list of generated object files for AC.
AC_OBJS = wtplist.o wtpman.o conf.o ac_main.o \ AC_OBJS = \
ac_interface.o \ wtplist.o wtpman.o conf.o ac_main.o \
socklist.o \ ac_interface.o \
db.o \ socklist.o \
ac_global.o db.o \
ac_global.o \
${AC_MODULES}
AC_SRCS = $(AC_OBJS:.o=.c) AC_SRCS = $(AC_OBJS:.o=.c)
AC_DEPS := $(AC_OBJS:.o=.d) AC_DEPS := $(AC_OBJS:.o=.d)

4
src/ac/ac.default.conf
View File

@ -61,14 +61,14 @@
# with missing mandatory elements. # with missing mandatory elements.
# #
# Default: # Default:
# strict_capwap = 1 # strict_capwap = on
# strict_headers # strict_headers
# #
# If set to 1, any malformed packets wil b thrown away. # If set to 1, any malformed packets wil b thrown away.
# #
# Default: # Default:
# strict_headers = 1 # strict_headers = on
# capwap_mode # capwap_mode

1
src/ac/ac_main.c
View File

@ -290,6 +290,7 @@ int ac_run()
void process_cw_ctrl_packet(int index, struct sockaddr *addr, uint8_t * buffer, int len) void process_cw_ctrl_packet(int index, struct sockaddr *addr, uint8_t * buffer, int len)
{ {
/* first of all check preamble */ /* first of all check preamble */
int preamble = cw_get_hdr_preamble(buffer); int preamble = cw_get_hdr_preamble(buffer);

3
src/ac/wtpman.c
View File

@ -105,6 +105,7 @@ int check_discovery(struct conn *conn, struct cw_action_in *a, uint8_t * data, i
static void wtpman_run_discovery(void *arg) static void wtpman_run_discovery(void *arg)
{ {
struct wtpman *wtpman = (struct wtpman *) arg; struct wtpman *wtpman = (struct wtpman *) arg;
//struct cwrmsg *cwrmsg; //struct cwrmsg *cwrmsg;
@ -583,12 +584,14 @@ void wtpman_lw_addpacket(struct wtpman *wtpman, uint8_t * packet, int len)
void wtpman_start(struct wtpman *wtpman, int dtlsmode) void wtpman_start(struct wtpman *wtpman, int dtlsmode)
{ {
if (dtlsmode) { if (dtlsmode) {
cw_dbg(DBG_INFO, "Starting wtpman in DTLS mode"); cw_dbg(DBG_INFO, "Starting wtpman in DTLS mode");
pthread_create(&wtpman->thread, NULL, (void *) &wtpman_run, pthread_create(&wtpman->thread, NULL, (void *) &wtpman_run,
(void *) wtpman); (void *) wtpman);
} else { } else {
cw_dbg(DBG_INFO, "Starting wtpman in non-dtls mode"); cw_dbg(DBG_INFO, "Starting wtpman in non-dtls mode");
pthread_create(&wtpman->thread, NULL, (void *) &wtpman_run_discovery, pthread_create(&wtpman->thread, NULL, (void *) &wtpman_run_discovery,
(void *) wtpman); (void *) wtpman);
} }