ACKme / WiConnect

Host library for controlling a WiConnect enabled Wi-Fi module.

Dependents:   wiconnect-ota_example wiconnect-web_setup_example wiconnect-test-console wiconnect-tcp_server_example ... more

WiconnectSocket.cpp@41:66beaca0fd1a, 2015-02-23 (annotated)

Committer:
dan_ackme
Date:
Mon Feb 23 22:23:47 2015 -0800
Revision:
41:66beaca0fd1a
Parent:
40:4b4306f3d829 
fixed compilation error

Who changed what in which revision?

UserRevisionLine numberNew contents of line
dan_ackme 29:b6af04b77a56 1 /**
dan_ackme 29:b6af04b77a56 2 * ACKme WiConnect Host Library is licensed under the BSD licence:
dan_ackme 29:b6af04b77a56 3 *
dan_ackme 29:b6af04b77a56 4 * Copyright (c)2014 ACKme Networks.
dan_ackme 29:b6af04b77a56 5 * All rights reserved.
dan_ackme 29:b6af04b77a56 6 *
dan_ackme 29:b6af04b77a56 7 * Redistribution and use in source and binary forms, with or without modification,
dan_ackme 29:b6af04b77a56 8 * are permitted provided that the following conditions are met:
dan_ackme 29:b6af04b77a56 9 *
dan_ackme 29:b6af04b77a56 10 * 1. Redistributions of source code must retain the above copyright notice,
dan_ackme 29:b6af04b77a56 11 * this list of conditions and the following disclaimer.
dan_ackme 29:b6af04b77a56 12 * 2. Redistributions in binary form must reproduce the above copyright notice,
dan_ackme 29:b6af04b77a56 13 * this list of conditions and the following disclaimer in the documentation
dan_ackme 29:b6af04b77a56 14 * and/or other materials provided with the distribution.
dan_ackme 29:b6af04b77a56 15 * 3. The name of the author may not be used to endorse or promote products
dan_ackme 29:b6af04b77a56 16 * derived from this software without specific prior written permission.
dan_ackme 29:b6af04b77a56 17 *
dan_ackme 29:b6af04b77a56 18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
dan_ackme 29:b6af04b77a56 19 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
dan_ackme 29:b6af04b77a56 20 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
dan_ackme 29:b6af04b77a56 21 * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
dan_ackme 29:b6af04b77a56 22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
dan_ackme 29:b6af04b77a56 23 * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
dan_ackme 29:b6af04b77a56 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
dan_ackme 29:b6af04b77a56 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
dan_ackme 29:b6af04b77a56 26 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
dan_ackme 29:b6af04b77a56 27 * OF SUCH DAMAGE.
dan_ackme 29:b6af04b77a56 28 */
dan_ackme 29:b6af04b77a56 29 #include <stdarg.h>
dan_ackme 29:b6af04b77a56 30 #include "Wiconnect.h"
dan_ackme 29:b6af04b77a56 31 #include "internal/common.h"
dan_ackme 29:b6af04b77a56 32 #include "api/StringUtil.h"
dan_ackme 29:b6af04b77a56 33
dan_ackme 29:b6af04b77a56 34
dan_ackme 29:b6af04b77a56 35 #define CHECK_CONNECTED() if(!isConnected()) return WICONNECT_NOT_CONNECTED
dan_ackme 29:b6af04b77a56 36
dan_ackme 29:b6af04b77a56 37
dan_ackme 29:b6af04b77a56 38 WiconnectResult readerCallback(void *user, void *data, int maxReadSize, int *bytesRead);
dan_ackme 29:b6af04b77a56 39
dan_ackme 29:b6af04b77a56 40
dan_ackme 29:b6af04b77a56 41
dan_ackme 29:b6af04b77a56 42 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 43 WiconnectSocket::WiconnectSocket(int rxBufferLen_, void *rxBuffer_, int txBufferLen_, void *txBuffer_)
dan_ackme 29:b6af04b77a56 44 {
dan_ackme 29:b6af04b77a56 45 wiconnect = Wiconnect::getInstance();
dan_ackme 29:b6af04b77a56 46
dan_ackme 29:b6af04b77a56 47 memset((void*)&txBuffer, 0, sizeof(Buffer));
dan_ackme 29:b6af04b77a56 48 memset((void*)&rxBuffer, 0, sizeof(Buffer));
dan_ackme 29:b6af04b77a56 49
dan_ackme 29:b6af04b77a56 50 txBuffer.size = txBufferLen_;
dan_ackme 29:b6af04b77a56 51 txBuffer.buffer = (uint8_t*)txBuffer_;
dan_ackme 29:b6af04b77a56 52
dan_ackme 29:b6af04b77a56 53 rxBuffer.size = rxBufferLen_;
dan_ackme 29:b6af04b77a56 54 rxBuffer.buffer = (uint8_t*)rxBuffer_;
dan_ackme 29:b6af04b77a56 55
dan_ackme 29:b6af04b77a56 56 if(txBuffer.size > 0)
dan_ackme 29:b6af04b77a56 57 {
dan_ackme 29:b6af04b77a56 58 if(txBuffer_ == NULL)
dan_ackme 29:b6af04b77a56 59 {
dan_ackme 29:b6af04b77a56 60 #ifdef WICONNECT_ENABLE_MALLOC
dan_ackme 29:b6af04b77a56 61 wiconnect_assert(wiconnect, "Socket(), malloc not defined", wiconnect->_malloc != NULL);
dan_ackme 29:b6af04b77a56 62 txBuffer.buffer = (uint8_t*)wiconnect->_malloc(txBufferLen_);
dan_ackme 29:b6af04b77a56 63 wiconnect_assert(wiconnect, "Socket(), txBuffer malloc failed", txBuffer.buffer != NULL);
dan_ackme 29:b6af04b77a56 64 txBuffer.allocated = true;
dan_ackme 29:b6af04b77a56 65 #else
dan_ackme 29:b6af04b77a56 66 wiconnect_assert(wiconnect, "must specify buffer", 0);
dan_ackme 29:b6af04b77a56 67 #endif
dan_ackme 29:b6af04b77a56 68 }
dan_ackme 29:b6af04b77a56 69 txBuffer.size -= 4;
dan_ackme 29:b6af04b77a56 70 }
dan_ackme 29:b6af04b77a56 71
dan_ackme 29:b6af04b77a56 72 if(rxBuffer.size > 0)
dan_ackme 29:b6af04b77a56 73 {
dan_ackme 29:b6af04b77a56 74 if(rxBuffer_ == NULL)
dan_ackme 29:b6af04b77a56 75 {
dan_ackme 29:b6af04b77a56 76 #ifdef WICONNECT_ENABLE_MALLOC
dan_ackme 29:b6af04b77a56 77 wiconnect_assert(wiconnect, "Socket(), malloc not defined", wiconnect->_malloc != NULL);
dan_ackme 29:b6af04b77a56 78 rxBuffer.buffer = (uint8_t*)wiconnect->_malloc(rxBufferLen_);
dan_ackme 29:b6af04b77a56 79 wiconnect_assert(wiconnect, "Socket(), rxBuffer malloc failed", rxBuffer.buffer != NULL);
dan_ackme 29:b6af04b77a56 80 rxBuffer.allocated = true;
dan_ackme 29:b6af04b77a56 81 #else
dan_ackme 29:b6af04b77a56 82 wiconnect_assert(wiconnect, "must specify buffer", 0);
dan_ackme 29:b6af04b77a56 83 #endif
dan_ackme 29:b6af04b77a56 84 }
dan_ackme 29:b6af04b77a56 85 rxBuffer.size -= 4;
dan_ackme 29:b6af04b77a56 86 }
dan_ackme 29:b6af04b77a56 87
dan_ackme 29:b6af04b77a56 88 handle = SOCKET_INVALID_HANDLE;
dan_ackme 29:b6af04b77a56 89 type = SOCKET_TYPE_UNKNOWN;
dan_ackme 29:b6af04b77a56 90 remotePort = 0;
dan_ackme 29:b6af04b77a56 91 localPort = 0;
dan_ackme 29:b6af04b77a56 92 connected = false;
dan_ackme 29:b6af04b77a56 93 enableAutoClose = false;
dan_ackme 29:b6af04b77a56 94 host[0] = 0;
dan_ackme 29:b6af04b77a56 95 }
dan_ackme 29:b6af04b77a56 96
dan_ackme 29:b6af04b77a56 97
dan_ackme 29:b6af04b77a56 98 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 99 WiconnectResult WiconnectSocket::init(uint8_t handle_, SocketType type_, const char *host_, uint16_t remotePort_, uint16_t localPort_)
dan_ackme 40:4b4306f3d829 100 {
dan_ackme 41:66beaca0fd1a 101 WiconnectResult result;
dan_ackme 40:4b4306f3d829 102 do
dan_ackme 40:4b4306f3d829 103 {
dan_ackme 40:4b4306f3d829 104 result = close();
dan_ackme 40:4b4306f3d829 105 } while(result == WICONNECT_PROCESSING);
dan_ackme 40:4b4306f3d829 106
dan_ackme 29:b6af04b77a56 107 handle = handle_;
dan_ackme 29:b6af04b77a56 108 type = type_;
dan_ackme 29:b6af04b77a56 109 remotePort = remotePort_;
dan_ackme 29:b6af04b77a56 110 localPort = localPort_;
dan_ackme 29:b6af04b77a56 111 connected = true;
dan_ackme 29:b6af04b77a56 112 enableAutoClose = false;
dan_ackme 29:b6af04b77a56 113
dan_ackme 29:b6af04b77a56 114 rxBuffer.ptr = rxBuffer.buffer;
dan_ackme 29:b6af04b77a56 115 rxBuffer.bytesPending = 0;
dan_ackme 29:b6af04b77a56 116 txBuffer.ptr = txBuffer.buffer;
dan_ackme 29:b6af04b77a56 117 txBuffer.bytesPending = 0;
dan_ackme 29:b6af04b77a56 118
dan_ackme 29:b6af04b77a56 119 strncpy(host, host_, sizeof(host)-1);
dan_ackme 29:b6af04b77a56 120
dan_ackme 29:b6af04b77a56 121 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 122 }
dan_ackme 29:b6af04b77a56 123
dan_ackme 29:b6af04b77a56 124 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 125 WiconnectSocket::~WiconnectSocket()
dan_ackme 29:b6af04b77a56 126 {
dan_ackme 29:b6af04b77a56 127 while((handle != SOCKET_INVALID_HANDLE) && (close() == WICONNECT_PROCESSING))
dan_ackme 29:b6af04b77a56 128 {
dan_ackme 29:b6af04b77a56 129 }
dan_ackme 29:b6af04b77a56 130
dan_ackme 29:b6af04b77a56 131 #ifdef WICONNECT_ENABLE_MALLOC
dan_ackme 29:b6af04b77a56 132 if(txBuffer.allocated && txBuffer.size > 0)
dan_ackme 29:b6af04b77a56 133 {
dan_ackme 29:b6af04b77a56 134 wiconnect_assert(wiconnect, "~Socket(), free not defined", wiconnect->_free != NULL);
dan_ackme 29:b6af04b77a56 135 wiconnect->_free(txBuffer.buffer);
dan_ackme 29:b6af04b77a56 136 }
dan_ackme 29:b6af04b77a56 137 if(rxBuffer.allocated && rxBuffer.size > 0)
dan_ackme 29:b6af04b77a56 138 {
dan_ackme 29:b6af04b77a56 139 wiconnect_assert(wiconnect, "~Socket(), free not defined", wiconnect->_free != NULL);
dan_ackme 29:b6af04b77a56 140 wiconnect->_free(rxBuffer.buffer);
dan_ackme 29:b6af04b77a56 141 }
dan_ackme 29:b6af04b77a56 142 #endif
dan_ackme 29:b6af04b77a56 143 }
dan_ackme 29:b6af04b77a56 144
dan_ackme 29:b6af04b77a56 145 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 146 bool WiconnectSocket::isConnected()
dan_ackme 29:b6af04b77a56 147 {
dan_ackme 29:b6af04b77a56 148 return connected;
dan_ackme 29:b6af04b77a56 149 }
dan_ackme 29:b6af04b77a56 150
dan_ackme 29:b6af04b77a56 151 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 152 SocketType WiconnectSocket::getType()
dan_ackme 29:b6af04b77a56 153 {
dan_ackme 29:b6af04b77a56 154 return type;
dan_ackme 29:b6af04b77a56 155 }
dan_ackme 29:b6af04b77a56 156
dan_ackme 29:b6af04b77a56 157 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 158 const char* WiconnectSocket::getHost()
dan_ackme 29:b6af04b77a56 159 {
dan_ackme 29:b6af04b77a56 160 return host;
dan_ackme 29:b6af04b77a56 161 }
dan_ackme 29:b6af04b77a56 162
dan_ackme 29:b6af04b77a56 163 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 164 uint16_t WiconnectSocket::getLocalPort()
dan_ackme 29:b6af04b77a56 165 {
dan_ackme 29:b6af04b77a56 166 return localPort;
dan_ackme 29:b6af04b77a56 167 }
dan_ackme 29:b6af04b77a56 168
dan_ackme 29:b6af04b77a56 169 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 170 uint16_t WiconnectSocket::getRemotePort()
dan_ackme 29:b6af04b77a56 171 {
dan_ackme 29:b6af04b77a56 172 return remotePort;
dan_ackme 29:b6af04b77a56 173 }
dan_ackme 29:b6af04b77a56 174
dan_ackme 29:b6af04b77a56 175 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 176 uint8_t WiconnectSocket::getHandle()
dan_ackme 29:b6af04b77a56 177 {
dan_ackme 29:b6af04b77a56 178 return handle;
dan_ackme 29:b6af04b77a56 179 }
dan_ackme 29:b6af04b77a56 180
dan_ackme 29:b6af04b77a56 181
dan_ackme 29:b6af04b77a56 182 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 183 WiconnectResult WiconnectSocket::close()
dan_ackme 29:b6af04b77a56 184 {
dan_ackme 29:b6af04b77a56 185 WiconnectResult result;
dan_ackme 29:b6af04b77a56 186 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 187 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 188
dan_ackme 29:b6af04b77a56 189 result = wiconnect->sendCommand("close %d", handle);
dan_ackme 29:b6af04b77a56 190
dan_ackme 29:b6af04b77a56 191 if(result != WICONNECT_PROCESSING)
dan_ackme 29:b6af04b77a56 192 {
dan_ackme 29:b6af04b77a56 193 connected = false;
dan_ackme 29:b6af04b77a56 194 wiconnect->socketClosedCallback(this);
dan_ackme 29:b6af04b77a56 195 }
dan_ackme 29:b6af04b77a56 196
dan_ackme 29:b6af04b77a56 197 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 198
dan_ackme 29:b6af04b77a56 199 return result;
dan_ackme 29:b6af04b77a56 200 }
dan_ackme 29:b6af04b77a56 201
dan_ackme 29:b6af04b77a56 202 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 203 WiconnectResult WiconnectSocket::poll(bool *rxDataAvailablePtr, bool autoClose)
dan_ackme 29:b6af04b77a56 204 {
dan_ackme 29:b6af04b77a56 205 WiconnectResult result;
dan_ackme 29:b6af04b77a56 206 int32_t status;
dan_ackme 29:b6af04b77a56 207 bool autoClosed = false;
dan_ackme 29:b6af04b77a56 208
dan_ackme 29:b6af04b77a56 209 *rxDataAvailablePtr = false;
dan_ackme 29:b6af04b77a56 210
dan_ackme 29:b6af04b77a56 211 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 212
dan_ackme 29:b6af04b77a56 213 if(rxBuffer.size > 0 && WICONNECT_IS_IDLE())
dan_ackme 29:b6af04b77a56 214 {
dan_ackme 29:b6af04b77a56 215 if(rxBuffer.ptr < &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 216 {
dan_ackme 29:b6af04b77a56 217 *rxDataAvailablePtr = true;
dan_ackme 29:b6af04b77a56 218 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 219 }
dan_ackme 29:b6af04b77a56 220 else if(read() == WICONNECT_SUCCESS && (rxBuffer.ptr < &rxBuffer.buffer[rxBuffer.bytesPending]))
dan_ackme 29:b6af04b77a56 221 {
dan_ackme 29:b6af04b77a56 222 *rxDataAvailablePtr = true;
dan_ackme 29:b6af04b77a56 223 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 224 }
dan_ackme 29:b6af04b77a56 225 }
dan_ackme 29:b6af04b77a56 226
dan_ackme 29:b6af04b77a56 227 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 228
dan_ackme 29:b6af04b77a56 229 if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("poll %d", handle)))
dan_ackme 29:b6af04b77a56 230 {
dan_ackme 29:b6af04b77a56 231 if(!WICONNECT_FAILED(result, wiconnect->responseToInt32(&status)))
dan_ackme 29:b6af04b77a56 232 {
dan_ackme 29:b6af04b77a56 233 if(status > 0)
dan_ackme 29:b6af04b77a56 234 {
dan_ackme 29:b6af04b77a56 235 if(status == 2 && enableAutoClose)
dan_ackme 29:b6af04b77a56 236 {
dan_ackme 29:b6af04b77a56 237 autoClosed = autoClose;
dan_ackme 29:b6af04b77a56 238 *rxDataAvailablePtr = false;
dan_ackme 29:b6af04b77a56 239 }
dan_ackme 29:b6af04b77a56 240 else
dan_ackme 29:b6af04b77a56 241 {
dan_ackme 29:b6af04b77a56 242 *rxDataAvailablePtr = true;
dan_ackme 29:b6af04b77a56 243 }
dan_ackme 29:b6af04b77a56 244 }
dan_ackme 29:b6af04b77a56 245 }
dan_ackme 29:b6af04b77a56 246 }
dan_ackme 29:b6af04b77a56 247
dan_ackme 29:b6af04b77a56 248 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 249
dan_ackme 29:b6af04b77a56 250 // if we auto-closed, then block until everything is cleaned-up
dan_ackme 29:b6af04b77a56 251 if(autoClosed)
dan_ackme 29:b6af04b77a56 252 {
dan_ackme 29:b6af04b77a56 253 while(WICONNECT_IS_PROCESSING(result, close()))
dan_ackme 29:b6af04b77a56 254 {
dan_ackme 29:b6af04b77a56 255 }
dan_ackme 29:b6af04b77a56 256 }
dan_ackme 29:b6af04b77a56 257
dan_ackme 29:b6af04b77a56 258 return result;
dan_ackme 29:b6af04b77a56 259 }
dan_ackme 29:b6af04b77a56 260
dan_ackme 29:b6af04b77a56 261 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 262 WiconnectResult WiconnectSocket::write(int length, bool flush)
dan_ackme 29:b6af04b77a56 263 {
dan_ackme 29:b6af04b77a56 264 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 265
dan_ackme 29:b6af04b77a56 266 if( txBuffer.size == 0)
dan_ackme 29:b6af04b77a56 267 {
dan_ackme 29:b6af04b77a56 268 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 269 }
dan_ackme 29:b6af04b77a56 270 else if(length > txBuffer.size)
dan_ackme 29:b6af04b77a56 271 {
dan_ackme 29:b6af04b77a56 272 return WICONNECT_OVERFLOW;
dan_ackme 29:b6af04b77a56 273 }
dan_ackme 29:b6af04b77a56 274 txBuffer.bytesPending = length;
dan_ackme 29:b6af04b77a56 275
dan_ackme 29:b6af04b77a56 276 return flush ? flushTxBuffer() : WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 277 }
dan_ackme 29:b6af04b77a56 278
dan_ackme 29:b6af04b77a56 279 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 280 WiconnectResult WiconnectSocket::write(const void* buffer, int length, bool flush)
dan_ackme 29:b6af04b77a56 281 {
dan_ackme 29:b6af04b77a56 282 WiconnectResult result = WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 283 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 284
dan_ackme 29:b6af04b77a56 285 if(txBuffer.size > 0)
dan_ackme 29:b6af04b77a56 286 {
dan_ackme 29:b6af04b77a56 287 const uint8_t *src = (const uint8_t *)buffer;
dan_ackme 29:b6af04b77a56 288
dan_ackme 29:b6af04b77a56 289 while(length > 0)
dan_ackme 29:b6af04b77a56 290 {
dan_ackme 29:b6af04b77a56 291 int bytesToWrite = MIN(length, txBuffer.size - txBuffer.bytesPending);
dan_ackme 29:b6af04b77a56 292 uint8_t *dst = (uint8_t*)&txBuffer.buffer[txBuffer.bytesPending];
dan_ackme 29:b6af04b77a56 293 memcpy(dst, src, bytesToWrite);
dan_ackme 29:b6af04b77a56 294 txBuffer.bytesPending += bytesToWrite;
dan_ackme 29:b6af04b77a56 295 length -= bytesToWrite;
dan_ackme 29:b6af04b77a56 296 src += bytesToWrite;
dan_ackme 29:b6af04b77a56 297
dan_ackme 29:b6af04b77a56 298 if((txBuffer.bytesPending >= txBuffer.size) &&
dan_ackme 29:b6af04b77a56 299 WICONNECT_FAILED(result, flushTxBuffer()))
dan_ackme 29:b6af04b77a56 300 {
dan_ackme 29:b6af04b77a56 301 break;
dan_ackme 29:b6af04b77a56 302 }
dan_ackme 29:b6af04b77a56 303 }
dan_ackme 29:b6af04b77a56 304
dan_ackme 29:b6af04b77a56 305 if(flush && txBuffer.bytesPending > 0)
dan_ackme 29:b6af04b77a56 306 {
dan_ackme 29:b6af04b77a56 307 result = flushTxBuffer();
dan_ackme 29:b6af04b77a56 308 }
dan_ackme 29:b6af04b77a56 309 }
dan_ackme 29:b6af04b77a56 310 else
dan_ackme 29:b6af04b77a56 311 {
dan_ackme 29:b6af04b77a56 312 if(WICONNECT_IS_IDLE())
dan_ackme 29:b6af04b77a56 313 {
dan_ackme 29:b6af04b77a56 314 txBuffer.ptr = (uint8_t*)buffer;
dan_ackme 29:b6af04b77a56 315 txBuffer.bytesPending = length;
dan_ackme 29:b6af04b77a56 316 }
dan_ackme 29:b6af04b77a56 317
dan_ackme 29:b6af04b77a56 318 result = flushTxBuffer();
dan_ackme 29:b6af04b77a56 319 }
dan_ackme 29:b6af04b77a56 320
dan_ackme 29:b6af04b77a56 321
dan_ackme 29:b6af04b77a56 322 return result;
dan_ackme 29:b6af04b77a56 323 }
dan_ackme 29:b6af04b77a56 324
dan_ackme 29:b6af04b77a56 325 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 326 WiconnectResult WiconnectSocket::read(void* buffer, uint16_t maxLength, uint16_t *bytesReadPtr)
dan_ackme 29:b6af04b77a56 327 {
dan_ackme 29:b6af04b77a56 328 WiconnectResult result;
dan_ackme 29:b6af04b77a56 329
dan_ackme 29:b6af04b77a56 330 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 331
dan_ackme 29:b6af04b77a56 332 if(rxBuffer.size > 0)
dan_ackme 29:b6af04b77a56 333 {
dan_ackme 29:b6af04b77a56 334 uint16_t bytesToRead = 0;
dan_ackme 29:b6af04b77a56 335 const uint16_t bufferedBytes = (&rxBuffer.buffer[rxBuffer.bytesPending] - rxBuffer.ptr);
dan_ackme 29:b6af04b77a56 336 if(bufferedBytes > 0)
dan_ackme 29:b6af04b77a56 337 {
dan_ackme 29:b6af04b77a56 338 bytesToRead = MIN(bufferedBytes, maxLength);
dan_ackme 29:b6af04b77a56 339 memcpy(buffer, rxBuffer.ptr, bytesToRead);
dan_ackme 29:b6af04b77a56 340 rxBuffer.ptr += bytesToRead;
dan_ackme 29:b6af04b77a56 341 *bytesReadPtr = bytesToRead;
dan_ackme 29:b6af04b77a56 342 }
dan_ackme 29:b6af04b77a56 343 if(rxBuffer.ptr >= &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 344 {
dan_ackme 29:b6af04b77a56 345 clearRxBuffer();
dan_ackme 29:b6af04b77a56 346 }
dan_ackme 29:b6af04b77a56 347 if(bytesToRead > 0)
dan_ackme 29:b6af04b77a56 348 {
dan_ackme 29:b6af04b77a56 349 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 350 }
dan_ackme 29:b6af04b77a56 351 }
dan_ackme 29:b6af04b77a56 352
dan_ackme 29:b6af04b77a56 353 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 354
dan_ackme 29:b6af04b77a56 355 if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand((char*)buffer, maxLength, "read %d %d", handle, maxLength)))
dan_ackme 29:b6af04b77a56 356 {
dan_ackme 29:b6af04b77a56 357 const uint16_t bytesRead = wiconnect->getLastCommandResponseLength();
dan_ackme 29:b6af04b77a56 358 enableAutoClose = (bytesRead == 0);
dan_ackme 29:b6af04b77a56 359 *bytesReadPtr = bytesRead;
dan_ackme 29:b6af04b77a56 360 }
dan_ackme 29:b6af04b77a56 361
dan_ackme 29:b6af04b77a56 362 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 363
dan_ackme 29:b6af04b77a56 364 return result;
dan_ackme 29:b6af04b77a56 365 }
dan_ackme 29:b6af04b77a56 366
dan_ackme 29:b6af04b77a56 367 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 368 WiconnectResult WiconnectSocket::read(uint8_t **bufferPtr, uint16_t *bytesReadPtr)
dan_ackme 29:b6af04b77a56 369 {
dan_ackme 29:b6af04b77a56 370 WiconnectResult result = WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 371
dan_ackme 29:b6af04b77a56 372 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 373
dan_ackme 29:b6af04b77a56 374 if(rxBuffer.size == 0)
dan_ackme 29:b6af04b77a56 375 {
dan_ackme 29:b6af04b77a56 376 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 377 }
dan_ackme 29:b6af04b77a56 378 else if(bufferPtr != NULL && bytesReadPtr == NULL)
dan_ackme 29:b6af04b77a56 379 {
dan_ackme 29:b6af04b77a56 380 return WICONNECT_BAD_ARG;
dan_ackme 29:b6af04b77a56 381 }
dan_ackme 29:b6af04b77a56 382
dan_ackme 29:b6af04b77a56 383 if(rxBuffer.ptr >= &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 384 {
dan_ackme 29:b6af04b77a56 385 clearRxBuffer();
dan_ackme 29:b6af04b77a56 386 }
dan_ackme 29:b6af04b77a56 387
dan_ackme 29:b6af04b77a56 388 if(rxBuffer.bytesPending < rxBuffer.size)
dan_ackme 29:b6af04b77a56 389 {
dan_ackme 29:b6af04b77a56 390 const int bytesToRead = rxBuffer.size - rxBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 391 char* ptr = (char*)&rxBuffer.buffer[rxBuffer.bytesPending];
dan_ackme 29:b6af04b77a56 392
dan_ackme 29:b6af04b77a56 393 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 394
dan_ackme 29:b6af04b77a56 395 loop:
dan_ackme 29:b6af04b77a56 396 if(bytesToRead > 0 && WICONNECT_SUCCEEDED(result, wiconnect->sendCommand(ptr, bytesToRead, "read %d %d", handle, bytesToRead)))
dan_ackme 29:b6af04b77a56 397 {
dan_ackme 29:b6af04b77a56 398 const uint16_t bytesRead = wiconnect->getLastCommandResponseLength();
dan_ackme 29:b6af04b77a56 399 enableAutoClose = (bytesRead == 0);
dan_ackme 29:b6af04b77a56 400 rxBuffer.bytesPending += bytesRead;
dan_ackme 29:b6af04b77a56 401 }
dan_ackme 29:b6af04b77a56 402
dan_ackme 29:b6af04b77a56 403 // if still processing and in non-blocking mode,
dan_ackme 29:b6af04b77a56 404 // then this api call must block until the command completes
dan_ackme 29:b6af04b77a56 405 if(result == WICONNECT_PROCESSING && wiconnect->nonBlocking)
dan_ackme 29:b6af04b77a56 406 {
dan_ackme 29:b6af04b77a56 407 goto loop;
dan_ackme 29:b6af04b77a56 408 }
dan_ackme 29:b6af04b77a56 409
dan_ackme 29:b6af04b77a56 410 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 411 }
dan_ackme 29:b6af04b77a56 412
dan_ackme 29:b6af04b77a56 413 if(bufferPtr != NULL)
dan_ackme 29:b6af04b77a56 414 {
dan_ackme 29:b6af04b77a56 415 *bufferPtr = rxBuffer.buffer;
dan_ackme 29:b6af04b77a56 416 *bytesReadPtr = rxBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 417 clearRxBuffer();
dan_ackme 29:b6af04b77a56 418 }
dan_ackme 29:b6af04b77a56 419
dan_ackme 29:b6af04b77a56 420 return result;
dan_ackme 29:b6af04b77a56 421 }
dan_ackme 29:b6af04b77a56 422
dan_ackme 29:b6af04b77a56 423 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 424 WiconnectResult WiconnectSocket::getc(uint8_t *c)
dan_ackme 29:b6af04b77a56 425 {
dan_ackme 29:b6af04b77a56 426 WiconnectResult result;
dan_ackme 29:b6af04b77a56 427
dan_ackme 29:b6af04b77a56 428 if(rxBuffer.size == 0)
dan_ackme 29:b6af04b77a56 429 {
dan_ackme 29:b6af04b77a56 430 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 431 }
dan_ackme 29:b6af04b77a56 432
dan_ackme 29:b6af04b77a56 433 if(rxBuffer.bytesPending == 0 &&
dan_ackme 29:b6af04b77a56 434 WICONNECT_FAILED(result, read()))
dan_ackme 29:b6af04b77a56 435 {
dan_ackme 29:b6af04b77a56 436 return result;
dan_ackme 29:b6af04b77a56 437 }
dan_ackme 29:b6af04b77a56 438 else if(rxBuffer.ptr < &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 439 {
dan_ackme 29:b6af04b77a56 440 *c = *rxBuffer.ptr;
dan_ackme 29:b6af04b77a56 441 ++rxBuffer.ptr;
dan_ackme 29:b6af04b77a56 442 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 443 }
dan_ackme 29:b6af04b77a56 444 else
dan_ackme 29:b6af04b77a56 445 {
dan_ackme 29:b6af04b77a56 446 clearRxBuffer();
dan_ackme 29:b6af04b77a56 447 return WICONNECT_ERROR;
dan_ackme 29:b6af04b77a56 448 }
dan_ackme 29:b6af04b77a56 449 }
dan_ackme 29:b6af04b77a56 450
dan_ackme 29:b6af04b77a56 451 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 452 WiconnectResult WiconnectSocket::putc(uint8_t c, bool flush)
dan_ackme 29:b6af04b77a56 453 {
dan_ackme 29:b6af04b77a56 454 WiconnectResult result = WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 455 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 456
dan_ackme 29:b6af04b77a56 457 if(txBuffer.size == 0)
dan_ackme 29:b6af04b77a56 458 {
dan_ackme 29:b6af04b77a56 459 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 460 }
dan_ackme 29:b6af04b77a56 461 else if(txBuffer.bytesPending < txBuffer.size)
dan_ackme 29:b6af04b77a56 462 {
dan_ackme 29:b6af04b77a56 463 uint8_t *ptr = (uint8_t*)&txBuffer.buffer[txBuffer.bytesPending];
dan_ackme 29:b6af04b77a56 464 *ptr = c;
dan_ackme 29:b6af04b77a56 465 ++txBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 466
dan_ackme 29:b6af04b77a56 467 if(flush || txBuffer.bytesPending >= txBuffer.size)
dan_ackme 29:b6af04b77a56 468 {
dan_ackme 29:b6af04b77a56 469 result = flushTxBuffer();
dan_ackme 29:b6af04b77a56 470 }
dan_ackme 29:b6af04b77a56 471 }
dan_ackme 29:b6af04b77a56 472 else
dan_ackme 29:b6af04b77a56 473 {
dan_ackme 29:b6af04b77a56 474 result = WICONNECT_OVERFLOW;
dan_ackme 29:b6af04b77a56 475 }
dan_ackme 29:b6af04b77a56 476
dan_ackme 29:b6af04b77a56 477 return result;
dan_ackme 29:b6af04b77a56 478 }
dan_ackme 29:b6af04b77a56 479
dan_ackme 29:b6af04b77a56 480 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 481 WiconnectResult WiconnectSocket::puts(const char *s, bool flush)
dan_ackme 29:b6af04b77a56 482 {
dan_ackme 29:b6af04b77a56 483 const int len = strlen(s);
dan_ackme 29:b6af04b77a56 484 return write(s, len, flush);
dan_ackme 29:b6af04b77a56 485 }
dan_ackme 29:b6af04b77a56 486
dan_ackme 29:b6af04b77a56 487 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 488 WiconnectResult WiconnectSocket::printf(const char* format, ...)
dan_ackme 29:b6af04b77a56 489 {
dan_ackme 29:b6af04b77a56 490 WiconnectResult result = WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 491
dan_ackme 29:b6af04b77a56 492 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 493 if(txBuffer.size == 0)
dan_ackme 29:b6af04b77a56 494 {
dan_ackme 29:b6af04b77a56 495 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 496 }
dan_ackme 29:b6af04b77a56 497
dan_ackme 29:b6af04b77a56 498 const int available = txBuffer.size - txBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 499 char *ptr = (char*)&txBuffer.buffer[txBuffer.bytesPending];
dan_ackme 29:b6af04b77a56 500 va_list args;
dan_ackme 29:b6af04b77a56 501 va_start(args, format);
dan_ackme 29:b6af04b77a56 502 const int len = vsnprintf(ptr, available, format, args);
dan_ackme 29:b6af04b77a56 503 if(len > available)
dan_ackme 29:b6af04b77a56 504 {
dan_ackme 29:b6af04b77a56 505 return WICONNECT_OVERFLOW;
dan_ackme 29:b6af04b77a56 506 }
dan_ackme 29:b6af04b77a56 507 else
dan_ackme 29:b6af04b77a56 508 {
dan_ackme 29:b6af04b77a56 509 txBuffer.bytesPending += len;
dan_ackme 29:b6af04b77a56 510 }
dan_ackme 29:b6af04b77a56 511
dan_ackme 29:b6af04b77a56 512 if(txBuffer.bytesPending >= txBuffer.size)
dan_ackme 29:b6af04b77a56 513 {
dan_ackme 29:b6af04b77a56 514 result = flushTxBuffer();
dan_ackme 29:b6af04b77a56 515 }
dan_ackme 29:b6af04b77a56 516
dan_ackme 29:b6af04b77a56 517 return result;
dan_ackme 29:b6af04b77a56 518 }
dan_ackme 29:b6af04b77a56 519
dan_ackme 29:b6af04b77a56 520
dan_ackme 29:b6af04b77a56 521 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 522 WiconnectResult WiconnectSocket::flushTxBuffer()
dan_ackme 29:b6af04b77a56 523 {
dan_ackme 29:b6af04b77a56 524 WiconnectResult result = WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 525
dan_ackme 29:b6af04b77a56 526 CHECK_CONNECTED();
dan_ackme 29:b6af04b77a56 527
dan_ackme 29:b6af04b77a56 528 if(txBuffer.size == 0)
dan_ackme 29:b6af04b77a56 529 {
dan_ackme 29:b6af04b77a56 530 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 531 }
dan_ackme 29:b6af04b77a56 532
dan_ackme 29:b6af04b77a56 533 if(txBuffer.bytesPending > 0)
dan_ackme 29:b6af04b77a56 534 {
dan_ackme 29:b6af04b77a56 535 loop:
dan_ackme 29:b6af04b77a56 536 result = wiconnect->sendCommand(ReaderFunc(readerCallback), &this->txBuffer, "write %u %u", handle, txBuffer.bytesPending);
dan_ackme 29:b6af04b77a56 537
dan_ackme 29:b6af04b77a56 538 // if still processing and in non-blocking mode and using a txtBuffer,
dan_ackme 29:b6af04b77a56 539 // then this api call must block until the command completes
dan_ackme 29:b6af04b77a56 540 if(result == WICONNECT_PROCESSING && wiconnect->nonBlocking && txBuffer.size > 0)
dan_ackme 29:b6af04b77a56 541 {
dan_ackme 29:b6af04b77a56 542 goto loop;
dan_ackme 29:b6af04b77a56 543 }
dan_ackme 29:b6af04b77a56 544 }
dan_ackme 29:b6af04b77a56 545
dan_ackme 29:b6af04b77a56 546 if(txBuffer.size == 0)
dan_ackme 29:b6af04b77a56 547 {
dan_ackme 29:b6af04b77a56 548 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 549 }
dan_ackme 29:b6af04b77a56 550
dan_ackme 29:b6af04b77a56 551 if(result != WICONNECT_PROCESSING)
dan_ackme 29:b6af04b77a56 552 {
dan_ackme 29:b6af04b77a56 553 txBuffer.ptr = txBuffer.buffer;
dan_ackme 29:b6af04b77a56 554 txBuffer.bytesPending = 0;
dan_ackme 29:b6af04b77a56 555 }
dan_ackme 29:b6af04b77a56 556
dan_ackme 29:b6af04b77a56 557 return result;
dan_ackme 29:b6af04b77a56 558 }
dan_ackme 29:b6af04b77a56 559
dan_ackme 29:b6af04b77a56 560
dan_ackme 29:b6af04b77a56 561
dan_ackme 29:b6af04b77a56 562 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 563 void WiconnectSocket::clearRxBuffer()
dan_ackme 29:b6af04b77a56 564 {
dan_ackme 29:b6af04b77a56 565 rxBuffer.bytesPending = 0;
dan_ackme 29:b6af04b77a56 566 rxBuffer.ptr = rxBuffer.buffer;
dan_ackme 29:b6af04b77a56 567 }
dan_ackme 29:b6af04b77a56 568
dan_ackme 29:b6af04b77a56 569 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 570 uint8_t* WiconnectSocket::getTxBuffer()
dan_ackme 29:b6af04b77a56 571 {
dan_ackme 29:b6af04b77a56 572 return txBuffer.buffer;
dan_ackme 29:b6af04b77a56 573 }
dan_ackme 29:b6af04b77a56 574 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 575 int WiconnectSocket::getTxBufferSize()
dan_ackme 29:b6af04b77a56 576 {
dan_ackme 29:b6af04b77a56 577 return txBuffer.size;
dan_ackme 29:b6af04b77a56 578 }
dan_ackme 29:b6af04b77a56 579 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 580 int WiconnectSocket::getTxBufferBytesPending()
dan_ackme 29:b6af04b77a56 581 {
dan_ackme 29:b6af04b77a56 582 return txBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 583 }
dan_ackme 29:b6af04b77a56 584 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 585 uint8_t* WiconnectSocket::getRxBuffer()
dan_ackme 29:b6af04b77a56 586 {
dan_ackme 29:b6af04b77a56 587 return rxBuffer.buffer;
dan_ackme 29:b6af04b77a56 588 }
dan_ackme 29:b6af04b77a56 589 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 590 int WiconnectSocket::getRxBufferSize()
dan_ackme 29:b6af04b77a56 591 {
dan_ackme 29:b6af04b77a56 592 return rxBuffer.size;
dan_ackme 29:b6af04b77a56 593 }
dan_ackme 29:b6af04b77a56 594 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 595 int WiconnectSocket::getRxBufferBytesPending()
dan_ackme 29:b6af04b77a56 596 {
dan_ackme 29:b6af04b77a56 597 return rxBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 598 }
dan_ackme 29:b6af04b77a56 599
dan_ackme 29:b6af04b77a56 600
dan_ackme 29:b6af04b77a56 601 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 602 WiconnectResult readerCallback(void *user, void *data, int maxReadSize, int *bytesRead)
dan_ackme 29:b6af04b77a56 603 {
dan_ackme 29:b6af04b77a56 604 Buffer *txBuffer = (Buffer*)user;
dan_ackme 29:b6af04b77a56 605
dan_ackme 29:b6af04b77a56 606 if(txBuffer->bytesPending == 0)
dan_ackme 29:b6af04b77a56 607 {
dan_ackme 29:b6af04b77a56 608 *bytesRead = EOF;
dan_ackme 29:b6af04b77a56 609 }
dan_ackme 29:b6af04b77a56 610 else
dan_ackme 29:b6af04b77a56 611 {
dan_ackme 29:b6af04b77a56 612 const int bytesToWrite = MIN(maxReadSize, txBuffer->bytesPending);
dan_ackme 29:b6af04b77a56 613 memcpy(data, txBuffer->ptr, bytesToWrite);
dan_ackme 29:b6af04b77a56 614 txBuffer->ptr += bytesToWrite;
dan_ackme 29:b6af04b77a56 615 txBuffer->bytesPending -= bytesToWrite;
dan_ackme 29:b6af04b77a56 616 *bytesRead = bytesToWrite;
dan_ackme 29:b6af04b77a56 617 }
dan_ackme 29:b6af04b77a56 618
dan_ackme 29:b6af04b77a56 619 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 620 }
dan_ackme 29:b6af04b77a56 621