deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Validate MQTT broker IP and escape quotes when displaying"

Browse source
This commit is contained in:
George Oikonomou 2017-06-02 23:02:54 +01:00 • committed by GitHub
parent 3800cb18a9
commit c558e1a559
2 changed files with 5 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/cc26xx/cc26xx-web-demo/mqtt-client.c
View file

@ -64,9 +64,6 @@
*/
static const char *broker_ip = "0064:ff9b:0000:0000:0000:0000:b8ac:7cbd";
/*---------------------------------------------------------------------------*/
#define ADDRESS_CONVERSION_OK 1
#define ADDRESS_CONVERSION_ERROR 0
/*---------------------------------------------------------------------------*/
/*
* A timeout used when waiting for something to happen (e.g. to connect or to
* disconnect)
@ -359,14 +356,7 @@ ip_addr_post_handler(char *key, int key_len, char *val, int val_len)
return HTTPD_SIMPLE_POST_HANDLER_UNKNOWN;
}
/*
* uiplib_ip6addrconv will immediately start writing into the supplied buffer
* even if it subsequently fails. Thus, pass an intermediate buffer
*/
uip_ip6addr_t tmp_addr;
if(val_len > MQTT_CLIENT_CONFIG_IP_ADDR_STR_LEN
|| uiplib_ip6addrconv(val, &tmp_addr) != ADDRESS_CONVERSION_OK) {
if(val_len > MQTT_CLIENT_CONFIG_IP_ADDR_STR_LEN) {
/* Ours but bad value */
rv = HTTPD_SIMPLE_POST_HANDLER_ERROR;
} else {