Merge "[Feature][ZXW-201]merge T106_DRDI_1201 modem"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf
index cf42b4f..13467a6 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf
+++ b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf
@@ -296,6 +296,7 @@
#开源应用及库
meta_app_open += "\
dropbear \
+ dbus \
e2fsprogs \
iptables \
curl \
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
index 2928d8d..1be825b 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
@@ -352,7 +352,7 @@
void datacall_ipv4_status_judge(int state,qser_data_call_info_s *data_res)
{
- if (state != 0)
+ if(state != 0)
{
data_res->v4.state = QSER_DATA_CALL_CONNECTED;
data_res->v4.reconnect = 1;
@@ -367,7 +367,7 @@
void datacall_ipv6_status_judge(int state,qser_data_call_info_s *data_res)
{
- if (state != 0)
+ if(state != 0)
{
data_res->v6.state = QSER_DATA_CALL_CONNECTED;
data_res->v6.reconnect = 1;
@@ -722,7 +722,11 @@
switch (pdp_type)
{
case QSER_APN_PDP_TYPE_IPV4:
+#ifdef MOBILETEK_TARGET_PLATFORM_T106
+ strcpy(out_pdp_type,"IP");
+#else
strcpy(out_pdp_type,"IPV4");
+#endif
break;
case QSER_APN_PDP_TYPE_PPP:
strcpy(out_pdp_type,"PPP");
@@ -847,7 +851,7 @@
data_cb_state.profile_idx = (char)handle;
memcpy(data_cb_state.name,data_urc_info.ifname,strlen(data_urc_info.ifname)+1);
- if (!strcmp(data_urc_info.type,"IPV4"))
+ if ((strcmp(data_urc_info.type,"IPV4") == 0) || (strcmp(data_urc_info.type,"IP") == 0))
{
data_cb_state.ip_family = QSER_DATA_CALL_TYPE_IPV4;
}
@@ -1060,28 +1064,27 @@
if ((strncmp(data_call_info.type,"IPV4", strlen("IPV4") + 1) == 0) || (strncmp(data_call_info.type,"IP", strlen("IP") + 1) == 0))
{
strcpy(info->v4.name,data_call_info.ifname);
- datacall_ipv4_status_judge(data_call_info.status,info);
+ datacall_ipv4_status_judge(data_call_info.active,info);
LYINFLOG("[IPV4]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
lynq_ipv4_aton_getinfo(&data_call_info,info);
}
else if (strncmp(data_call_info.type,"IPV6", strlen("IPV6") + 1) == 0)
{
strcpy(info->v6.name,data_call_info.ifname);
-
- datacall_ipv6_status_judge(data_call_info.status,info);
+ datacall_ipv6_status_judge(data_call_info.active,info);
LYINFLOG("[IPV6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
lynq_ipv6_inet_pton_getinfo(&data_call_info,info);
}
else if (strncmp(data_call_info.type,"IPV4V6", strlen("IPV4V6") + 1) == 0)
{
strcpy(info->v4.name,data_call_info.ifname);
- datacall_ipv4_status_judge(data_call_info.status,info);
+ datacall_ipv4_status_judge(data_call_info.active,info);
LYINFLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
#ifndef MOBILETEK_TARGET_PLATFORM_T106
lynq_ipv4_aton_getinfo(&data_call_info,info);
#endif
strcpy(info->v6.name,data_call_info.ifname);
- datacall_ipv6_status_judge(data_call_info.status,info);
+ datacall_ipv6_status_judge(data_call_info.active,info);
LYINFLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
#ifndef MOBILETEK_TARGET_PLATFORM_T106
lynq_ipv6_inet_pton_getinfo(&data_call_info,info);