giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #559 from nfi/contrib/coap-endpoint-parse

Browse Source 
coap: bug fix when parsing secure CoAP endpoint with a specified port.
This commit is contained in:
Simon Duquennoy 2018-06-04 21:14:00 +02:00 committed by GitHub
commit 53caec12c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
os/net/app-layer/coap/coap-uip.c
View File

@ -214,30 +214,27 @@ coap_endpoint_parse(const char *text, size_t size, coap_endpoint_t *ep)
/* Only IPv6 supported */ /* Only IPv6 supported */
int start = index_of(text, 0, size, '['); int start = index_of(text, 0, size, '[');
int end = index_of(text, start, size, ']'); int end = index_of(text, start, size, ']');
int secure = strncmp((const char *)text, "coaps:", 6) == 0;
uint32_t port; uint32_t port;
if(start > 0 && end > start &&
uiplib_ipaddrconv((const char *)&text[start], &ep->ipaddr)) { ep->secure = strncmp(text, "coaps:", 6) == 0;
if(start >= 0 && end > start &&
uiplib_ipaddrconv(&text[start], &ep->ipaddr)) {
if(text[end + 1] == ':' && if(text[end + 1] == ':' &&
get_port(text + end + 2, size - end - 2, &port)) { get_port(text + end + 2, size - end - 2, &port)) {
ep->port = UIP_HTONS(port); ep->port = UIP_HTONS(port);
} else if(secure) { } else if(ep->secure) {
/** /* Use secure CoAP port by default for secure endpoints. */
* Secure CoAP should use a different port but for now
* the same port is used.
*/
LOG_DBG("Using secure port (coaps)\n");
ep->port = SERVER_LISTEN_SECURE_PORT; ep->port = SERVER_LISTEN_SECURE_PORT;
ep->secure = 1;
} else { } else {
ep->port = SERVER_LISTEN_PORT; ep->port = SERVER_LISTEN_PORT;
ep->secure = 0;
} }
return 1; return 1;
} else { } else if(size < UIPLIB_IPV6_MAX_STR_LEN) {
if(uiplib_ipaddrconv((const char *)&text, &ep->ipaddr)) { char buf[UIPLIB_IPV6_MAX_STR_LEN];
memcpy(buf, text, size);
buf[size] = '\0';
if(uiplib_ipaddrconv(buf, &ep->ipaddr)) {
ep->port = SERVER_LISTEN_PORT; ep->port = SERVER_LISTEN_PORT;
ep->secure = 0;
return 1; return 1;
} }
} }