Andrew Bonney
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.
if/ppp/PPPNetIf.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?
| User | Revision | Line number | New 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 | /** \file |
| andrewbonney | 0:ec559500a63f | 25 | PPP Generic network interface header file |
| andrewbonney | 0:ec559500a63f | 26 | */ |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | //This is a backend for PPP, using lwIP |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | #ifndef PPPNETIF_H |
| andrewbonney | 0:ec559500a63f | 31 | #define PPPNETIF_H |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | #include "mbed.h" |
| andrewbonney | 0:ec559500a63f | 34 | |
| andrewbonney | 0:ec559500a63f | 35 | //For now, only a GPRS Modem is supported, |
| andrewbonney | 0:ec559500a63f | 36 | //but we could easily split this class into a base class + two derived classes |
| andrewbonney | 0:ec559500a63f | 37 | // (PPP over GPRS + PPP over Serial Modem) |
| andrewbonney | 0:ec559500a63f | 38 | #include "drv/gprs/GPRSModem.h" |
| andrewbonney | 0:ec559500a63f | 39 | #include "if/lwip/LwipNetIf.h" |
| andrewbonney | 0:ec559500a63f | 40 | |
| andrewbonney | 0:ec559500a63f | 41 | ///PPP connection error codes |
| andrewbonney | 0:ec559500a63f | 42 | enum PPPErr |
| andrewbonney | 0:ec559500a63f | 43 | { |
| andrewbonney | 0:ec559500a63f | 44 | __PPP_MIN = -0xFFFF, |
| andrewbonney | 0:ec559500a63f | 45 | PPP_MODEM, ///<AT error returned |
| andrewbonney | 0:ec559500a63f | 46 | PPP_NETWORK, ///<Network is down |
| andrewbonney | 0:ec559500a63f | 47 | PPP_PROTOCOL, ///<PPP Protocol error |
| andrewbonney | 0:ec559500a63f | 48 | PPP_CLOSED, ///<Connection is closed |
| andrewbonney | 0:ec559500a63f | 49 | PPP_OK = 0 ///<Success |
| andrewbonney | 0:ec559500a63f | 50 | }; |
| andrewbonney | 0:ec559500a63f | 51 | |
| andrewbonney | 0:ec559500a63f | 52 | enum PPPStatus |
| andrewbonney | 0:ec559500a63f | 53 | { |
| andrewbonney | 0:ec559500a63f | 54 | PPP_CONNECTING, |
| andrewbonney | 0:ec559500a63f | 55 | PPP_CONNECTED, |
| andrewbonney | 0:ec559500a63f | 56 | PPP_DISCONNECTED, |
| andrewbonney | 0:ec559500a63f | 57 | }; |
| andrewbonney | 0:ec559500a63f | 58 | |
| andrewbonney | 0:ec559500a63f | 59 | class PPPNetIf : public LwipNetIf |
| andrewbonney | 0:ec559500a63f | 60 | { |
| andrewbonney | 0:ec559500a63f | 61 | public: |
| andrewbonney | 0:ec559500a63f | 62 | PPPNetIf(GPRSModem* pIf); |
| andrewbonney | 0:ec559500a63f | 63 | virtual ~PPPNetIf(); |
| andrewbonney | 0:ec559500a63f | 64 | |
| andrewbonney | 0:ec559500a63f | 65 | #if 0 |
| andrewbonney | 0:ec559500a63f | 66 | PPPErr open(Serial* pSerial); |
| andrewbonney | 0:ec559500a63f | 67 | #endif |
| andrewbonney | 0:ec559500a63f | 68 | |
| andrewbonney | 0:ec559500a63f | 69 | PPPErr GPRSConnect(const char* apn, const char* userId, const char* password); //Connect using GPRS |
| andrewbonney | 0:ec559500a63f | 70 | PPPErr ATConnect(const char* number); //Connect using a "classic" voice modem or GSM |
| andrewbonney | 0:ec559500a63f | 71 | |
| andrewbonney | 0:ec559500a63f | 72 | virtual void poll(); |
| andrewbonney | 0:ec559500a63f | 73 | |
| andrewbonney | 0:ec559500a63f | 74 | PPPErr disconnect(); |
| andrewbonney | 0:ec559500a63f | 75 | |
| andrewbonney | 0:ec559500a63f | 76 | #if 0 |
| andrewbonney | 0:ec559500a63f | 77 | PPPErr close(); |
| andrewbonney | 0:ec559500a63f | 78 | #endif |
| andrewbonney | 0:ec559500a63f | 79 | |
| andrewbonney | 0:ec559500a63f | 80 | protected: |
| andrewbonney | 0:ec559500a63f | 81 | GPRSModem* m_pIf; |
| andrewbonney | 0:ec559500a63f | 82 | |
| andrewbonney | 0:ec559500a63f | 83 | private: |
| andrewbonney | 0:ec559500a63f | 84 | void pppCallback(int errCode, void *arg); |
| andrewbonney | 0:ec559500a63f | 85 | |
| andrewbonney | 0:ec559500a63f | 86 | static void sPppCallback(void *ctx, int errCode, void *arg) //Callback from ppp.c |
| andrewbonney | 0:ec559500a63f | 87 | { return ((PPPNetIf*)ctx)->pppCallback(errCode, arg); } |
| andrewbonney | 0:ec559500a63f | 88 | |
| andrewbonney | 0:ec559500a63f | 89 | bool m_connected; |
| andrewbonney | 0:ec559500a63f | 90 | /*bool m_open;*/ |
| andrewbonney | 0:ec559500a63f | 91 | volatile PPPStatus m_status; |
| andrewbonney | 0:ec559500a63f | 92 | volatile int m_fd; //PPP Session descriptor |
| andrewbonney | 0:ec559500a63f | 93 | |
| andrewbonney | 0:ec559500a63f | 94 | //int m_id; |
| andrewbonney | 0:ec559500a63f | 95 | |
| andrewbonney | 0:ec559500a63f | 96 | uint8_t* m_buf; |
| andrewbonney | 0:ec559500a63f | 97 | |
| andrewbonney | 0:ec559500a63f | 98 | }; |
| andrewbonney | 0:ec559500a63f | 99 | |
| andrewbonney | 0:ec559500a63f | 100 | #endif |