Andrew Bonney / NetServicesMod

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.

drv/at/ATIf.h@0:ec559500a63f, 2011-04-08 (annotated)

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 ATIF_H





andrewbonney

0:ec559500a63f


    25

#define ATIF_H





andrewbonney

0:ec559500a63f


    26







andrewbonney

0:ec559500a63f


    27

#include "netCfg.h"





andrewbonney

0:ec559500a63f


    28







andrewbonney

0:ec559500a63f


    29

#include "mbed.h"





andrewbonney

0:ec559500a63f


    30

#include "drv/serial/buf/SerialBuf.h"





andrewbonney

0:ec559500a63f


    31

#include <list>





andrewbonney

0:ec559500a63f


    32

using std::list;





andrewbonney

0:ec559500a63f


    33







andrewbonney

0:ec559500a63f


    34

//class Serial; //Pb w forward decl





andrewbonney

0:ec559500a63f


    35







andrewbonney

0:ec559500a63f


    36

enum ATErr





andrewbonney

0:ec559500a63f


    37

{





andrewbonney

0:ec559500a63f


    38

  __AT_MIN = -0xFFFF,





andrewbonney

0:ec559500a63f


    39

  AT_CLOSED,





andrewbonney

0:ec559500a63f


    40

  AT_NOANSWER,





andrewbonney

0:ec559500a63f


    41

  AT_ERROR,





andrewbonney

0:ec559500a63f


    42

  AT_TIMEOUT, 





andrewbonney

0:ec559500a63f


    43

  AT_BUSY,





andrewbonney

0:ec559500a63f


    44

  AT_PARSE,





andrewbonney

0:ec559500a63f


    45

  AT_INCOMPLETE,





andrewbonney

0:ec559500a63f


    46

  AT_OK = 0





andrewbonney

0:ec559500a63f


    47

};





andrewbonney

0:ec559500a63f


    48







andrewbonney

0:ec559500a63f


    49

class ATIf : public SerialBuf





andrewbonney

0:ec559500a63f


    50

{





andrewbonney

0:ec559500a63f


    51

  public:





andrewbonney

0:ec559500a63f


    52

    





andrewbonney

0:ec559500a63f


    53

    ATIf();





andrewbonney

0:ec559500a63f


    54

    virtual ~ATIf();





andrewbonney

0:ec559500a63f


    55







andrewbonney

0:ec559500a63f


    56

#if 0    





andrewbonney

0:ec559500a63f


    57

    template<class T> 





andrewbonney

0:ec559500a63f


    58

    //void attachSignal( const char* sigName, T* pItem, bool (T::*pMethod)(ATIf*, bool, bool*) ); //Attach Signal ("Unsollicited response code" in Telit_AT_Reference_Guide.pdf) to an handler fn





andrewbonney

0:ec559500a63f


    59

    //Linker bug : Must be defined here :(





andrewbonney

0:ec559500a63f


    60

    void attachSignal( const char* sigName, T* pItem, bool (T::*pMethod)(ATIf*, bool, bool*) ) //Attach Signal ("Unsollicited response code" in Telit_AT_Reference_Guide.pdf) to an handler fn





andrewbonney

0:ec559500a63f


    61

    {





andrewbonney

0:ec559500a63f


    62

      ATSigHandler sig(sigName, (ATSigHandler::CDummy*)pItem, (bool (ATSigHandler::CDummy::*)(ATIf*, bool, bool*))pMethod);





andrewbonney

0:ec559500a63f


    63

      m_signals.push_back(sig);





andrewbonney

0:ec559500a63f


    64

    }





andrewbonney

0:ec559500a63f


    65

    void detachSignal( const char* sigName );    





andrewbonney

0:ec559500a63f


    66

#endif





andrewbonney

0:ec559500a63f


    67

  





andrewbonney

0:ec559500a63f


    68

    ATErr open(Serial* pSerial); //Deactivate echo, etc





andrewbonney

0:ec559500a63f


    69

    #if NET_USB_SERIAL





andrewbonney

0:ec559500a63f


    70

    ATErr open(UsbSerial* pUsbSerial); //Deactivate echo, etc





andrewbonney

0:ec559500a63f


    71

    #endif





andrewbonney

0:ec559500a63f


    72

    ATErr close(); //Release port





andrewbonney

0:ec559500a63f


    73

    





andrewbonney

0:ec559500a63f


    74

    int printf(const char* format, ... );





andrewbonney

0:ec559500a63f


    75

    int scanf(const char* format, ... );





andrewbonney

0:ec559500a63f


    76

    void setTimeout(int timeout); //used by scanf





andrewbonney

0:ec559500a63f


    77

    void setLineMode(bool lineMode); //Switch btw line & raw fns





andrewbonney

0:ec559500a63f


    78

    //void setSignals(bool signalsEnable);





andrewbonney

0:ec559500a63f


    79

    ATErr flushBuffer(); //Discard input buffer





andrewbonney

0:ec559500a63f


    80

    ATErr flushLine(int timeout); //Discard input buffer until CRLF is encountered





andrewbonney

0:ec559500a63f


    81

    





andrewbonney

0:ec559500a63f


    82

  protected:





andrewbonney

0:ec559500a63f


    83

    //virtual bool onRead(); //Inherited from SerialBuf, return true if data is incomplete





andrewbonney

0:ec559500a63f


    84

    ATErr rawOpen(Serial* pSerial, int baudrate); //Simple open function for similar non-conforming protocols





andrewbonney

0:ec559500a63f


    85







andrewbonney

0:ec559500a63f


    86

  public:





andrewbonney

0:ec559500a63f


    87

/*    ATErr command(const char* cmd, char* result, int resultLen, int timeout); */ //Kinda useless





andrewbonney

0:ec559500a63f


    88

    ATErr write(const char* cmd, bool lineMode = false);





andrewbonney

0:ec559500a63f


    89

    ATErr read(char* result, int resultMaxLen, int timeout, bool lineMode = false, int resultMinLen = 0);





andrewbonney

0:ec559500a63f


    90

    bool isOpen();





andrewbonney

0:ec559500a63f


    91

    ATErr checkOK(); //Helper fn to quickly check that OK has been returned





andrewbonney

0:ec559500a63f


    92

  





andrewbonney

0:ec559500a63f


    93

  private:  





andrewbonney

0:ec559500a63f


    94

    int readLine(char* line, int maxLen, int timeout); //Read a single line from serial port





andrewbonney

0:ec559500a63f


    95

    int writeLine(const char* line); //Write a single line to serial port





andrewbonney

0:ec559500a63f


    96

    





andrewbonney

0:ec559500a63f


    97

    int readRaw(char* str, int maxLen, int timeout = 0, int minLen = 0); //Read from serial port in buf





andrewbonney

0:ec559500a63f


    98

    int writeRaw(const char* str); //Write directly to serial port





andrewbonney

0:ec559500a63f


    99

      





andrewbonney

0:ec559500a63f


   100

    volatile int m_readTimeout;





andrewbonney

0:ec559500a63f


   101

    volatile bool m_lineMode;





andrewbonney

0:ec559500a63f


   102

    //bool m_signalsEnable;





andrewbonney

0:ec559500a63f


   103

    bool m_isOpen;





andrewbonney

0:ec559500a63f


   104

    





andrewbonney

0:ec559500a63f


   105

    char* m_tmpBuf;





andrewbonney

0:ec559500a63f


   106

 





andrewbonney

0:ec559500a63f


   107

#if 0 





andrewbonney

0:ec559500a63f


   108

    class ATSigHandler





andrewbonney

0:ec559500a63f


   109

    {





andrewbonney

0:ec559500a63f


   110

      class CDummy;





andrewbonney

0:ec559500a63f


   111

      public:





andrewbonney

0:ec559500a63f


   112

        ATSigHandler(const char* name, CDummy* cbObj, bool (CDummy::*cbMeth)(ATIf* pIf, bool beg, bool* pMoreData)) : m_cbObj(cbObj), m_cbMeth(cbMeth), m_name(name) 





andrewbonney

0:ec559500a63f


   113

        {}





andrewbonney

0:ec559500a63f


   114

      protected:





andrewbonney

0:ec559500a63f


   115

        CDummy* m_cbObj;





andrewbonney

0:ec559500a63f


   116

        bool (CDummy::*m_cbMeth)(ATIf* pIf, bool beg, bool* pMoreData); //*pMoreData set to true if needs to read next line, beg = true if beginning of new code





andrewbonney

0:ec559500a63f


   117

        const char* m_name;





andrewbonney

0:ec559500a63f


   118

     





andrewbonney

0:ec559500a63f


   119

      friend class ATIf;





andrewbonney

0:ec559500a63f


   120

    };





andrewbonney

0:ec559500a63f


   121

    





andrewbonney

0:ec559500a63f


   122

    volatile ATSigHandler* m_pCurrentSignal; //Signal that asked more data





andrewbonney

0:ec559500a63f


   123

    





andrewbonney

0:ec559500a63f


   124

    bool handleSignal(); //Returns true if signal has been handled





andrewbonney

0:ec559500a63f


   125

    list<ATSigHandler> m_signals;





andrewbonney

0:ec559500a63f


   126

#endif





andrewbonney

0:ec559500a63f


   127

    





andrewbonney

0:ec559500a63f


   128

};





andrewbonney

0:ec559500a63f


   129







andrewbonney

0:ec559500a63f


   130

#endif