Skip to content

Commit 8d94d4c

Browse files
0xc01700xc0170
authored
Merge pull request #12214 from kivaisan/move_string_to_pdp_type_to_cellularcontext
Cellular: Move string_to_pdp_type method to CellularContext
2 parents af03f83 + 0d7cc42 commit 8d94d4c

File tree

8 files changed

+126
-63
lines changed

8 files changed

+126
-63
lines changed

‎UNITTESTS/features/cellular/framework/common/util/utiltest.cpp‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <string.h>
1919
#include "CellularUtil.h"
2020

21-
using namespace mbed;
2221
using namespace mbed_cellular_util;
2322

2423
// AStyle ignored as the definition is not clear due to preprocessor usage
@@ -250,22 +249,3 @@ TEST_F(Testutil, int_to_hex_str)
250249
EXPECT_TRUE(buf[0] == '6');
251250
EXPECT_TRUE(buf[1] == '4');
252251
}
253-
254-
TEST_F(Testutil, string_to_pdp_type)
255-
{
256-
pdp_type_t type = string_to_pdp_type("IPV4V6");
257-
ASSERT_EQ(type, IPV4V6_PDP_TYPE);
258-
259-
type = string_to_pdp_type("IPV6");
260-
ASSERT_EQ(type, IPV6_PDP_TYPE);
261-
262-
type = string_to_pdp_type("IP");
263-
ASSERT_EQ(type, IPV4_PDP_TYPE);
264-
265-
type = string_to_pdp_type("Non-IP");
266-
ASSERT_EQ(type, NON_IP_PDP_TYPE);
267-
268-
type = string_to_pdp_type("diipadaapa");
269-
ASSERT_EQ(type, DEFAULT_PDP_TYPE);
270-
}
271-

‎UNITTESTS/features/cellular/framework/device/cellularcontext/cellularcontexttest.cpp‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,15 @@ class testContext : public CellularContext
4747
{
4848
_device = dev;
4949
_cp_netif = new ControlPlane_netif_stub();
50+
51+
nonip_pdp_string = NULL;
5052
}
5153

5254
~testContext()
5355
{
5456
delete _cp_netif;
5557
}
58+
5659
int get_retry_count()
5760
{
5861
return _retry_count;
@@ -180,6 +183,11 @@ class testContext : public CellularContext
180183

181184
}
182185

186+
const char *get_nonip_context_type_str()
187+
{
188+
return nonip_pdp_string;
189+
}
190+
183191
void cp_data_received()
184192
{
185193
CellularContext::cp_data_received();
@@ -198,6 +206,58 @@ class testContext : public CellularContext
198206
{
199207
CellularContext::do_connect_with_retry();
200208
}
209+
210+
void test_string_to_pdp_type()
211+
{
212+
pdp_type_t type = string_to_pdp_type("IPV4V6");
213+
ASSERT_EQ(type, IPV4V6_PDP_TYPE);
214+
215+
type = string_to_pdp_type("IPV6");
216+
ASSERT_EQ(type, IPV6_PDP_TYPE);
217+
218+
type = string_to_pdp_type("IP");
219+
ASSERT_EQ(type, IPV4_PDP_TYPE);
220+
221+
type = string_to_pdp_type("Non-IP");
222+
ASSERT_EQ(type, NON_IP_PDP_TYPE);
223+
224+
nonip_pdp_string = NULL;
225+
type = string_to_pdp_type("diipadaapa");
226+
ASSERT_EQ(type, DEFAULT_PDP_TYPE);
227+
}
228+
229+
void test_nonip_context_type_str()
230+
{
231+
nonip_pdp_string = "NONIP";
232+
233+
pdp_type_t type = string_to_pdp_type("diipadaapa");
234+
ASSERT_EQ(type, DEFAULT_PDP_TYPE);
235+
236+
type = string_to_pdp_type("NONIP");
237+
ASSERT_EQ(type, NON_IP_PDP_TYPE);
238+
239+
type = string_to_pdp_type("nonip");
240+
ASSERT_EQ(type, DEFAULT_PDP_TYPE);
241+
242+
type = string_to_pdp_type("IPV6");
243+
ASSERT_EQ(type, IPV6_PDP_TYPE);
244+
245+
nonip_pdp_string = "testnonip";
246+
247+
type = string_to_pdp_type("diipadaapa");
248+
ASSERT_EQ(type, DEFAULT_PDP_TYPE);
249+
250+
type = string_to_pdp_type("testnonip");
251+
ASSERT_EQ(type, NON_IP_PDP_TYPE);
252+
253+
type = string_to_pdp_type("nonip");
254+
ASSERT_EQ(type, DEFAULT_PDP_TYPE);
255+
256+
type = string_to_pdp_type("IPV6");
257+
ASSERT_EQ(type, IPV6_PDP_TYPE);
258+
}
259+
260+
const char *nonip_pdp_string;
201261
};
202262

203263
static int network_cb_count = 0;
@@ -314,6 +374,20 @@ TEST_F(TestCellularContext, do_connect_with_retry_async)
314374
delete dev;
315375
}
316376

377+
TEST_F(TestCellularContext, string_to_pdp_type)
378+
{
379+
testContext *ctx = new testContext();
380+
EXPECT_TRUE(ctx != NULL);
317381

382+
ctx->test_string_to_pdp_type();
383+
delete ctx;
384+
}
318385

386+
TEST_F(TestCellularContext, nonip_context_type_str)
387+
{
388+
testContext *ctx = new testContext();
389+
EXPECT_TRUE(ctx != NULL);
319390

391+
ctx->test_nonip_context_type_str();
392+
delete ctx;
393+
}

‎UNITTESTS/stubs/CellularContext_stub.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,9 @@ void CellularContext::call_network_cb(nsapi_connection_status_t status)
6868
}
6969
}
7070

71+
CellularContext::pdp_type_t CellularContext::string_to_pdp_type(const char *pdp_type)
72+
{
73+
return IPV4V6_PDP_TYPE;
74+
}
75+
7176
}

‎UNITTESTS/stubs/CellularUtil_stub.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ int CellularUtil_stub::char_pos = 0;
2828
char *CellularUtil_stub::char_table[50] = {};
2929
int CellularUtil_stub::table_idx = 0;
3030

31-
using namespace mbed;
3231
namespace mbed_cellular_util {
3332

3433
#define MAX_STRING_LEN 200
@@ -134,9 +133,4 @@ uint16_t get_dynamic_ip_port()
134133
return CellularUtil_stub::uint16_value;
135134
}
136135

137-
pdp_type_t string_to_pdp_type(const char *pdp_type)
138-
{
139-
return IPV4V6_PDP_TYPE;
140-
}
141-
142136
} // namespace mbed_cellular_util

‎features/cellular/framework/API/CellularContext.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,14 @@ class CellularContext : public CellularInterface {
305305
OP_MAX = 5
306306
};
307307

308+
enum pdp_type_t {
309+
DEFAULT_PDP_TYPE = DEFAULT_STACK,
310+
IPV4_PDP_TYPE = IPV4_STACK,
311+
IPV6_PDP_TYPE = IPV6_STACK,
312+
IPV4V6_PDP_TYPE = IPV4V6_STACK,
313+
NON_IP_PDP_TYPE
314+
};
315+
308316
/** The CellularDevice calls the status callback function on status changes on the network or CellularDevice.
309317
*
310318
* @param ev event type
@@ -321,6 +329,16 @@ class CellularContext : public CellularInterface {
321329
*/
322330
virtual void enable_hup(bool enable) = 0;
323331

332+
/** Return PDP type string for Non-IP if modem uses other than standard "Non-IP"
333+
*
334+
* Some modems uses a non-standard PDP type string for non-ip (e.g. "NONIP").
335+
* In those cases modem driver must implement this method to return the PDP type string
336+
* used by the modem.
337+
*
338+
* @return PDP type string used by the modem or NULL if standard ("Non-IP")
339+
*/
340+
virtual const char *get_nonip_context_type_str() = 0;
341+
324342
/** Triggers control plane's operations needed when control plane data is received,
325343
* like socket event, for example.
326344
*/
@@ -347,6 +365,14 @@ class CellularContext : public CellularInterface {
347365
*/
348366
void validate_ip_address();
349367

368+
/** Converts the given pdp type in char format to enum pdp_type_t
369+
*
370+
* @param pdp_type pdp type in string format
371+
* @return converted pdp_type_t enum
372+
*/
373+
CellularContext::pdp_type_t string_to_pdp_type(const char *pdp_type);
374+
375+
protected:
350376
// member variables needed in target override methods
351377
NetworkStack *_stack; // must be pointer because of PPP
352378
pdp_type_t _pdp_type;

‎features/cellular/framework/common/CellularUtil.cpp‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#define RANDOM_PORT_NUMBER_COUNT (RANDOM_PORT_NUMBER_END - RANDOM_PORT_NUMBER_START + 1)
2626
#define RANDOM_PORT_NUMBER_MAX_STEP 100
2727

28-
using namespace mbed;
2928
namespace mbed_cellular_util {
3029

3130
nsapi_version_t convert_ipv6(char *ip)
@@ -365,23 +364,4 @@ uint16_t get_dynamic_ip_port()
365364
return (RANDOM_PORT_NUMBER_START + port_counter);
366365
}
367366

368-
pdp_type_t string_to_pdp_type(const char *pdp_type_str)
369-
{
370-
pdp_type_t pdp_type = DEFAULT_PDP_TYPE;
371-
int len = strlen(pdp_type_str);
372-
373-
if (len == 6 && memcmp(pdp_type_str, "IPV4V6", len) == 0) {
374-
pdp_type = IPV4V6_PDP_TYPE;
375-
} else if (len == 4 && memcmp(pdp_type_str, "IPV6", len) == 0) {
376-
pdp_type = IPV6_PDP_TYPE;
377-
} else if (len == 2 && memcmp(pdp_type_str, "IP", len) == 0) {
378-
pdp_type = IPV4_PDP_TYPE;
379-
} else if (len == 6 && memcmp(pdp_type_str, "Non-IP", len) == 0) {
380-
pdp_type = NON_IP_PDP_TYPE;
381-
} else if (len == 5 && memcmp(pdp_type_str, "NONIP", len) == 0) {
382-
pdp_type = NON_IP_PDP_TYPE;
383-
}
384-
return pdp_type;
385-
}
386-
387367
} // namespace mbed_cellular_util

‎features/cellular/framework/common/CellularUtil.h‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,6 @@
2222
#include <inttypes.h>
2323
#include "nsapi_types.h"
2424

25-
namespace mbed {
26-
27-
typedef enum pdp_type {
28-
DEFAULT_PDP_TYPE = DEFAULT_STACK,
29-
IPV4_PDP_TYPE = IPV4_STACK,
30-
IPV6_PDP_TYPE = IPV6_STACK,
31-
IPV4V6_PDP_TYPE = IPV4V6_STACK,
32-
NON_IP_PDP_TYPE
33-
} pdp_type_t;
34-
}
3525
namespace mbed_cellular_util {
3626

3727
// some helper macros
@@ -139,13 +129,6 @@ uint32_t binary_str_to_uint(const char *binary_string, int binary_string_length)
139129
*/
140130
uint16_t get_dynamic_ip_port();
141131

142-
/** Converts the given pdp type in char format to enum pdp_type_t
143-
*
144-
* @param pdp_type pdp type in string format
145-
* @return converted pdp_type_t enum
146-
*/
147-
mbed::pdp_type_t string_to_pdp_type(const char *pdp_type);
148-
149132
} // namespace mbed_cellular_util
150133

151134
#endif

‎features/cellular/framework/device/CellularContext.cpp‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,27 @@ void CellularContext::validate_ip_address()
113113
}
114114
}
115115

116+
CellularContext::pdp_type_t CellularContext::string_to_pdp_type(const char *pdp_type_str)
117+
{
118+
pdp_type_t pdp_type = DEFAULT_PDP_TYPE;
119+
int len = strlen(pdp_type_str);
120+
121+
if (len == 6 && memcmp(pdp_type_str, "IPV4V6", len) == 0) {
122+
pdp_type = IPV4V6_PDP_TYPE;
123+
} else if (len == 4 && memcmp(pdp_type_str, "IPV6", len) == 0) {
124+
pdp_type = IPV6_PDP_TYPE;
125+
} else if (len == 2 && memcmp(pdp_type_str, "IP", len) == 0) {
126+
pdp_type = IPV4_PDP_TYPE;
127+
} else if (len == 6 && memcmp(pdp_type_str, "Non-IP", len) == 0) {
128+
pdp_type = NON_IP_PDP_TYPE;
129+
} else if (get_nonip_context_type_str() &&
130+
len == strlen(get_nonip_context_type_str()) &&
131+
memcmp(pdp_type_str, get_nonip_context_type_str(), len) == 0) {
132+
pdp_type = NON_IP_PDP_TYPE;
133+
}
134+
return pdp_type;
135+
}
136+
116137
void CellularContext::do_connect_with_retry()
117138
{
118139
if (_cb_data.final_try) {

0 commit comments

Comments
 (0)