Commit a6b28ad

committed

Fixing WiFi code to allow HTTPS-GET instead of HTTP-GET (required for Arduino IoT Cloud OTA).

1 parent b86aaa7 commit a6b28adCopy full SHA for a6b28ad

File tree

2 files changed

+21

-7

lines changed

libraries/WiFi/src
- WiFiHelpers.cpp
- utility
  - https_request.h

2 files changed

+21

-7

lines changed

`‎libraries/WiFi/src/WiFiHelpers.cpp‎`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include "WiFi.h"`
`18`	`18`	`#include "mbed.h"`
`19`	`19`	`#include "utility/http_request.h"`
	`20`	`+#include "utility/https_request.h"`
`20`	`21`
`21`	`22`	`static FILE* target;`
`22`	`23`
`@@ -26,7 +27,13 @@ void body_callback(const char* data, uint32_t data_len) {`
`26`	`27`
`27`	`28`	`int WiFiClass::download(char* url, const char* target_file) {`
`28`	`29`	`target = fopen(target_file, "wb");`
`29`		`- HttpRequest* req = new HttpRequest(getNetwork(), HTTP_GET, url, &body_callback);`
`30`		`- req->send(NULL, 0);`
`31`		`- fclose(target);`
	`30`	`+ HttpsRequest* req = new HttpsRequest(getNetwork(), nullptr, HTTP_GET, url, &body_callback);`
	`31`	`+ if (req->send(NULL, 0) == NULL)`
	`32`	`+ {`
	`33`	`+ fclose(target);`
	`34`	`+ return req->get_error();`
	`35`	`+ }`
	`36`	`+ int const size = ftell(target);`
	`37`	`+ fclose(target);`
	`38`	`+ return size;`
`32`	`39`	`}`

`‎libraries/WiFi/src/utility/https_request.h‎`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,16 +49,20 @@ class HttpsRequest : public HttpRequestBase {`
`49`	`49`	`const char* ssl_ca_pem,`
`50`	`50`	`http_method method,`
`51`	`51`	`const char* url,`
`52`		`- Callback<void(const char *at, uint32_t length)> body_callback = 0)`
	`52`	`+ mbed::Callback<void(const char *at, uint32_t length)> body_callback = 0)`
`53`	`53`	`: HttpRequestBase(NULL, body_callback)`
`54`	`54`	`{`
	`55`	`+ _error = 0;`
	`56`	`+ _network = network;`
	`57`	`+`
`55`	`58`	`_parsed_url = new ParsedUrl(url);`
`56`	`59`	`_request_builder = new HttpRequestBuilder(method, _parsed_url);`
`57`	`60`	`_response = NULL;`
`58`	`61`
`59`	`62`	`_socket = new TLSSocket();`
`60`	`63`	`((TLSSocket*)_socket)->open(network);`
`61`		`- ((TLSSocket*)_socket)->set_root_ca_cert(ssl_ca_pem);`
	`64`	`+ //((TLSSocket*)_socket)->set_root_ca_cert(ssl_ca_pem);`
	`65`	`+ ((TLSSocket*)_socket)->set_root_ca_cert("/wlan/", 0);`
`62`	`66`	`_we_created_socket = true;`
`63`	`67`	`}`
`64`	`68`
`@@ -76,7 +80,7 @@ class HttpsRequest : public HttpRequestBase {`
`76`	`80`	`HttpsRequest(TLSSocket* socket,`
`77`	`81`	`http_method method,`
`78`	`82`	`const char* url,`
`79`		`- Callback<void(const char *at, uint32_t length)> body_callback = 0)`
	`83`	`+ mbed::Callback<void(const char *at, uint32_t length)> body_callback = 0)`
`80`	`84`	`: HttpRequestBase(socket, body_callback)`
`81`	`85`	`{`
`82`	`86`	`_parsed_url = new ParsedUrl(url);`
`@@ -91,7 +95,10 @@ class HttpsRequest : public HttpRequestBase {`
`91`	`95`
`92`	`96`	`protected:`
`93`	`97`	`virtual nsapi_error_t connect_socket(char *host, uint16_t port) {`
`94`		`- return ((TLSSocket*)_socket)->connect(host, port);`
	`98`	`+ SocketAddress socketAddress = SocketAddress();`
	`99`	`+ socketAddress.set_port(port);`
	`100`	`+ _network->gethostbyname(host, &socketAddress);`
	`101`	`+ return ((TLSSocket*)_socket)->connect(socketAddress);`
`95`	`102`	`}`
`96`	`103`	`};`
`97`	`104`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit a6b28ad

File tree

2 files changed

2 files changed

`‎libraries/WiFi/src/WiFiHelpers.cpp‎`

`‎libraries/WiFi/src/utility/https_request.h‎`

0 commit comments