From b8a06da8c4b8b6352ffca202faf325b0eeec4bc1 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Wed, 13 Apr 2016 08:33:08 +0000 Subject: [PATCH] Added mod_zyxel FossilOrigin-Name: 92bba90ca6b39e100681927b2fc78099e7dfb912c1b8a18a5e1179596540af2c --- src/ac/Makefile | 1 + src/ac/conf.c | 9 +-- src/mod/cisco/Makefile | 2 +- src/mod/modload.h | 3 +- src/mod/zyxel/Makefile | 12 ++++ src/mod/zyxel/mod_zyxel.h | 7 ++ src/mod/zyxel/zyxel_actions_ac.c | 120 +++++++++++++++++++++++++++++++ 7 files changed, 148 insertions(+), 6 deletions(-) create mode 100644 src/mod/zyxel/Makefile create mode 100644 src/mod/zyxel/mod_zyxel.h create mode 100644 src/mod/zyxel/zyxel_actions_ac.c diff --git a/src/ac/Makefile b/src/ac/Makefile index c37f8bde..4d8300d8 100644 --- a/src/ac/Makefile +++ b/src/ac/Makefile @@ -19,6 +19,7 @@ LIBS+=-lcapwap80211 LIBS+=-lcipwap LIBS+=-lcisco LIBS+=-lfortinet +LIBS+=-lzyxel LIBS+=-lcw LIBS+=-lrt LIBS+=-lpthread diff --git a/src/ac/conf.c b/src/ac/conf.c index 53a5bb6f..1f6dae07 100644 --- a/src/ac/conf.c +++ b/src/ac/conf.c @@ -144,10 +144,11 @@ static int init_mods() conf_mods[0]=modload_ac("cisco"); conf_mods[1]=modload_ac("fortinet"); - conf_mods[2]=modload_ac("cipwap"); - conf_mods[3]=modload_ac("capwap"); - conf_mods[4]=modload_ac("capwap80211"); - conf_mods[5]=NULL; + conf_mods[2]=modload_ac("zyxel"); + conf_mods[3]=modload_ac("cipwap"); + conf_mods[4]=modload_ac("capwap"); + conf_mods[5]=modload_ac("capwap80211"); + conf_mods[6]=NULL; diff --git a/src/mod/cisco/Makefile b/src/mod/cisco/Makefile index ad7fec16..a94b081e 100644 --- a/src/mod/cisco/Makefile +++ b/src/mod/cisco/Makefile @@ -15,7 +15,6 @@ OBJS=\ cisco_in_radio_administrative_state.o \ cisco_in_spam_vendor_specific.o \ cisco_in_telnet_ssh.o \ - cisco_out_radio_administrative_states.o \ cisco_items.o \ cisco80211_in_mac_operation.o \ cisco80211_in_wtp_radio_configuration.o \ @@ -28,6 +27,7 @@ OBJS=\ cisco_out_radio_operational_state.o \ cisco_in_radio_operational_state.o +# cisco_out_radio_administrative_state.o \ diff --git a/src/mod/modload.h b/src/mod/modload.h index ace4bf32..a81905f9 100644 --- a/src/mod/modload.h +++ b/src/mod/modload.h @@ -10,9 +10,10 @@ struct mod_wtp * modload_wtp(const char *name); #include "capwap/mod_capwap.h" #include "cisco/mod_cisco.h" #include "fortinet/mod_fortinet.h" +#include "zyxel/mod_zyxel.h" #include "capwap80211/mod_capwap80211.h" -#define MODS_AC { mod_capwap_ac, mod_cipwap_ac, mod_cisco_ac, mod_capwap80211_ac, mod_fortinet_ac, NULL } +#define MODS_AC { mod_capwap_ac, mod_cipwap_ac, mod_cisco_ac, mod_zyxel_ac, mod_capwap80211_ac, mod_fortinet_ac, NULL } #define MODS_WTP { mod_capwap_wtp, mod_cipwap_wtp, mod_cisco_wtp, mod_capwap80211_wtp, mod_fortinet_wtp, NULL } diff --git a/src/mod/zyxel/Makefile b/src/mod/zyxel/Makefile new file mode 100644 index 00000000..86c55205 --- /dev/null +++ b/src/mod/zyxel/Makefile @@ -0,0 +1,12 @@ + +OBJS=\ + mod_zyxel_ac.o \ + zyxel_actions_ac.o + + + +NAME=libzyxel.a + +include ../Mod.mak + + diff --git a/src/mod/zyxel/mod_zyxel.h b/src/mod/zyxel/mod_zyxel.h new file mode 100644 index 00000000..2f7078da --- /dev/null +++ b/src/mod/zyxel/mod_zyxel.h @@ -0,0 +1,7 @@ +#ifndef __MOD_ZYXEL_H +#define __MOD_ZYXEL_H + +struct mod_ac * mod_zyxel_ac(); + + +#endif diff --git a/src/mod/zyxel/zyxel_actions_ac.c b/src/mod/zyxel/zyxel_actions_ac.c new file mode 100644 index 00000000..45601e2a --- /dev/null +++ b/src/mod/zyxel/zyxel_actions_ac.c @@ -0,0 +1,120 @@ +/* + This file is part of libcapwap. + + libcapwap is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libcapwap is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Foobar. If not, see . + +*/ + + +#include "cw/capwap.h" +#include "cw/cipwap.h" + +#include "cw/action.h" +#include "cw/capwap_items.h" +#include "cw/strheap.h" +#include "cw/radio.h" +#include "cw/capwap80211.h" +#include "cw/capwap80211_items.h" + +#include "cw/cw_80211.h" + +#include "include/capwap_actions.h" + + + +#include "include/cipwap_items.h" + + +static cw_action_in_t actions_in[] = { + + + + /* End of list */ + {0, 0} +}; + + +static cw_action_out_t actions_out[]={ + {0,0} + +}; + +static cw_action_in_t actions80211_in[] = { + + {0,0} + +}; + + + + +static cw_action_out_t actions80211_out[]={ + + + + {0,0} +}; + + +#include "cw/item.h" + + +#include "../modload.h" + +int zyxel_register_actions_ac(struct cw_actiondef *def) +{ + + int rc; + rc = cw_actionlist_in_register_actions(def->in, actions_in); + rc += cw_actionlist_out_register_actions(def->out, actions_out); + + rc += cw_strheap_register_strings(def->strmsg, capwap_strings_msg); + rc += cw_strheap_register_strings(def->strelem, cipwap_strings_elem); + +// rc += cw_itemdefheap_register(def->items, _capwap_itemdefs); +// rc += cw_itemdefheap_register(def->radioitems, cisco_radioitemdefs); + + intavltree_add(def->wbids, 0); + + + + return rc; +} + + + +int zyxel_register_actions80211_ac(struct cw_actiondef *def) +{ + + int rc; + rc=0; + rc = cw_actionlist_in_register_actions(def->in, actions80211_in); + rc += cw_actionlist_out_register_actions(def->out, actions80211_out); +// rc += cw_itemdefheap_register(def->items, cisco_itemdefs); +// rc += cw_itemdefheap_register(def->radioitems, cisco_radioitemdefs); + + +/* rc += cw_strheap_register_strings(def->strmsg, capwap_strings_msg); + rc += cw_strheap_register_strings(def->strelem, cipwap_strings_elem); + + rc += cw_itemdefheap_register(def->radioitems, capwap_radioitemdefs); + + intavltree_add(def->wbids, 0); +*/ + + + return rc; +} + +