From 4d242d1b446f9666155eedb60918a376a5d47132 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Thu, 3 Mar 2016 18:24:28 +0000 Subject: [PATCH] Work on mods FossilOrigin-Name: b97c913c6d4499d5451e53075322a9313abbf36f114433d48e4cef7094ab2123 --- src/capwap/cw_out_wtp_board_data.c | 4 +++- src/wtp/wtp_conf.c | 1 + src/wtp/wtp_main.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/capwap/cw_out_wtp_board_data.c b/src/capwap/cw_out_wtp_board_data.c index a2f33a09..be69c2fc 100644 --- a/src/capwap/cw_out_wtp_board_data.c +++ b/src/capwap/cw_out_wtp_board_data.c @@ -10,8 +10,10 @@ int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t * { mbag_t board_data = mbag_get_mbag(conn->config, CW_ITEM_WTP_BOARD_DATA,NULL); + + if (!board_data) { - cw_log(LOG_ERR, "Error: Can't send WTP Board Data element. WTP Board Data is not defined."); + cw_log(LOG_ERR, "Error: Can't send WTP Board Data element. \"%s\" is undefined.",CW_ITEM_WTP_BOARD_DATA); return 0; } diff --git a/src/wtp/wtp_conf.c b/src/wtp/wtp_conf.c index 1600fdd4..4c8b3fa4 100644 --- a/src/wtp/wtp_conf.c +++ b/src/wtp/wtp_conf.c @@ -217,6 +217,7 @@ int wtpconf_preinit() conf_hardware_version = bstr_create_from_cfgstr(CONF_DEFAULT_HARDWARE_VERSION); conf_bootloader_version = bstr_create_from_cfgstr(CONF_DEFAULT_BOOTLOADER_VERSION); conf_serial_no = bstr_create_from_cfgstr(CONF_DEFAULT_SERIAL_NO); + conf_model_no = bstr_create_from_cfgstr(CONF_DEFAULT_MODEL_NO); conf_board_id = bstr_create_from_cfgstr(CONF_DEFAULT_BOARD_ID); conf_board_revision = bstr_create_from_cfgstr(CONF_DEFAULT_BOARD_REVISION); diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index 7dead0ec..5f7900e3 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -166,8 +166,17 @@ conn->config=mbag_create(); mbag_set_bstr16n(board_data, CW_ITEM_WTP_BOARD_SERIALNO, bstr_data(conf_serial_no), bstr_len(conf_serial_no)); + mbag_set_bstr16n(board_data, CW_ITEM_WTP_BOARD_MODELNO, bstr_data(conf_model_no),bstr_len(conf_model_no)); + + - mbag_set_mavl(conn->outgoing, CW_ITEM_WTP_BOARD_DATA, board_data); + mbag_set_mbag(conn->config, CW_ITEM_WTP_BOARD_DATA, board_data); + +printf("Board_data %p\n",board_data); + +mbag_t mb = mbag_get_mbag(conn->config,CW_ITEM_WTP_BOARD_DATA,NULL); +printf("mbag %p\n",mb); + cw_acpriolist_t acprios = cw_acpriolist_create(); cw_acpriolist_set(acprios,"Master AC",strlen("Master AC"),1);