Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependents: mbed_mqtt_endpoint_ublox_ethernet mbed_mqtt_endpoint_ublox_cellular mbed_nsp_endpoint_ublox_cellular mbed_nsp_endpoint_ublox_ethernet ... more
Revision 183:2f586f91ff23, committed 2014-09-13
- Comitter:
- ansond
- Date:
- Sat Sep 13 04:27:19 2014 +0000
- Parent:
- 182:85c62a9f146d
- Child:
- 184:b73d6c976063
- Commit message:
- updates for autoregistration
Changed in this revision
--- a/CommonDefinitions.h Sat Sep 13 02:56:10 2014 +0000 +++ b/CommonDefinitions.h Sat Sep 13 04:27:19 2014 +0000 @@ -55,6 +55,14 @@ // Multitech probe for temperature reporting //#define MULTITECH_TEMP_PROBE true +// Until we get HTTPS with BasicAuth working in MBED... +#define GW_IPADDRESS "192.168.1.220" // gateway IP address (default) +#define GW_PORT "8888" // gateway port (default) + +// IOC REST URL for AutoRegister +#define IOC_USERNAME "anson" +#define IOC_PASSWORD "savetheplanet1" + // Auto Registration with IOC on init/startup #define AUTO_REGISTER_WITH_IOC true // true - auto register, false - dont
--- a/HTTPTransport.cpp Sat Sep 13 02:56:10 2014 +0000
+++ b/HTTPTransport.cpp Sat Sep 13 04:27:19 2014 +0000
@@ -45,19 +45,24 @@
// default destructor
HTTPTransport::~HTTPTransport() {
}
+
+ // Basic Auth
+ void HTTPTransport::basicAuth(char *username,char *pw) { this->m_http->basicAuth(username,pw); }
// HTTP Get
- bool HTTPTransport::httpGet(char *url,char *result,int result_length) {
+ bool HTTPTransport::httpGet(char *url,char *result,int result_length,int timeout) {
this->logger()->blinkTransportTxLED();
#ifdef NETWORK_MUTEX
if (network_mutex != NULL) network_mutex->lock();
#endif
- int status = this->m_http->get(url,result,result_length);
+ int status = 0;
+ if (timeout > 0) status = this->m_http->get(url,result,result_length,timeout);
+ else status = this->m_http->get(url,result,result_length);
#ifdef NETWORK_MUTEX
if (network_mutex != NULL) network_mutex->unlock();
#endif
this->logger()->blinkTransportRxLED();
- this->logger()->log("httpGet: Status: %d",status);
+ //this->logger()->log("httpGet: Status: %d",status);
return (status == 0);
}
@@ -74,7 +79,7 @@
if (network_mutex != NULL) network_mutex->unlock();
#endif
this->logger()->blinkTransportRxLED();
- this->logger()->log("httpPut: Status: %d",status);
+ //this->logger()->log("httpPut: Status: %d",status);
return (status == 0);
}
@@ -91,7 +96,7 @@
if (network_mutex != NULL) network_mutex->unlock();
#endif
this->logger()->blinkTransportRxLED();
- this->logger()->log("httpPost: Status: %d",status);
+ //this->logger()->log("httpPost: Status: %d",status);
return (status == 0);
}
@@ -107,6 +112,6 @@
if (network_mutex != NULL) network_mutex->unlock();
#endif
this->logger()->blinkTransportRxLED();
- this->logger()->log("httpDelete: Status: %d",status);
+ //this->logger()->log("httpDelete: Status: %d",status);
return (status == 0);
}
\ No newline at end of file
--- a/HTTPTransport.h Sat Sep 13 02:56:10 2014 +0000
+++ b/HTTPTransport.h Sat Sep 13 04:27:19 2014 +0000
@@ -34,7 +34,8 @@
HTTPTransport(HTTPClient *http,ErrorHandler *error_handler,void *endpoint);
virtual ~HTTPTransport();
- virtual bool httpGet(char *url,char *result,int result_length);
+ virtual void basicAuth(char *username,char *pw);
+ virtual bool httpGet(char *url,char *result,int result_length,int timeout=0);
virtual bool httpPut(char *url,char *data,int data_length,char *result,int result_length);
virtual bool httpPost(char *url,char *data,int data_length,char *result,int result_length);
virtual bool httpDelete(char *url,char *data,int data_length);