diff --git a/usr/local/sbin/vyprvpn-down b/usr/local/sbin/vyprvpn-down index 28d8186..e966681 100755 --- a/usr/local/sbin/vyprvpn-down +++ b/usr/local/sbin/vyprvpn-down @@ -19,7 +19,7 @@ # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -LOG_FILE=/var/log/openvpn/up-down.log +#LOG_FILE=/var/log/openvpn/up-down.log @@ -36,7 +36,6 @@ Local_Netmask="$5" Phase="$6" - network_init @@ -44,20 +43,19 @@ network_dst_tab_dev_lookup "${Dev}" network_dst_tab_get "${dst_id}" - -echo -n >>${LOG_FILE} "$(date): Down: [${Dev}] Local_MTU: [${Local_MTU}] Remote_MTU: [${Remote_MTU}] Local_Address: [${Local_Address}] Local_Netmask: [${Local_Netmask}] Dst_Table: ${dst_table} Phase: ${Phase}" +line="[${Dev}]: Local_MTU: [${Local_MTU}] Remote_MTU: [${Remote_MTU}] Local_Address: [${Local_Address}] Local_Netmask: [${Local_Netmask}] Dst_Table: ${dst_table} Phase: ${Phase}" if [[ "${dst_table}" != "" ]] then - echo >>${LOG_FILE} " Status: [OK]" + log_print "VPN-Down" "$line" " Status: [OK]" remote_address=0.0.0.0 - echo >>${LOG_FILE} "$(date): Down: ${Dev}: set ${remote_address} to vpn${id}.vpn.rx3" + log_print "VPN-Down" "[${Dev}]: set ${remote_address} to vpn${id}.vpn.rx3" ${DEBUG} ip_host_update vpn${id} vpn.rx3 ${remote_address} 60 else - echo >>${LOG_FILE} " Status: [ERROR]!" + log_print "VPN-Down" "$line" " Status: [ERROR]!" fi -echo >>${LOG_FILE} "$(date): Down: ${Dev}: Done" +log_print "VPN-Down" "[${Dev}]: Done!" diff --git a/usr/local/sbin/vyprvpn-up b/usr/local/sbin/vyprvpn-up index cecd35a..e567f33 100755 --- a/usr/local/sbin/vyprvpn-up +++ b/usr/local/sbin/vyprvpn-up @@ -6,7 +6,7 @@ #LOG=":" #LOG="echo" -LOG="" +#LOG="" @@ -20,7 +20,7 @@ LOG="" # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -LOG_FILE=/var/log/openvpn/up-down.log +#LOG_FILE=/var/log/openvpn/up-down.log @@ -44,18 +44,17 @@ network_dst_tab_dev_lookup "${Dev}" network_dst_tab_get "${dst_id}" -echo -n >>${LOG_FILE} "$(date): Up: [${Dev}] Local_MTU: [${Local_MTU} Remote_MTU: [${Remote_MTU}] Local_Address: [${Local_Address}] Local_Netmask: [${Local_Netmask}] Dst_Table: [${dst_table}] Dst_Id: [${dst_id}] Phase: [${Phase}]" +line="[${Dev}]: Local_MTU: [${Local_MTU}] Remote_MTU: [${Remote_MTU}] Local_Address: [${Local_Address}] Local_Netmask: [${Local_Netmask}] Dst_Table: [${dst_table}] Dst_Id: [${dst_id}] Phase: [${Phase}]" if [[ "${dst_table}" != "" ]] then - echo >>${LOG_FILE} " Status: [OK]" - echo >>${LOG_FILE} "$(date): Up: ${Dev}: ip route add table ${dst_table} default dev ${Dev}" + log_print "VPN-Up" "$line" " Status: [OK]" + log_print "VPN-Up" "[${Dev}]: ip route add table: [${dst_table}] default dev: [${Dev}]" ${DEBUG} ip route del table ${dst_table} default ${DEBUG} ip route add table ${dst_table} default dev ${Dev} - - echo >>${LOG_FILE} "$(date): Up: ${Dev}: Done!" else - echo >>${LOG_FILE} " Status: [ERROR]!" - echo >>${LOG_FILE} "$(date): Up: [${Dev}] Done" + log_print "VPN-Up" "$line" " Status: [ERROR]!" fi + +log_print "VPN-Up" "[${Dev}]: Done!"