commit 12a8781fdfac99fb8ea70735674212bd98e60bc2
author wangyouqiang <yq.wang@mobiletek.cn> Mon Apr 22 14:54:52 2024 +0800
committer wangyouqiang <yq.wang@mobiletek.cn> Mon Apr 22 14:54:52 2024 +0800
tree 8e84eac5be008a93efd6316602cd2cdc13e5a0ff
parent d0f7fdb67e7f941599de51e71bea09f6daef9ef7

T108: 优化data_call代码

Change-Id: If99d0d20c9e000d7ccc32985ef02254ba42fcd20

mbtk/liblynq_lib/src/lynq_data_call.c

diff --git a/mbtk/liblynq_lib/src/lynq_data_call.c b/mbtk/liblynq_lib/src/lynq_data_call.c
index 4a58448..1d886f3 100755
--- a/mbtk/liblynq_lib/src/lynq_data_call.c
+++ b/mbtk/liblynq_lib/src/lynq_data_call.c
@@ -54,7 +54,7 @@
 
 /******************************FUNC*****************************************/
 #if defined(MBTK_ALL_CID_SUPPORT)
-int qser_route_config(int profile_idx)
+static int qser_route_config(int profile_idx)
 {
     char buf[1024] = {0};
     char dns[128] = {0};
@@ -67,7 +67,7 @@
 
     int ret = mbtk_data_call_state_get(qser_info_handle, profile_idx, &ipv4, &ipv6);
     if(ret != 0)
-        return -1;
+        return QSER_RESULT_FAIL;
     else
     {
         memset(buf, 0x0, 1024);
@@ -115,7 +115,7 @@
             if(fd < 0)
             {
                 LOGD("mbtk_route_config : open fail.");
-                return -1;
+                return QSER_RESULT_FAIL;
             }
 
             ret = write(fd, buf, offset);
@@ -132,7 +132,7 @@
 }
 #endif
 
-char qser_get_apn_profile_idx(void)
+static char qser_get_apn_profile_idx(void)
 {
     char i = 0;
     for(i = QSER_PROFILE_IDX_MIN; i <= QSER_PROFILE_IDX_MAX; i++)
@@ -146,7 +146,7 @@
     return i;
 }
 
-int qser_check_profile_idx(unsigned char profile_idx)
+static int qser_check_profile_idx(unsigned char profile_idx)
 {
     if(profile_idx < QSER_PROFILE_IDX_MIN || profile_idx > QSER_PROFILE_IDX_MAX)
     {
@@ -163,7 +163,7 @@
     return QSER_RESULT_SUCCESS;
 }
 
-int qser_apn_info_param_convert(int profile_idx, qser_apn_info_s *new_apn, mbtk_apn_info_t *old_apn)
+static int qser_apn_info_param_convert(int profile_idx, qser_apn_info_s *new_apn, mbtk_apn_info_t *old_apn)
 {
     if(new_apn == NULL || old_apn == NULL)
     {
@@ -284,7 +284,7 @@
 }
 
 /*Check parameter*/
-int qser_check_apn_name_type(qser_apn_info_s *apn)
+static int qser_check_apn_name_type(qser_apn_info_s *apn)
 {
     if(apn == NULL)
     {
@@ -295,7 +295,7 @@
     //check default idx = 0
     int apn_name_length = strlen(apn->apn_name);
     //LOGE("qser_apn_info[0].apn_name: %s!", qser_apn_info[0].apn_name);
-    char *p = strchr(qser_apn_info[0].apn_name, '.');
+    char *p = strstr(qser_apn_info[0].apn_name, "mnc");
     if(p == NULL)
     {
         LOGE("qser_check_apn_type not find!");
@@ -303,8 +303,8 @@
     }
     else
     {
-        int default_apn_name_length = p - (qser_apn_info[0].apn_name);
-        //LOGE("qser_check_apn_type default_apn_name_length = [%d]!", default_apn_name_length);
+        int default_apn_name_length = p - (qser_apn_info[0].apn_name) -1;
+        LOGE("qser_check_apn_type default_apn_name_length = [%d]!", default_apn_name_length);
         if(default_apn_name_length == apn_name_length)
         {
             int i = 0;
@@ -371,7 +371,7 @@
     return QSER_RESULT_SUCCESS;
 }
 
-void qser_state_init(qser_data_call_state_s *state)
+static void qser_state_init(qser_data_call_state_s *state)
 {
     if(state != NULL)
     {