Diff: internal/socket/SocketInterface.cpp

Revision:

17:7268f365676b

Parent:

16:7f1d6d359787

Child:

21:17bb3eddcbae

--- a/internal/socket/SocketInterface.cpp	Wed Aug 13 04:41:04 2014 -0700
+++ b/internal/socket/SocketInterface.cpp	Sat Aug 23 05:39:17 2014 -0700
@@ -43,7 +43,7 @@
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::connect(Socket &socket, SocketType type, const char *host, uint16_t remortPort, uint16_t localPort, const void *args, Pin irqPin)
+WiconnectResult SocketInterface::connect(WiconnectSocket &socket, SocketType type, const char *host, uint16_t remortPort, uint16_t localPort, const void *args, Pin irqPin)
 {
     WiconnectResult result;
     int32_t handle;
@@ -140,31 +140,31 @@
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::tcpConnect(Socket &socket, const char *host, uint16_t remortPort, Pin irqPin)
+WiconnectResult SocketInterface::tcpConnect(WiconnectSocket &socket, const char *host, uint16_t remortPort, Pin irqPin)
 {
     return connect(socket, SOCKET_TYPE_TCP, host, remortPort, SOCKET_ANY_PORT, NULL, irqPin);
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::tlsConnect(Socket &socket, const char *host, uint16_t remortPort, const char *certFilename, Pin irqPin)
+WiconnectResult SocketInterface::tlsConnect(WiconnectSocket &socket, const char *host, uint16_t remortPort, const char *certFilename, Pin irqPin)
 {
     return connect(socket, SOCKET_TYPE_TLS, host, remortPort, SOCKET_ANY_PORT, certFilename, irqPin);
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::udpConnect(Socket &socket, const char *host, uint16_t remortPort, uint16_t localPort, Pin irqPin)
+WiconnectResult SocketInterface::udpConnect(WiconnectSocket &socket, const char *host, uint16_t remortPort, uint16_t localPort, Pin irqPin)
 {
     return connect(socket, SOCKET_TYPE_UDP, host, remortPort, localPort, NULL, irqPin);
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::httpConnect(Socket &socket, const char *url, const HttpSocketArgs *args)
+WiconnectResult SocketInterface::httpConnect(WiconnectSocket &socket, const char *url, const HttpSocketArgs *args)
 {
     return connect(socket, SOCKET_TYPE_HTTP, url, SOCKET_ANY_PORT, SOCKET_ANY_PORT, args, NC);
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::httpGet(Socket &socket, const char *url, bool openOnly, const char *certFilename)
+WiconnectResult SocketInterface::httpGet(WiconnectSocket &socket, const char *url, bool openOnly, const char *certFilename)
 {
     const HttpSocketArgs args =
     {
@@ -177,7 +177,7 @@
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::httpPost(Socket &socket, const char *url, const char *contextType, bool openOnly, const char *certFilename)
+WiconnectResult SocketInterface::httpPost(WiconnectSocket &socket, const char *url, const char *contextType, bool openOnly, const char *certFilename)
 {
     const HttpSocketArgs args =
     {
@@ -190,7 +190,7 @@
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::httpHead(Socket &socket, const char *url, const char *certFilename)
+WiconnectResult SocketInterface::httpHead(WiconnectSocket &socket, const char *url, const char *certFilename)
 {
     const HttpSocketArgs args =
     {
@@ -203,7 +203,7 @@
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::httpAddHeader(Socket &socket, const char *key, const char *value)
+WiconnectResult SocketInterface::httpAddHeader(WiconnectSocket &socket, const char *key, const char *value)
 {
     WiconnectResult result;
     char cmdBuffer[WICONNECT_MAX_CMD_SIZE];
@@ -223,7 +223,7 @@
 }
 
 /*************************************************************************************************/
-WiconnectResult SocketInterface::httpGetStatus(Socket &socket, uint32_t *statusCodePtr)
+WiconnectResult SocketInterface::httpGetStatus(WiconnectSocket &socket, uint32_t *statusCodePtr)
 {
     WiconnectResult result;