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/gprsmodule/GPRSModuleNetIf.cpp@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 | #include "netCfg.h" |
| andrewbonney | 0:ec559500a63f | 25 | #if NET_GPRS_MODULE |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | #include "GPRSModuleNetIf.h" |
| andrewbonney | 0:ec559500a63f | 28 | |
| andrewbonney | 0:ec559500a63f | 29 | #define __DEBUG |
| andrewbonney | 0:ec559500a63f | 30 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 31 | |
| andrewbonney | 0:ec559500a63f | 32 | GPRSModuleNetIf::GPRSModuleNetIf(PinName tx, PinName rx, int baud /*= 115200*/) : PPPNetIf(NULL), m_serial(tx, rx) |
| andrewbonney | 0:ec559500a63f | 33 | { |
| andrewbonney | 0:ec559500a63f | 34 | PPPNetIf::m_pIf = new GPRSModem(); |
| andrewbonney | 0:ec559500a63f | 35 | m_serial.baud(baud); |
| andrewbonney | 0:ec559500a63f | 36 | } |
| andrewbonney | 0:ec559500a63f | 37 | |
| andrewbonney | 0:ec559500a63f | 38 | GPRSModuleNetIf::~GPRSModuleNetIf() |
| andrewbonney | 0:ec559500a63f | 39 | { |
| andrewbonney | 0:ec559500a63f | 40 | delete PPPNetIf::m_pIf; |
| andrewbonney | 0:ec559500a63f | 41 | } |
| andrewbonney | 0:ec559500a63f | 42 | |
| andrewbonney | 0:ec559500a63f | 43 | PPPErr GPRSModuleNetIf::connect(const char* apn /*= NULL*/, const char* userId /*= NULL*/, const char* password /*= NULL*/) //Connect using GPRS |
| andrewbonney | 0:ec559500a63f | 44 | { |
| andrewbonney | 0:ec559500a63f | 45 | |
| andrewbonney | 0:ec559500a63f | 46 | DBG("Powering on module.\n") |
| andrewbonney | 0:ec559500a63f | 47 | if(!setOn()) //Could not power on module |
| andrewbonney | 0:ec559500a63f | 48 | { |
| andrewbonney | 0:ec559500a63f | 49 | DBG("Could not power on module.\n"); |
| andrewbonney | 0:ec559500a63f | 50 | return PPP_MODEM; |
| andrewbonney | 0:ec559500a63f | 51 | } |
| andrewbonney | 0:ec559500a63f | 52 | |
| andrewbonney | 0:ec559500a63f | 53 | //wait(10); //Wait for module to init. |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | ATErr atErr; |
| andrewbonney | 0:ec559500a63f | 56 | for(int i=0; i<3; i++) |
| andrewbonney | 0:ec559500a63f | 57 | { |
| andrewbonney | 0:ec559500a63f | 58 | atErr = m_pIf->open(&m_serial); //3 tries |
| andrewbonney | 0:ec559500a63f | 59 | if(!atErr) |
| andrewbonney | 0:ec559500a63f | 60 | break; |
| andrewbonney | 0:ec559500a63f | 61 | DBG("Could not open AT If, trying again.\n"); |
| andrewbonney | 0:ec559500a63f | 62 | wait(4); |
| andrewbonney | 0:ec559500a63f | 63 | } |
| andrewbonney | 0:ec559500a63f | 64 | |
| andrewbonney | 0:ec559500a63f | 65 | if(atErr) |
| andrewbonney | 0:ec559500a63f | 66 | { |
| andrewbonney | 0:ec559500a63f | 67 | setOff(); |
| andrewbonney | 0:ec559500a63f | 68 | return PPP_MODEM; |
| andrewbonney | 0:ec559500a63f | 69 | } |
| andrewbonney | 0:ec559500a63f | 70 | |
| andrewbonney | 0:ec559500a63f | 71 | DBG("AT If opened.\n"); |
| andrewbonney | 0:ec559500a63f | 72 | |
| andrewbonney | 0:ec559500a63f | 73 | PPPErr pppErr; |
| andrewbonney | 0:ec559500a63f | 74 | for(int i=0; i<3; i++) |
| andrewbonney | 0:ec559500a63f | 75 | { |
| andrewbonney | 0:ec559500a63f | 76 | DBG("Trying to connect.\n"); |
| andrewbonney | 0:ec559500a63f | 77 | pppErr = PPPNetIf::GPRSConnect(apn, userId, password); |
| andrewbonney | 0:ec559500a63f | 78 | if(!pppErr) |
| andrewbonney | 0:ec559500a63f | 79 | break; |
| andrewbonney | 0:ec559500a63f | 80 | DBG("Could not connect.\n"); |
| andrewbonney | 0:ec559500a63f | 81 | wait(4); |
| andrewbonney | 0:ec559500a63f | 82 | } |
| andrewbonney | 0:ec559500a63f | 83 | if(pppErr) |
| andrewbonney | 0:ec559500a63f | 84 | { |
| andrewbonney | 0:ec559500a63f | 85 | setOff(); |
| andrewbonney | 0:ec559500a63f | 86 | return pppErr; |
| andrewbonney | 0:ec559500a63f | 87 | } |
| andrewbonney | 0:ec559500a63f | 88 | |
| andrewbonney | 0:ec559500a63f | 89 | DBG("Connected.\n"); |
| andrewbonney | 0:ec559500a63f | 90 | |
| andrewbonney | 0:ec559500a63f | 91 | return PPP_OK; |
| andrewbonney | 0:ec559500a63f | 92 | } |
| andrewbonney | 0:ec559500a63f | 93 | |
| andrewbonney | 0:ec559500a63f | 94 | PPPErr GPRSModuleNetIf::disconnect() |
| andrewbonney | 0:ec559500a63f | 95 | { |
| andrewbonney | 0:ec559500a63f | 96 | DBG("Disconnecting...\n"); |
| andrewbonney | 0:ec559500a63f | 97 | PPPErr pppErr = PPPNetIf::disconnect(); |
| andrewbonney | 0:ec559500a63f | 98 | if(pppErr) |
| andrewbonney | 0:ec559500a63f | 99 | return pppErr; |
| andrewbonney | 0:ec559500a63f | 100 | |
| andrewbonney | 0:ec559500a63f | 101 | m_pIf->close(); |
| andrewbonney | 0:ec559500a63f | 102 | |
| andrewbonney | 0:ec559500a63f | 103 | DBG("Powering off module.\n") |
| andrewbonney | 0:ec559500a63f | 104 | setOff(); //Power off module |
| andrewbonney | 0:ec559500a63f | 105 | |
| andrewbonney | 0:ec559500a63f | 106 | DBG("Off.\n") |
| andrewbonney | 0:ec559500a63f | 107 | |
| andrewbonney | 0:ec559500a63f | 108 | return PPP_OK; |
| andrewbonney | 0:ec559500a63f | 109 | } |
| andrewbonney | 0:ec559500a63f | 110 | |
| andrewbonney | 0:ec559500a63f | 111 | |
| andrewbonney | 0:ec559500a63f | 112 | #endif |