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

Work on mods. 

FossilOrigin-Name: 854e21683acac6a13ce938ea49c55bc0ced53c40af9053e904d0c6dbfe16dd79
This commit is contained in:
7u83@mail.ru 2016-02-26 22:33:30 +00:00
parent f3e471174d
commit a7dbeb049a
8 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ac/Makefile
View File

@ -10,11 +10,13 @@ ifndef ARCH
ARCH = $(shell $(CC) -dumpmachine) ARCH = $(shell $(CC) -dumpmachine)
endif endif
LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../capwap/$(ARCH) LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../lib/$(ARCH)
CFLAGS += -Werror -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_ARCH=\"${ARCH}\" CFLAGS += -Werror -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_ARCH=\"${ARCH}\"
LIBS+=-lcapwap LIBS+=-lcapwap
LIBS+=-lcipwap
LIBS+=-lcw
LIBS+=-lrt LIBS+=-lrt
LIBS+=-lpthread LIBS+=-lpthread
LIBS+=-lconfuse LIBS+=-lconfuse
@ -75,7 +77,7 @@ all: $(AC_NAME)
$(AC_NAME): $(AC_OBJS) $(AC_NAME): $(AC_OBJS)
$(CC) $(AC_OBJS) -o $(AC_NAME) $(LDFLAGS) $(LIBS) $(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
clean: clean:

6
src/ac/conf.c
View File

@ -134,7 +134,7 @@ static int init_acname()
return 1; return 1;
} }
#include "capwap/mod.h" #include "../mod/modload.h"
struct mod_ac * conf_mods[10]; struct mod_ac * conf_mods[10];
@ -142,8 +142,8 @@ struct mod_ac * conf_mods[10];
static int init_mods() static int init_mods()
{ {
conf_mods[0]=cw_get_mod_ac("cipwap"); conf_mods[0]=modload_ac("cipwap");
conf_mods[1]=cw_get_mod_ac("capwap"); conf_mods[1]=modload_ac("capwap");
conf_mods[2]=NULL; conf_mods[2]=NULL;

27
src/capwap/Makefile
View File

@ -18,7 +18,8 @@ endif
#OPENSSLINC=$(OPENSSLINC) #OPENSSLINC=$(OPENSSLINC)
#../contrib/openssl-1.0.1i/include #../contrib/openssl-1.0.1i/include
NAME=libcapwap.a NAME=libcw.a
LIBDIR=../lib/$(ARCH)
SOCKOBJS=\ SOCKOBJS=\
sock_create.o\ sock_create.o\
@ -47,7 +48,6 @@ LOGOBJS=log.o \
log_file.o \ log_file.o \
dbg_strings.o\ dbg_strings.o\
dbg.o \ dbg.o \
cw_get_mod_ac.o
WTPINFOOBJS =\ WTPINFOOBJS =\
@ -277,7 +277,7 @@ OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I /usr/local/include CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I /usr/local/include -I../
#CFLAGS = -Wall -Os -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I/usr/local/include #CFLAGS = -Wall -Os -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I/usr/local/include
CFLAGS += $(GNUTLS_CFLAGS) \ CFLAGS += $(GNUTLS_CFLAGS) \
@ -292,8 +292,8 @@ CFLAGS += $(GNUTLS_CFLAGS) \
#SRCS = $(OBJS:.o=.c) #SRCS = $(OBJS:.o=.c)
MODOBJS=$(wildcard ./mod/cipwap/$(ARCH)/*.o) #MODOBJS=$(wildcard ./mod/cipwap/$(ARCH)/*.o)
MODOBJS+=$(wildcard ./mod/capwap/$(ARCH)/*.o) #MODOBJS+=$(wildcard ./mod/capwap/$(ARCH)/*.o)
$(ARCH)/%.o:%.c $(ARCH)/%.o:%.c
@mkdir -p $(ARCH) @mkdir -p $(ARCH)
@ -301,9 +301,10 @@ $(ARCH)/%.o:%.c
@$(CC) -c $(CFLAGS) $< -o $@ @$(CC) -c $(CFLAGS) $< -o $@
# @$(CC) -MM $(CFLAGS) $< > $*.d # @$(CC) -MM $(CFLAGS) $< > $*.d
$(ARCH)/$(NAME) : $(OBJS) $(MODOBJS) $(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
@echo " AR $(ARCH)/$(NAME)" @mkdir -p $(LIBDIR)
@$(AR) rcs $(ARCH)/$(NAME) $(OBJS) $(MODOBJS) @echo " AR $(LIBDIR)/$(NAME)"
@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
SRCS = $(OBJS:.o=.c) SRCS = $(OBJS:.o=.c)
@ -314,19 +315,11 @@ DEPS := $(OBJS:.o=.d)
# top-level rule, to compile everything. # top-level rule, to compile everything.
all: all: $(ARCH)/$(NAME)
$(MAKE) mod_cipwap
$(MAKE) capwap
capwap: $(ARCH)/$(NAME)
mod_cipwap:
$(MAKE) -C mod/cipwap
clean: clean:
$(RM) $(ARCH)/* $(RM) $(ARCH)/*

12
src/capwap/mod.h
View File

@ -4,8 +4,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "sock.h" #include "capwap/sock.h"
#include "conn.h" #include "capwap/conn.h"
struct mod_ac struct mod_ac
{ {
@ -24,13 +24,13 @@ struct mod_ac
}; };
#include "mod/cipwap/mod_cipwap.h" //#include "cipwap/mod_cipwap.h"
#include "mod/capwap/mod_capwap.h" //#include "capwap/mod_capwap.h"
#define MODS_AC { mod_capwap_ac,mod_cipwap_ac,NULL } //#define MODS_AC { mod_capwap_ac,mod_cipwap_ac,NULL }
extern struct mod_ac * cw_get_mod_ac(const char *name); //extern struct mod_ac * cw_get_mod_ac(const char *name);
#endif #endif

17
src/mod/capwap/Makefile
View File

@ -1,5 +1,5 @@
include ../../../Macros.mak include ../../Macros.mak
include ../../../Config.mak include ../../Config.mak
OBJS=\ OBJS=\
mod_capwap_ac.o \ mod_capwap_ac.o \
@ -10,8 +10,10 @@ OBJS=\
OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS)) OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../../ CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../ -I../
NAME=libcapwap.a
LIBDIR=../../lib/$(ARCH)
SRCS = $(OBJS:.o=.c) SRCS = $(OBJS:.o=.c)
@ -21,7 +23,14 @@ $(ARCH)/%.o:%.c
@$(CC) -c $(CFLAGS) $< -o $@ @$(CC) -c $(CFLAGS) $< -o $@
all: $(OBJS) $(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
@mkdir -p $(LIBDIR)
@echo " AR $(LIBDIR)/$(NAME)"
@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
all: $(LIBDIR)/$(NAME)
clean: clean:
rm -rf $(ARCH) rm -rf $(ARCH)
rm -f $(LIBDIR)/$(NAME)

2
src/mod/capwap/mod_capwap_ac.c
View File

@ -1,5 +1,5 @@
#include "capwap/mod.h" #include "mod.h"
#include "capwap/log.h" #include "capwap/log.h"
#include "capwap/dbg.h" #include "capwap/dbg.h"

16
src/mod/cipwap/Makefile
View File

@ -1,5 +1,5 @@
include ../../../Macros.mak include ../../Macros.mak
include ../../../Config.mak include ../../Config.mak
OBJS=\ OBJS=\
mod_cipwap_ac.o mod_cipwap_ac.o
@ -7,9 +7,12 @@ OBJS=\
OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS)) OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../../ CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../ -I../
NAME=libcipwap.a
LIBDIR=../../lib/$(ARCH)
SRCS = $(OBJS:.o=.c) SRCS = $(OBJS:.o=.c)
$(ARCH)/%.o:%.c $(ARCH)/%.o:%.c
@ -17,8 +20,13 @@ $(ARCH)/%.o:%.c
@echo " CC "$< @echo " CC "$<
@$(CC) -c $(CFLAGS) $< -o $@ @$(CC) -c $(CFLAGS) $< -o $@
$(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
@mkdir -p $(LIBDIR)
@echo " AR $(LIBDIR)/$(NAME)"
@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
all: $(OBJS)
all: $(LIBDIR)/$(NAME)
clean: clean:
rm -rf $(ARCH) rm -rf $(ARCH)

2
src/mod/cipwap/mod_cipwap_ac.c
View File

@ -1,5 +1,5 @@
#include "capwap/mod.h" #include "mod.h"
#include "capwap/log.h" #include "capwap/log.h"
#include "mod_cipwap.h" #include "mod_cipwap.h"