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

renamed MBAG_DWORD to MTYPE_DWORD 

FossilOrigin-Name: b00554dede0d39403c706f0dc0685f9fda6a5d5062e2462bc622cd112150c606
This commit is contained in:
7u83@mail.ru 2018-02-18 13:17:45 +00:00
parent 597d06e2c2
commit 6aec017177
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cw/capwap80211_items.c
View File

@ -40,15 +40,15 @@ struct cw_itemdef capwap80211_radioitemdefs[] = {
{CW_RADIOITEM80211_SUPPORTED_RATES,CW_ITEM_NONE,CAPWAP80211_TYPE_RATESET},
{CW_RADIOITEM80211_RATE_SET,CW_ITEM_NONE,CAPWAP80211_TYPE_RATESET},
{CW_RADIOITEM80211_WTP_RADIO_INFORMATION,CW_ITEM_NONE,MBAG_DWORD},
{CW_RADIOITEM80211_WTP_RADIO_INFORMATION,CW_ITEM_NONE,MTYPE_DWORD},
/* MAC Operation */
{CW_RADIOITEM80211_RTS_THRESHOLD,CW_ITEM_NONE,MBAG_WORD},
{CW_RADIOITEM80211_SHORT_RETRY,CW_ITEM_NONE,MBAG_BYTE},
{CW_RADIOITEM80211_LONG_RETRY,CW_ITEM_NONE,MBAG_BYTE},
{CW_RADIOITEM80211_FRAGMENTATION_THRESHOLD,CW_ITEM_NONE,MBAG_WORD},
{CW_RADIOITEM80211_TX_MSDU_LIFETIME,CW_ITEM_NONE,MBAG_DWORD},
{CW_RADIOITEM80211_RX_MSDU_LIFETIME,CW_ITEM_NONE,MBAG_DWORD},
{CW_RADIOITEM80211_TX_MSDU_LIFETIME,CW_ITEM_NONE,MTYPE_DWORD},
{CW_RADIOITEM80211_RX_MSDU_LIFETIME,CW_ITEM_NONE,MTYPE_DWORD},
/* Radio Config Items */
{CW_RADIOITEM80211_SHORT_PREAMBLE,CW_ITEM_NONE,MBAG_BYTE},

6
src/cw/capwap_items.c
View File

@ -130,12 +130,12 @@ struct cw_itemdef capwap_itemdefs[] = {
//{CW_ITEM_WTP_GROUP_NAME,CW_ITEM_NONE,MBAG_STR},
{CW_ITEM_MAXIMUM_MESSAGE_LENGTH,CW_ITEM_NONE,MBAG_WORD},
{CW_ITEM_STATISTICS_TIMER,CW_ITEM_NONE,MBAG_WORD},
{CW_ITEM_IDLE_TIMEOUT,CW_ITEM_NONE,MBAG_DWORD},
{CW_ITEM_IDLE_TIMEOUT,CW_ITEM_NONE,MTYPE_DWORD},
{CW_ITEM_CAPWAP_TIMERS,CW_ITEM_NONE,MBAG_WORD},
{CW_ITEM_AC_NAME_WITH_PRIORITY,CW_ITEM_ANY,MBAG_STR},
{CW_ITEM_AC_NAME,CW_ITEM_NONE,MBAG_STR},
{CW_ITEM_RESULT_CODE,CW_ITEM_NONE,MBAG_DWORD},
{CW_ITEM_RESULT_CODE,CW_ITEM_NONE,MTYPE_DWORD},
{CW_ITEM_ECN_SUPPORT,CW_ITEM_NONE,MBAG_BYTE},
{CW_ITEM_DISCOVERY_TYPE,CW_ITEM_NONE,MBAG_BYTE},
{ CW_ITEM_SESSION_ID,CW_ITEM_NONE,MBAG_BSTR},
@ -146,7 +146,7 @@ struct cw_itemdef capwap_itemdefs[] = {
/* Board Data */
{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_NONE,MBAG_MBAG},
{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_VENDOR,MBAG_DWORD},
{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_VENDOR,MTYPE_DWORD},
{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_MODELNO,MBAG_BSTR16},
{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_SERIALNO,MBAG_BSTR16},

2
src/cw/cw_in_generic.c
View File

@ -39,7 +39,7 @@ int static do_save(mbag_t itemstore, struct conn *conn, struct cw_action_in *a,
mbag_set_word(itemstore, a->item_id, cw_get_word(data));
return 1;
}
if (a->itemtype == MBAG_DWORD) {
if (a->itemtype == MTYPE_DWORD) {
mbag_set_dword(itemstore, a->item_id, cw_get_dword(data));
return 1;
}

2
src/cw/cw_in_generic2.c
View File

@ -51,7 +51,7 @@ int static do_save(mbag_t itemstore, struct conn *conn, struct cw_action_in *a,
mbag_set_word(itemstore, a->item_id, cw_get_word(data));
return 1;
}
if (idef->type == MBAG_DWORD) {
if (idef->type == MTYPE_DWORD) {
mbag_set_dword(itemstore, a->item_id, cw_get_dword(data));
return 1;
}

2
src/cw/cw_put_mbag_item.c
View File

@ -46,7 +46,7 @@ int cw_put_mbag_item(uint8_t * dst, struct mbag_item *item)
if (MBAG_WORD == item->type){
return cw_put_word(dst, item->word);
}
if (MBAG_DWORD == item->type){
if (MTYPE_DWORD == item->type){
return cw_put_dword(dst, item->dword);
}
if (MBAG_BSTR == item->type) {

6
src/cw/mbag.h
View File

@ -131,8 +131,8 @@ extern const struct mbag_typedef mbag_type_data;
#define MBAG_BYTE (&mbag_type_byte)
/** MBAG_WORD stores one word */
#define MBAG_WORD (&mbag_type_word)
/** MBAG_DWORD stores one dword */
#define MBAG_DWORD (&mtype_dword)
/** MTYPE_DWORD stores one dword */
#define MTYPE_DWORD (&mtype_dword)
/** MBAG_MBAG stores an MBAG */
#define MBAG_MBAG (&mbag_type_mbag)
#define MBAG_MBAG_DYN (&mbag_type_mbag_dyn)
@ -358,7 +358,7 @@ static inline uint32_t mbag_get_dword(mbag_t s, const char *id, uint32_t def)
struct mbag_item *i = mbag_get(s, id);
if (!i)
return def;
if (i->type != MBAG_DWORD)
if (i->type != MTYPE_DWORD)
return def;
return i->dword;
}

2
src/cw/mbag_set_from_buf.c
View File

@ -12,7 +12,7 @@ int mbag_set_from_buf(mbag_t dst, mbagtype_t type, const char *item_id, uint8_t
mbag_set_word(dst, item_id, cw_get_word(data));
return 1;
}
if (type == MBAG_DWORD) {
if (type == MTYPE_DWORD) {
mbag_set_dword(dst, item_id, cw_get_dword(data));
return 1;
}

4
src/cw/mbag_type_dword.c
View File

@ -22,7 +22,7 @@
static struct mbag_item * from_str(const char *src)
{
mbag_item_t * i = mbag_item_new(MBAG_DWORD);
mbag_item_t * i = mbag_item_new(MTYPE_DWORD);
if (!i)
return NULL;
i->dword=atoi(src);
@ -37,7 +37,7 @@ static int to_str(void *item,char *dst)
static struct mbag_item * get(const uint8_t *src,int len)
{
mbag_item_t * item = mbag_item_new(MBAG_DWORD);
mbag_item_t * item = mbag_item_new(MTYPE_DWORD);
if (!item)
return NULL;
item->dword=cw_get_dword(src);

2
src/cw/radio.c
View File

@ -25,7 +25,7 @@ const char CW_RADIO_CFP_MAX_DURATION[]="cfp_max_duration";
struct cw_itemdef xxxcapwap_radioitemdefs[] = {
//{CW_RADIO_ADMIN_STATE,CW_ITEM_NONE,MBAG_BYTE},
{CW_RADIO_TYPE,CW_ITEM_NONE,MBAG_DWORD},
{CW_RADIO_TYPE,CW_ITEM_NONE,MTYPE_DWORD},
{CW_RADIO_DECRYPTION_ERROR_REPORT_PERIOD,CW_ITEM_NONE,MBAG_WORD},
{CW_RADIO_BSSID,CW_ITEM_NONE,MBAG_BSTR16},