From e3ba6898fd4a530eb5fe75224dbd58da0d6988c6 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sat, 2 Apr 2016 07:20:50 +0000 Subject: [PATCH] Sparated Cisco items. FossilOrigin-Name: 231ce4f57bb0b3995e8ef023b517f523cc975dc0e57901cd12ecd39ff3b14037 --- src/mod/cisco/Makefile | 3 ++- src/mod/cisco/cisco_actions_ac.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mod/cisco/Makefile b/src/mod/cisco/Makefile index 04693102..622bf2a4 100644 --- a/src/mod/cisco/Makefile +++ b/src/mod/cisco/Makefile @@ -15,7 +15,8 @@ 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_out_radio_administrative_states.o \ + cisco_items.o diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 026b347c..4d39ff58 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -33,6 +33,9 @@ #include "mod_cisco.h" #include "cisco.h" +#include "cisco_items.h" + + static cw_action_in_t actions_in[] = { @@ -401,12 +404,13 @@ int cisco_register_actions80211_ac(struct cw_actiondef *def) int rc; rc=0; rc = cw_actionlist_in_register_actions(def->in, actions80211_in); + rc += cw_itemdefheap_register(def->items, cisco_itemdefs); + /* 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, capwap_radioitemdefs); intavltree_add(def->wbids, 0);