Modified version of NetServices. Fixes an issue where connections failed should the HTTP response status line be received in a packet on its own prior to any further headers. Changes are made to the HTTPClient.cpp file's readHeaders method.

Committer:
andrewbonney
Date:
Fri Apr 08 14:39:41 2011 +0000
Revision:
0:ec559500a63f

        

Who changed what in which revision?

UserRevisionLine numberNew contents of line
andrewbonney 0:ec559500a63f 1
andrewbonney 0:ec559500a63f 2 /*
andrewbonney 0:ec559500a63f 3 Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com)
andrewbonney 0:ec559500a63f 4
andrewbonney 0:ec559500a63f 5 Permission is hereby granted, free of charge, to any person obtaining a copy
andrewbonney 0:ec559500a63f 6 of this software and associated documentation files (the "Software"), to deal
andrewbonney 0:ec559500a63f 7 in the Software without restriction, including without limitation the rights
andrewbonney 0:ec559500a63f 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
andrewbonney 0:ec559500a63f 9 copies of the Software, and to permit persons to whom the Software is
andrewbonney 0:ec559500a63f 10 furnished to do so, subject to the following conditions:
andrewbonney 0:ec559500a63f 11
andrewbonney 0:ec559500a63f 12 The above copyright notice and this permission notice shall be included in
andrewbonney 0:ec559500a63f 13 all copies or substantial portions of the Software.
andrewbonney 0:ec559500a63f 14
andrewbonney 0:ec559500a63f 15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
andrewbonney 0:ec559500a63f 16 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
andrewbonney 0:ec559500a63f 17 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
andrewbonney 0:ec559500a63f 18 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
andrewbonney 0:ec559500a63f 19 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
andrewbonney 0:ec559500a63f 20 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
andrewbonney 0:ec559500a63f 21 THE SOFTWARE.
andrewbonney 0:ec559500a63f 22 */
andrewbonney 0:ec559500a63f 23
andrewbonney 0:ec559500a63f 24 #ifndef SERIALBUF_H
andrewbonney 0:ec559500a63f 25 #define SERIALBUF_H
andrewbonney 0:ec559500a63f 26
andrewbonney 0:ec559500a63f 27 #include "mbed.h"
andrewbonney 0:ec559500a63f 28 #include "netCfg.h"
andrewbonney 0:ec559500a63f 29 #if NET_USB_SERIAL
andrewbonney 0:ec559500a63f 30 #include "drv/serial/usb/UsbSerial.h"
andrewbonney 0:ec559500a63f 31 #endif
andrewbonney 0:ec559500a63f 32
andrewbonney 0:ec559500a63f 33 class SerialCircularBuf
andrewbonney 0:ec559500a63f 34 {
andrewbonney 0:ec559500a63f 35 public:
andrewbonney 0:ec559500a63f 36 SerialCircularBuf(int len);
andrewbonney 0:ec559500a63f 37 ~SerialCircularBuf();
andrewbonney 0:ec559500a63f 38
andrewbonney 0:ec559500a63f 39 int room();
andrewbonney 0:ec559500a63f 40 int len();
andrewbonney 0:ec559500a63f 41
andrewbonney 0:ec559500a63f 42 void write(char c);
andrewbonney 0:ec559500a63f 43 char read();
andrewbonney 0:ec559500a63f 44
andrewbonney 0:ec559500a63f 45 void setReadMode(bool readMode); //If true, keeps chars in buf when read, false by default
andrewbonney 0:ec559500a63f 46 void flushRead(); //Delete chars that have been read & return chars len (only useful with readMode = true)
andrewbonney 0:ec559500a63f 47 void resetRead(); //Go back to initial read position & return chars len (only useful with readMode = true)
andrewbonney 0:ec559500a63f 48
andrewbonney 0:ec559500a63f 49 private:
andrewbonney 0:ec559500a63f 50 char* m_buf;
andrewbonney 0:ec559500a63f 51 int m_len;
andrewbonney 0:ec559500a63f 52
andrewbonney 0:ec559500a63f 53 volatile char* m_pReadStart;
andrewbonney 0:ec559500a63f 54 volatile char* m_pRead;
andrewbonney 0:ec559500a63f 55 volatile char* m_pWrite;
andrewbonney 0:ec559500a63f 56 volatile bool m_readMode;
andrewbonney 0:ec559500a63f 57 };
andrewbonney 0:ec559500a63f 58
andrewbonney 0:ec559500a63f 59 class SerialBuf
andrewbonney 0:ec559500a63f 60 {
andrewbonney 0:ec559500a63f 61 public:
andrewbonney 0:ec559500a63f 62 SerialBuf(int len); //Buffer length
andrewbonney 0:ec559500a63f 63 virtual ~SerialBuf();
andrewbonney 0:ec559500a63f 64
andrewbonney 0:ec559500a63f 65 void attach(Serial* pSerial);
andrewbonney 0:ec559500a63f 66 void detach();
andrewbonney 0:ec559500a63f 67
andrewbonney 0:ec559500a63f 68 #if NET_USB_SERIAL
andrewbonney 0:ec559500a63f 69 void attach(UsbSerial* pUsbSerial);
andrewbonney 0:ec559500a63f 70 #endif
andrewbonney 0:ec559500a63f 71
andrewbonney 0:ec559500a63f 72 //Really useful for debugging
andrewbonney 0:ec559500a63f 73 char getc();
andrewbonney 0:ec559500a63f 74 void putc(char c);
andrewbonney 0:ec559500a63f 75 bool readable();
andrewbonney 0:ec559500a63f 76 bool writeable();
andrewbonney 0:ec559500a63f 77 /*protected:*/
andrewbonney 0:ec559500a63f 78 void setReadMode(bool readMode); //If true, keeps chars in buf when read, false by default
andrewbonney 0:ec559500a63f 79 void flushRead(); //Delete chars that have been read & return chars len (only useful with readMode = true)
andrewbonney 0:ec559500a63f 80 void resetRead(); //Go back to initial read position & return chars len (only useful with readMode = true)
andrewbonney 0:ec559500a63f 81
andrewbonney 0:ec559500a63f 82 private:
andrewbonney 0:ec559500a63f 83 void onRxInterrupt(); //Callback from m_pSerial
andrewbonney 0:ec559500a63f 84 void onTxInterrupt(); //Callback from m_pSerial
andrewbonney 0:ec559500a63f 85
andrewbonney 0:ec559500a63f 86 SerialCircularBuf m_rxBuf;
andrewbonney 0:ec559500a63f 87 SerialCircularBuf m_txBuf;
andrewbonney 0:ec559500a63f 88
andrewbonney 0:ec559500a63f 89 Serial* m_pSerial; //Not owned
andrewbonney 0:ec559500a63f 90
andrewbonney 0:ec559500a63f 91 #if NET_USB_SERIAL
andrewbonney 0:ec559500a63f 92 //USB Serial Impl
andrewbonney 0:ec559500a63f 93 UsbSerial* m_pUsbSerial; //Not owned
andrewbonney 0:ec559500a63f 94 //Ticker m_usbTick;
andrewbonney 0:ec559500a63f 95 #endif
andrewbonney 0:ec559500a63f 96 };
andrewbonney 0:ec559500a63f 97
andrewbonney 0:ec559500a63f 98
andrewbonney 0:ec559500a63f 99 #endif