Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

3 files changed, 14 insertions, 5 deletions

diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown
index 83d1790..420216f 100755
--- a/usr/local/sbin/ppp-linkdown
+++ b/usr/local/sbin/ppp-linkdown
@@ -1,7 +1,8 @@
 #!/bin/sh
-
+if [ -f /tmp/$1up ] && [ -f /conf/$1.log ]; then
+        seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/$1up`))
+        /usr/local/sbin/ppp-log-uptime.sh $seconds $1 &
+fi
 # delete the node just in case mpd cannot do that
-/usr/sbin/ngctl shutdown $1:
-/bin/rm -f /var/etc/nameserver_$1
-/bin/rm -f /tmp/$1_router
-/bin/rm -f /tmp/$1up
+#/usr/sbin/ngctl shutdown $1:
+/bin/rm -f /var/etc/nameserver_$1
\ No newline at end of file
diff --git a/usr/local/sbin/ppp-log-uptime.sh b/usr/local/sbin/ppp-log-uptime.sh
new file mode 100644
index 0000000..6fd8def
--- /dev/null
+++ b/usr/local/sbin/ppp-log-uptime.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+#write the uptime in seconds to the persistent log in /conf/
+/etc/rc.conf_mount_rw
+/bin/echo `date -j +%Y.%m.%d-%H:%M:%S` $1 >> /conf/$2.log
+/etc/rc.conf_mount_ro
diff --git a/usr/local/sbin/ppp-uptime.sh b/usr/local/sbin/ppp-uptime.sh
new file mode 100644
index 0000000..d7a8441
--- /dev/null
+++ b/usr/local/sbin/ppp-uptime.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+#get ppp uptime from age of /tmp/{interface}up file
+[ -f /tmp/$1up ] && /bin/echo $((`date -j +%s` - `/usr/bin/stat -f %m /tmp/$1up`))
\ No newline at end of file