Yu.Ding 1 týždeň pred
rodič
commit
67ed07a41d
51 zmenil súbory, kde vykonal 106 pridanie a 215 odobranie
  1. 0 46
      Modules/service_process/main.c
  2. 3 2
      Modules/sipconf/main.c
  3. 8 3
      etc/rc.local
  4. 0 0
      etc/scripts/action.sh
  5. 0 0
      etc/scripts/api_agent
  6. 0 0
      etc/scripts/audio_init.sh
  7. 0 0
      etc/scripts/auto_privisioning.sh
  8. 0 0
      etc/scripts/conf_handle.sh
  9. 0 0
      etc/scripts/config_store.sh
  10. 0 0
      etc/scripts/dhcp_auto_privisioning.sh
  11. 0 0
      etc/scripts/factoryReset_check.sh
  12. 0 0
      etc/scripts/getmodel.sh
  13. 2 12
      etc/scripts/getsubmask.sh
  14. 0 0
      etc/scripts/gpio_init.sh
  15. 0 0
      etc/scripts/httpd.sh
  16. 0 0
      etc/scripts/import_compare.sh
  17. 0 0
      etc/scripts/keep_tcpdump.sh
  18. 0 0
      etc/scripts/merge_conf.sh
  19. 0 0
      etc/scripts/monitor_ptp.sh
  20. 0 0
      etc/scripts/onvif-discover
  21. 0 0
      etc/scripts/onvif_upgrade.sh
  22. 0 0
      etc/scripts/onvifserver
  23. 0 0
      etc/scripts/output_control
  24. 0 0
      etc/scripts/pa_mute.sh
  25. 0 0
      etc/scripts/play_ip
  26. 0 0
      etc/scripts/play_rebooting.sh
  27. 19 17
      etc/scripts/product_model.sh
  28. 0 0
      etc/scripts/rtspserver
  29. 0 0
      etc/scripts/serial_ctrl
  30. 0 0
      etc/scripts/service_process
  31. 0 0
      etc/scripts/set_lan.sh
  32. 0 0
      etc/scripts/set_volume.sh
  33. 0 0
      etc/scripts/set_webpid.sh
  34. 0 0
      etc/scripts/settime.sh
  35. 12 34
      etc/scripts/shell_action.sh
  36. BIN
      etc/scripts/sipconf
  37. 1 4
      etc/scripts/sipphone.sh
  38. 0 0
      etc/scripts/system_led.sh
  39. 0 0
      etc/scripts/tcpdump.sh
  40. 0 0
      etc/scripts/trouble_shooting.sh
  41. 0 0
      etc/scripts/upgrade.sh
  42. 0 0
      etc/scripts/watch.sh
  43. 25 97
      etc/scripts/watch_process.sh
  44. 0 0
      etc/scripts/watch_tool.sh
  45. 0 0
      etc/scripts/webpid.sh
  46. 36 0
      etc/ssl/certs/cert.pem
  47. BIN
      usr/bin/bareservice
  48. BIN
      usr/lib/aarch64-linux-gnu/.DS_Store
  49. BIN
      usr/lib/aarch64-linux-gnu/libbaresip.so
  50. BIN
      usr/lib/aarch64-linux-gnu/libbaresip.so.14
  51. BIN
      usr/lib/aarch64-linux-gnu/libcjson.so.1

+ 0 - 46
Modules/service_process/main.c

@@ -2657,52 +2657,6 @@ int main(int argc, char *argv[]){
                     }
                 }
             }
-            // if (count >= 70) {
-            //     playBeep();
-            //     if(DEBUG)
-            //         printf("KEY1 DOWN\n");
-            //     writeLog(BTN, "KEY1", "DOWN");
-            //     GetCmdValue(SPK_CONF, "intercom:key_1_action", action, sizeof(action));
-            //     if(strcmp(action,"call") == 0)
-            //     {
-            //         keyAction(KEY1);
-            //         key1_action = TRUE;
-            //     }
-            //     if(strcmp(action,"http") == 0)
-            //     {
-            //         GetCmdValue(SPK_CONF, "intercom:http_1_url", url, sizeof(url));
-            //         action_url(url);
-	        //         writeLog(FUN, "KEY1 HTTP Request", url);
-            //         key1_action = TRUE;
-            //     }
-            //     else if(strcmp(action,"play") == 0)
-            //     {
-            //         char audiofile[32],repeat_tmp[16];
-            //         GetCmdValue(SPK_CONF, "intercom:audio_1_file", audiofile, sizeof(audiofile));
-            //         GetCmdValue(SPK_CONF, "intercom:audio_1_repeat", repeat_tmp, sizeof(repeat_tmp));
-            //         int repeat = atoi(repeat_tmp);
-            //         play_audio(audiofile,repeat);
-            //         sprintf(strtmp, "File: %s; Repeat: %d", audiofile, repeat);
-            //         writeLog( FUN, "KEY1 Play Auido", strtmp );
-            //         key1_action = TRUE;
-            //     }
-            //     if(!key1_action) continue;
-            //     GetCmdValue(SPK_CONF, "intercom:trigger_1_screen", srceen, sizeof(srceen));
-            //     if(strcmp(srceen, "yes") == 0)
-            //     {
-            //         int ret_thrd_delay;
-            //         pthread_t thread_delay;
-            //         GetCmdValue(SPK_CONF, "intercom:trigger_1_id", srceen_id, sizeof(srceen_id));
-            //         sprintf(strtmp,"{\"action\": \"on\", \"id\": %s}",srceen_id);
-            //         screen_control(strtmp);
-            //         ret_thrd_delay = pthread_create(&thread_delay, NULL, key1ScreenDelayControl, NULL);
-            //         if (ret_thrd_delay != 0) {
-            //             printf("create thread_delay screenDelayControl failed\n");
-            //             continue;
-            //         }
-            //         pthread_detach(thread_delay);
-            //     }
-            // }
         }
         /*RESET*/
         if( fdset[1].revents & POLLPRI )

+ 3 - 2
Modules/sipconf/main.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "iniparser.h"
+#include "iniparser/iniparser.h"
 
 #define Boolean     int
 #define TRUE        1
@@ -301,7 +301,7 @@ audio_path              /usr/share/baresip\n\
 audio_player            alsa,default\n\
 audio_source            %s\n\
 audio_alert             alsa,default\n\
-auplay_channels         1\n\
+auplay_channels         2\n\
 audio_level             no\n\
 ausrc_format            s16\n\
 auplay_format           s16\n\
@@ -354,6 +354,7 @@ module                  alsa.so\n\
 # Audio filter Modules\n\
 module                  aufile.so\n\
 module                  mixausrc.so\n\
+module                  auresamp.so\n\
 \n\
 # Media NAT modules\n\
 module                  stun.so\n\

+ 8 - 3
etc/rc.local

@@ -4,6 +4,7 @@
 #if [ -f "/root/restart_count.log" ];then
 #	/bin/bash /usr/local/bin/test_reboot.sh
 #fi
+/etc/scripts/gpio_init.sh
 chmod 777 /dev/ttyS*
 # Create dummy video node for chromium V4L2 VDA/VEA with rkmpp plugin
 echo dec > /dev/video-dec0
@@ -15,11 +16,15 @@ ln -rsf /usr/lib/*/libv4l2.so /usr/lib/
 if [ -e /usr/lib/aarch64-linux-gnu/ ]; then
     ln -Tsf lib /usr/lib64
 fi
-bash /etc/init.d/rkwifibt.sh &
+# bash /etc/init.d/rkwifibt.sh &
 bash /usr/local/bin/init.sh
-/etc/scripts/httpd.sh start
+
+/etc/scripts/product_model.sh
+
+/etc/scripts/watch.sh start > /dev/null 2>&1 &
 
 sleep 5
-udhcpc -i usb0 -n
+# udhcpc -i usb0 -n
+/etc/scripts/system_led.sh &
 
 exit 0

+ 0 - 0
etc/scripts/action.sh


+ 0 - 0
etc/scripts/api_agent


+ 0 - 0
etc/scripts/audio_init.sh


+ 0 - 0
etc/scripts/auto_privisioning.sh


+ 0 - 0
etc/scripts/conf_handle.sh


+ 0 - 0
etc/scripts/config_store.sh


+ 0 - 0
etc/scripts/dhcp_auto_privisioning.sh


+ 0 - 0
etc/scripts/factoryReset_check.sh


+ 0 - 0
etc/scripts/getmodel.sh


+ 2 - 12
etc/scripts/getsubmask.sh

@@ -31,23 +31,13 @@ case "${action}" in
 	;;
 
 	get_ip)
-		device_model="`/etc/scripts/getmodel.sh`"
-		if [ "foo${device_model}" == "fooX10" ];then
-			ip="`ifconfig br0 | grep 'inet addr' | awk '{print $2}' | tr -d ' ' | cut -d ':' -f2`"
-		else
-			ip="`ifconfig eth0 | grep 'inet addr' | awk '{print $2}' | tr -d ' ' | cut -d ':' -f2`"
-		fi
+		ip="`ifconfig eth1 | grep 'inet ' | awk '{print $2}'`"
 
 		echo -n "${ip}"
 	;;
 
 	*)
-		model="`sysconf /etc/speaker.conf get system model`"
-		if [ "foo${model}" = "fooX10" ];then
-			submask="`/sbin/ifconfig br0 | grep Mask | awk '{print $4}' | cut -d ':' -f2`"
-		else
-			submask="`/sbin/ifconfig eth0 | grep Mask | awk '{print $4}' | cut -d ':' -f2`"
-		fi
+		submask="`/sbin/ifconfig eth1 | grep netmask | awk '{print $4}'`"
 		echo -n "${submask}"
 esac
 

+ 0 - 0
etc/scripts/gpio_init.sh


+ 0 - 0
etc/scripts/httpd.sh


+ 0 - 0
etc/scripts/import_compare.sh


+ 0 - 0
etc/scripts/keep_tcpdump.sh


+ 0 - 0
etc/scripts/merge_conf.sh


+ 0 - 0
etc/scripts/monitor_ptp.sh


+ 0 - 0
etc/scripts/onvif-discover


+ 0 - 0
etc/scripts/onvif_upgrade.sh


+ 0 - 0
etc/scripts/onvifserver


+ 0 - 0
etc/scripts/output_control


+ 0 - 0
etc/scripts/pa_mute.sh


+ 0 - 0
etc/scripts/play_ip


+ 0 - 0
etc/scripts/play_rebooting.sh


+ 19 - 17
etc/scripts/product_model.sh

@@ -3,26 +3,28 @@
 #  Tpye select
 #
 
-tmp_hard_verssion="`/usr/bin/vendor_storage -r VENDOR_WIFI_MAC_ID | awk -F" " '{print $2}'`"
-tmp1_hard_version=${tmp_hard_verssion: -2}
-hard_version="Ver${tmp1_hard_version:0:1}.${tmp1_hard_version:1:1}"
+# tmp_hard_verssion="`/usr/bin/vendor_storage -r VENDOR_WIFI_MAC_ID | awk -F" " '{print $2}'`"
+# tmp1_hard_version=${tmp_hard_verssion: -2}
+# hard_version="Ver${tmp1_hard_version:0:1}.${tmp1_hard_version:1:1}"
+hard_version="Ver1.0"
 sysconf /etc/speaker.conf set system hard_version ${hard_version}
 
-SN="`/usr/bin/vendor_storage -r VENDOR_SN_ID | awk '{print $2}'`"
-SN_MODEL="`echo ${SN:0:4}`"
-# erro,using default model
-[ -z "${SN_MODEL}" ] && exit 0
-
-# SQ10-B
-if [ "${SN_MODEL}" = "ZSQB" ];then
-    model=SQ10-B
-    ui_model=SQ10-B
-# SQ10-T
-elif [ "${SN_MODEL}" = "ZSQT" ];then
-    model=SQ10-T
-    ui_model=SQ10-T
-fi
+# SN="`/usr/bin/vendor_storage -r VENDOR_SN_ID | awk '{print $2}'`"
+# SN_MODEL="`echo ${SN:0:4}`"
+# # erro,using default model
+# [ -z "${SN_MODEL}" ] && exit 0
 
+# # SQ10-B
+# if [ "${SN_MODEL}" = "ZSQB" ];then
+#     model=SQ10-B
+#     ui_model=SQ10-B
+# # SQ10-T
+# elif [ "${SN_MODEL}" = "ZSQT" ];then
+#     model=SQ10-T
+#     ui_model=SQ10-T
+# fi
+model=IPS-M2
+ui_model=IPS-M2
 sysconf /etc/speaker.conf set system model ${model}
 sysconf /etc/speaker.conf set system ui_model ${ui_model}
 

+ 0 - 0
etc/scripts/rtspserver


+ 0 - 0
etc/scripts/serial_ctrl


+ 0 - 0
etc/scripts/service_process


+ 0 - 0
etc/scripts/set_lan.sh


+ 0 - 0
etc/scripts/set_volume.sh


+ 0 - 0
etc/scripts/set_webpid.sh


+ 0 - 0
etc/scripts/settime.sh


+ 12 - 34
etc/scripts/shell_action.sh

@@ -45,11 +45,7 @@ case ${action} in
     ;;
 
     getdeviceInfo)
-        if /sbin/ifconfig br0 > /dev/null 2>&1;then
-            dev="br0"
-        else
-            dev="eth0"
-        fi
+        dev="eth1"
 
 		model="`${SYSCONFCMD} ${SYSCONF} get system model`"
 		hardVersion="`${SYSCONFCMD} ${SYSCONF} get system hard_version`"
@@ -97,11 +93,7 @@ case ${action} in
 		dstIp="$2"	
 		[ -z "${dstIp}" ] && exit 0
 
-        if /sbin/ifconfig br0 > /dev/null 2>&1;then
-            dev="br0"
-        else
-            dev="eth0"
-        fi
+        dev="eth1"
 
 		if ! /sbin/route -n | grep "${dstIp}" > /dev/null;then
 			/sbin/route add -net ${dstIp} netmask 255.255.255.255 dev ${dev}
@@ -113,11 +105,7 @@ case ${action} in
 		dstIp="$2"	
 		[ -z "${dstIp}" ] && exit 0
 
-        if /sbin/ifconfig br0 > /dev/null 2>&1;then
-            dev="br0"
-        else
-            dev="eth0"
-        fi
+        dev="eth1"
 
 		if /sbin/route -n | grep "${dstIp}" > /dev/null;then
 			/sbin/route del -net ${dstIp} netmask 255.255.255.255 dev ${dev}
@@ -153,11 +141,8 @@ case ${action} in
         fi
         server="`${SYSCONFCMD} ${SYSCONF} get account_info_1 server`"
         model="`${SYSCONFCMD} ${SYSCONF} get system model`"
-        if [ "foo${model}" = "fooX10" ];then
-            interface="br0"
-        else
-            interface="eth0"
-        fi
+        interface="eth1"
+
         if [ ! -z ${delay} ];then
             /usr/sbin/ptpd2 -i ${interface} -s -U -g --ptpengine:log_delayreq_interval=1 --delay-override ${delay} -u ${server}
         else
@@ -179,11 +164,7 @@ case ${action} in
 
             server="`${SYSCONFCMD} ${SYSCONF} get ptp server`"
             model="`${SYSCONFCMD} ${SYSCONF} get system model`"
-            if [ "foo${model}" = "fooX10" ];then
-                interface="br0"
-            else
-                interface="eth0"
-            fi
+            interface="eth1"
             if [ ! -z ${delay} ];then
                 /usr/sbin/ptpd2 -i ${interface} -s -U -g --ptpengine:log_delayreq_interval=1 --delay-override ${delay} -u ${server}
             else
@@ -241,18 +222,14 @@ case ${action} in
 
     set_onvif)
         generate_config() {
-            if /sbin/ifconfig br0 > /dev/null 2>&1;then
-                dev="br0"
-            else
-                dev="eth0"
-            fi
+            dev="eth1"
 
             model="`${SYSCONFCMD} ${SYSCONF} get system model`"
             hardVersion="`${SYSCONFCMD} ${SYSCONF} get system hard_version`"
-            ip="`/sbin/ifconfig ${dev} | grep 'inet addr' | awk '{print $2}' | cut -d ':' -f2 | tr -d ' '`"
-            mac="`/sbin/ifconfig ${dev} | grep HWaddr | awk '{printf $5}' | sed 's/:/-/g'`"
+            ip="`/sbin/ifconfig ${dev} | grep 'inet ' | awk '{print $2}'`"
+            mac="`/sbin/ifconfig ${dev} | grep ether | awk '{printf $2}' | sed 's/:/-/g'`"
             softwareVersion="`${SYSCONFCMD} ${SYSCONF} get system firmware`"
-            Manufacturer="ZYCOO"
+            Manufacturer="G2"
             username="`${SYSCONFCMD} ${SYSCONF} get onvif username`"
             password="`${SYSCONFCMD} ${SYSCONF} get onvif password`"
             enMIC="`${SYSCONFCMD} ${SYSCONF} get onvif enable_mic`"
@@ -363,7 +340,8 @@ fi
 	<scope_fixed>onvif://www.onvif.org/Profile/Streaming</scope_fixed>
 	<scope_fixed>onvif://www.onvif.org/location/country/china</scope_fixed>
 	<scope_fixed>onvif://www.onvif.org/type/video_encoder</scope_fixed>
-	<scope_fixed>onvif://www.onvif.org/name/ZYCOO-IP-SPEAKER</scope_fixed>
+	<scope_fixed>onvif://www.onvif.org/type/audio_decoder</scope_fixed>
+	<scope_fixed>onvif://www.onvif.org/name/IPSPEAKER</scope_fixed>
 	<scope_fixed>onvif://www.onvif.org/hardware/${model}</scope_fixed>
 	<scope_config>onvif://www.onvif.org/acc/uuid/${uuid}</scope_config>
 	<scope_config>onvif://www.onvif.org/acc/mac/${mac}</scope_config>

BIN
etc/scripts/sipconf


+ 1 - 4
etc/scripts/sipphone.sh

@@ -17,10 +17,7 @@ case "$1" in
         redis-cli FLUSHALL
 
         # start baresip
-        if [ -n "`baresip -4 -d|egrep 'Illegal instruction|segment fault' 2>/dev/null`" ];then
-            /sbin/reboot
-            exit;
-        fi
+        baresip -4 -d
 
         # start baresip service
         bareservice > /dev/null 2>&1 &

+ 0 - 0
etc/scripts/system_led.sh


+ 0 - 0
etc/scripts/tcpdump.sh


+ 0 - 0
etc/scripts/trouble_shooting.sh


+ 0 - 0
etc/scripts/upgrade.sh


+ 0 - 0
etc/scripts/watch.sh


+ 25 - 97
etc/scripts/watch_process.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
 wd_c=0
-free_c=0
-time_wait_c=0
 start()
 {
         while [ 1 ]
         do
-                HTTPD_STAT="`ps|grep speaker-cgi|grep -v grep`"
+                HTTPD_STAT="`ps -e|grep speaker-cgi|grep -v grep`"
                 if [ -z "${HTTPD_STAT}" ];then
                         killall speaker-cgi > /dev/null 2>&1
                         sleep 1
@@ -14,102 +12,28 @@ start()
                         wd_c=`expr $wd_c + 1`
                 fi
 
-                APIAGENT_STAT="`ps|grep api_agent|grep -v grep`"
-                if [ -z "${APIAGENT_STAT}" ];then
-                        /etc/scripts/api_agent &
-                fi
-
-                AICTRL_STAT="`ps|grep serial_ctrl|grep -v grep`"
-                if [ -z "${AICTRL_STAT}" ];then
-                        HWVer="`sysconf /etc/speaker.conf get system hard_version`"
-                        if [ ${HWVer:3:1} -ge 3 ];then
-                                /etc/scripts/shell_action.sh ai start
-                        fi
-                fi
+                # APIAGENT_STAT="`ps|grep api_agent|grep -v grep`"
+                # if [ -z "${APIAGENT_STAT}" ];then
+                #         /etc/scripts/api_agent &
+                # fi
 
-                REDIS_STAT="`ps|grep 'redis-server'|grep -v grep`"
+                REDIS_STAT="`ps -e|grep 'redis-server'|grep -v grep`"
                 if [ -z "${REDIS_STAT}" ];then
                         /usr/sbin/redis-server /etc/redis.conf > /dev/null 2>&1 &
                         wd_c=`expr $wd_c + 1`
                 fi
 
-                OUTPUTCTRL_STAT="`ps|grep output_control|grep -v grep`"
-                if [ -z "${OUTPUTCTRL_STAT}" ];then
-                        /etc/scripts/output_control &
-                fi
-
-                PROCESS_STAT="`ps|grep service_process|grep -v grep`"
-                if [ -z "${PROCESS_STAT}" ];then
-                        /etc/scripts/service_process &
-                fi
-
-                ISPEAKER_STAT="`ps|grep -w "python3 /app/ispeaker-service/ispeaker" |grep -v grep`"
-                if [ -z "${ISPEAKER_STAT}" ];then
-                        ISPEAKER_ENABLE="`sysconf /etc/speaker.conf get system broadcast_service`"
-                        SIP_ENABLE="`sysconf /etc/speaker.conf get account_info_1 enable`"
-                        MULTICAST_ENABLE="`sysconf /etc/speaker.conf get multicast_player enable`"
-                        if [ "foo${ISPEAKER_ENABLE}" = "fooyes" -a "foo${SIP_ENABLE}" = "fooyes" ] || [ "foo${MULTICAST_ENABLE}" = "fooyes" ];then
-                                if [ "foo${ISPEAKER_ENABLE}" = "fooyes" -a "foo${SIP_ENABLE}" = "fooyes" ];then
-                                        killall ptpd2 > /dev/null 2>&1
-                                        /etc/scripts/shell_action.sh startSyncTimeToIPAC
-                                else
-                                        killall ptpd2 > /dev/null 2>&1
-                                fi
-                                killall ispeaker > /dev/null 2>&1
-                                # sleep 1
-                                /etc/scripts/ispeaker start
-                                wd_c=`expr $wd_c + 1`
-                        fi
-                fi
-
-                WAIT_STAT=$(netstat -apn | grep 1883 | awk '{print $6}' | tr -d ' ')
-                if ! echo "$WAIT_STAT" | grep -q "ESTABLISHED" && echo "$WAIT_STAT" | grep -Eq "TIME_WAIT|CLOSE_WAIT|SYN_SENT|FIN_WAIT1"; then
-                        time_wait_c=`expr $time_wait_c + 1`
-                        if [ $time_wait_c -gt 3 ];then
-                                ISPEAKER_ENABLE="`sysconf /etc/speaker.conf get system broadcast_service`"
-                                SIP_ENABLE="`sysconf /etc/speaker.conf get account_info_1 enable`"
-                                if [ "foo${ISPEAKER_ENABLE}" = "fooyes" -a "foo${SIP_ENABLE}" = "fooyes" ];then
-                                        killall ispeaker > /dev/null 2>&1
-                                        sleep 1
-                                        /etc/scripts/ispeaker start
-                                        sleep 3
-                                        time_wait_c=0
-                                fi
-                        fi
-                else
-                        time_wait_c=0 
-                fi
-
-                PTP_STAT="`ps|grep -w ptpd2|grep -v grep`"
-                if [ -z "${PTP_STAT}" ];then
-                        PTP_ENABLE="`sysconf /etc/speaker.conf get ptp enable`"
-                        if [ "foo${PTP_ENABLE}" = "fooyes" ];then
-                                ISPEAKER_ENABLE="`sysconf /etc/speaker.conf get system broadcast_service`"
-                                SIP_ENABLE="`sysconf /etc/speaker.conf get account_info_1 enable`"
-                                if [ "foo${ISPEAKER_ENABLE}" = "foono" -o "foo${SIP_ENABLE}" = "foono" ];then
-                                        killall ptpd2 > /dev/null 2>&1
-                                        /etc/scripts/shell_action.sh startSyncTimeToPtpServer 
-                                fi
-                        else
-                                ISPEAKER_ENABLE="`sysconf /etc/speaker.conf get system broadcast_service`"
-                                SIP_ENABLE="`sysconf /etc/speaker.conf get account_info_1 enable`"
-                                if [ "foo${ISPEAKER_ENABLE}" = "fooyes" -a "foo${SIP_ENABLE}" = "fooyes" ];then
-                                        killall ptpd2 > /dev/null 2>&1
-                                        /etc/scripts/shell_action.sh startSyncTimeToIPAC
-                                fi
-                        fi
-                fi
+                # OUTPUTCTRL_STAT="`ps|grep output_control|grep -v grep`"
+                # if [ -z "${OUTPUTCTRL_STAT}" ];then
+                #         /etc/scripts/output_control &
+                # fi
 
-                ONVIFSERVER_STAT="`ps|grep -w onvifserver|grep -v grep`"
-                RTSPSERVER_STAT="`ps|grep -w rtspserver|grep -v grep`"
-                if [ -z "${ONVIFSERVER_STAT}" -o -z "${RTSPSERVER_STAT}" ];then
-                        ONVIF_ENABLE="`sysconf /etc/speaker.conf get onvif enable`"
-                        if [ "foo${ONVIF_ENABLE}" = "fooyes" ];then
-                                /etc/scripts/shell_action.sh set_onvif
-                        fi
-                fi
+                # PROCESS_STAT="`ps|grep service_process|grep -v grep`"
+                # if [ -z "${PROCESS_STAT}" ];then
+                #         /etc/scripts/service_process &
+                # fi
 
-                SIPPHONE_STAT="`ps|grep baresip|grep -v grep`"
+                SIPPHONE_STAT="`ps -e|grep baresip|grep -v grep`"
                 SIPSEV_STAT="`ps|grep 'bareservice'|grep -v grep`"
                 if [ -z "${SIPPHONE_STAT}" -o -z "${SIPSEV_STAT}" ];then
                         killall baresip > /dev/null 2>&1
@@ -119,16 +43,20 @@ start()
                         wd_c=`expr $wd_c + 1`
                 fi
 
-                ONVIF_STAT="`ps|grep 'onvif-discover'|grep -v grep`"
+                # ONVIFSERVER_STAT="`ps|grep -w onvifserver|grep -v grep`"
+                # RTSPSERVER_STAT="`ps|grep -w rtspserver|grep -v grep`"
+                # if [ -z "${ONVIFSERVER_STAT}" -o -z "${RTSPSERVER_STAT}" ];then
+                #         ONVIF_ENABLE="`sysconf /etc/speaker.conf get onvif enable`"
+                #         if [ "foo${ONVIF_ENABLE}" = "fooyes" ];then
+                #                 /etc/scripts/shell_action.sh set_onvif
+                #         fi
+                # fi
+
+                ONVIF_STAT="`ps -e|grep 'onvif-discover'|grep -v grep`"
                 if [ -z "${ONVIF_STAT}" ];then
                         /etc/scripts/onvif-discover > /dev/null 2>&1 &
                 fi
 
-                EQ_STAT="`ps|grep 'eq_drc_process'|grep -v grep`"
-                if [ -z "${EQ_STAT}" ];then
-                        /usr/bin/eq_drc_process > /dev/null 2>&1 &
-                fi
-
                 SPEAKER_CONF_ERROR_STAT="`grep "\['" /oem/etc/speaker.conf`"
                 if [ ! -z "${SPEAKER_CONF_ERROR_STAT}" ];then
                         sed -i "s/\['//g" /oem/etc/speaker.conf

+ 0 - 0
etc/scripts/watch_tool.sh


+ 0 - 0
etc/scripts/webpid.sh


+ 36 - 0
etc/ssl/certs/cert.pem

@@ -0,0 +1,36 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDGvL7k7azoIrdLnteVUqUXeqeOYFAGRp/k+HapooExeUJYfcIW
+uMI9/2AbKYx2PpeaWqrXXSCNtHplbkEW5C/AMSnq2Grot4/Z0HKTig3j0IR4a7hy
+atGfedE3NwaOE5NflmPDG71da2e1/QnPVRPORgRqu1Nj6cSWHZV/8kGWZwIDAQAB
+AoGAYZosvk2jz1XNY0wdYG54OfG4/Il8g7iHqnIEBQeUH3IIDWGlwnb2nnAfCPf8
+zc2rsti4cpB//lgWjF37hXyHniQp0w5iNcUvhmpGqYQW7YVwh5i/DvJwHmabEwSA
+znBivhOHznd9SMW7arDj9ZXyJmWkl/9cKk64J2S0wrpFy8ECQQDt193VKDusMZQk
+ZO7LkLntv//mRflwfkTCghwXrxaZ10J5bM+bSQbBBzbgYrPo7F9ooTm+i/S8qMIq
++17j7yb3AkEA1eijRg/hyF8OB3MORMrwTC+x/C0BvSsmOzfugVFNkMqV/gqUwxfV
+iTVN4CrJMnm0QU+MZHqektmCLROy86AAEQJBAMrkFKZbNdxERt1tBI++m/0GhmOH
+Wavu6vUKTLCfeaYujNRMUCVlfE95ugRb7qFJ0nHM5xd3CIVPaKOF34KNZi0CQH8k
+ufeo9QEOTt5qqu6E2XPPXbGQZtozzZOhWSiQVNRdNe48B9Q2VHwrrNAzXkecQ2IW
+kFIg+CQ9GL0GWnWogqECQHgOXezVoNEcRCLc2Jet6KdW7DfJyA1c5lFpeiVJZ3tI
+60U2QyyNyO+hvhV7E1Ub8zuijMGCCLz7/1g0Oe6S9iA=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDYDCCAUgCAQEwDQYJKoZIhvcNAQEFBQAwOTEcMBoGA1UEAxMTQXN0ZXJpc2sg
+UHJpdmF0ZSBDQTEZMBcGA1UEChMQTXkgU3VwZXIgQ29tcGFueTAeFw0xNTA2MTkw
+NzQ2MzZaFw0xNjA2MTgwNzQ2MzZaMDcxGjAYBgNVBAMTEXBieC5teWNvbXBhbnku
+Y29tMRkwFwYDVQQKExBNeSBTdXBlciBDb21wYW55MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDGvL7k7azoIrdLnteVUqUXeqeOYFAGRp/k+HapooExeUJYfcIW
+uMI9/2AbKYx2PpeaWqrXXSCNtHplbkEW5C/AMSnq2Grot4/Z0HKTig3j0IR4a7hy
+atGfedE3NwaOE5NflmPDG71da2e1/QnPVRPORgRqu1Nj6cSWHZV/8kGWZwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4ICAQB+xvOY4IT+8LEkJ7haHSOdwTlZOyaZ8Klfojsx
+x5Vy5QA7RAI5TtbqaTlcw16sXUU3/IyA7qlxhONAILWLgJyz+hUFkktfy2A3Q6np
+vRoGAYPppBtY3JMvASoxfpp/C3+CKL8Xe5v3Juff1dupawyJT82Kz6WqOeNS6QYz
+jMKvDqbWKtEAMNI9SnQ+MEfK54F/G2QAqafggdr6qPltbI02Sk2n0LZQCe7RtA13
+Mh/twtCaEMDghXznIi49uD0Kl9/MgN6QGe1zrcJ3EN0w1kzh8Y/8u14tjuFfOPNl
+Z/D5QpeqNbv+5weZkBnaH8/0Gz+bnRNy+uj9V7gHaqhu5Vt9wjv+yM1LVlAzhmLh
+rI8B4EVA5oZmbABhpm+p4PhN2TyeQ2mKNjcJ82kZrvUrWCPOGjJxyYtxF0+wBKsU
+ueLIbRkWk6V/mwngEPqJ4zd2ED4hKGp2RzObmscl/Dg8qFbXSj783wUYhadJqxu9
+QPiKfquSwZUamDMbReysHd+cF4+7ibGuvWWpjnYDSTPshawk5BN2RjXvYXHPSjr2
+i7hjJo4dB8sPCePuKiCxsJnsVQGUkUEjqCnlkdw+EQraBJHnZMQ65jaW/Bpsogjh
+rUG1Gb4Z5/fXYlq5WZM+2v/leuGMRep/oxLVzIVKOGA/U+Z3koAL/xmHnqzNTyks
+zFoHog==
+-----END CERTIFICATE-----

BIN
usr/bin/bareservice


BIN
usr/lib/aarch64-linux-gnu/.DS_Store


BIN
usr/lib/aarch64-linux-gnu/libbaresip.so


BIN
usr/lib/aarch64-linux-gnu/libbaresip.so.14


BIN
usr/lib/aarch64-linux-gnu/libcjson.so.1