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

modified mod_cisco to compile as dll

Browse Source 
FossilOrigin-Name: 80dd614719e8d1eade48978ae743c603fed96ec0779e953719ff66bd89b0f5c3
This commit is contained in:
7u83@mail.ru
2018-02-26 14:00:05 +00:00
parent e3b569f13a
commit 33cc9e3af9
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/cipwap/Makefile
View File

@ -1,13 +1,23 @@
include ../../Macros.mak
include ../../Config.mak
include ../../Config.local.mak
OBJS=\ OBJS=\
mod_cipwap_ac.o \ mod_cipwap_ac.o \
mod_cipwap_wtp.o \
cipwap_actions_ac.o \ cipwap_actions_ac.o \
cipwap_actions_wtp.o \ cipwap_actions_wtp.o \
cipwap_items.o \ cipwap_items.o \
NAME := cipwap
LIBDIR := ../../../lib
LIBARCHDIR := $(LIBDIR)/$(ARCH)
OBJDIR := ../../../obj/mod_$(NAME)/$(ARCH)
SNAME := $(LIBARCHDIR)/libmod_$(NAME).a
DNAME := $(LIBARCHDIR)/mod_$(NAME).so
MODNAME := $(LIBDIR)/mod_$(NAME).so
SLIBS := -lcw
NAME=libcipwap.a
include ../Mod.mak include ../Mod.mak

13
src/mod/cisco/Makefile
View File

@ -1,7 +1,10 @@
include ../../Macros.mak
include ../../Config.mak
include ../../Config.local.mak
OBJS=\ OBJS=\
mod_cisco_ac.o \ mod_cisco_ac.o \
mod_cisco_wtp.o \
cisco_actions_ac.o \ cisco_actions_ac.o \
cisco_actions_wtp.o \ cisco_actions_wtp.o \
cisco_out_ap_timesync.o \ cisco_out_ap_timesync.o \
@ -31,8 +34,14 @@ OBJS=\
# cisco_out_radio_administrative_state.o \ # cisco_out_radio_administrative_state.o \
LIBDIR := ../../../lib
LIBARCHDIR := $(LIBDIR)/$(ARCH)
OBJDIR := ../../../obj/mod_cisco/$(ARCH)
SNAME := $(LIBARCHDIR)/libmod_cisco.a
DNAME := $(LIBARCHDIR)/mod_cisco.so
MODNAME := $(LIBDIR)/mod_cisco.so
SLIBS := -lcw -lmod_cipwap -lmod_capwap
NAME=libcisco.a
include ../Mod.mak include ../Mod.mak

5
src/mod/cisco/cisco_out_wtp_descriptor.c
View File

@ -6,12 +6,13 @@
#include "cisco.h" #include "cisco.h"
extern mbag_t cisco_config_wtp; //#extern mbag_t cisco_config_wtp;
int cisco_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a, uint8_t * dst) int cisco_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
{ {
mbag_t mbag = cisco_config_wtp; // mbag_t mbag = cisco_config_wtp;
mbag_t mbag = NULL;
// XXX Dummy WTP Descriptor Header // XXX Dummy WTP Descriptor Header
uint8_t *d = dst+4; uint8_t *d = dst+4;

8
src/mod/cisco/mod_cisco_ac.c
View File

@ -27,7 +27,7 @@ static int register_actions(struct cw_actiondef *actions, int mode)
case CW_MOD_MODE_CAPWAP: case CW_MOD_MODE_CAPWAP:
{ {
struct cw_Mod *cmod = modload_ac("cipwap"); struct cw_Mod *cmod = NULL; //modload_ac("cipwap");
if (!cmod) { if (!cmod) {
cw_log(LOG_ERR, cw_log(LOG_ERR,
"Can't initialize mod_cisco, failed to load base mod mod_cipwap"); "Can't initialize mod_cisco, failed to load base mod mod_cipwap");
@ -40,7 +40,7 @@ static int register_actions(struct cw_actiondef *actions, int mode)
} }
case MOD_MODE_BINDINGS: case MOD_MODE_BINDINGS:
{ {
struct cw_Mod *cmod = modload_ac("capwap80211"); struct cw_Mod *cmod = NULL; //modload_ac("capwap80211");
if (!cmod) { if (!cmod) {
cw_log(LOG_ERR, cw_log(LOG_ERR,
"Can't initialize mod_cisco, failed to load base mod mod_capwap80211"); "Can't initialize mod_cisco, failed to load base mod mod_capwap80211");
@ -180,3 +180,7 @@ struct cw_Mod *mod_cisco_ac()
}; };
struct cw_Mod *mod_cisco()
{
return &capwap_ac;
};