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

Merge pull request #1696 from momote-io/fixes

Browse source 
fix ipv6 http socket host handling as in RFC2732
This commit is contained in:
Simon Duquennoy 2016-06-05 12:46:59 +02:00
parent 6c946319d9 47df9c4e6e
commit 8cdff8c21b
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/net/http-socket/http-socket.c
View file

@ -350,6 +350,11 @@ parse_url(const char *url, char *host, uint16_t *portptr, char *path)
} }
} }
/* check if host is null terminated */
if(!memchr(host, 0, MAX_HOSTLEN)) {
return 0;
}
/* Find the port. Default is 80. */ /* Find the port. Default is 80. */
port = 80; port = 80;
if(*urlptr == ':') { if(*urlptr == ':') {
@ -413,7 +418,15 @@ event(struct tcp_socket *tcps, void *ptr,
tcp_socket_send_str(tcps, " HTTP/1.1\r\n"); tcp_socket_send_str(tcps, " HTTP/1.1\r\n");
tcp_socket_send_str(tcps, "Connection: close\r\n"); tcp_socket_send_str(tcps, "Connection: close\r\n");
tcp_socket_send_str(tcps, "Host: "); tcp_socket_send_str(tcps, "Host: ");
/* If we have IPv6 host, add the '[' and the ']' characters
to the host. As in rfc2732. */
if(memchr(host, ':', MAX_HOSTLEN)) {
tcp_socket_send_str(tcps, "[");
}
tcp_socket_send_str(tcps, host); tcp_socket_send_str(tcps, host);
if(memchr(host, ':', MAX_HOSTLEN)) {
tcp_socket_send_str(tcps, "]");
}
tcp_socket_send_str(tcps, "\r\n"); tcp_socket_send_str(tcps, "\r\n");
if(s->postdata != NULL) { if(s->postdata != NULL) {
if(s->content_type) { if(s->content_type) {