Workig on Modules

FossilOrigin-Name: 57d51d934fb035d00765d1b3a03b9a6b2e6aa75e1e10b24760d66eaa93dc0250
This commit is contained in:
7u83@mail.ru 2016-02-22 08:18:35 +00:00
parent 99349f4b1b
commit 7e9721f369
7 changed files with 44 additions and 21 deletions

View File

@ -18,3 +18,10 @@ GNUTLS_LIBS=
GNUTLS_LDFLAGS=-lgnutls -lnettle -lgmp
endif
ifndef ARCH
ARCH = $(shell $(CC) -dumpmachine)
endif

View File

@ -79,10 +79,19 @@ static int parse_args(int argc, char *argv[])
return 0;
}
#include "capwap/mod.h"
extern struct mod_ac * cw_get_mod_ac(const char *name);
int main(int argc, char *argv[])
{
int rc = 0;
struct mod_ac *m = cw_get_mod_ac("capwap");
m->init();
exit(0);
/* parse arguments */
parse_args(argc, argv);

View File

@ -9,9 +9,9 @@ ifndef AR
AR = ar
endif
ifndef ARCH
ARCH = $(shell $(CC) -dumpmachine)
endif
#ifndef ARCH
# ARCH = $(shell $(CC) -dumpmachine)
#endif
@ -39,14 +39,15 @@ SOCKOBJS=\
sock_set_dontfrag.o \
sock_get_primary_if.o \
sock_receive.o \
sock_getifinfo.o
sock_getifinfo.o \
LOGOBJS=log.o \
log_syslog.o \
log_file.o \
dbg_strings.o\
dbg.o
dbg.o \
cw_get_mods.o
WTPINFOOBJS =\
@ -262,7 +263,7 @@ OBJS=$(CONNOBJS) $(FRAGOBJS) $(SOCKOBJS) $(CAPWAPOBJS) $(WTPINFOOBJS) \
$(LWAPPOBJS) \
$(LWAPPCISCOOBJS) \
$(CWACTION) \
$(MAVLOBJS)
$(MAVLOBJS) \
#include $(OBJS:.o=.d)
@ -270,7 +271,11 @@ O:=$(OBJS);
OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
CFLAGS = -Wall -Werror -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
#CFLAGS = -Wall -Os -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I/usr/local/include
CFLAGS += $(GNUTLS_CFLAGS) \
@ -282,6 +287,8 @@ CFLAGS += $(GNUTLS_CFLAGS) \
-Werror
#SRCS = $(OBJS:.o=.c)
$(ARCH)/%.o:%.c
@ -292,17 +299,24 @@ $(ARCH)/%.o:%.c
$(ARCH)/$(NAME) : $(OBJS)
@echo " AR $(ARCH)/$(NAME)"
@$(AR) rcs $(ARCH)/$(NAME) $(OBJS)
@$(AR) rcs $(ARCH)/$(NAME) $(OBJS) $(MODOBJS)
SRCS = $(OBJS:.o=.c)
DEPS := $(OBJS:.o=.d)
mod_cipwap:
$(MAKE) -C mod/cipwap
.PHONY: deps clean clean_libs libs
# top-level rule, to compile everything.
all: $(ARCH)/$(NAME)
$(MAKE) mod_cipwap
clean:

View File

@ -1155,4 +1155,6 @@ int cw_in_radio_administrative_state_wtp(struct conn *conn, struct cw_action_in
struct sockaddr *from);
#endif

View File

@ -74,7 +74,7 @@ int cw_check_missing_mand(cw_action_in_t ** out, struct conn * conn, cw_action_i
if (!ai->mand)
continue;
int i = (int)ai->item_id;
int i = (intptr_t)ai->item_id;
void * rc = mavl_get(conn->mand,&i);
if (!rc) {
out[n++]=ai;

View File

@ -128,18 +128,6 @@ int cw_put_custom_msg(struct conn *conn, uint8_t * rawout, mavl_conststr_t elems
as.msg_id=msg_id;
as.item_id=i;
as.vendor_id=0;
}

View File

@ -75,6 +75,9 @@ extern int sock_getifinfo(const struct sockaddr *addr, char *ifname,
char *sock_strsockaddr(const struct sockaddr *sa, char *s, size_t maxlen, int addport);
int sock_parse_ip_address ( const char** ppszText,
unsigned char* abyAddr, int* pnPort, int* pbIsIPv6 );
#define sock_addr2str(s) ( sock_strsockaddr( (struct sockaddr*)s, (char[64]){0}, 64,0 ) )