Netservices modded to read fragmented HTTP respsonse/payload from special purpose server - 180 bytes only

Committer:
RodColeman
Date:
Thu Sep 08 10:48:09 2011 +0000
Revision:
0:850eacf3e945
revised fixed length to 178 bytes

Who changed what in which revision?

UserRevisionLine numberNew contents of line
RodColeman 0:850eacf3e945 1
RodColeman 0:850eacf3e945 2 /*
RodColeman 0:850eacf3e945 3 Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com)
RodColeman 0:850eacf3e945 4
RodColeman 0:850eacf3e945 5 Permission is hereby granted, free of charge, to any person obtaining a copy
RodColeman 0:850eacf3e945 6 of this software and associated documentation files (the "Software"), to deal
RodColeman 0:850eacf3e945 7 in the Software without restriction, including without limitation the rights
RodColeman 0:850eacf3e945 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
RodColeman 0:850eacf3e945 9 copies of the Software, and to permit persons to whom the Software is
RodColeman 0:850eacf3e945 10 furnished to do so, subject to the following conditions:
RodColeman 0:850eacf3e945 11
RodColeman 0:850eacf3e945 12 The above copyright notice and this permission notice shall be included in
RodColeman 0:850eacf3e945 13 all copies or substantial portions of the Software.
RodColeman 0:850eacf3e945 14
RodColeman 0:850eacf3e945 15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
RodColeman 0:850eacf3e945 16 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
RodColeman 0:850eacf3e945 17 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
RodColeman 0:850eacf3e945 18 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
RodColeman 0:850eacf3e945 19 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
RodColeman 0:850eacf3e945 20 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
RodColeman 0:850eacf3e945 21 THE SOFTWARE.
RodColeman 0:850eacf3e945 22 */
RodColeman 0:850eacf3e945 23
RodColeman 0:850eacf3e945 24 #include "PPPNetIf.h"
RodColeman 0:850eacf3e945 25 #include "mbed.h"
RodColeman 0:850eacf3e945 26 #include "ppp/ppp.h"
RodColeman 0:850eacf3e945 27 #include "lwip/init.h"
RodColeman 0:850eacf3e945 28 #include "lwip/sio.h"
RodColeman 0:850eacf3e945 29
RodColeman 0:850eacf3e945 30 #define __DEBUG
RodColeman 0:850eacf3e945 31 #include "dbg/dbg.h"
RodColeman 0:850eacf3e945 32
RodColeman 0:850eacf3e945 33 #include "netCfg.h"
RodColeman 0:850eacf3e945 34 #if NET_PPP
RodColeman 0:850eacf3e945 35
RodColeman 0:850eacf3e945 36 #define PPP_TIMEOUT 60000
RodColeman 0:850eacf3e945 37
RodColeman 0:850eacf3e945 38 #define BUF_SIZE 256
RodColeman 0:850eacf3e945 39
RodColeman 0:850eacf3e945 40 PPPNetIf::PPPNetIf(GPRSModem* pIf) : LwipNetIf(), m_pIf(pIf),/* m_open(false),*/ m_connected(false), m_status(PPP_DISCONNECTED), m_fd(0) //, m_id(0)
RodColeman 0:850eacf3e945 41 {
RodColeman 0:850eacf3e945 42 //FIXME: Check static refcount
RodColeman 0:850eacf3e945 43 m_buf = new uint8_t[BUF_SIZE];
RodColeman 0:850eacf3e945 44 }
RodColeman 0:850eacf3e945 45
RodColeman 0:850eacf3e945 46 PPPNetIf::~PPPNetIf()
RodColeman 0:850eacf3e945 47 {
RodColeman 0:850eacf3e945 48 delete[] m_buf;
RodColeman 0:850eacf3e945 49 }
RodColeman 0:850eacf3e945 50
RodColeman 0:850eacf3e945 51 #if 0
RodColeman 0:850eacf3e945 52 PPPErr PPPNetIf::open(Serial* pSerial)
RodColeman 0:850eacf3e945 53 {
RodColeman 0:850eacf3e945 54 GPRSErr err = m_pIf->open(pSerial);
RodColeman 0:850eacf3e945 55 if(err)
RodColeman 0:850eacf3e945 56 return PPP_MODEM;
RodColeman 0:850eacf3e945 57 m_open = true;
RodColeman 0:850eacf3e945 58 #if 0
RodColeman 0:850eacf3e945 59 m_id = sioMgr::registerSerialIf(this);
RodColeman 0:850eacf3e945 60 if(!m_id)
RodColeman 0:850eacf3e945 61 {
RodColeman 0:850eacf3e945 62 close();
RodColeman 0:850eacf3e945 63 return PPP_CLOSED;
RodColeman 0:850eacf3e945 64 }
RodColeman 0:850eacf3e945 65 #endif
RodColeman 0:850eacf3e945 66 return PPP_OK;
RodColeman 0:850eacf3e945 67 }
RodColeman 0:850eacf3e945 68 #endif
RodColeman 0:850eacf3e945 69
RodColeman 0:850eacf3e945 70
RodColeman 0:850eacf3e945 71 PPPErr PPPNetIf::GPRSConnect(const char* apn, const char* userId, const char* password) //Connect using GPRS
RodColeman 0:850eacf3e945 72 {
RodColeman 0:850eacf3e945 73 LwipNetIf::init();
RodColeman 0:850eacf3e945 74 pppInit();
RodColeman 0:850eacf3e945 75 //TODO: Tell ATIf that we get ownership of the serial port
RodColeman 0:850eacf3e945 76
RodColeman 0:850eacf3e945 77 GPRSErr gprsErr;
RodColeman 0:850eacf3e945 78 gprsErr = m_pIf->connect(apn);
RodColeman 0:850eacf3e945 79 if(gprsErr)
RodColeman 0:850eacf3e945 80 return PPP_NETWORK;
RodColeman 0:850eacf3e945 81
RodColeman 0:850eacf3e945 82 DBG("PPPNetIf: If Connected.\n");
RodColeman 0:850eacf3e945 83
RodColeman 0:850eacf3e945 84 if( userId == NULL )
RodColeman 0:850eacf3e945 85 pppSetAuth(PPPAUTHTYPE_NONE, NULL, NULL);
RodColeman 0:850eacf3e945 86 else
RodColeman 0:850eacf3e945 87 pppSetAuth(PPPAUTHTYPE_PAP, userId, password); //TODO: Allow CHAP as well
RodColeman 0:850eacf3e945 88
RodColeman 0:850eacf3e945 89 DBG("PPPNetIf: Set Auth.\n");
RodColeman 0:850eacf3e945 90
RodColeman 0:850eacf3e945 91 //wait(1.);
RodColeman 0:850eacf3e945 92
RodColeman 0:850eacf3e945 93 //m_pIf->flushBuffer(); //Flush buffer before passing serial port to PPP
RodColeman 0:850eacf3e945 94
RodColeman 0:850eacf3e945 95 m_status = PPP_CONNECTING;
RodColeman 0:850eacf3e945 96 DBG("m_pIf = %p\n", m_pIf);
RodColeman 0:850eacf3e945 97 int res = pppOverSerialOpen((void*)m_pIf, sPppCallback, (void*)this);
RodColeman 0:850eacf3e945 98 DBG("PPP connected\n");
RodColeman 0:850eacf3e945 99 if(res<0)
RodColeman 0:850eacf3e945 100 {
RodColeman 0:850eacf3e945 101 disconnect();
RodColeman 0:850eacf3e945 102 return PPP_PROTOCOL;
RodColeman 0:850eacf3e945 103 }
RodColeman 0:850eacf3e945 104
RodColeman 0:850eacf3e945 105 DBG("PPPNetIf: PPP Started with res = %d.\n", res);
RodColeman 0:850eacf3e945 106
RodColeman 0:850eacf3e945 107 m_fd = res;
RodColeman 0:850eacf3e945 108 m_connected = true;
RodColeman 0:850eacf3e945 109 Timer t;
RodColeman 0:850eacf3e945 110 t.start();
RodColeman 0:850eacf3e945 111 while( m_status == PPP_CONNECTING ) //Wait for callback
RodColeman 0:850eacf3e945 112 {
RodColeman 0:850eacf3e945 113 poll();
RodColeman 0:850eacf3e945 114 if(t.read_ms()>PPP_TIMEOUT)
RodColeman 0:850eacf3e945 115 {
RodColeman 0:850eacf3e945 116 DBG("PPPNetIf: Timeout.\n");
RodColeman 0:850eacf3e945 117 disconnect();
RodColeman 0:850eacf3e945 118 return PPP_PROTOCOL;
RodColeman 0:850eacf3e945 119 }
RodColeman 0:850eacf3e945 120 }
RodColeman 0:850eacf3e945 121
RodColeman 0:850eacf3e945 122 DBG("PPPNetIf: Callback returned.\n");
RodColeman 0:850eacf3e945 123
RodColeman 0:850eacf3e945 124 if( m_status == PPP_DISCONNECTED )
RodColeman 0:850eacf3e945 125 {
RodColeman 0:850eacf3e945 126 disconnect();
RodColeman 0:850eacf3e945 127 return PPP_PROTOCOL;
RodColeman 0:850eacf3e945 128 }
RodColeman 0:850eacf3e945 129
RodColeman 0:850eacf3e945 130 return PPP_OK;
RodColeman 0:850eacf3e945 131
RodColeman 0:850eacf3e945 132 }
RodColeman 0:850eacf3e945 133
RodColeman 0:850eacf3e945 134 PPPErr PPPNetIf::ATConnect(const char* number) //Connect using a "classic" voice modem or GSM
RodColeman 0:850eacf3e945 135 {
RodColeman 0:850eacf3e945 136 //TODO: IMPL
RodColeman 0:850eacf3e945 137 return PPP_MODEM;
RodColeman 0:850eacf3e945 138 }
RodColeman 0:850eacf3e945 139
RodColeman 0:850eacf3e945 140 PPPErr PPPNetIf::disconnect()
RodColeman 0:850eacf3e945 141 {
RodColeman 0:850eacf3e945 142 if(m_fd)
RodColeman 0:850eacf3e945 143 pppClose(m_fd); //0 if ok, else should gen a WARN
RodColeman 0:850eacf3e945 144 m_connected = false;
RodColeman 0:850eacf3e945 145
RodColeman 0:850eacf3e945 146 m_pIf->flushBuffer();
RodColeman 0:850eacf3e945 147 m_pIf->printf("+++\r\n");
RodColeman 0:850eacf3e945 148 wait(.5);
RodColeman 0:850eacf3e945 149 m_pIf->flushBuffer();
RodColeman 0:850eacf3e945 150
RodColeman 0:850eacf3e945 151 GPRSErr gprsErr;
RodColeman 0:850eacf3e945 152 gprsErr = m_pIf->disconnect();
RodColeman 0:850eacf3e945 153 if(gprsErr)
RodColeman 0:850eacf3e945 154 return PPP_NETWORK;
RodColeman 0:850eacf3e945 155
RodColeman 0:850eacf3e945 156 return PPP_OK;
RodColeman 0:850eacf3e945 157 }
RodColeman 0:850eacf3e945 158
RodColeman 0:850eacf3e945 159 #if 0
RodColeman 0:850eacf3e945 160 PPPErr PPPNetIf::close()
RodColeman 0:850eacf3e945 161 {
RodColeman 0:850eacf3e945 162 GPRSErr err = m_pIf->close();
RodColeman 0:850eacf3e945 163 if(err)
RodColeman 0:850eacf3e945 164 return PPP_MODEM;
RodColeman 0:850eacf3e945 165 m_open = false;
RodColeman 0:850eacf3e945 166 return PPP_OK;
RodColeman 0:850eacf3e945 167 }
RodColeman 0:850eacf3e945 168 #endif
RodColeman 0:850eacf3e945 169
RodColeman 0:850eacf3e945 170
RodColeman 0:850eacf3e945 171 #if 0
RodColeman 0:850eacf3e945 172 //We have to use :
RodColeman 0:850eacf3e945 173
RodColeman 0:850eacf3e945 174 /** Pass received raw characters to PPPoS to be decoded. This function is
RodColeman 0:850eacf3e945 175 * thread-safe and can be called from a dedicated RX-thread or from a main-loop.
RodColeman 0:850eacf3e945 176 *
RodColeman 0:850eacf3e945 177 * @param pd PPP descriptor index, returned by pppOpen()
RodColeman 0:850eacf3e945 178 * @param data received data
RodColeman 0:850eacf3e945 179 * @param len length of received data
RodColeman 0:850eacf3e945 180 */
RodColeman 0:850eacf3e945 181 void
RodColeman 0:850eacf3e945 182 pppos_input(int pd, u_char* data, int len)
RodColeman 0:850eacf3e945 183 {
RodColeman 0:850eacf3e945 184 pppInProc(&pppControl[pd].rx, data, len);
RodColeman 0:850eacf3e945 185 }
RodColeman 0:850eacf3e945 186 #endif
RodColeman 0:850eacf3e945 187
RodColeman 0:850eacf3e945 188 void PPPNetIf::poll()
RodColeman 0:850eacf3e945 189 {
RodColeman 0:850eacf3e945 190 if(!m_connected)
RodColeman 0:850eacf3e945 191 return;
RodColeman 0:850eacf3e945 192 LwipNetIf::poll();
RodColeman 0:850eacf3e945 193 //static u8_t buf[128];
RodColeman 0:850eacf3e945 194 int len;
RodColeman 0:850eacf3e945 195 do
RodColeman 0:850eacf3e945 196 {
RodColeman 0:850eacf3e945 197 len = sio_tryread((sio_fd_t) m_pIf, m_buf, BUF_SIZE);
RodColeman 0:850eacf3e945 198 if(len > 0)
RodColeman 0:850eacf3e945 199 pppos_input(m_fd, m_buf, len);
RodColeman 0:850eacf3e945 200 } while(len>0);
RodColeman 0:850eacf3e945 201 }
RodColeman 0:850eacf3e945 202
RodColeman 0:850eacf3e945 203 //Link Callback
RodColeman 0:850eacf3e945 204 void PPPNetIf::pppCallback(int errCode, void *arg)
RodColeman 0:850eacf3e945 205 {
RodColeman 0:850eacf3e945 206 switch ( errCode )
RodColeman 0:850eacf3e945 207 {
RodColeman 0:850eacf3e945 208 //No error
RodColeman 0:850eacf3e945 209 case PPPERR_NONE:
RodColeman 0:850eacf3e945 210 {
RodColeman 0:850eacf3e945 211 struct ppp_addrs* addrs = (struct ppp_addrs*) arg;
RodColeman 0:850eacf3e945 212 m_ip = IpAddr(&(addrs->our_ipaddr)); //Set IP
RodColeman 0:850eacf3e945 213 }
RodColeman 0:850eacf3e945 214 m_status = PPP_CONNECTED;
RodColeman 0:850eacf3e945 215 break;
RodColeman 0:850eacf3e945 216 default:
RodColeman 0:850eacf3e945 217 //Disconnected
RodColeman 0:850eacf3e945 218 DBG("PPPNetIf: Callback errCode = %d.\n", errCode);
RodColeman 0:850eacf3e945 219 m_status = PPP_DISCONNECTED;
RodColeman 0:850eacf3e945 220 break;
RodColeman 0:850eacf3e945 221 }
RodColeman 0:850eacf3e945 222 }
RodColeman 0:850eacf3e945 223
RodColeman 0:850eacf3e945 224 #endif