fix cid1 callback return earlu and close default route config
Change-Id: I0ec670c8d65451ea5a1bf462c4131c2d3b9f8317
diff --git a/mbtk/mbtk_rild/src/mbtk_info_server.c b/mbtk/mbtk_rild/src/mbtk_info_server.c
index 48d3a7a..ad01378 100755
--- a/mbtk/mbtk_rild/src/mbtk_info_server.c
+++ b/mbtk/mbtk_rild/src/mbtk_info_server.c
@@ -5708,24 +5708,25 @@
cid_active[cid] = 1;
mbtk_set_default_pdp_state(true, cid);
- mbtk_qser_route_config(cid, &ipv4, &ipv6);
-#ifdef MBTK_ALL_CID_SUPPORT
- if(cid == 1) //cid 1 as a special treatment
- {
- mbtk_pdp_cb_info_s pdp_cb_info;
- memset(&pdp_cb_info, 0x00, sizeof(mbtk_pdp_cb_info_s));
- pdp_cb_info.cid = cid;
- pdp_cb_info.auto_urc = false;
- pdp_cb_info.connect_state = true;
- memcpy(&(pdp_cb_info.ipv4), &ipv4, sizeof(mbtk_ipv4_info_t));
- memcpy(&(pdp_cb_info.ipv6), &ipv6, sizeof(mbtk_ipv6_info_t));
- pack_rsp_send(cli_info->fd , MBTK_INFO_ID_IND_PDP_STATE_CHANGE, &pdp_cb_info, sizeof(mbtk_pdp_cb_info_s));
- }
-#endif
+ //mbtk_qser_route_config(cid, &ipv4, &ipv6);
if(cli_info->fd != DATA_CALL_BOOTCONN_FD)
{
mbtk_net_led_set(MBTK_NET_LED_DATA_CONNECT);
pack_rsp_send(cli_info->fd, MBTK_INFO_ID_NET_DATA_CALL_RSP, NULL, 0);
+#ifdef MBTK_ALL_CID_SUPPORT
+ if(cid == 1) //cid 1 as a special treatment
+ {
+ mbtk_pdp_cb_info_s pdp_cb_info;
+ memset(&pdp_cb_info, 0x00, sizeof(mbtk_pdp_cb_info_s));
+ pdp_cb_info.cid = cid;
+ pdp_cb_info.auto_urc = false;
+ pdp_cb_info.connect_state = true;
+ memcpy(&(pdp_cb_info.ipv4), &ipv4, sizeof(mbtk_ipv4_info_t));
+ memcpy(&(pdp_cb_info.ipv6), &ipv6, sizeof(mbtk_ipv6_info_t));
+ usleep(1000);
+ pack_rsp_send(cli_info->fd , MBTK_INFO_ID_IND_PDP_STATE_CHANGE, &pdp_cb_info, sizeof(mbtk_pdp_cb_info_s));
+ }
+#endif
}
else
{
@@ -6869,7 +6870,7 @@
}
}
- mbtk_qser_route_config(cid, &ipv4, &ipv6);
+ //mbtk_qser_route_config(cid, &ipv4, &ipv6);
}
} else { // Del IP
if(mbtk_ifc_configure2(dev, NULL, 0, NULL, NULL)) {