Merge "[Bugfix][T106BUG-476 T106BUG-477]Resolved the ims registration problem in India"
diff --git a/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c b/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c
index b940957..79cbb75 100755
--- a/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c
+++ b/ap/os/linux/linux-3.4.x/drivers/net/zvnet/zvnet_dev.c
@@ -899,9 +899,9 @@
continue;
}
if(unlikely(!(skb->dev->flags & IFF_UP))) {
- dev_kfree_skb (skb);
if(printk_ratelimit())
zv_err("drop!!!%s is down.", skb->dev->name);
+ dev_kfree_skb (skb);
continue;
}
if (fast_from_driver && fast_from_driver(skb, skb->dev))
@@ -921,8 +921,8 @@
if(0 != (skb = zvnet_direct_read_skb(&g_zvnet_chn_info))) {
//skb_debug_test(skb);
if(unlikely(!(skb->dev->flags & IFF_UP))) {
- dev_kfree_skb (skb);
zv_err("drop!!!%s is down.", skb->dev->name);
+ dev_kfree_skb (skb);
continue;
}
#if 1
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/first.sh b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/first.sh
index 08edd81..04cd5f7 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/first.sh
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/first.sh
@@ -35,9 +35,13 @@
fi
mkdir -p /tmp
-mount -t tmpfs tmpfs /tmp
+#l.yang modify for T106BUG-387 start
+mount -t tmpfs tmpfs /tmp -o nodev,nosuid,noexec
+#l.yang modify for T106BUG-387 end
mkdir -p /run
-mount -t tmpfs tmpfs /run
+#l.yang modify for T106BUG-387 start
+mount -t tmpfs tmpfs /run -o nodev,nosuid,noexec
+#l.yang modify for T106BUG-387 end
mkdir -p /dev/pts
mount -t devpts devpts /dev/pts
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh
index 43539be..73e88e9 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc/init.d/fscheck.sh
@@ -3,15 +3,11 @@
#cppdemo > /dev/null 2>&1 &
fscheck -f /etc_ro/fscheck/userdata.ini
-mkdir -p /mnt/oemdata/cache
-mkdir -p /mnt/oemdata/var/log
+
#q.huang@20230920 add for network start
mkdir -p /mnt/userdata/ril/network
#q.huang@20230920 add for network end
-if [ ! -L /var/run ]; then
- rm -fr /var/run
- ln -s /run /var/run
-fi
+
if [ -d "/etc/selinux" ];then
/sbin/restorecon -RF /etc_rw /mnt/userdata/ /mnt/oemdata/
@@ -23,6 +19,16 @@
else
/sbin/ubi_mount.sh /mnt/oem oem2 vol_oem squashfs
fi
+
+#l.yang modify for T106BUG-387 start
+if [ -e /dev/mmcblk1p1 ]; then
+ mount -t ext4 /dev/mmcblk1p1 /var/log
+else
+ mkdir -p /mnt/oemdata/log
+ mount /mnt/oemdata/log /var/log
+fi
+#l.yang modify for T106BUG-387 start
+
if [ $? -ne 0 ]; then
flags_tool_static --switch
reboot
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_sys b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_sys
index 6d1c13f..0cc35f9e 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_sys
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_sys
@@ -76,7 +76,9 @@
OS=TOS
urlMobile=
DNS_proxy=
-dnsmasqfile=/var/log/dnsmasq.log
+#l.yang modify fot T106BUG-387 start
+dnsmasqfile=/mnt/userdata/log/dnsmasq.log
+#l.yang modify fot T106BUG-387 end
dnsmasqfileSize=1024
lan_domain_Enabled=1
auto_connect_when_limited=no
@@ -116,7 +118,9 @@
fota_ab_upgrade_total_size=0
fota_ab_upgrade_updated_size=0
fota_ab_aa_sync_status=2
-fota_ab_log_path=/cache/zte_fota_ab/upi_ab.log
+#l.yang modify fot T106BUG-387 start
+fota_ab_log_path=/mnt/userdata/zte_fota_ab/upi_ab.log
+#l.yang modify fot T106BUG-387 end
fota_aa_auto_sync=0
Login=admin
Password=
@@ -147,10 +151,10 @@
#syslogdÏà¹ØÅäÖÃ
syslog_file_size=1
syslog_file_num=5
-#you.chen modify for log
-print_level=3
+#jb.qi change for log on 20240110 start
+print_level=1
syslog_level=1
-#you.chen modify for log
+#jb.qi change for log on 20240110 end
skb_debug=
seclog_switch=
@@ -381,13 +385,17 @@
zcat_mode=CPUSB
zlog_num=10
zlog_size=100
-zlog_path=/mnt/userdata/zcat
-rule_file=/etc_ro/logrule/ati_std.rule
+#jb.qi change for nv_log on 20240110 start
+zlog_path=/mnt/oemdata/zcat
+rule_file=/etc_ro/logrule/all_3.rule
+#jb.qi change for nv_log on 20240110 end
-#ramdump´æ´¢Ä£Ê½
+#ramdump
ramdump_mode=USB
ramdump_device=/dev/mmcblk1p1
-ramdump_path=/cache
+#l.yang modify fot T106BUG-387 start
+ramdump_path=/mnt/userdata
+#l.yang modify fot T106BUG-387 end
#ÕÕÏà»úͼƬ·Ö±æÂÊÏÔʾ¿ØÖÆ
zcamera_interprolation=1
@@ -433,4 +441,4 @@
DEBUG_INFO_FILE_PATH=/mnt/userdata
DEBUG_INFO_FILE_NUM=2
DEBUG_INFO_FILE_TOTAL_SIZE=1
-#debug info end
\ No newline at end of file
+#debug info end
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user
index 88d46cd..0ae23b1 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/etc_ro/default/default_parameter_user
@@ -14,7 +14,9 @@
at_snap_flag=3
at_wifi_mac=0
auto_apn_index=0
-cid_reserved=1
+#xf.li@20240111 modify for T106BUG-480 start
+cid_reserved=0
+#xf.li@20240111 modify for T106BUG-480 end
clear_pb_when_restore=no
clear_sms_when_restore=no
default_apn=3gnet
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/postinstall.sh b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/postinstall.sh
index b8a5064..df788bf 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/postinstall.sh
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc_ref/fs/normal/rootfs/postinstall.sh
@@ -1,6 +1,12 @@
#!/bin/sh
-ln -s /mnt/oemdata/cache cache
+set -e
+
+#l.yang modify for T106BUG-387 ,create a log file in the/var directory start
+rm -fr var/* && ln -s /run var/run && mkdir -p var/log
+#l.yang modify for T106BUG-387 ,create a log file in the/var directory end
+
+#ln -s /mnt/userdata/cache cache
ln -s /etc/init.d/fscheck.sh ./etc/rcS.d/S14fscheck.sh
ln -s /etc/init.d/zcatlog_config.sh ./etc/rcS.d/S17zcatlog_config.sh
ln -s /etc/init.d/shutdown_first.sh ./etc/rcS.d/K01shutdown_first.sh
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb
index 4c9df17..b9d6b78 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb
@@ -88,9 +88,6 @@
fakeroot distro_rootfs_files_sysvinit() {
rm -rf ${IMAGE_ROOTFS}/boot
cp -arfp ${FS-DIR}/fs/${BOOT_CTL}/rootfs/* ${IMAGE_ROOTFS}/
- if [ -f ${IMAGE_ROOTFS}/postinstall.sh ]; then
- cd ${IMAGE_ROOTFS} && sh postinstall.sh && rm -v ${IMAGE_ROOTFS}/postinstall.sh
- fi
rm -rf ${IMAGE_ROOTFS}/etc/rc[0-6].d
rm -f ${IMAGE_ROOTFS}/etc/fstab
@@ -217,17 +214,9 @@
ROOTFS_POSTPROCESS_COMMAND_remove += 'empty_var_volatile;'
-fakeroot do_ln_var(){
- if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
- rm -rf ${IMAGE_ROOTFS}/var
- if ${@bb.utils.contains('DISTRO_FEATURES','oemfs','true','false',d)}; then
- cd ${IMAGE_ROOTFS}/ && ln -snf mnt/oemdata/var var
- else
- cd ${IMAGE_ROOTFS}/ && ln -snf mnt/userdata/var var
- fi
- elif ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
- rm -rf ${IMAGE_ROOTFS}/var
- cd ${IMAGE_ROOTFS}/ && ln -snf tmp var
+fakeroot do_postinstall(){
+ if [ -f ${IMAGE_ROOTFS}/postinstall.sh ]; then
+ cd ${IMAGE_ROOTFS} && sh postinstall.sh && rm -v ${IMAGE_ROOTFS}/postinstall.sh
fi
}
@@ -256,7 +245,7 @@
}
IMAGE_POSTPROCESS_COMMAND_prepend = ' \
- do_ln_var; \
+ do_postinstall; \
${@bb.utils.contains("TCLIBC", "musl", "do_ln_musl_ld;", "", d)} \
${@bb.utils.contains("DISTRO_FEATURES", "selinux", "selinux_set_labels ;", "", d)} \
'
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-at-common/liblynq-at-common.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-at-common/liblynq-at-common.bb
index f50d299..70f1504 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-at-common/liblynq-at-common.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-at-common/liblynq-at-common.bb
@@ -3,7 +3,7 @@
DESCRIPTION = "liblynq-at-common"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3f86c7f456a6d0bbeca155e65084eee1"
-DEPENDS += "liblynq-log liblynq-qser-autosuspend"
+DEPENDS += "liblynq-log liblynq-qser-autosuspend liblynq-led"
#inherit workonsrc
WORKONSRC = "${TOPDIR}/../src/lynq/lib/liblynq-at-common/"
FILESEXTRAPATHS_prepend :="${TOPDIR}/../src/lynq/lib/:"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-irq-demo/files/lynq-irq-demo.cpp b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-irq-demo/files/lynq-irq-demo.cpp
index 0f8ddef..3b3bafc 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-irq-demo/files/lynq-irq-demo.cpp
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-irq-demo/files/lynq-irq-demo.cpp
@@ -144,8 +144,8 @@
else
{
printf("lynq_irq_uninstall success\n");
- break;
}
+ break;
}
else
{
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-atcid/lynq_atsvc_plugin.xml b/cap/zx297520v3/src/lynq/framework/lynq-atcid/lynq_atsvc_plugin.xml
index 1fa3af5..3ec11c8 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-atcid/lynq_atsvc_plugin.xml
+++ b/cap/zx297520v3/src/lynq/framework/lynq-atcid/lynq_atsvc_plugin.xml
@@ -10,7 +10,7 @@
/>
<module name="/lib/liblynq-at-common.so"
register="lynq_register_at_common"
- cmd="AT+MNETCALL;AT+GTARNDIS;AT+CGIR;AT+LGMDS;AT+LRNDISHANDLE;AT+LEELSP"
+ cmd="AT+MNETCALL;AT+GTARNDIS;AT+CGIR;AT+LGMDS;AT+LRNDISHANDLE;AT+LEELSP;AT+NETLED;AT+STATUSLED"
/>
<module name="/lib/liblynq-at-factory.so"
register="lynq_register_at_factory"
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-at-common/liblynq-at-common.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-at-common/liblynq-at-common.cpp
index ea38faf..391d43c 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-at-common/liblynq-at-common.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-at-common/liblynq-at-common.cpp
@@ -7,6 +7,7 @@
#include <liblog/lynq_deflog.h>
#include "include/liblynq-at-common.h"
#include <include/lynq-qser-autosuspend.h>
+#include <libled/lynq_led.h>
DEFINE_LYNQ_LIB_LOG(LYNQ_AT_COMMON)
@@ -67,10 +68,54 @@
return;
}
+void lynq_handle_netled(char* input)
+{
+ int ret;
+ char buf[64] = {0};
+ int mode = input[strlen(input)-1]-'0';
+ ALOGE("lynq_handle_netled start\n");
+
+ ret = lynq_set_netled_on(mode);
+ if(ret != 0)
+ {
+ sprintf(buf,"+CME ERROR: 100\r\n");
+ handle_output(buf, strlen(buf), Response);
+ }
+ else
+ {
+ lynq_response_ok();
+ }
+
+ return;
+}
+
+void lynq_handle_statusled(char* input)
+{
+ int ret;
+ char buf[64] = {0};
+ int mode = input[strlen(input)-1]-'0';
+
+ ALOGE("lynq_handle_statusled start\n");
+ ret = lynq_set_statusled_on(mode);
+
+ if(ret != 0)
+ {
+ sprintf(buf,"+CME ERROR: 100\r\n");
+ handle_output(buf, strlen(buf), Response);
+ }
+ else
+ {
+ lynq_response_ok();
+ }
+
+ return;
+}
static Command commands[] =
{
{"CGIR",lynq_handle_version},
{"LEELSP",lynq_handle_autosuspend},
+ {"NETLED",lynq_handle_netled},
+ {"STATUSLED",lynq_handle_statusled},
{NULL, NULL}
};
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-at-common/makefile b/cap/zx297520v3/src/lynq/lib/liblynq-at-common/makefile
index e5a1c20..869f980 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-at-common/makefile
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-at-common/makefile
@@ -38,6 +38,8 @@
-lpthread \
-llynq-log \
-llynq-qser-autosuspend \
+ -llynq-led \
+
SOURCES = $(wildcard *.cpp)
diff --git a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/main.cpp b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/main.cpp
index 8abbd7c..3f7bbf0 100755
--- a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/main.cpp
+++ b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/main.cpp
@@ -29,8 +29,8 @@
int ret = 0;
char socket_name[64]={0};
- system("rm -rf /var/socket");
- system("mkdir -p /var/socket");
+ system("rm -rf /var/run/socket");
+ system("mkdir -p /var/run/socket");
if(argc < 3)
{
@@ -39,7 +39,7 @@
}
if((argv[1] != NULL) && (argv[2]!=NULL))
{
- sprintf(socket_name,"/var/socket/%s",argv[1]);
+ sprintf(socket_name,"/var/run/socket/%s",argv[1]);
if(LYNQ_E_SUCCESS != init_msg_dispatch(socket_name, atoi(argv[2])))
{
exit(1);
diff --git a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/socket-tool.cpp b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/socket-tool.cpp
index 24e4f22..990a910 100755
--- a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/socket-tool.cpp
+++ b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/socket-tool.cpp
@@ -22,7 +22,7 @@
}
if((argv[1] != NULL) && (argv[2]!=NULL))
{
- sprintf(socket_name_service,"/var/socket/%s",argv[1]);
+ sprintf(socket_name_service,"/var/run/socket/%s",argv[1]);
//sprintf(socket_name_client,"/var/socket/%s-client",argv[1]);
client_socket_fd = create_socket(AF_UNIX, SOCK_DGRAM,0, 0, NULL,socket_name_service, (void *)&g_client_local_addr, 2, 1);
if(0 > client_socket_fd)
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/zvnet/zvnet_dev.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/zvnet/zvnet_dev.c
old mode 100644
new mode 100755
index 94238d6..917ca39
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/zvnet/zvnet_dev.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/zvnet/zvnet_dev.c
@@ -832,9 +832,9 @@
continue;
}
if(unlikely(!(skb->dev->flags & IFF_UP))) {
- dev_kfree_skb (skb);
if(printk_ratelimit())
zv_err("drop!!!%s is down.", skb->dev->name);
+ dev_kfree_skb (skb);
continue;
}
skb->protocol = eth_type_trans(skb, skb->dev);
@@ -855,8 +855,8 @@
if(0 != (skb = zvnet_direct_read_skb(&g_zvnet_chn_info))) {
//skb_debug_test(skb);
if(unlikely(!(skb->dev->flags & IFF_UP))) {
- dev_kfree_skb (skb);
zv_err("drop!!!%s is down.", skb->dev->name);
+ dev_kfree_skb (skb);
continue;
}
skb->protocol = eth_type_trans(skb, skb->dev);
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.auth b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.auth
index db0cc5a..1e34ddf 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.auth
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.auth
@@ -1,5 +1,5 @@
#dev_name#
-logfile /var/log/pppd.log
+logfile /mnt/userdata/log/pppd.log
debug
local 192.168.2.1:192.168.2.100
ms-dns 114.114.114.114
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.noauth b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.noauth
index e00b17f..c7e6438 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.noauth
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/etc/options.noauth
@@ -1,5 +1,5 @@
#dev_name#
-logfile /var/log/pppd.log
+logfile /mnt/userdata/log/pppd.log
debug
local 192.168.2.1:192.168.2.100
ms-dns 114.114.114.114
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/scripts/fota_release_space.sh b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/scripts/fota_release_space.sh
index dfe8908..9cc1bb0 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/scripts/fota_release_space.sh
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/Script/scripts/fota_release_space.sh
@@ -29,7 +29,7 @@
killall sd_hotplug
killall syslogd
-rm -rf /var/log
+rm -rf /mnt/userdata/log
#EC 616000558980
killall zte_mifi
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/adb/services.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/adb/services.c
index ba96def..f870096 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/adb/services.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/adb/services.c
@@ -162,38 +162,20 @@
adb_close(fd);
}
-int my_adb_reboot(int a,int b,void * p)
-{
- return 0;
-}
-
void reboot_service(int fd, void *arg)
{
char buf[100];
- int pid, ret;
+ int ret;
sync();
-
- /* Attempt to unmount the SD card first.
- * No need to bother checking for errors.
- */
- pid = fork();
- if (pid == 0) {
- /* ask vdc to unmount it */
- execl("/system/bin/vdc", "/system/bin/vdc", "volume", "unmount",
- getenv("EXTERNAL_STORAGE"), "force", NULL);
- } else if (pid > 0) {
- /* wait until vdc succeeds or fails */
- waitpid(pid, &ret, 0);
- }
-
- ret = my_adb_reboot(ANDROID_RB_RESTART2, 0, (char *) arg);
+ ret = system("reboot");
if (ret < 0) {
snprintf(buf, sizeof(buf), "reboot failed: %s\n", strerror(errno));
writex(fd, buf, strlen(buf));
}
free(arg);
adb_close(fd);
+ sleep(3);
}
#endif
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc/fota_update.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc/fota_update.h
index 0d2b9b2..5ebcdb4 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc/fota_update.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc/fota_update.h
@@ -8,7 +8,7 @@
#define ZFOTA_AT_PARA_LEN 16
#define NV_FOTA_UPGRADE_FLAG "fota_update_flag"
-#define FOTA_MAIN_PATH "/cache/zte_fota/"
+#define FOTA_MAIN_PATH "/mnt/userdata/zte_fota/"
#define FOTA_DUA_MAIN_PATH FOTA_MAIN_PATH"dua/"
#define FOTA_DUA_UPDATE_STATUS_FILE FOTA_MAIN_PATH"update_status"
#define NV_FOTA_UPGRADE_RESULT "fota_upgrade_result"
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6c.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6c.c
index bc6e8eb..a4b1594 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6c.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6c.c
@@ -149,7 +149,7 @@
#define DHCP6C_CONF "/etc_ro/dhcp6c.conf"
#define DHCP6C_PIDFILE "/var/run/dhcp6c.pid"
-#define DUID_FILE "/var/dhcp6c_duid"
+#define DUID_FILE "/var/run/dhcp6c_duid"
int g_i_if_chinamobile_pd_diff = 0;
static int pid;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c
index 9dcb413..c4d4b16 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c
@@ -112,7 +112,7 @@
struct host_decl *host = NULL;
struct rootgroup *globalgroup = NULL;
-#define DUID_FILE "/var/dhcp6s_duid"
+#define DUID_FILE "/var/run/dhcp6s_duid"
#define DHCP6S_CONF "/etc_ro/dhcp6s.conf"
#define DH6_VALID_MESSAGE(a) \
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/lease.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/lease.h
index 2ccafa6..96bbb42 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/lease.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/lease.h
@@ -39,8 +39,8 @@
#define ADDR_VALIDATE 2
#define ADDR_ABANDON 3
-#define PATH_SERVER6_LEASE "/var/server6.leases"
-#define PATH_CLIENT6_LEASE "/var/client6.leases"
+#define PATH_SERVER6_LEASE "/var/run/server6.leases"
+#define PATH_CLIENT6_LEASE "/var/run/client6.leases"
#define HASH_TABLE_COUNT 4
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/fota_auto_sync/main.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/fota_auto_sync/main.c
index dcf4b12..ab58af6 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/fota_auto_sync/main.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/fota_auto_sync/main.c
@@ -42,7 +42,7 @@
#define FILE_PATH_PROC_CMDLINE "/proc/cmdline"
-#define FOTA_SYNC_LOG_PATH "/cache/zte_fota_ab/upi_ab.log"
+#define FOTA_SYNC_LOG_PATH "/mnt/userdata/zte_fota_ab/upi_ab.log"
/*******************************************************************************
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/include/fota_common.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/include/fota_common.h
index 9429d72..a74e436 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/include/fota_common.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/include/fota_common.h
@@ -214,7 +214,7 @@
/***********************************************/
-#define ZTE_FOTA_MAIN_PATH "/cache/zte_fota/"
+#define ZTE_FOTA_MAIN_PATH "/mnt/userdata/zte_fota/"
#define FOTAUPI ZTE_FOTA_MAIN_PATH"upi.log"
#define FOTARB ZTE_FOTA_MAIN_PATH"lib.log"
#define FOTADM ZTE_FOTA_MAIN_PATH"dm.log"
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libsqlite/sqlite3.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libsqlite/sqlite3.c
index 29e1321..0b60e4d 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libsqlite/sqlite3.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libsqlite/sqlite3.c
@@ -29545,7 +29545,7 @@
static const char *azDirs[] = {
0,
0,
- "/var/tmp",
+ 0,/*"/tmp",*/
"/usr/tmp",
"/tmp",
0 /* List terminator */
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libvoice/voice_buffer.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libvoice/voice_buffer.c
index 56598f4..e236432 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libvoice/voice_buffer.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/libvoice/voice_buffer.c
@@ -60,19 +60,19 @@
#define VBUFFER_DEV_FLAGS O_RDWR
-#define VBUFFER_TX_FILE_NAME "/cache/tx.pcm"
-#define VBUFFER_RX_FILE_NAME "/cache/rx.pcm"
-#define VBUFFER_TX16_FILE_NAME "/cache/tx16.pcm"
-#define VBUFFER_RX16_FILE_NAME "/cache/rx16.pcm"
+#define VBUFFER_TX_FILE_NAME "/mnt/userdata/tx.pcm"
+#define VBUFFER_RX_FILE_NAME "/mnt/userdata/rx.pcm"
+#define VBUFFER_TX16_FILE_NAME "/mnt/userdata/tx16.pcm"
+#define VBUFFER_RX16_FILE_NAME "/mnt/userdata/rx16.pcm"
-#define VBUFFER_RTP_TX_FILE_NAME "/cache/rtp_tx.rtp"
-#define VBUFFER_RTP_RX_FILE_NAME "/cache/rtp_rx.rtp"
-#define VBUFFER_RTP_TX16_FILE_NAME "/cache/rtp_tx16.rtp"
-#define VBUFFER_RTP_RX16_FILE_NAME "/cache/rtp_rx16.rtp"
-#define VBUFFER_RTP_TX_PCM_FILE_NAME "/cache/rtp_tx_dec.pcm"
+#define VBUFFER_RTP_TX_FILE_NAME "/mnt/userdata/rtp_tx.rtp"
+#define VBUFFER_RTP_RX_FILE_NAME "/mnt/userdata/rtp_rx.rtp"
+#define VBUFFER_RTP_TX16_FILE_NAME "/mnt/userdata/rtp_tx16.rtp"
+#define VBUFFER_RTP_RX16_FILE_NAME "/mnt/userdata/rtp_rx16.rtp"
+#define VBUFFER_RTP_TX_PCM_FILE_NAME "/mnt/userdata/rtp_tx_dec.pcm"
-#define VBUFFER_RTP_FROM_NET_FILE_NAME "/cache/rtp_from_net.rtp"
+#define VBUFFER_RTP_FROM_NET_FILE_NAME "/mnt/userdata/rtp_from_net.rtp"
#define ENABLE_RTP_TX_TEST
#define RTP_TEST_WITH_NET_SOCKET
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/include/cutils/sockets.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/include/cutils/sockets.h
index ed7ed05..fd01af8 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/include/cutils/sockets.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/include/cutils/sockets.h
@@ -34,7 +34,7 @@
#ifdef ZXIC_RIL_SUPPORT
#define ANDROID_SOCKET_DIR "/dev/socket"
#else
-#define ANDROID_SOCKET_DIR "/var/socket"
+#define ANDROID_SOCKET_DIR "/var/run/socket"
#endif
#ifdef __cplusplus
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/libcutils/socket_local.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/libcutils/socket_local.h
index ac97679..9bdb166 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/libcutils/socket_local.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/libcutils/socket_local.h
@@ -21,7 +21,7 @@
#ifdef ZXIC_RIL_SUPPORT
//#define ANDROID_RESERVED_SOCKET_PREFIX "/dev/socket/"
#else
-#define ANDROID_RESERVED_SOCKET_PREFIX "/var/socket/"
+#define ANDROID_RESERVED_SOCKET_PREFIX "/var/run/socket/"
#endif
/*
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/liblog/log_read.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/liblog/log_read.c
index 08dbaa8..6f94e5a 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/liblog/log_read.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/binder/liblog/log_read.c
@@ -65,7 +65,7 @@
#ifdef ZXIC_RIL_SUPPORT
#define ANDROID_RESERVED_SOCKET_PREFIX "/dev/socket/"
#else
-#define ANDROID_RESERVED_SOCKET_PREFIX "/var/socket/"
+#define ANDROID_RESERVED_SOCKET_PREFIX "/var/run/socket/"
#endif
/* End of ../libcutils/socket_local.h */
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ps.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ps.c
index 03b128d..aba2754 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ps.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ps.c
@@ -804,10 +804,10 @@
const char *username = NULL;
const char *password = NULL;
const char *challenge = NULL;
- /*act_typeΪ¼¤»î×éÍøÀàÐÍ£¬
- *0ΪAPºË±¾µØ²¦ºÅ,ÎÞЧ
- *1ΪCAPºË±¾µØ²¦ºÅ,
- *2ΪĬÈϲ¦ºÅ£¨normal£©,Æô¶¯Ä¬ÈÏ·ÓÉ,É豸ËùÓÐÓ¦Óö¼¿ÉÒÔÖ±½ÓÉÏÍø,Ö»Äܲ¥Ò»Â·;
+ /*act_typeΪ\BC\A4\BB\EE\D7\E9\CD\F8\C0\E0\D0ͣ\AC
+ *0ΪAP\BA˱\BE\B5ز\A6\BA\C5,\CE\DEЧ
+ *1ΪCAP\BA˱\BE\B5ز\A6\BA\C5,
+ *2ΪĬ\C8ϲ\A6\BAţ\A8normal\A3\A9,\C6\F4\B6\AFĬ\C8\CF·\D3\C9,\C9豸\CB\F9\D3\D0Ӧ\D3ö\BC\BF\C9\D2\D4ֱ\BD\D3\C9\CF\CD\F8,ֻ\C4ܲ\A5һ·;
*/
const char *active_type = NULL;
@@ -913,9 +913,10 @@
}
cmd = atstr + strlen(atstr);
- /*act_typeΪ¼¤»î×éÍøÀàÐÍ£¬0ΪAPºË±¾µØ²¦ºÅ,1ΪCAPºË±¾µØ²¦ºÅ,2ΪĬÈϲ¦ºÅ,Æô¶¯Ä¬ÈÏ·ÓÉ,É豸ËùÓÐÓ¦Óö¼¿ÉÒÔÖ±½ÓÉÏÍø,Ö»Äܲ¥Ò»Â·;*/
- snprintf(cmd, sizeof(atstr) - strlen(atstr) - 1, ",,,%d", act_type);
-
+ /*act_typeΪ\BC\A4\BB\EE\D7\E9\CD\F8\C0\E0\D0ͣ\AC0ΪAP\BA˱\BE\B5ز\A6\BA\C5,1ΪCAP\BA˱\BE\B5ز\A6\BA\C5,2ΪĬ\C8ϲ\A6\BA\C5,\C6\F4\B6\AFĬ\C8\CF·\D3\C9,\C9豸\CB\F9\D3\D0Ӧ\D3ö\BC\BF\C9\D2\D4ֱ\BD\D3\C9\CF\CD\F8,ֻ\C4ܲ\A5һ·;*/
+ //xf.li@20240111 modify for T106BUG-480 start
+ snprintf(cmd, sizeof(atstr) - strlen(atstr) - 1, ",,1,%d", act_type);
+ //xf.li@20240111 modify for T106BUG-480 end
err = at_send_command_singleline_timeout(atstr, "+ZPDPACT:", &p_response, TIMEOUT_ZPDPACT);
if (err < 0 || (p_response->success == 0)) {
RLOGE("requestSetupDataCall err:%d", err);
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/rild/rild.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/rild/rild.c
index 0602575..0a45733 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/rild/rild.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/rild/rild.c
@@ -159,7 +159,7 @@
}
sprintf(val,"%d",sock);
- snprintf(key, sizeof(key), "/var/socket/%s", sname);
+ snprintf(key, sizeof(key), "/var/run/socket/%s", sname);
setenv(key, val, 1);
RLOGD("getRildSocket val:%s", getenv(key));
@@ -332,8 +332,8 @@
#endif
- system("rm -rf /var/socket");
- system("mkdir -p /var/socket");
+ system("rm -rf /var/run/socket");
+ system("mkdir -p /var/run/socket");
if(0 > getRildSocket("rild") || 0 > getRildSocket("rild-debug")) {
RLOGD("getLogSocket fail.");
goto done;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/player_demo/capture_demo.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/player_demo/capture_demo.c
index 2a2da17..78d5556 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/player_demo/capture_demo.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/player_demo/capture_demo.c
@@ -137,7 +137,7 @@
int audio_is_init = 0;
sc_audio_handle_t capture_handle = SC_AUDIO_INVALID_HANDLE;
sc_audio_pcm_config_t pcm_config;
- char *fpath = "/var/capture.wav";
+ char *fpath = "/mnt/userdata/capture.wav";
audiodemo_log("capture_demo:Demo go.\n");
if(parseOpts(argc,argv) == -1) {
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/socket_demo/socket_main.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/socket_demo/socket_main.c
index 2c732cb..e96da51 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/socket_demo/socket_main.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/test/socket_demo/socket_main.c
@@ -56,14 +56,14 @@
{
printf("Usage: %s\n", Opt);
printf("sock_create:type create a new socket(eg. sock_create:1)\n");
- printf("sock_createclient:type,addr,data create a new client socket(eg. sock_createclient:1,/var/sockclient,data)\n");
- printf("sock_createserver:type,addr,backlog create a new server socket(eg. sock_createserver:1,/var/sockserver,30)\n");
- printf("sock_bind:fd,addr socket bind(eg. sock_bind:fd,/var/sockclient)\n");
+ printf("sock_createclient:type,addr,data create a new client socket(eg. sock_createclient:1,/var/run/sockclient,data)\n");
+ printf("sock_createserver:type,addr,backlog create a new server socket(eg. sock_createserver:1,/var/run/sockserver,30)\n");
+ printf("sock_bind:fd,addr socket bind(eg. sock_bind:fd,/var/run/sockclient)\n");
printf("sock_listen:fd,backlog socket listen(eg. sock_listen:fd,30)\n");
printf("sock_accept:fd socket accept(eg. sock_accept:fd)\n");
- printf("sock_conn:fd,srvaddr conn server socket(eg. sock_conn:fd, /var/sockserver)\n");
+ printf("sock_conn:fd,srvaddr conn server socket(eg. sock_conn:fd, /var/run/sockserver)\n");
printf("sock_send:fd,message send socket message(eg. sock_send:fd,ipc test)\n");
- printf("sock_sendto:fd,srvaddr,message sendto socket message(eg. sock_sendto:fd,/var/sockserver,ipc test)\n");
+ printf("sock_sendto:fd,srvaddr,message sendto socket message(eg. sock_sendto:fd,/var/run/sockserver,ipc test)\n");
printf("sock_write:fd,message write socket message(eg. sock_write:fd,ipc test)\n");
printf("sock_recv:fd recv socket message(eg. sock_recv: fd)\n");
printf("sock_recvfrom:fd recvfrom socket message(eg. sock_recvfrom: fd)\n");
@@ -152,7 +152,7 @@
memset(&my_addr, 0, sizeof(struct sockaddr_un));
my_addr.sun_family = AF_UNIX;
- strncpy(my_addr.sun_path, "/var/socktest", sizeof(my_addr.sun_path)-1);
+ strncpy(my_addr.sun_path, "/var/run/socktest", sizeof(my_addr.sun_path)-1);
//·þÎñ¶Ë°ó¶¨µØÖ·
if(bind(serverfd, (struct sockaddr*)&my_addr, sizeof(my_addr)) == 0){
@@ -250,7 +250,7 @@
//¸ø¿Í»§¶Ë°ó¶¨µØÖ·
memset(&my_addr, 0, sizeof(struct sockaddr_un));
my_addr.sun_family = AF_UNIX;
- strncpy(my_addr.sun_path, "/var/sockclient", sizeof(my_addr.sun_path)-1);
+ strncpy(my_addr.sun_path, "/var/run/sockclient", sizeof(my_addr.sun_path)-1);
//¿Í»§¶Ë°ó¶¨µØÖ·
if(bind(clientfd, (struct sockaddr*)&my_addr, sizeof(my_addr)) == 0){
@@ -1298,7 +1298,7 @@
}
}
#else
- snprintf(cmdstr, SOCKET_CMD_MAX_LEN, "sock_createclient:%d,%s,%s", 2, "/var/socketap", "send data to ap test");
+ snprintf(cmdstr, SOCKET_CMD_MAX_LEN, "sock_createclient:%d,%s,%s", 2, "/var/run/socketap", "send data to ap test");
socket_create_client(cmdstr, strlen(cmdstr));
#endif