Introducing mavl and mbag.
FossilOrigin-Name: 383bc0c7d65716c38a10aea87ab94c240e581cd2193f55fdfcbe644ef3dec0ff
This commit is contained in:
@ -1,22 +1,22 @@
|
||||
#include "log.h"
|
||||
#include "conn.h"
|
||||
|
||||
#include "itemstore.h"
|
||||
#include "mbag.h"
|
||||
#include "capwap_items.h"
|
||||
#include "capwap.h"
|
||||
|
||||
|
||||
int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
|
||||
{
|
||||
cw_itemstore_t board_data =
|
||||
cw_itemstore_get_avltree(conn->local, CW_ITEM_WTP_BOARD_DATA);
|
||||
mbag_t board_data =
|
||||
mbag_get_avltree(conn->local, CW_ITEM_WTP_BOARD_DATA);
|
||||
if (!board_data) {
|
||||
cw_log(LOG_ERR, "Error: Can't send WTP Board Data element. WTP Board Data is not defined.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct cw_item *i;
|
||||
i = cw_itemstore_get(board_data, CW_ITEM_WTP_BOARD_VENDOR);
|
||||
struct mbag_item *i;
|
||||
i = mbag_get(board_data, CW_ITEM_WTP_BOARD_VENDOR);
|
||||
if (!i) {
|
||||
cw_log(LOG_ERR,
|
||||
"Error: Can't send WTP Board Data element - no vendor defined");
|
||||
@ -26,7 +26,7 @@ int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t *
|
||||
uint8_t *d = dst + 4;
|
||||
d += cw_put_dword(d, i->dword);
|
||||
|
||||
i = cw_itemstore_get(board_data, CW_ITEM_WTP_BOARD_MODELNO);
|
||||
i = mbag_get(board_data, CW_ITEM_WTP_BOARD_MODELNO);
|
||||
if (i) {
|
||||
d += cw_put_word(d, CW_BOARDDATA_MODELNO);
|
||||
d += cw_put_word(d, bstr16_len(i->data));
|
||||
@ -36,7 +36,7 @@ int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t *
|
||||
"Error: Can't set sub-element \"WTP Model Number\" in WTP Board Data.");
|
||||
}
|
||||
|
||||
i = cw_itemstore_get(board_data, CW_ITEM_WTP_BOARD_SERIALNO);
|
||||
i = mbag_get(board_data, CW_ITEM_WTP_BOARD_SERIALNO);
|
||||
if (i) {
|
||||
d += cw_put_word(d, CW_BOARDDATA_SERIALNO);
|
||||
d += cw_put_word(d, bstr16_len(i->data));
|
||||
@ -47,21 +47,21 @@ int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t *
|
||||
}
|
||||
|
||||
|
||||
i = cw_itemstore_get(board_data, CW_ITEM_WTP_BOARD_ID);
|
||||
i = mbag_get(board_data, CW_ITEM_WTP_BOARD_ID);
|
||||
if (i) {
|
||||
d += cw_put_word(d, CW_BOARDDATA_BOARDID);
|
||||
d += cw_put_word(d, bstr16_len(i->data));
|
||||
d += cw_put_data(d, bstr16_data(i->data), bstr16_len(i->data));
|
||||
}
|
||||
|
||||
i = cw_itemstore_get(board_data, CW_ITEM_WTP_BOARD_REVISION);
|
||||
i = mbag_get(board_data, CW_ITEM_WTP_BOARD_REVISION);
|
||||
if (i) {
|
||||
d += cw_put_word(d, CW_BOARDDATA_REVISION);
|
||||
d += cw_put_word(d, bstr16_len(i->data));
|
||||
d += cw_put_data(d, bstr16_data(i->data), bstr16_len(i->data));
|
||||
}
|
||||
|
||||
i = cw_itemstore_get(board_data, CW_ITEM_WTP_BOARD_MACADDRESS);
|
||||
i = mbag_get(board_data, CW_ITEM_WTP_BOARD_MACADDRESS);
|
||||
if (i) {
|
||||
d += cw_put_word(d, CW_BOARDDATA_MACADDRESS);
|
||||
d += cw_put_word(d, bstr_len(i->data));
|
||||
|
Reference in New Issue
Block a user