Merge pull request #280 from alienatedsec/proxychain

Merging Pre-Releases

Author: alienatedsec

VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0d

scripts/init_sysroot.sh

@@ -279,7 +279,7 @@ FIRMWARE_DIR=$(normalize_path $(get_script_dir)/../stock_firmware)/$CAMERA_NAME
 
 echo ""
 echo "------------------------------------------------------------------------"
-echo " YI-HACK-V4 - INIT SYSROOT"
+echo " YI-HACK-V5 - INIT SYSROOT"
 echo "------------------------------------------------------------------------"
 printf " camera_name      : %s\n" $CAMERA_NAME
 printf " camera_id        : %s\n" $CAMERA_ID

src/proxychains-ng/compile.proxychains-ng

@@ -6,14 +6,18 @@ cd $SCRIPT_DIR
 
 cd proxychains-ng || exit 1
 
+#CFLAGS="-march=armv5te -mcpu=arm926ej-s -I/opt/arm-hisiv300-linux/target/usr/include -L/opt/arm-hisiv300-linux/target/usr/lib" \
+#CC="arm-hisiv300-linux-uclibcgnueabi-gcc" \
+#  ./configure --prefix=
 make clean
 make -j$(nproc) || exit 1
+make DESTDIR=$SCRIPT_DIR/_install install
+mkdir -p $SCRIPT_DIR/_install/tmp/sd/yi-hack-v5/etc
 
-mkdir -p $SCRIPT_DIR/_install/bin
-mkdir -p $SCRIPT_DIR/_install/lib
+arm-hisiv300-linux-uclibcgnueabi-strip $SCRIPT_DIR/_install/tmp/sd/yi-hack-v5/bin/proxychains4
+arm-hisiv300-linux-uclibcgnueabi-strip $SCRIPT_DIR/_install/tmp/sd/yi-hack-v5/bin/proxychains4-daemon
+arm-hisiv300-linux-uclibcgnueabi-strip $SCRIPT_DIR/_install/tmp/sd/yi-hack-v5/lib/libproxychains4.so
 
-cp -f proxychains4 $SCRIPT_DIR/_install/bin
-cp -f libproxychains4.so $SCRIPT_DIR/_install/lib
-
-arm-hisiv300-linux-uclibcgnueabi-strip $SCRIPT_DIR/_install/bin/proxychains4
-arm-hisiv300-linux-uclibcgnueabi-strip $SCRIPT_DIR/_install/lib/libproxychains4.so
+cd ..
+cp -f proxychains.conf $SCRIPT_DIR/_install/tmp/sd/yi-hack-v5/etc/proxychains.conf.template
+cp -f proxychains.conf $SCRIPT_DIR/_install/tmp/sd/yi-hack-v5/etc/proxychains.conf

src/proxychains-ng/config.mak

@@ -1,8 +1,14 @@
+
 CC=arm-hisiv300-linux-uclibcgnueabi-gcc
-prefix=/home/yi-hack-v5/
-libdir=/home/yi-hack-v5/lib
-sysconfdir=/home/yi-hack-v5/etc
 USER_CFLAGS=-march=armv5te -mcpu=arm926ej-s -I/opt/arm-hisiv300-linux/target/usr/include -L/opt/arm-hisiv300-linux/target/usr/lib
-USER_LDFLAGS=
-AR=arm-hisiv300-linux-uclibcgnueabi-ar
-RANLIB=arm-hisiv300-linux-uclibcgnueabi-ranlib
+prefix=/tmp/sd/yi-hack-v5
+exec_prefix=/tmp/sd/yi-hack-v5
+bindir=/tmp/sd/yi-hack-v5/bin
+libdir=/tmp/sd/yi-hack-v5/lib
+includedir=/include
+sysconfdir=/tmp/sd/yi-hack-v5/etc
+CPPFLAGS+= -DSUPER_SECURE
+CPPFLAGS+=  -Wno-unknown-pragmas -DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=socklen_t -DGN_FLAGS_T=unsigned -DHAVE_GNU_GETSERVBYNAME_R -DHAVE_PIPE2 -DHAVE_SOCK_CLOEXEC -DHAVE_CLOCK_GETTIME
+LD_SET_SONAME = -Wl,--soname,
+LIBDL = -ldl
+PTHREAD = -lpthread

src/proxychains-ng/install.proxychains-ng

@@ -11,6 +11,6 @@ mkdir -p ../../build/home/yi-hack-v5/bin/
 mkdir -p ../../build/home/yi-hack-v5/lib/
 mkdir -p ../../build/home/yi-hack-v5/etc/
 
-rsync -a ./_install/bin/* ../../build/home/yi-hack-v5/bin/
-rsync -a ./_install/lib/* ../../build/home/yi-hack-v5/lib/
-rsync -a ./proxychains.conf ../../build/home/yi-hack-v5/etc/
+rsync -a ./_install/tmp/sd/yi-hack-v5/bin/* ../../build/home/yi-hack-v5/bin/
+rsync -a ./_install/tmp/sd/yi-hack-v5/lib/* ../../build/home/yi-hack-v5/lib/
+rsync -a ./_install/tmp/sd/yi-hack-v5/etc/* ../../build/home/yi-hack-v5/etc/

src/proxychains-ng/proxychains-ng

@@ -14,24 +14,34 @@ DISABLE_CLOUD=no
 REC_WITHOUT_CLOUD=no
 MQTT=no
 RTSP=no
+RTSP_ALT=no
 RTSP_STREAM=high
 RTSP_AUDIO=no
+SPEAKER_AUDIO=yes
+SNAPSHOT=yes
+SNAPSHOT_VIDEO=no
+SNAPSHOT_LOW=no
+TIMELAPSE=no
+TIMELAPSE_FTP=no
+TIMELAPSE_DT=60
+TIMELAPSE_VDT=
 ONVIF=no
-ONVIF_WSDD=no
+ONVIF_WSDD=yes
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
-ONVIF_WM_SNAPSHOT=no
-NTPD=no
+ONVIF_WM_SNAPSHOT=yes
+TIME_OSD=no
+NTPD=yes
 NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no
-SWAP_FILE=no
+SWAP_FILE=yes
 RTSP_PORT=554
 ONVIF_PORT=80
 HTTPD_PORT=8080
 USERNAME=
 PASSWORD=
 TIMEZONE=
-FREE_SPACE=0
+FREE_SPACE=15
 FTP_UPLOAD=no
 FTP_HOST=
 FTP_DIR=
@@ -40,18 +50,25 @@ FTP_USERNAME=
 FTP_PASSWORD=
 FTP_FILE_DELETE_AFTER_UPLOAD=yes
 SSH_PASSWORD=
-CRONTAB="
+CRONTAB=
+DEBUG_LOG=no"
 
 PARMS2="
 SWITCH_ON=yes
 SAVE_VIDEO_ON_MOTION=yes
+MOTION_DETECTION=yes
 SENSITIVITY=low
 AI_HUMAN_DETECTION=no
+AI_VEHICLE_DETECTION=no
+AI_ANIMAL_DETECTION=no
+FACE_DETECTION=no
+MOTION_TRACKING=no
 SOUND_DETECTION=no
 SOUND_SENSITIVITY=80
 LED=yes
 ROTATE=no
-IR=yes"
+IR=yes
+CRUISE=no"
 
 PARMS3="
 MQTT_IP=0.0.0.0
@@ -63,14 +80,18 @@ MQTT_PREFIX=yicam
 TOPIC_BIRTH_WILL=status
 TOPIC_MOTION=motion_detection
 TOPIC_MOTION_IMAGE=motion_detection_image
+MOTION_IMAGE_DELAY=0.5
 TOPIC_MOTION_FILES=motion_files
-TOPIC_AI_HUMAN_DETECTION=ai_human_detection
+TOPIC_AI_HUMAN_DETECTION=ai_human_detection   
 TOPIC_SOUND_DETECTION=sound_detection
 BIRTH_MSG=online
 WILL_MSG=offline
 MOTION_START_MSG=motion_start
 MOTION_STOP_MSG=motion_stop
 AI_HUMAN_DETECTION_MSG=human
+AI_VEHICLE_DETECTION_MSG=vehicle
+AI_ANIMAL_DETECTION_MSG=animal
+BABY_CRYING_MSG=crying
 SOUND_DETECTION_MSG=sound_detected
 MQTT_KEEPALIVE=120
 MQTT_QOS=1
@@ -81,33 +102,42 @@ MQTT_RETAIN_MOTION_FILES=0
 MQTT_RETAIN_AI_HUMAN_DETECTION=0
 MQTT_RETAIN_SOUND_DETECTION=0"
 
+if [ ! -f $SYSTEM_CONF_FILE ]; then
+    touch $SYSTEM_CONF_FILE
+fi
 for i in $PARMS1
 do
     if [ ! -z "$i" ]; then
         PAR=$(echo "$i" | cut -d= -f1)
-        MATCH=$(cat $SYSTEM_CONF_FILE | grep $PAR)
+        MATCH=$(cat $SYSTEM_CONF_FILE | grep ^$PAR=)
         if [ -z "$MATCH" ]; then
             echo "$i" >> $SYSTEM_CONF_FILE
         fi
     fi
 done
 
+if [ ! -f $CAMERA_CONF_FILE ]; then
+    touch $CAMERA_CONF_FILE
+fi
 for i in $PARMS2
 do
     if [ ! -z "$i" ]; then
         PAR=$(echo "$i" | cut -d= -f1)
-        MATCH=$(cat $CAMERA_CONF_FILE | grep $PAR)
+        MATCH=$(cat $CAMERA_CONF_FILE | grep ^$PAR=)
         if [ -z "$MATCH" ]; then
             echo "$i" >> $CAMERA_CONF_FILE
         fi
     fi
 done
 
+if [ ! -f $MQTTV4_CONF_FILE ]; then
+    touch $MQTTV4_CONF_FILE
+fi
 for i in $PARMS3
 do
     if [ ! -z "$i" ]; then
         PAR=$(echo "$i" | cut -d= -f1)
-        MATCH=$(cat $MQTTV4_CONF_FILE | grep $PAR)
+        MATCH=$(cat $MQTTV4_CONF_FILE | grep ^$PAR=)
         if [ -z "$MATCH" ]; then
             echo "$i" >> $MQTTV4_CONF_FILE
         fi

src/static/static/home/yi-hack-v5/script/check_conf.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# 0.4.0c
+
 CONF_FILE="etc/system.conf"
 if [ -d "/tmp/sd/yi-hack-v5" ]; then
         YI_HACK_V5_PREFIX="/tmp/sd/yi-hack-v5"
@@ -85,8 +87,8 @@ elif [ "$c" = "136" ]; then
     echo '{"code":"20000","time":'$(date +%s)'000}'
 elif [ "$c" = "141" ]; then
     #CMD_do_tnp_on_line
-    echo '{"code":"20000"}'
-    #echo '{"code":"20000","data":{"InitString":"ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCD","License":"ABDCDE:","DID":"'$uid'"}}'
+    #echo '{"code":"20000"}'
+    echo '{"code":"20000","data":{"InitString":"ABGBJPLDIEEKKKHPODFPPOEJHNCHFCGAHHEDKFIJIDBCDIBDPKIIAONIPBCLBOKOPIKMDKPMNADGACDMBC","License":"FTTDHY:","DID":"'$uid'"}}'
 elif [ "$c" = "142" ]; then
     #CMD_do_get_dev_info
     TIMEZONE=$(get_config TIMEZONE)
@@ -98,12 +100,12 @@ elif [ "$c" = "142" ]; then
     #{"code":"20000","data":{"timezone":"GMT+01:00","language":"en-US","tz_offset":3600000,"css_flag":0,"css_mode":0,"appParam":{"schedule_power":{"schedule_power_on":{"enable":0,"repeater":"","time":"2212220800"},"schedule_power_off":{"enable":0,"repeater":"","time":"2212222200"}}},"doorbellCoolingDuration":"0","model":"38","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}
 elif [ "$c" = "304" ]; then
     #CMD_do_update_event_v4
-    echo '{"code":"20000"}'
-    #echo '{"code":"20000","data":{"id":"'$EventTime'","ipcSetTime":"180"}}'
+    #echo '{"code":"20000"}'
+    echo '{"code":"20000","data":{"id":"'$EventTime'","ipcSetTime":"180"}}'
 elif [ "$c" = "306" ]; then
     #CMD_do_gen_presigned_url_v5
-    echo '{"code":"20000"}'
-    #echo '{"code":"20000","data":{"jpg":{"method":"PUT","pwd":"unusedpassword_","url":"http://server/yyyy/mm/dd/xxx/xxx.jpg?Expires=xxx&OSSAccessKeyId=xxx&Signature=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"},"mp4":{"method":"PUT","pwd":"unusedpassword_","url":"http://server/yyyy/mm/dd/xxx/xxx.mp4?Expires=xxx&OSSAccessKeyId=xxx&Signature=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"},"ok":"true"}}'
+    #echo '{"code":"20000"}'
+    echo '{"code":"20000","data":{"jpg":{"method":"PUT","pwd":"unusedpassword_","url":"http://server/yyyy/mm/dd/xxx/xxx.jpg?Expires=xxx&OSSAccessKeyId=xxx&Signature=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"},"mp4":{"method":"PUT","pwd":"unusedpassword_","url":"http://server/yyyy/mm/dd/xxx/xxx.mp4?Expires=xxx&OSSAccessKeyId=xxx&Signature=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"},"ok":"true"}}'
 elif [ "$c" = "411" ]; then
     #CMD_do_event_upload
     echo ''

src/static/static/home/yi-hack-v5/script/cloudAPI_fake

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# 0.4.0c
+
 CONF_FILE="etc/system.conf"
 
 if [ -d "/tmp/sd/yi-hack-v5" ]; then
@@ -65,6 +67,11 @@ if [ -f $YI_HACK_UPGRADE_PATH/yi-hack-v5/fw_upgrade_in_progress ]; then
     exit
 fi
 
+# Update cloudAPI_fake if necessary
+if [[ "$(grep -m 3 -n '' /home/app/cloudAPI_fake | tail -n 1 | cut -d ':' -f 2 | cut -c 3-)" != "$(grep -m 3 -n '' $YI_HACK_PREFIX/script/cloudAPI_fake | tail -n 1 | cut -d ':' -f 2 | cut -c 3-)" ]]; then
+  cp -f $YI_HACK_PREFIX/script/cloudAPI_fake /home/app/
+fi
+
 # Manual Wi-Fi config
 if [ -f /tmp/sd/recover/configure_wifi.cfg ]; then
 	mv /tmp/sd/recover/configure_wifi.cfg /tmp/configure_wifi.cfg
@@ -150,14 +157,19 @@ else
   echo "Version file does not exist. Your SD card is not FAT32 to load the latest firmware correctly. Go to https://github.com/alienatedsec/yi-hack-v5/discussions/267" > "/tmp/sd/fat32error.txt"
 fi
 
+if [[ $(get_config NTPD) == "yes" ]] ; then
+    # Wait until all the other processes have been initialized
+    sleep 5 && ntpd -p $(get_config NTP_SERVER) &
+fi
+
 if [[ $(get_config DISABLE_CLOUD) == "no" ]] ; then
     (
         cd /home/app
         killall dispatch
         LD_PRELOAD=/home/yi-hack-v5/lib/ipc_multiplex.so ./dispatch &
         sleep 2
         LD_LIBRARY_PATH="/home/yi-hack-v5/lib:/lib:/home/lib:/home/app/locallib:/home/hisiko/hisilib" ./rmm &
-        sleep 4
+        sleep 8
         ./mp4record &
         ./cloud &
         ./p2p_tnp &
@@ -174,13 +186,13 @@ if [[ $(get_config DISABLE_CLOUD) == "yes" ]] ; then
         LD_PRELOAD=/home/yi-hack-v5/lib/ipc_multiplex.so ./dispatch &
         sleep 2
         LD_LIBRARY_PATH="/home/yi-hack-v5/lib:/lib:/home/lib:/home/app/locallib:/home/hisiko/hisilib" ./rmm &
-        sleep 4
-        ./cloud &
-
+		sleep 8
         if [[ $(get_config REC_WITHOUT_CLOUD) == "yes" ]] ; then
             cd /home/app
             ./mp4record &
         fi
+		sleep 4
+        ./cloud &
     )
 fi
 
@@ -213,11 +225,6 @@ mkdir -p $YI_HACK_PREFIX/etc/dropbear
     dropbear -R -B
 fi
 
-if [[ $(get_config NTPD) == "yes" ]] ; then
-    # Wait until all the other processes have been initialized
-    sleep 5 && ntpd -p $(get_config NTP_SERVER) &
-fi
-
 ipc_multiplexer &
 
 mqttv4 &

src/static/static/home/yi-hack-v5/script/system.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# 0.4.0d
+
 script_name=$(basename -- "$0")
 
 if pidof "$script_name" -o $$ >/dev/null;then
@@ -58,6 +60,16 @@ restart_grabber()
     rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT -u $RRTSP_USER -w $RRTSP_PWD &
 }
 
+restart_cloud()
+{
+    if [[ $(get_config DISABLE_CLOUD) == "yes" ]] ; then
+    (
+        cd /home/app
+        ./cloud &
+    )
+    fi
+}
+
 check_rtsp()
 {
     SOCKET=`/bin/netstat -an 2>&1 | grep ":$RTSP_PORT " | grep LISTEN | grep -c ^`
@@ -87,6 +99,20 @@ check_rtsp()
     fi
 }
 
+check_cloud()
+{
+    CPU=`top -b -n 1 | grep cloud | grep -v grep | tail -n 1 | awk '{print $8}'`
+    if [[ $(get_config DISABLE_CLOUD) == "yes" ]] ; then
+    (
+    if [ "$CPU" == "" ]; then
+        echo "$(date +'%Y-%m-%d %H:%M:%S') - No running processes, restarting ./cloud & ..." >> $LOG_FILE
+        restart_cloud
+        COUNTER=0
+    fi
+    )
+    fi
+}
+
 check_rmm()
 {
     PS=`ps | grep rmm | grep -v grep | grep -c ^`
@@ -126,6 +152,7 @@ do
     check_grabber
     check_rtsp
     check_rmm
+    check_cloud
     if [ $COUNTER -eq 0 ]; then
         sleep $INTERVAL
     fi