From b1c406dcc1be5d69df1cbabc70b809490b601901 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Thu, 29 Mar 2018 07:35:14 +0000 Subject: [PATCH] catch error, if put_msg finds no handler FossilOrigin-Name: bcada13e86977fb8e3502d5d580ffe023b9eb350a0a9953f4641634e026c702c --- actube.workspace | 4 ++-- src/cw/cw_put_msg.c | 6 ++++++ src/wtp/config.ktv | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/actube.workspace b/actube.workspace index 361145ca..e0162c79 100644 --- a/actube.workspace +++ b/actube.workspace @@ -5,8 +5,8 @@ - - + + diff --git a/src/cw/cw_put_msg.c b/src/cw/cw_put_msg.c index 55ede4c6..d50c6582 100644 --- a/src/cw/cw_put_msg.c +++ b/src/cw/cw_put_msg.c @@ -75,6 +75,12 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout) data = mlistelem_dataptr(elem); handler = cw_msgset_get_elemhandler(conn->msgset,data->proto,data->vendor,data->id); /* printf("Elem: %d %d %d %s\n", data->proto, data->vendor, data->id, handler->name);*/ + if (handler==NULL){ + cw_log(LOG_ERR,"Can't put message element %d %d %, no handler defined.", + data->proto,data->vendor,data->id); + continue; + } + if (handler->put == NULL){ if (data->mand){ diff --git a/src/wtp/config.ktv b/src/wtp/config.ktv index 5e531b9b..972be761 100644 --- a/src/wtp/config.ktv +++ b/src/wtp/config.ktv @@ -27,7 +27,6 @@ wtp-descriptor/bootloader/version:Bstr16:.x171312 wtp-descriptor/max-radios:Byte:2 radio/0/wtp-radio-information:Dword:01 -radio/1/wtp-radio-information:Dword:15 -radio/2/wtp-radio-information:Dword:03 +radio/1/wtp-radio-information:Dword:02 wtp-name:Bstr16:WFAT01