mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-08-24 07:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

http client: add https support, fix parsing header with chained pbufs

Browse Source
This commit is contained in:
goldsimon 2018-02-16 12:29:40 +01:00
parent e87392cc85
commit bd656efd64
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/apps/http/http_client.c
View File

@ -288,7 +288,7 @@ httpc_tcp_recv(void *arg, struct altcp_pcb *pcb, struct pbuf *p, err_t r)
}
if (req->parse_state == HTTPC_PARSE_WAIT_HEADERS) {
u16_t total_header_len;
err_t err = http_wait_headers(p, &req->hdr_content_len, &total_header_len);
err_t err = http_wait_headers(req->rx_hdrs, &req->hdr_content_len, &total_header_len);
if (err == ERR_OK) {
/* hide header bytes in pbuf */
struct pbuf *q;
@ -536,6 +536,16 @@ httpc_init_connection_common(httpc_state_t **connection, const httpc_connection_
httpc_free_state(req);
return ERR_MEM;
}
#if LWIP_ALTCP_TLS
if (settings->tls_config) {
struct altcp_pcb *pcbs = altcp_tls_new(settings->tls_config, req->pcb);
if (pcbs == NULL) {
httpc_free_state(req);
return ERR_MEM;
}
req->pcb = pcbs;
}
#endif
req->remote_port = settings->use_proxy ? settings->proxy_port : server_port;
altcp_arg(req->pcb, req);
altcp_recv(req->pcb, httpc_tcp_recv);

4
src/include/lwip/apps/http_client.h
View File

@ -109,6 +109,10 @@ typedef struct _httpc_connection {
u8_t use_proxy;
/* @todo: add username:pass? */
#if LWIP_ALTCP_TLS
struct altcp_tls_config *tls_config;
#endif
/* this callback is called when the transfer is finished (or aborted) */
httpc_result_fn result_fn;
/* this callback is called after receiving the http headers