From ca25a414fcd85b6d2630d9637f617b35dd7824cc Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Fri, 21 Jul 2017 16:06:49 +0200 Subject: [PATCH] Added network identity to post-data when sats-update --- lib/api/source/fetch.php | 16 ++++++++++------ update | 9 +++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/api/source/fetch.php b/lib/api/source/fetch.php index 2a217a6..8163c7b 100755 --- a/lib/api/source/fetch.php +++ b/lib/api/source/fetch.php @@ -9,8 +9,12 @@ /* (1) Initialize dataset ---------------------------------------------------------*/ $data = [ - 'default' => [], - 'feature' => [] + 'default' => [], + 'feature' => [], + 'identity' => [ + 'ap' => preg_replace('/\s+/', '', file_get_contents(TMP_DIR.'/net.ap')), + 'ip' => preg_replace('/\s+/', '', file_get_contents(TMP_DIR.'/net.ip')) + ] ]; @@ -78,13 +82,13 @@ } - - + + return json_encode($data); } echo api_fetch(); - - + + ?> diff --git a/update b/update index f7bc9bb..09eec75 100755 --- a/update +++ b/update @@ -10,6 +10,15 @@ if [ ! -e /target/sync ]; then slog "not synchronized yet, aborting" - "update" && exit 127; fi; +# (2) Get wireless IFACE # +IFACE=`sudo ifconfig | grep -o -P "^w\w+"`; + +# (3) Get network identity # +AP_ID=`sudo iwconfig $IFACE | grep -o -P "ESSID:\"SATS_.+\"" | sed 's/ESSID:"SATS_//' | sed 's/"$//'`; +IP_AD=`sudo ifconfig $IFACE | grep -o -P "inet addr:\d+\.\d+\.\d+\.\d+" | sed 's/inet addr://'` +echo $AP_ID | sudo -u sats tee $TMP_DIR/net.ap; +echo $IP_AD | sudo -u sats tee $TMP_DIR/net.ip; + # (2) Send data + fetch configuration test "$($SOURCE_DIR/lib/api/update)" = "127" && slog "update failed" - "update" && exit 127;