- Bug fixes next to Darkstar live testing...

- Fix .ovpn download file type.

lib/rx3/dns.bash

@@ -315,7 +315,7 @@ dns_host_update()
         echo "update delete  ${host}.${zone}. TXT"
         echo "update add     ${host}.${zone}. ${ttl} TXT ${date}"
         echo ""
-    ) | sudo nsupdate || rc="$?"
+    ) | sudo nsupdate && rc="$?"
 
     if [[ "${rc}" == "0" ]]
     then

lib/rx3/network.bash

@@ -71,7 +71,7 @@ declare -g  NETWORK_LOG_FILE
 declare -g  NETWORK_LOG_LOCK
 #declare -g  NETWORK_LOG_LOCK="${NETWORK_LOG_FILE}"
 
-declare -g  NETWORK_LOG_TRACE="DISABLE"
+declare -g  NETWORK_LOG_TRACE="DISABLED"
 
 declare -g  NETWORK_NC_TIMEOUT
 
@@ -134,14 +134,24 @@ network_common_openvpn_stats_get()
     fi
     
     if [[ "${device}" != "" ]]
-    then            
+    then
+        ovpn_stat_client_name=""
+        
         if [[ "${NETWORK_OPENVPN_STATUS}" =~ ("${device}.status: TITLE") ]]
         then
             # OpenVPN Server Mode
             
             OIFS="${IFS}"
             IFS=","
-            set XXX/$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${device}\.status: CLIENT_LIST,${client},")  &>/dev/null || true
+            line="$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${device}\.status: CLIENT_LIST,${client},")" || true
+
+            if [[ "${line}" == "" ]]
+            then
+                line="/var/lib/openvpn/${device}.status: CLIENT_LIST,,,,,,,,,,,,"
+            fi
+            
+            set XXX/${line}  &>/dev/null || true
+            
             IFS="${OIFS}"
 
                                    tmp="${1/XXX*\//}"
@@ -1078,7 +1088,7 @@ network_table_set()
     fi
 
     
-    tab_assign NETWORK_SRC_TAB "${src_id},Table" "${ts_table}"
+    tab_assign NETWORK_SRC_TAB "${src_id},Table" "${nts_table}"
     
 
     ${DEBUG} sed "/^NETWORK_SRC_CONFIG=\"/,/^\"/ { s/^\(${nts_ip//./\\.}[[:space:]]\+\([^\t ]\+[[:space:]]\+\)\{2\}\)[^[:space:]]\+/\1${nts_table}/ }" -i ${NETWORK_CONFIG_FILE}

lib/rx3/vpn.bash

@@ -264,11 +264,11 @@ vpn_job_tab_deinit()
     do
 	vpn_job_tab_get "${job_id}"
 
-	if [[ "${job_PId}" -gt 0 ]]
+	if [[ "${job_pid}" -gt 0 ]]
 	then
 	    log_info "VPN" "Killing : Id: [${job_id}]   Name: [${job_name}]    PId: [${job_pid}]..."
 	    
-	    kill -15 ${job_pid}
+	    kill -15 ${job_pid} || true
 	fi
     done
 
@@ -339,12 +339,8 @@ vpn_supervisor()
 	for job_id in ${VPN_JOB_ID_LIST}
 	do
 	    vpn_job_tab_get "${job_id}"
-
             
-            ${DEBUG} kill -0 "${job_pid}" 2>/dev/null
-            rc=$?
-
-            if [[ ${job_pid} == 0 ]] || [[ $rc != 0 ]]
+            if [[ ${job_pid} == "0" ]] || ! kill -0 "${job_pid}" 2>/dev/null
             then
 		log_info "VPN" "Restarting Cmd: [${job_cmd}]..."
 		
@@ -395,10 +391,7 @@ vpn_jobs_kill()
     do
 	vpn_job_tab_get "${job_id}"
 	    
-        ${DEBUG} kill -0 "${job_pid}" 2>/dev/null
-        rc=$?
-
-        if [[ ${job_pid} != 0 ]] && [[ $rc == 0 ]]
+        if [[ ${job_pid} != 0 ]] && kill -0 "${job_pid}" 2>/dev/null
         then
 	    log_info "VPN" "Killing Job Id: [${job_id}]   Job_PId: [${job_pid}]   Cmd: [${job_cmd}]..."
 		
@@ -477,10 +470,7 @@ vpn_start()
 	daemon_pid=0
     fi
     
-    ${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null
-    rc=$?
-
-    if [[ "${daemon_pid}" == "0" ]] || [[ $rc != 0 ]]
+    if [[ "${daemon_pid}" == "0" ]] || ! kill -0 "${daemon_pid}" 2>/dev/null
     then
         vpn_config_make_all
         
@@ -519,10 +509,7 @@ vpn_stop()
 	daemon_pid=0
     fi
     
-    ${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null
-    rc=$?
-    
-    if [[ "${daemon_pid}" == "0" ]] || [[ $rc != 0 ]]
+    if [[ "${daemon_pid}" == "0" ]] || ! kill -0 "${daemon_pid}" 2>/dev/null
     then
 	log_info "VPN" "Daemon already stoped!"
     else
@@ -572,10 +559,7 @@ vpn_status()
     do
 	vpn_job_tab_get "${job_id}"
         
-	${DEBUG} kill -0 "${job_pid}" 2>/dev/null
-	rc=$?
-        
-	if [[ "${job_pid}" == "0" ]] || [[ $rc != 0 ]]
+	if [[ "${job_pid}" == "0" ]] || ! kill -0 "${job_pid}" 2>/dev/null
 	then
 	    job_status="Down"
 	else