data_call: 修改与移远文档不一致
Change-Id: Idb857d7de6f580f351b7ae75f2f972f8290785df
diff --git a/mbtk/ql_lib/src/ql_data_call.c b/mbtk/ql_lib/src/ql_data_call.c
index c473739..b08f228 100755
--- a/mbtk/ql_lib/src/ql_data_call.c
+++ b/mbtk/ql_lib/src/ql_data_call.c
@@ -79,34 +79,7 @@
inited = TRUE;
mbtk_pdp_state_change_cb_reg(ql_info_handle, ql_wan_net_state_change_cb);
- mbtk_apn_info_t apns[10] = {0};
- int apn_num = MBTK_APN_CID_MAX;
- int ret = mbtk_apn_get(ql_info_handle, &apn_num, apns);
- if(ret != 0)
- {
- LOGD("mbtk_apn_get ret = %d",ret);
- }
- else
- {
- int i;
- int profile_idx;
- for(i=0;i<MBTK_APN_CID_MAX;i++)
- {
- if(apns[i].cid > 0 && apns[i].cid <= MBTK_APN_CID_MAX)
- {
- profile_idx = apns[i].cid;
- if(apns[i].ip_type == MBTK_IP_TYPE_IPV4V6) // IPV4V6
- ql_apn_info[profile_idx].ip_type = 0;
- else if(apns[i].ip_type == MBTK_IP_TYPE_IP) // IPV4
- ql_apn_info[profile_idx].ip_type = 1;
- else if(apns[i].ip_type == MBTK_IP_TYPE_IPV6) // IPV6
- ql_apn_info[profile_idx].ip_type = 2;
- else
- ql_apn_info[profile_idx].ip_type = 0;
- }
- }
- }
- return 0;
+ //return 0;
} else {
LOGE("mbtk_info_handle_get() fail.");
return -1;
@@ -117,8 +90,37 @@
inited = TRUE;
mbtk_pdp_state_change_cb_reg(ql_info_handle, ql_wan_net_state_change_cb);
}
- return 0;
+ //return 0;
}
+
+ mbtk_apn_info_t apns[10] = {0};
+ int apn_num = MBTK_APN_CID_MAX;
+ int ret = mbtk_apn_get(ql_info_handle, &apn_num, apns);
+ if(ret != 0)
+ {
+ LOGD("mbtk_apn_get ret = %d",ret);
+ }
+ else
+ {
+ int i;
+ int profile_idx;
+ for(i=0;i<MBTK_APN_CID_MAX;i++)
+ {
+ if(apns[i].cid > 0 && apns[i].cid <= MBTK_APN_CID_MAX)
+ {
+ profile_idx = apns[i].cid;
+ if(apns[i].ip_type == MBTK_IP_TYPE_IPV4V6) // IPV4V6
+ ql_apn_info[profile_idx].ip_type = 0;
+ else if(apns[i].ip_type == MBTK_IP_TYPE_IP) // IPV4
+ ql_apn_info[profile_idx].ip_type = 1;
+ else if(apns[i].ip_type == MBTK_IP_TYPE_IPV6) // IPV6
+ ql_apn_info[profile_idx].ip_type = 2;
+ else
+ ql_apn_info[profile_idx].ip_type = 0;
+ }
+ }
+ }
+ return 0;
}
int ql_wan_release(void)
@@ -181,14 +183,13 @@
if(profile_idx < MBTK_APN_CID_MIN || profile_idx > MBTK_APN_CID_MAX)
{
LOGD("ql_wan_start_ex() cid out of range.");
-#if 0 //mbtk wyq for data_call add "if 0"
+#if 0
if(ql_net_ex_status_cb)
- ql_net_ex_status_cb(profile_idx, ql_apn_info[profile_idx].ip_type ,PDP_ERROR_UNSPECIFIED, 0);
+ ql_net_ex_status_cb(profile_idx, ql_apn_info[profile_idx].ip_type ,PDP_CID_EXIST_FAIL, 0);
#endif
return -1;
}
-#if 0 //mbtk wyq for data_call add "if 0"
//ql_netw_status_cb(ql_apn_info[profile_idx].cid);
if(op == 0)
{
@@ -196,12 +197,14 @@
goto exit;
}
+#if 0
if(ql_apn_info[profile_idx].active)
{
if(ql_net_ex_status_cb)
ql_net_ex_status_cb(profile_idx, ql_apn_info[profile_idx].ip_type, PDP_CID_EXIST_FAIL, 0);
return -1;
}
+#endif
if(ql_net_ex_status_cb) {
ql_net_ex_status_cb(profile_idx, ql_apn_info[profile_idx].ip_type, CONNECT_DIAL_IMMEDIATELY, 0);
@@ -209,11 +212,9 @@
}
data_call_continue:
-#endif
- ret = mbtk_data_call_start(ql_info_handle, profile_idx, mbtk_interval_sec, op == 1 ? TRUE : FALSE, 0);
+ ret = mbtk_data_call_start(ql_info_handle, profile_idx, 0, op == 3 ? TRUE : FALSE, 0);
if(ret != 0)
{
-#if 0 //mbtk wyq for data_call add "if 0"
if(mbtk_interval_sec <= 0)
{
if(ql_net_ex_status_cb)
@@ -230,7 +231,6 @@
ql_net_ex_status_cb(profile_idx, ql_apn_info[profile_idx].ip_type, CONNECT_REDIAL, 0);
goto data_call_continue;
}
-#endif
LOGD("mbtk_data_call_start() fail.");
}
else
@@ -280,7 +280,7 @@
ql_net_status_cb(CONNECT_DIAL_IMMEDIATELY);
ql_net_status_cb(CONNECT_CONNING);
data_call_continue:
- ret = mbtk_data_call_start(ql_info_handle, profile_idx, mbtk_interval_sec, op == 3 ? TRUE : FALSE, 0);
+ ret = mbtk_data_call_start(ql_info_handle, profile_idx, 0, op == 3 ? TRUE : FALSE, 0);
if(ret != 0)
{
if(mbtk_interval_sec <= 0)