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