Procházet zdrojové kódy

Snap7 SIEMENS SPS für SMS Ankopplung mit Gateway für Programmierung

Reinhard Russinger před 6 roky
rodič
revize
8121952f35
56 změnil soubory, kde provedl 1580 přidání a 625 odebrání
  1. 0 121
      board/PSG/iot2000/rootfs_overlay/etc/dhcp/dhcpd.conf
  2. 22 1
      board/PSG/iot2000/rootfs_overlay/etc/dnsmasq.conf
  3. 17 0
      board/PSG/iot2000/rootfs_overlay/etc/hostapd/hostapd.conf
  4. 0 49
      board/PSG/iot2000/rootfs_overlay/etc/init.d/S80dhcp-server
  5. 0 106
      board/PSG/iot2000/rootfs_overlay/etc/init.d/S97mysqld
  6. 0 38
      board/PSG/iot2000/rootfs_overlay/etc/init.d/S99CamServer
  7. 0 39
      board/PSG/iot2000/rootfs_overlay/etc/init.d/S99IOHandler
  8. 0 38
      board/PSG/iot2000/rootfs_overlay/etc/init.d/S99SLIDApi
  9. 2 1
      board/PSG/iot2000/rootfs_overlay/etc/init.d/rcS
  10. 51 0
      board/PSG/iot2000/rootfs_overlay/etc/netplug.d/netplug
  11. 2 0
      board/PSG/iot2000/rootfs_overlay/etc/netplug/netplugd.conf
  12. 1 0
      board/PSG/iot2000/rootfs_overlay/etc/network/if-down.d/wpasupplicant
  13. 1 0
      board/PSG/iot2000/rootfs_overlay/etc/network/if-post-down.d/wpasupplicant
  14. 21 0
      board/PSG/iot2000/rootfs_overlay/etc/network/if-pre-up.d/wait_iface
  15. 1 0
      board/PSG/iot2000/rootfs_overlay/etc/network/if-pre-up.d/wpasupplicant
  16. 1 0
      board/PSG/iot2000/rootfs_overlay/etc/network/if-up.d/wpasupplicant
  17. 11 8
      board/PSG/iot2000/rootfs_overlay/etc/network/interfaces
  18. 1 0
      board/PSG/iot2000/rootfs_overlay/etc/network/run
  19. 0 27
      board/PSG/iot2000/rootfs_overlay/etc/profile
  20. 0 81
      board/PSG/iot2000/rootfs_overlay/etc/tinc/genkey_psgnet.sh
  21. 1 1
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet
  22. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/hosts/psg_iot2000
  23. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/hosts/psgnet
  24. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/rsa_key.priv
  25. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/tinc-down
  26. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/tinc-up
  27. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/tinc.conf
  28. 16 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/hosts/P_8A35
  29. 1 1
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/hosts/psgnet
  30. 52 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/rsa_key.priv
  31. 0 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/tinc-down
  32. 2 0
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/tinc-up
  33. 2 2
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/tinc.conf
  34. 0 16
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/hosts/melasan
  35. 0 52
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/rsa_key.priv
  36. 0 2
      board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/tinc-up
  37. 7 0
      board/PSG/iot2000/rootfs_overlay/etc/udev/rules.d/70-persistent-net.rules
  38. 2 0
      board/PSG/iot2000/rootfs_overlay/etc/udev/rules.d/80-wifi.rules
  39. 50 0
      board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/action_wpa.sh
  40. 1006 0
      board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/functions.sh
  41. 172 0
      board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/ifupdown.sh
  42. 8 0
      board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/wpa_supplicant.conf
  43. binární
      board/PSG/iot2000/rootfs_overlay/lib/libsnap7.so
  44. 25 5
      board/PSG/iot2000/rootfs_overlay/root/delportfwd.sh
  45. 0 15
      board/PSG/iot2000/rootfs_overlay/root/monitoring/activation_queue_check.sh
  46. 0 14
      board/PSG/iot2000/rootfs_overlay/root/monitoring/helios_api_check.sh
  47. 9 3
      board/PSG/iot2000/rootfs_overlay/root/portfwd.sh
  48. 7 0
      board/PSG/iot2000/rootfs_overlay/rules.d/70-persistent-net.rules
  49. 2 0
      board/PSG/iot2000/rootfs_overlay/rules.d/80-wifi.rules
  50. 1 0
      board/PSG/iot2000/rootfs_overlay/sbin/wpa_action
  51. 1 0
      board/PSG/iot2000/rootfs_overlay/sbin/wpa_cli
  52. 1 0
      board/PSG/iot2000/rootfs_overlay/sbin/wpa_passphrase
  53. 1 0
      board/PSG/iot2000/rootfs_overlay/sbin/wpa_supplicant
  54. 81 0
      board/PSG/iot2000/rootfs_overlay/usr/sbin/wpa_action
  55. binární
      board/PSG/iot2000/rootfs_overlay/var/psg/Display_GSM
  56. 2 5
      configs/iot2000_defconfig

+ 0 - 121
board/PSG/iot2000/rootfs_overlay/etc/dhcp/dhcpd.conf

@@ -1,121 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-subnet 192.168.7.0 netmask 255.255.255.252 {
-  range 192.168.7.1 192.168.7.1;
-  option domain-name-servers 192.168.7.2;
-  option routers 192.168.7.2;
-}
-
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.100 192.168.0.254;
-  option domain-name-servers 192.168.0.1;
-  option routers 192.168.0.1;
-}
-
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the 
-# DHCP server to understand the network topology.
-
-#subnet 10.152.187.0 netmask 255.255.255.0 {
-#}
-
-# This is a very basic subnet declaration.
-
-#subnet 10.254.239.0 netmask 255.255.255.224 {
-#  range 10.254.239.10 10.254.239.20;
-#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-#}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-#subnet 10.254.239.32 netmask 255.255.255.224 {
-#  range dynamic-bootp 10.254.239.40 10.254.239.60;
-#  option broadcast-address 10.254.239.31;
-#  option routers rtr-239-32-1.example.org;
-#}
-
-# A slightly different configuration for an internal subnet.
-#subnet 10.5.5.0 netmask 255.255.255.224 {
-#  range 10.5.5.26 10.5.5.30;
-#  option domain-name-servers ns1.internal.example.org;
-#  option domain-name "internal.example.org";
-#  option routers 10.5.5.1;
-#  option broadcast-address 10.5.5.31;
-#  default-lease-time 600;
-#  max-lease-time 7200;
-#}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-#host passacaglia {
-#  hardware ethernet 0:0:c0:5d:bd:95;
-#  filename "vmunix.passacaglia";
-#  server-name "toccata.fugue.com";
-#}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-#host fantasia {
-#  hardware ethernet 08:00:07:26:c0:a5;
-#  fixed-address fantasia.fugue.com;
-#}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-#class "foo" {
-#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-#}
-
-#shared-network 224-29 {
-#  subnet 10.17.224.0 netmask 255.255.255.0 {
-#    option routers rtr-224.example.org;
-#  }
-#  subnet 10.0.29.0 netmask 255.255.255.0 {
-#    option routers rtr-29.example.org;
-#  }
-#  pool {
-#    allow members of "foo";
-#    range 10.17.224.10 10.17.224.250;
-#  }
-#  pool {
-#    deny members of "foo";
-#    range 10.0.29.10 10.0.29.230;
-#  }
-#}

+ 22 - 1
board/PSG/iot2000/rootfs_overlay/etc/dnsmasq.conf

@@ -1,5 +1,26 @@
+interface=eth1
+interface=usb0
+interface=wlan0
+
+no-dhcp-interface=eth0
+dhcp-range=eth1,192.168.0.201,192.168.0.239,1h
+dhcp-option=eth1,1,255.255.255.0
+dhcp-option=eth1,3,192.168.0.200
+dhcp-option=eth1,6,192.168.0.200
+
+dhcp-range=wlan0,192.168.10.201,192.168.10.239,1h
+dhcp-option=wlan0,1,255.255.255.0
+dhcp-option=wlan0,3,192.168.10.200
+dhcp-option=wlan0,6,192.168.10.200
+
+dhcp-range=usb0,192.168.7.1,192.168.7.1,1h
+dhcp-option=usb0,1,255.255.255.252
+dhcp-option=usb0,3,192.168.7.2
+dhcp-option=usb0,6,192.168.7.2
+
 listen-address=127.0.0.1
 listen-address=192.168.7.2
-listen-address=192.168.0.1
+listen-address=192.168.0.200
+listen-address=192.168.10.200
 
 

+ 17 - 0
board/PSG/iot2000/rootfs_overlay/etc/hostapd/hostapd.conf

@@ -0,0 +1,17 @@
+driver=nl80211
+interface=wlan0
+ssid=PSG-IOT2000
+hw_mode=g
+macaddr_acl=0
+auth_algs=1
+ignore_broadcast_ssid=0
+wpa=2
+wpa_passphrase=pepionkel
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=CCMP
+wpa_group_rekey=86400
+#-----------
+device_name=PSG-IOT2000
+manufacturer=PSG GmbH
+model_name=ELRU
+model_number=280361

+ 0 - 49
board/PSG/iot2000/rootfs_overlay/etc/init.d/S80dhcp-server

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
-#
-
-# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
-#       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
-INTERFACES="eth1 usb0"
-
-# Additional options that are passed to the DHCP server daemon?
-OPTIONS=""
-
-NAME="dhcpd"
-DAEMON="/usr/sbin/${NAME}"
-CFG_FILE="/etc/default/${NAME}"
-
-# Read configuration variable file if it is present
-[ -r "${CFG_FILE}" ] && . "${CFG_FILE}"
-
-# Sanity checks
-test -f /usr/sbin/dhcpd || exit 0
-test -f /etc/dhcp/dhcpd.conf || exit 0
-
-case "$1" in
-	start)
-		printf "Starting DHCP server: "
-		test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
-		test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
-		start-stop-daemon -S -q -x ${DAEMON} -- -q $OPTIONS $INTERFACES
-		[ $? = 0 ] && echo "OK" || echo "FAIL"
-		;;
-	stop)
-		printf "Stopping DHCP server: "
-		start-stop-daemon -K -q -x ${DAEMON}
-		[ $? = 0 ] && echo "OK" || echo "FAIL"
-		;;
-	restart | force-reload)
-		$0 stop
-		$0 start
-		if [ "$?" != "0" ]; then
-			exit 1
-		fi
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|force-reload}"
-		exit 1
-esac
-
-exit 0

+ 0 - 106
board/PSG/iot2000/rootfs_overlay/etc/init.d/S97mysqld

@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# mysql
-#
-
-MYSQL_LIB="/var/lib/mysql"
-MYSQL_RUN="/run/mysql"
-MYSQL_PID="$MYSQL_RUN/mysqld.pid"
-MYSQL_BIN="/usr/bin"
-MYSQL_INSTALL="FALSE"
-
-wait_for_ready() {
-	WAIT_DELAY=5
-	while [ $WAIT_DELAY -gt 0 ]; do
-		if $MYSQL_BIN/mysqladmin ping > /dev/null 2>&1; then
-			return 0
-		fi
-		sleep 1
-		: $((WAIT_DELAY -= 1))
-	done
-	return 1
-}
-
-start() {
-	if [ `ls -1 $MYSQL_LIB | wc -l` = 0 ] ; then
-		printf "Creating mysql system tables ... "
-
-		MYSQL_INSTALL="TRUE"		
-		$MYSQL_BIN/mysql_install_db --basedir=/usr --user=mysql \
-			--datadir=$MYSQL_LIB > /dev/null 2>&1
-		if [ $? != 0 ]; then
-			echo "FAIL"
-			exit 1
-		fi
-		echo "OK"
-	fi
-
-	# mysqld runs as user mysql, but /run is only writable by root
-	# so create a subdirectory for mysql.
-	install -d -o mysql -g root -m 0755 $MYSQL_RUN
-
-	# We don't use start-stop-daemon because mysqld has its own
-	# wrapper script.
-	printf "Starting mysql ... "
-	$MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PID --user=mysql \
-		> /dev/null 2>&1 &
-	wait_for_ready
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-	if [ $MYSQL_INSTALL = "TRUE" ]; then
-		# creat tzinfo for mysql
-		echo "create tzinfo for mysql"
-		mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
-		[ $? = 0 ] && echo "tzinfo OK" || echo "tzinfo FAIL"
-		# create Melasan Database
-echo ">>>Create Melasan DB <<<"
-(
-cat << EOF
-set @@session.time_zone=UTC;
-create database if not exists Melasan;
-create user if not exists 'melasan'@'localhost' identified by 'Melasan2017';
-grant all privileges on Melasan.* to 'melasan'@'localhost';
-flush privileges;
-create table if not exists Melasan.Slid (
-Date timestamp not null,
-slid char(40) not null,
-EnableDone bool default false,
-readcnt int not null default 0,
-primary key (slid)
-) engine=innodb;
-EOF
-) | mysql -u root
-		[ $? = 0 ] && echo "genDB OK" || echo "genDB FAIL"
-		# ================
-	fi
-}
-
-stop() {
-	printf "Stopping mysql ... "
-	if [ -f $MYSQL_PID ]; then
-		kill `cat $MYSQL_PID` > /dev/null 2>&1
-		[ $? = 0 ] && echo "OK" || echo "FAIL"
-	else
-		echo "FAIL"
-	fi
-}
-
-restart() {
-	stop
-	sleep 1
-	start
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-	restart
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart}"
-	;;
-esac

+ 0 - 38
board/PSG/iot2000/rootfs_overlay/etc/init.d/S99CamServer

@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Start App	
-#
-#
-APPNAME=CamServer
-APPBIN=/opt/AuthenticVision/CamServer
-
-case "$1" in
-  start)
-        echo -e "Starting ${APPNAME} ...\n"
-	if [ ! -f ${APPBIN} ]; then
-		echo -e "Program ${APPBIN} doesn't exist \n"
-		exit 1
-	fi 
-        screen -dmS ${APPNAME} sh -c "while true; do ${APPBIN}; echo '${APPNAME} stopped--> restart'; sleep 2;done"
-        exit 0
-        ;;
-  stop)
-        echo -e "Stopping ${APPNAME} ...\n"
-        KILLPID=`screen -list | grep ${APPNAME} | awk -F'.' '{print $1}'`
-        if [ ${#KILLPID} != "0" ]
-                then
-                kill $KILLPID
-         fi
-         exit 0
-        ;;
-  restart|reload)
-        "$0" stop
-        "$0" start
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-esac
-
-exit $?
-

+ 0 - 39
board/PSG/iot2000/rootfs_overlay/etc/init.d/S99IOHandler

@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Start App	
-#
-#
-APPNAME=IOHandler
-APPBIN=/opt/AuthenticVision/IOHandler
-
-case "$1" in
-  start)
-        echo -e "Starting ${APPNAME} ...\n"
-	if [ ! -f ${APPBIN} ]; then
-		echo -e "Program ${APPBIN} doesn't exist \n"
-		exit 1
-	fi 
-	switchserialmode /dev/ttyS2 rs485
-        screen -dmS ${APPNAME} sh -c "while true; do ${APPBIN}; echo '${APPNAME} stopped--> restart'; sleep 2;done"
-        exit 0
-        ;;
-  stop)
-        echo -e "Stopping ${APPNAME} ...\n"
-        KILLPID=`screen -list | grep ${APPNAME} | awk -F'.' '{print $1}'`
-        if [ ${#KILLPID} != "0" ]
-                then
-                kill $KILLPID
-         fi
-         exit 0
-        ;;
-  restart|reload)
-        "$0" stop
-        "$0" start
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-esac
-
-exit $?
-

+ 0 - 38
board/PSG/iot2000/rootfs_overlay/etc/init.d/S99SLIDApi

@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Start App	
-#
-#
-APPNAME=SLIDApi
-APPBIN=/opt/AuthenticVision/SLIDApi
-
-case "$1" in
-  start)
-        echo -e "Starting ${APPNAME} ...\n"
-	if [ ! -f ${APPBIN} ]; then
-		echo -e "Program ${APPBIN} doesn't exist \n"
-		exit 1
-	fi 
-        screen -dmS ${APPNAME} sh -c "while true; do ${APPBIN}; echo '${APPNAME} stopped--> restart'; sleep 2;done"
-        exit 0
-        ;;
-  stop)
-        echo -e "Stopping ${APPNAME} ...\n"
-        KILLPID=`screen -list | grep ${APPNAME} | awk -F'.' '{print $1}'`
-        if [ ${#KILLPID} != "0" ]
-                then
-                kill $KILLPID
-         fi
-         exit 0
-        ;;
-  restart|reload)
-        "$0" stop
-        "$0" start
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-esac
-
-exit $?
-

+ 2 - 1
board/PSG/iot2000/rootfs_overlay/etc/init.d/rcS

@@ -36,6 +36,7 @@ done
 #--- iptables
 iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
 iptables -t nat -A POSTROUTING -o ppp0 -j MASQUERADE
+iptables -t nat -A POSTROUTING -o tun5 -j MASQUERADE
 /root/portfwd.sh
 #----
-/root/do.sh
+#/root/do.sh

+ 51 - 0
board/PSG/iot2000/rootfs_overlay/etc/netplug.d/netplug

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# netplug - policy agent for netplugd
+#
+# Copyright 2003 Key Research, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.  You are forbidden from
+# redistributing or modifying it under the terms of any other license,
+# including other versions of the GNU General Public License.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+
+
+PATH=/usr/bin:/bin:/usr/sbin:/sbin
+export PATH
+
+dev="$1"
+action="$2"
+
+case "$action" in
+in)
+    if [ -x /sbin/ifup ]; then
+	exec /sbin/ifup --ignore-errors $dev
+    else
+	echo "Please teach me how to plug in an interface!" 1>&2
+	exit 1
+    fi
+    ;;
+out)
+    if [ -x /sbin/ifdown ]; then
+	# At least on Fedora Core 1, the call to ip addr flush infloops
+	# /sbin/ifdown $dev && exec /sbin/ip addr flush $dev
+	exec /sbin/ifdown --ignore-errors $dev
+    else
+	echo "Please teach me how to unplug an interface!" 1>&2
+	exit 1
+    fi
+    ;;
+probe)
+    exec /sbin/ip link set $dev up >/dev/null 2>&1
+    ;;
+*)
+    echo "I have been called with a funny action of '%s'!" 1>&2
+    exit 1
+    ;;
+esac

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/netplug/netplugd.conf

@@ -0,0 +1,2 @@
+eth0
+eth1

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/etc/network/if-down.d/wpasupplicant

@@ -0,0 +1 @@
+../../wpa_supplicant/ifupdown.sh

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/etc/network/if-post-down.d/wpasupplicant

@@ -0,0 +1 @@
+../../wpa_supplicant/ifupdown.sh

+ 21 - 0
board/PSG/iot2000/rootfs_overlay/etc/network/if-pre-up.d/wait_iface

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# In case we have a slow-to-appear interface (e.g. eth-over-USB),
+# and we need to configure it, wait until it appears, but not too
+# long either. IF_WAIT_DELAY is in seconds.
+
+if [ "${IF_WAIT_DELAY}" -a ! -e "/sys/class/net/${IFACE}" ]; then
+    printf "Waiting for interface %s to appear" "${IFACE}"
+    while [ ${IF_WAIT_DELAY} -gt 0 ]; do
+        if [ -e "/sys/class/net/${IFACE}" ]; then
+            printf "\n"
+            exit 0
+        fi
+        sleep 1
+        printf "."
+        : $((IF_WAIT_DELAY -= 1))
+    done
+    printf " timeout!\n"
+    exit 1
+fi
+

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/etc/network/if-pre-up.d/wpasupplicant

@@ -0,0 +1 @@
+../../wpa_supplicant/ifupdown.sh

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/etc/network/if-up.d/wpasupplicant

@@ -0,0 +1 @@
+../../wpa_supplicant/ifupdown.sh

+ 11 - 8
board/PSG/iot2000/rootfs_overlay/etc/network/interfaces

@@ -7,15 +7,8 @@ iface lo inet loopback
 
 iface eth0 inet dhcp
 
-#iface eth0 inet static
-#       address 192.168.21.84
-#       netmask 255.255.252.0
-#       broadcast 192.168.23.255
-#       gateway 192.168.21.111
-#       post-up echo "nameserver 192.168.21.111" > /etc/resolv.conf
-
 iface eth1 inet static
-       address 192.168.0.1
+       address 192.168.0.200
        netmask 255.255.255.0
        broadcast 192.168.0.255
 
@@ -24,3 +17,13 @@ iface usb0 inet static
 	broadcast 192.168.7.2
 	netmask 255.255.255.252
 
+##iface wlan0 inet dhcp
+##	wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
+
+iface wlan0 inet static
+	post-up hostapd -B /etc/hostapd/hostapd.conf
+	address 192.168.10.200
+	netmask 255.255.255.0
+	broadcast 192.168.10.255
+	down killall hostapd
+	down ip addr flush dev $IFACE

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/etc/network/run

@@ -0,0 +1 @@
+/run/network

+ 0 - 27
board/PSG/iot2000/rootfs_overlay/etc/profile

@@ -1,27 +0,0 @@
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-if [ "$PS1" ]; then
-	if [ "`id -u`" -eq 0 ]; then
-		export PS1='# '
-	else
-		export PS1='$ '
-	fi
-fi
-
-export PAGER='/bin/more '
-export EDITOR='/bin/vi'
-export TERM='linux'
-
-# Source configuration files from /etc/profile.d
-for i in /etc/profile.d/*.sh ; do
-	if [ -r "$i" ]; then
-		. $i
-	fi
-	unset i
-done
-
-#--- aliases
-alias status="/opt/AuthenticVision/CMDHelper status"
-alias active="/opt/AuthenticVision/CMDHelper active"
-alias inactive="/opt/AuthenticVision/CMDHelper inactive"
-alias reset="/opt/AuthenticVision/CMDHelper reset"

+ 0 - 81
board/PSG/iot2000/rootfs_overlay/etc/tinc/genkey_psgnet.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-WDIR=`pwd`
-NODENAME="node??"
-NETNAME="psgnet"
-IP="10.222.0.???"
-NETMASK="255.255.255.0"
-NETWORK="$IP/32"
-
-rm -rf $NETNAME
-mkdir -p $NETNAME/hosts
-WDIR=$WDIR/$NETNAME
-
-#--- interface erstellen
-echo ">>"$WDIR"<<"
-(\
-cat << EOF
-#--- automatisch erstellt
-Subnet = $NETWORK
-EOF
-) > $WDIR/hosts/$NODENAME
-
-#--- zieldaten
-echo ">>"$WDIR"<<"
-(\
-cat << EOF
-Address = gogs.psg-bgh.de 443
-Subnet = 10.222.0.1/32
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEA0C7f+XIVcIJ0hHPkLXQ2HSAsqRBGuZBND3opPEI9IlR13HemSpIT
-N0ME4guB94I6RyUyTu/JhHzwUUFNnD/3OtEu3fPmmyjPUk0+nhsvoaqN9JBT/U9/
-ujgziNR5N1l6m/51FDU0dryOLASgnyWEPr7ozesrUcZxV12iAdspa2zsDMoLBhbC
-/ro2pqp0cSNzsuWhV2qEXiJEoTIU71t6t0cvWpXzwGSqUPxxJuQ74I0Xx7q/6eFm
-jy44x7L5OX/EIqanSUoQ+pFCit7Vdb1CNU+s6OWnxA9dxxWdVfCkB9CrPbto4o8t
-R6qbA2Y8F5hOAdeEYD/rpqAs/WcvNxiMtK0Zkr1sJIQv9ujY6dwCv9LShsEtCJkk
-F4eYuak2kGStWBQmpbCBqAleglt9pI7azzBi4Dt/17O4qQZJLjJuaT6TOc2cx8+s
-D24x3mUwpsYhUNx19/e5IYlJZSQhJNHUa212LT+7dmjwkAoUGZ2ZUIjWUpOBAPXJ
-K2FAunOOPd5HImIKz3ST6zHTy9L0xnGSK4K52//bfsOnpo4pGtu5ERWqU+66gjyq
-MJLBKcajRP9JZIyFvHgJYBE1LFo4e7hs4SHf3hon8TptcuVcL5ANQm8ZXyQH5riL
-Sxx0a9uhkBFpLcvy1VIWgtyYyFDe+4PyXAP+CPvkJc69PuIibN9Vk+ECAwEAAQ==
------END RSA PUBLIC KEY-----
-EOF
-) > $WDIR/hosts/$NETNAME
-
-#-- Konfiguration erstellen
-(\
-cat << EOF
-Name = $NODENAME
-PingTimeout = 40
-AddressFamily = ipv4
-Interface = tun5
-Port = 443
-Mode = router
-ConnectTo = $NETNAME
-EOF
-) > $WDIR/tinc.conf
-
-#-- up script erstellen
-(\
-cat << EOF
-#!/bin/sh
-ifconfig \$INTERFACE $IP netmask $NETMASK
-EOF
-) > $WDIR/tinc-up
-chmod u+x $WDIR/tinc-up
-
-#-- down script erstellen
-(\
-cat << EOF
-#!/bin/sh
-ifconfig \$INTERFACE down
-EOF
-) > $WDIR/tinc-down
-chmod u+x $WDIR/tinc-down
-
-tincd  -c $WDIR -K4096 <<EOF
-
-
-EOF
-
-#scp $WDIR/hosts/$NODENAME psgnet@gogs.psg-bgh.de:~/

+ 1 - 1
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet

@@ -1 +1 @@
-psgnet_iot200
+psgnet_P_8A35

+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/hosts/psg_iot2000 → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/hosts/psg_iot2000


+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/hosts/psgnet → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/hosts/psgnet


+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/rsa_key.priv → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/rsa_key.priv


+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/tinc-down → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/tinc-down


+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/tinc-up → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/tinc-up


+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/tinc.conf → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_2000/tinc.conf


+ 16 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/hosts/P_8A35

@@ -0,0 +1,16 @@
+#--- automatisch erstellt
+Subnet = 10.222.0.200/32
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA39FFOAsX9oNn1B/QDXJyHVPIze/FZqv97q+LpZFcNi2sbxHW+0zZ
+v2V9MmChDBg8pg8UCVIm0EhHGHc+gxCjTZHhHn5G9Gs/0B5DMN/3fo83cGitcq3M
+4JDLhbDATxnB7bT9LjrIbntLJo8oms58R05iSOxtj9h7ilrM1815TAmufmucfIri
+K31yFQJibcz5+xvDn5uRfJ/vCt/McpkMdAhuFY2m9BiMVJ26p7eo/lJc/ls5T0Gg
+JEYvDpb18IS7KT8f6Dkjf/KnVKy2mAWxL1RCi+axXQOuLg47TAT8WWvUoZuK0rsU
+Yy4e6kqn7AGV5xFArqPNiycsADHb7flCA5P/LQNSYb/qyz82TASAZ/K6cBshEz0K
+dOIVjSXry/dsNDdu6GUtIjCyG0WGK2GiyskI5gpGjw+rqUQe6xwvvDa6gD96BALa
+gqLhxhqALoKwbJ27OOnNdTGFvYqi5mqnlYU0blai+RWUi3KuPzsobqUVGI6ixPtF
+fNxhZsqqEG+g/lTh7DLmP02WSa/L2kORl9um8006NpU47dfsQ5wCkGdj5QDn/77j
+kqPUkZQtrP5X9FxyTwZPXPlLojG9lAzAjZ54voBPFECsOT8YEmbsKhRft/JAUVBG
+WMvhGYA2CtUJbsGhEYYqMRWMFdraY0NXvM1iFiTCpqjNR1VpO0VtJpsCAwEAAQ==
+-----END RSA PUBLIC KEY-----

+ 1 - 1
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/hosts/psgnet → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/hosts/psgnet

@@ -1,4 +1,4 @@
-Address = gogs.psg-bgh.de 443
+Address = gogs.psg-bgh.de 756
 Subnet = 10.222.0.1/32
 
 -----BEGIN RSA PUBLIC KEY-----

+ 52 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/rsa_key.priv

@@ -0,0 +1,52 @@
+
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

+ 0 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/tinc-down → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/tinc-down


+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/tinc-up

@@ -0,0 +1,2 @@
+#!/bin/sh
+ifconfig $INTERFACE 10.222.0.200 netmask 255.255.0.0

+ 2 - 2
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/tinc.conf → board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8A35/tinc.conf

@@ -1,7 +1,7 @@
-Name = melasan
+Name = P_8A35
 PingTimeout = 40
 AddressFamily = ipv4
 Interface = tun5
-Port = 443
+Port = 756
 Mode = switch
 ConnectTo = psgnet

+ 0 - 16
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/hosts/melasan

@@ -1,16 +0,0 @@
-#--- automatisch erstellt
-Subnet = 10.222.0.100/32
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAnPPEgphOtFXeV6Isv0KOV8GfnQSy0U86/GpifWo+rBEYNjbW7fwu
-bdbjuEEnUz4FExOOPw912fG+q/wBvq/3H3r3bIWDfNoA6ZqGZ0WDUuPJS1rMVgyq
-eVf8xooI3W+pBrYPW8v+5+8FB3HoWvB39HhveeDhM53vXlECmBu9gZjU9AmRsgZz
-0o/T1Mcp1aNkRcbLm7nbPiyZvteAgSAXCoYu1iJHyPbm4TgmiJcJl3QRmXM4KXFo
-LpTJL+DRDkSRxw7WtC/gjfC9JpmRN49gmsFeGl8wVFepcBH1wCCOALLRJXJiwMSA
-fRDrrXothGRHDoXn2d27WFiPQ4adyX9dXB2j8ZpYNW7s0e4Z9a3V7qU947AH/L4J
-UHey0Au0qFHKNpVLmGP428eCzHJU6lLv00sMsHS3ltBioGXHP+4m89i+xDLGJs/A
-pXrBJ8H52LttmwXPOZZ/or1scPPFbeOzVdYUaVOhgVXU4TdomY1on64tOWVdK4lQ
-vN7jvONo8Cy6z1aT/N7owDXDJev4vi1p22713Olpv41v00rDk/WFl0hgdxL533Vq
-Rk5yFK0m9EGKq+P8/+GUvVd5oGuTkfRaBgSDHtIxbjJxasHdu2PS6c87RlzToh/0
-QFEAMevTYLQvYO+dySYBFm2GiTcA1QL7Dkk1us8Ykex6bi5HlnN3z+0CAwEAAQ==
------END RSA PUBLIC KEY-----

+ 0 - 52
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/rsa_key.priv

@@ -1,52 +0,0 @@
-
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----

+ 0 - 2
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/tinc-up

@@ -1,2 +0,0 @@
-#!/bin/sh
-ifconfig $INTERFACE 10.222.0.100 netmask 255.255.255.0

+ 7 - 0
board/PSG/iot2000/rootfs_overlay/etc/udev/rules.d/70-persistent-net.rules

@@ -0,0 +1,7 @@
+# This file was automatically generated by the /lib/udev/write_net_rules
+# program, run by the persistent-net-generator.rules rules file.
+#
+# You can modify it, as long as you keep each rule on a single
+# line, and change only the value of the NAME= key.
+
+#ACTION=="add", SUBSYSTEM=="net", DRIVERS=="?*", KERNEL=="wlan*", ATTR{address}=="74:da:38:ec:a2:34", NAME="wlan0"

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/udev/rules.d/80-wifi.rules

@@ -0,0 +1,2 @@
+ACTION=="add", SUBSYSTEM=="net", KERNEL=="wlan*", RUN+="/sbin/ifup %k"
+ACTION=="remove", SUBSYSTEM=="net", KERNEL=="wlan*", RUN+="/sbin/ifdown %k"

+ 50 - 0
board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/action_wpa.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Action script to enable/disable wpa-roam interfaces in reaction to
+# ifplugd events.
+#
+# Copyright: Copyright (c) 2008-2010, Kel Modderman <kel@otaku42.de>
+# License:   GPL-2
+#
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+if [ ! -x /sbin/wpa_action ]; then
+	exit 0
+fi
+
+# ifplugd(8) - <iface> <action>
+#
+# If an ifplugd managed interface is brought up, disconnect any
+# wpa-roam managed interfaces so that only one "roaming" interface
+# remains active on the system.
+
+IFPLUGD_IFACE="${1}"
+
+case "${2}" in
+	up)
+		COMMAND=disconnect
+		;;
+	down)
+		COMMAND=reconnect
+		;;
+	*)
+		echo "$0: unknown arguments: ${@}" >&2
+		exit 1
+		;;
+esac
+
+for CTRL in /run/wpa_supplicant/*; do
+	[ -S "${CTRL}" ] || continue
+
+	IFACE="${CTRL#/run/wpa_supplicant/}"
+
+	# skip if ifplugd is managing this interface
+	if [ "${IFPLUGD_IFACE}" = "${IFACE}" ]; then
+		continue
+	fi
+
+	if wpa_action "${IFACE}" check; then
+		wpa_cli -i "${IFACE}" "${COMMAND}"
+	fi
+done

+ 1006 - 0
board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/functions.sh

@@ -0,0 +1,1006 @@
+#!/bin/sh
+
+#####################################################################
+## Purpose
+# This file contains common shell functions used by scripts of the
+# wpasupplicant package to allow ifupdown to manage wpa_supplicant.
+# It also contains some functions used by wpa_action(8) that allow
+# ifupdown to be managed by wpa_cli(8) action events.
+#
+# This file is provided by the wpasupplicant package.
+
+#####################################################################
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
+# <pkg-wpa-devel@lists.alioth.debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+#####################################################################
+## global variables
+# wpa_supplicant variables
+WPA_SUP_BIN="/sbin/wpa_supplicant"
+WPA_SUP_PNAME="wpa_supplicant"
+WPA_SUP_PIDFILE="/run/wpa_supplicant.${WPA_IFACE}.pid"
+WPA_SUP_OMIT_DIR="/run/sendsigs.omit.d"
+WPA_SUP_OMIT_PIDFILE="${WPA_SUP_OMIT_DIR}/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
+
+# wpa_cli variables
+WPA_CLI_BIN="/sbin/wpa_cli"
+WPA_CLI_PNAME="wpa_cli"
+WPA_CLI_PIDFILE="/run/wpa_action.${WPA_IFACE}.pid"
+WPA_CLI_TIMESTAMP="/run/wpa_action.${WPA_IFACE}.timestamp"
+WPA_CLI_IFUPDOWN="/run/wpa_action.${WPA_IFACE}.ifupdown"
+
+# default ctrl_interface socket directory
+if [ -z "$WPA_CTRL_DIR" ]; then
+	WPA_CTRL_DIR="/run/wpa_supplicant"
+fi
+
+# verbosity variables
+if [ -n "$IF_WPA_VERBOSITY" ] || [ "$VERBOSITY" = "1" ]; then
+	TO_NULL="/dev/stdout"
+	DAEMON_VERBOSITY="--verbose"
+else
+	TO_NULL="/dev/null"
+	DAEMON_VERBOSITY="--quiet"
+fi
+
+#####################################################################
+## wpa_cli wrapper
+# Path to common ctrl_interface socket and iface supplied.
+# NB: WPA_CTRL_DIR cannot be used for interactive commands, it is
+# set only in the environment that wpa_cli provides when processing
+# action events.
+#
+wpa_cli () {
+	"$WPA_CLI_BIN" -p "$WPA_CTRL_DIR" -i "$WPA_IFACE" "$@"
+
+	return "$?"
+}
+
+#####################################################################
+## verbose and stderr message wrapper
+# Ensures a standard and easily identifiable message is printed by
+# scripts using this function library.
+#
+# log		Log a message to syslog when called non-interactively
+#		by wpa_action
+#
+# verbose	To stdout when IF_WPA_VERBOSITY or VERBOSITY is true
+#
+# action	Same as verbose but without newline
+#		Useful for allowing wpa_cli commands to echo result
+#		value of 'OK' or 'FAILED'
+#
+# stderr	Echo warning or error messages to stderr
+#
+# NB: when called by wpa_action, there is no redirection (verbose)
+#
+wpa_msg () {
+	if [ "$1" = "log" ]; then
+		shift
+		case "$WPA_ACTION" in
+			"CONNECTED"|"DISCONNECTED")
+				[ -x /usr/bin/logger ] || return
+				if [ "$#" -gt 0 ]; then
+					logger -t "wpa_action" "$@"
+				else
+					logger -t "wpa_action"
+				fi
+				;;
+			*)
+				[ "$#" -gt 0 ] && echo "wpa_action: $@"
+				;;
+		esac
+		return
+	fi
+	
+	case "$1" in 
+		"verbose")
+			shift
+			echo "$WPA_SUP_PNAME: $@" >$TO_NULL
+			;;
+		"action")
+			shift
+			echo -n "$WPA_SUP_PNAME: $@ -- " >$TO_NULL
+			;;
+		"stderr")
+			shift
+			echo "$WPA_SUP_PNAME: $@" >/dev/stderr
+			;;
+		*)
+			;;
+	esac
+}
+
+#####################################################################
+## validate daemon pid files
+# Test daemon process ID files via start-stop-daemon with a signal 0
+# given the exec binary and pidfile location.
+#
+# $1	daemon
+# $2	pidfile
+#
+# Returns true when pidfile exists, the process ID exists _and_ was
+# created by the exec binary.
+#
+# If the test fails, but the pidfile exists, it is stale
+#
+test_daemon_pidfile () {
+	local DAEMON
+	local PIDFILE
+	
+	if [ -n "$1" ]; then
+		DAEMON="$1"
+	fi
+	
+	if [ -f "$2" ]; then
+		PIDFILE="$2"
+	fi
+	
+	if [ -n "$DAEMON" ] && [ -f "$PIDFILE" ]; then
+		if start-stop-daemon --stop --quiet --signal 0 \
+			--exec "$DAEMON" --pidfile "$PIDFILE"; then
+			return 0
+		else
+			rm -f "$PIDFILE"
+			return 1
+		fi
+	else
+		return 1
+	fi
+}
+
+# validate wpa_supplicant pidfile
+test_wpa_supplicant () {
+	test_daemon_pidfile "$WPA_SUP_BIN" "$WPA_SUP_PIDFILE"
+}
+
+# validate wpa_cli pidfile
+test_wpa_cli () {
+	test_daemon_pidfile "$WPA_CLI_BIN" "$WPA_CLI_PIDFILE"
+}
+
+#####################################################################
+## daemonize wpa_supplicant
+# Start wpa_supplicant via start-stop-dameon with all required
+# options. Will start if environment variable WPA_SUP_CONF is present
+#
+# Default options:
+# -B	dameonize/background process
+# -D	driver backend ('wext' if none given)
+# -P	process ID file
+# -C	path to ctrl_interface socket directory
+# -s    log to syslog
+#
+# Conditional options:
+# -c	configuration file
+# -W	wait for wpa_cli to attach to ctrl_interface socket
+# -b	bridge interface name
+# -f	path to log file
+#
+init_wpa_supplicant () {
+	[ -n "$WPA_SUP_CONF" ] || return 0
+
+	local WPA_SUP_OPTIONS
+	WPA_SUP_OPTIONS="-s -B -P $WPA_SUP_PIDFILE -i $WPA_IFACE"
+
+	if [ -n "$WPA_ACTION_SCRIPT" ]; then
+		if [ -x "$WPA_ACTION_SCRIPT" ]; then
+			WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -W"
+			wpa_msg verbose "wait for wpa_cli to attach"
+		else
+			wpa_msg stderr "action script \"$WPA_ACTION_SCRIPT\" not executable"
+			return 1
+		fi
+	fi
+
+	if [ -n "$IF_WPA_BRIDGE" ]; then
+		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -b $IF_WPA_BRIDGE"
+		wpa_msg verbose "wpa-bridge $IF_WPA_BRIDGE"
+	fi
+
+	if [ -n "$IF_WPA_DRIVER" ]; then
+		wpa_msg verbose "wpa-driver $IF_WPA_DRIVER"
+		case "$IF_WPA_DRIVER" in
+			hostap|ipw|madwifi|ndiswrapper)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
+				wpa_msg stderr "\"$IF_WPA_DRIVER\" wpa-driver is unsupported"
+				wpa_msg stderr "using \"nl80211,wext\" wpa-driver instead ..."
+				;;
+			*)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D $IF_WPA_DRIVER"
+				;;
+		esac
+	else
+		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
+		wpa_msg verbose "wpa-driver nl80211,wext (default)"
+	fi
+
+	if [ -n "$IF_WPA_DEBUG_LEVEL" ]; then
+		case "$IF_WPA_DEBUG_LEVEL" in
+			3)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -ddd"
+				;;
+			2)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -dd"
+				;;
+			1)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -d"
+				;;
+			0)
+				# wpa_supplicant default verbosity
+				;;
+			-1)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -q"
+				;;
+			-2)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -qq"
+				;;
+		esac
+		wpa_msg verbose "using debug level: $IF_WPA_DEBUG_LEVEL"
+	fi
+
+	if [ -n "$IF_WPA_LOGFILE" ]; then
+		# custom log file
+		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -f $IF_WPA_LOGFILE"
+		WPA_SUP_LOGFILE="$IF_WPA_LOGFILE"
+		wpa_msg verbose "logging to $IF_WPA_LOGFILE"
+	fi
+
+	wpa_msg verbose "$WPA_SUP_BIN $WPA_SUP_OPTIONS $WPA_SUP_CONF"
+		
+	start-stop-daemon --start --oknodo $DAEMON_VERBOSITY \
+		--name $WPA_SUP_PNAME --startas $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE \
+		-- $WPA_SUP_OPTIONS $WPA_SUP_CONF
+
+	if [ "$?" -ne 0 ]; then
+		wpa_msg stderr "$WPA_SUP_BIN daemon failed to start"
+		return 1
+	fi
+
+	local WPA_PIDFILE_WAIT
+	local MAX_WPA_PIDFILE_WAIT
+	WPA_PIDFILE_WAIT="0"
+	MAX_WPA_PIDFILE_WAIT="5"
+	until [ -s "$WPA_SUP_PIDFILE" ]; do
+		if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
+			wpa_msg stderr "timed out waiting for creation of $WPA_SUP_PIDFILE"
+			return 1
+		else
+			wpa_msg verbose "waiting for \"$WPA_SUP_PIDFILE\": " \
+				"$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
+		fi
+
+		WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
+		sleep 1
+	done
+	if [ -d "${WPA_SUP_OMIT_DIR}" ]; then
+		wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	fi
+
+	local WPA_SOCKET_WAIT
+	local MAX_WPA_SOCKET_WAIT
+	WPA_SOCKET_WAIT="0"
+	MAX_WPA_SOCKET_WAIT="5"
+	until [ -S "$WPA_CTRL_DIR/$WPA_IFACE" ]; do
+		if [ "$WPA_SOCKET_WAIT" -ge "$MAX_WPA_SOCKET_WAIT" ]; then
+			wpa_msg stderr "ctrl_interface socket not found at $WPA_CTRL_DIR/$WPA_IFACE"
+			return 1
+		else
+			wpa_msg verbose "waiting for \"$WPA_CTRL_DIR/$WPA_IFACE\": " \
+				"$WPA_SOCKET_WAIT (max. $MAX_WPA_SOCKET_WAIT)"
+		fi
+		
+		WPA_SOCKET_WAIT=$(($WPA_SOCKET_WAIT + 1))
+		sleep 1
+	done
+	
+	wpa_msg verbose "ctrl_interface socket located at $WPA_CTRL_DIR/$WPA_IFACE"
+}
+
+#####################################################################
+## stop wpa_supplicant process
+# Kill wpa_supplicant via start-stop-daemon, given the location of
+# the pidfile or ctrl_interface socket path and interface name
+#
+kill_wpa_supplicant () {
+	test_wpa_supplicant || return 0
+
+	wpa_msg verbose "terminating $WPA_SUP_PNAME daemon via pidfile $WPA_SUP_PIDFILE"
+
+	start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
+		--exec $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE
+
+	if [ -f "$WPA_SUP_PIDFILE" ]; then
+		rm -f "$WPA_SUP_PIDFILE"
+	fi
+
+	if [ -f "$WPA_SUP_OMIT_PIDFILE" ]; then
+		wpa_msg verbose "removing $WPA_SUP_OMIT_PIDFILE"
+		rm -f "$WPA_SUP_OMIT_PIDFILE"
+	fi
+}
+
+#####################################################################
+## reload wpa_supplicant process
+# Sending a HUP signal causes wpa_supplicant to reparse its
+# configuration file
+#
+reload_wpa_supplicant () {
+	if test_wpa_supplicant; then
+		wpa_msg verbose "reloading wpa_supplicant configuration file via HUP signal"
+		start-stop-daemon --stop --signal HUP \
+			--name "$WPA_SUP_PNAME" --pidfile "$WPA_SUP_PIDFILE"
+	else
+		wpa_msg verbose "cannot $WPA_ACTION, $WPA_SUP_PIDFILE does not exist"
+	fi
+}
+
+#####################################################################
+## daemonize wpa_cli and action script
+# If environment variable WPA_ACTION_SCRIPT is present, wpa_cli will
+# be spawned via start-stop-daemon
+#
+# Required options:
+# -a	action script => wpa_action
+# -P	process ID file
+# -B	background process
+#
+init_wpa_cli () {
+	[ -n "$WPA_ACTION_SCRIPT" ] || return 0
+
+	local WPA_CLI_OPTIONS
+	WPA_CLI_OPTIONS="-B -P $WPA_CLI_PIDFILE -i $WPA_IFACE"
+
+	wpa_msg verbose "$WPA_CLI_BIN $WPA_CLI_OPTIONS -p $WPA_CTRL_DIR -a $WPA_ACTION_SCRIPT"
+		
+	start-stop-daemon --start --oknodo $DAEMON_VERBOSITY \
+		--name $WPA_CLI_PNAME --startas $WPA_CLI_BIN --pidfile $WPA_CLI_PIDFILE \
+		-- $WPA_CLI_OPTIONS -p $WPA_CTRL_DIR -a $WPA_ACTION_SCRIPT
+
+	if [ "$?" -ne 0 ]; then
+		wpa_msg stderr "$WPA_CLI_BIN daemon failed to start"
+		return 1
+	fi
+}
+
+#####################################################################
+## stop wpa_cli process
+# Kill wpa_cli via start-stop-daemon, given the location of the
+# pidfile
+#
+kill_wpa_cli () {
+	test_wpa_cli || return 0
+	
+	wpa_msg verbose "terminating $WPA_CLI_PNAME daemon via pidfile $WPA_CLI_PIDFILE"
+	
+	start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
+		--exec $WPA_CLI_BIN --pidfile $WPA_CLI_PIDFILE
+	
+	if [ -f "$WPA_CLI_PIDFILE" ]; then
+		rm -f "$WPA_CLI_PIDFILE"
+	fi
+
+	if [ -f "$WPA_CLI_TIMESTAMP" ]; then
+		rm -f "$WPA_CLI_TIMESTAMP"
+	fi
+
+	if [ -L "$WPA_CLI_IFUPDOWN" ]; then
+		rm -f "$WPA_CLI_IFUPDOWN"
+	fi
+}
+
+#####################################################################
+## higher level wpa_cli wrapper for variable and set_network commands
+# wpa_cli_do <value> <type> <variable> [set_network variable] <desc>
+#
+# $1	envorinment variable
+# $2	data type of variable {raw|ascii}
+# $3	wpa_cli variable, if $3 is set_network, shift and take 
+#	set_network subvariable
+# $4	wpa-* string as it would appear in interfaces file, enhances
+#	verbose messages
+#
+wpa_cli_do () {
+	if [ -z "$1" ]; then
+		return 0
+	fi
+	
+	local WPACLISET_VALUE
+	local WPACLISET_VARIABLE
+	local WPACLISET_DESC
+	
+	case "$2" in
+		ascii)
+			# Double quote
+			WPACLISET_VALUE="\"$1\""
+			;;
+		raw|*)
+			# Provide raw value
+			WPACLISET_VALUE="$1"
+			;;
+	esac
+	
+	case "$3" in
+		set_network)
+			if [ -z "$WPA_ID" ]; then
+				return 1
+			fi
+			shift
+			WPACLISET_VARIABLE="set_network $WPA_ID $3"
+			;;
+		*)
+			WPACLISET_VARIABLE="$3"
+			;;
+	esac
+	
+	case "$4" in
+		*-psk|*-passphrase|*-passwd*|*-password*|*-wep-key*)
+			WPACLISET_DESC="$4 *****"
+			;;
+		*)
+			WPACLISET_DESC="$4 $WPACLISET_VALUE"
+			;;
+	esac
+
+	wpa_msg action "$WPACLISET_DESC"
+	
+	wpa_cli $WPACLISET_VARIABLE "$WPACLISET_VALUE" >$TO_NULL
+
+	if [ "$?" -ne 0 ]; then
+		wpa_msg stderr "$WPACLISET_DESC failed!"
+	fi
+}
+
+#####################################################################
+## check value data type in plaintext or hex
+# returns 0 if input consists of hexadecimal digits only, 1 otherwise
+#
+ishex () {
+	if [ -z "$1" ]; then 
+		return 0
+	fi
+	
+	case "$1" in
+		*[!0-9a-fA-F]*)
+			# plaintext
+			return 1
+			;;
+		*)
+			# hexadecimal
+			return 0
+			;;
+	esac
+}
+
+#####################################################################
+## sanity check and set psk|passphrase
+# Warn about strange psk|passphrase values
+#
+# $1	psk or passphrase value
+# 
+# If psk is surrounded by quotes strip them.
+#
+# If psk contains all hexadecimal characters and string length is 64:
+#	is 256bit hexadecimal
+# else:
+# 	is plaintext
+#
+# plaintext passphrases must be 8 - 63 characters in length
+# 256-bit hexadecimal key must be 64 characters in length
+#
+wpa_key_check_and_set () {
+	if [ "$#" -ne 3 ]; then
+		return 0
+	fi
+
+	local KEY
+	local KEY_LEN
+	local KEY_TYPE
+	local ENC_TYPE
+	
+	case "$1" in
+		'"'*'"')
+			# Strip surrounding quotation marks
+			KEY=$(echo -n "$1" | sed 's/^"//;s/"$//')
+			;;
+		*)
+			KEY="$1"
+			;;
+	esac
+
+	KEY_LEN="${#KEY}"
+
+	case "$2" in
+		wep_key*)
+			ENC_TYPE="WEP"
+			;;
+		psk)
+			ENC_TYPE="WPA"
+			;;
+		*)
+			return 0
+			;;
+	esac
+
+	if [ "$ENC_TYPE" = "WEP" ]; then
+		if ishex "$KEY"; then
+			case "$KEY_LEN" in
+				10|26|32|58)
+					# 64/128/152/256-bit WEP
+					KEY_TYPE="raw"
+					;;
+				*)
+					KEY_TYPE="ascii"
+					;;
+			esac
+		else
+			KEY_TYPE="ascii"
+		fi
+
+		if [ "$KEY_TYPE" = "ascii" ]; then
+			if [ "$KEY_LEN" -lt "5" ]; then
+				wpa_msg stderr "WARNING: plaintext or ascii WEP key has $KEY_LEN characters,"
+				wpa_msg stderr "it must have at least 5 to be valid."
+			fi
+		fi
+	elif [ "$ENC_TYPE" = "WPA" ]; then
+		if ishex "$KEY"; then
+			case "$KEY_LEN" in
+				64)
+					# 256-bit WPA
+					KEY_TYPE="raw"
+					;;
+				*)
+					KEY_TYPE="ascii"
+					;;
+			esac
+		else
+			KEY_TYPE="ascii"
+		fi
+
+		if [ "$KEY_TYPE" = "ascii" ]; then
+			if [ "$KEY_LEN" -lt "8" ] || [ "$KEY_LEN" -gt "63" ]; then
+				wpa_msg stderr "WARNING: plaintext or ascii WPA key has $KEY_LEN characters,"
+				wpa_msg stderr "it must have between 8 and 63 to be valid."
+				wpa_msg stderr "If the WPA key is a 256-bit hexadecimal key, it must have"
+				wpa_msg stderr "exactly 64 characters."
+			fi
+		fi
+	fi
+
+	wpa_cli_do "$KEY" "$KEY_TYPE" set_network "$2" "$3"
+}
+
+#####################################################################
+## formulate a usable configuration from interfaces(5) wpa- lines
+# A series of wpa_cli commands corresponding to environment variables
+# created as a result of wpa- lines in an interfaces stanza.
+#
+# NB: no-act when roaming daemon is used (to avoid prematurely
+# attaching to ctrl_interface socket)
+#
+conf_wpa_supplicant () {
+	if [ -n "$WPA_ACTION_SCRIPT" ]; then
+		return 0
+	fi
+
+	if [ "$IF_WPA_DRIVER" = "wired" ]; then
+		IF_WPA_AP_SCAN="0"
+		wpa_msg verbose "forcing ap_scan=0 (required for wired IEEE8021X auth)"
+	fi
+
+	if [ -n "$IF_WPA_ESSID" ]; then
+		# #403316, be similar to wireless tools
+		IF_WPA_SSID="$IF_WPA_ESSID"
+	fi
+	
+	wpa_cli_do "$IF_WPA_AP_SCAN" raw \
+		ap_scan wpa-ap-scan
+	
+	wpa_cli_do "$IF_WPA_PREAUTHENTICATE" raw \
+		preauthenticate wpa-preauthenticate
+		
+	if [ -n "$IF_WPA_SSID" ] || [ "$IF_WPA_DRIVER" = "wired" ] || \
+		[ -n "$IF_WPA_KEY_MGMT" ]; then
+		
+		case "$IF_WPA_SSID" in
+			'"'*'"')
+				IF_WPA_SSID=$(echo -n "$IF_WPA_SSID" | sed 's/^"//;s/"$//')
+				;;
+			*)
+				;;
+		esac
+		
+		WPA_ID=$(wpa_cli add_network)
+
+		wpa_msg verbose "configuring network block -- $WPA_ID"
+		
+		wpa_cli_do "$IF_WPA_SSID" ascii \
+			set_network ssid wpa-ssid
+		
+		wpa_cli_do "$IF_WPA_PRIORITY" raw \
+			set_network priority wpa-priority
+		
+		wpa_cli_do "$IF_WPA_BSSID" raw \
+			set_network bssid wpa-bssid
+		
+		if [ -s "$IF_WPA_PSK_FILE" ]; then
+			IF_WPA_PSK=$(cat "$IF_WPA_PSK_FILE")
+		fi
+		
+		# remain compat with wpa-passphrase-file
+		if [ -s "$IF_WPA_PASSPHRASE_FILE" ]; then
+			IF_WPA_PSK=$(cat "$IF_WPA_PASSPHRASE_FILE")
+		fi
+		
+		# remain compat with wpa-passphrase
+		if [ -n "$IF_WPA_PASSPHRASE" ]; then
+			IF_WPA_PSK="$IF_WPA_PASSPHRASE"
+		fi
+	
+		if [ -n "$IF_WPA_PSK" ]; then
+			wpa_key_check_and_set "$IF_WPA_PSK" \
+				psk wpa-psk
+		fi
+		
+		wpa_cli_do "$IF_WPA_PAIRWISE" raw \
+			set_network pairwise wpa-pairwise
+		
+		wpa_cli_do "$IF_WPA_GROUP" raw \
+			set_network group wpa-group
+
+		wpa_cli_do "$IF_WPA_MODE" raw \
+			set_network mode wpa-mode
+
+		wpa_cli_do "$IF_WPA_FREQUENCY" raw \
+			set_network frequency wpa-frequency
+
+		wpa_cli_do "$IF_WPA_SCAN_FREQ" raw \
+			set_network scan_freq wpa-scan-freq
+
+		wpa_cli_do "$IF_WPA_FREQ_LIST" raw \
+			set_network freq_list wpa-freq-list
+		
+		wpa_cli_do "$IF_WPA_KEY_MGMT" raw \
+			set_network key_mgmt wpa-key-mgmt
+		
+		wpa_cli_do "$IF_WPA_PROTO" raw \
+			set_network proto wpa-proto
+		
+		wpa_cli_do "$IF_WPA_AUTH_ALG" raw \
+			set_network auth_alg wpa-auth-alg
+		
+		wpa_cli_do "$IF_WPA_SCAN_SSID" raw \
+			set_network scan_ssid wpa-scan-ssid
+		
+		wpa_cli_do "$IF_WPA_IDENTITY" ascii \
+			set_network identity wpa-identity
+		
+		wpa_cli_do "$IF_WPA_ANONYMOUS_IDENTITY" ascii \
+			set_network anonymous_identity wpa-anonymous-identity
+		
+		wpa_cli_do "$IF_WPA_EAP" raw \
+			set_network eap wpa-eap
+		
+		wpa_cli_do "$IF_WPA_EAPPSK" raw \
+			set_network eappsk wpa-eappsk
+
+		wpa_cli_do "$IF_WPA_NAI" ascii \
+			set_network nai wpa-nai
+
+		wpa_cli_do "$IF_WPA_PASSWORD" ascii \
+			set_network password wpa-password
+
+		wpa_cli_do "$IF_WPA_CA_CERT" ascii \
+			set_network ca_cert wpa-ca-cert
+
+		wpa_cli_do "$IF_WPA_CA_PATH" ascii \
+			set_network ca_path wpa-ca-path
+
+		wpa_cli_do "$IF_WPA_CLIENT_CERT" ascii \
+			set_network client_cert wpa-client-cert
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY" ascii \
+			set_network private_key wpa-private-key
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY_PASSWD" ascii \
+			set_network private_key_passwd wpa-private-key-passwd
+		
+		wpa_cli_do "$IF_WPA_DH_FILE" ascii \
+			set_network dh_file wpa-dh-file
+
+		wpa_cli_do "$IF_WPA_SUBJECT_MATCH" ascii \
+			set_network subject_match wpa-subject-match
+
+		wpa_cli_do "$IF_WPA_ALTSUBJECT_MATCH" ascii \
+			set_network altsubject_match wpa-altsubject-match
+
+		wpa_cli_do "$IF_WPA_CA_CERT2" ascii \
+			set_network ca_cert2 wpa-ca-cert2
+
+		wpa_cli_do "$IF_WPA_CA_PATH2" ascii \
+			set_network ca_path2 wpa-ca-path2
+
+		wpa_cli_do "$IF_WPA_CLIENT_CERT2" ascii \
+			set_network client_cert2 wpa-client-cert2
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY2" ascii \
+			set_network private_key2 wpa-private-key2
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY_PASSWD2" ascii \
+			set_network private_key_passwd2 wpa-private-key-passwd2
+		
+		wpa_cli_do "$IF_WPA_DH_FILE2" ascii \
+			set_network dh_file2 wpa-dh-file2
+
+		wpa_cli_do "$IF_WPA_SUBJECT_MATCH2" ascii \
+			set_network subject_match2 wpa-subject-match2
+
+		wpa_cli_do "$IF_WPA_ALTSUBJECT_MATCH2" ascii \
+			set_network altsubject_match2 wpa-altsubject-match2
+		
+		wpa_cli_do "$IF_WPA_EAP_METHODS" raw \
+			set_network eap_methods wpa-eap-methods
+
+		wpa_cli_do "$IF_WPA_PHASE1" ascii \
+			set_network phase1 wpa-phase1
+
+		wpa_cli_do "$IF_WPA_PHASE2" ascii \
+			set_network phase2 wpa-phase2
+
+		wpa_cli_do "$IF_WPA_PCSC" raw \
+			set_network pcsc wpa-pcsc
+
+		wpa_cli_do "$IF_WPA_PIN" ascii \
+			set_network pin wpa-pin
+
+		wpa_cli_do "$IF_WPA_ENGINE" raw \
+			set_network engine wpa-engine
+
+		wpa_cli_do "$IF_WPA_ENGINE_ID" ascii \
+			set_network engine_id wpa-engine-id
+
+		wpa_cli_do "$IF_WPA_KEY_ID" ascii \
+			set_network key_id wpa-key-id
+
+		wpa_cli_do "$IF_WPA_EAPOL_FLAGS" raw \
+			set_network eapol_flags wpa-eapol-flags
+		
+		if [ -n "$IF_WPA_WEP_KEY0" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY0" \
+				wep_key0 wpa-wep-key0
+		fi
+		
+		if [ -n "$IF_WPA_WEP_KEY1" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY1" \
+				wep_key1 wpa-wep-key1
+		fi
+
+		if [ -n "$IF_WPA_WEP_KEY2" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY2" \
+				wep_key2 wpa-wep-key2
+		fi
+
+		if [ -n "$IF_WPA_WEP_KEY3" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY3" \
+				wep_key3 wpa-wep-key3
+		fi
+		
+		wpa_cli_do "$IF_WPA_WEP_TX_KEYIDX" raw \
+			set_network wep_tx_keyidx wpa-wep-tx-keyidx
+		
+		wpa_cli_do "$IF_WPA_PROACTIVE_KEY_CACHING" raw \
+			set_network proactive_key_caching wpa-proactive-key-caching
+			
+		wpa_cli_do "$IF_WPA_PAC_FILE" ascii \
+			set_network pac_file wpa-pac-file
+		
+		wpa_cli_do "$IF_WPA_PEERKEY" raw \
+			set_network peerkey wpa-peerkey
+			
+		wpa_cli_do "$IF_FRAGMENT_SIZE" raw \
+			set_network fragment_size wpa-fragment-size
+
+		wpa_cli_do "$IF_WPA_ID_STR" ascii \
+			set_network id_str wpa-id-str
+		
+		wpa_cli_do "$WPA_ID" raw \
+			enable_network "enabling network block"
+	fi
+}
+
+#####################################################################
+## Log wpa_cli environment variables
+wpa_log_env () {
+	wpa_msg log "WPA_IFACE=$WPA_IFACE WPA_ACTION=$WPA_ACTION"
+	wpa_msg log "WPA_ID=$WPA_ID WPA_ID_STR=$WPA_ID_STR WPA_CTRL_DIR=$WPA_CTRL_DIR"
+}
+
+#####################################################################
+## hysteresis checking
+# Networking tools such as dhcp clients used with ifupdown can
+# synthesize artificial ACTION events, particularly just after a
+# DISCONNECTED/CONNECTED events are experienced in quick succession.
+# This can lead to infinite event loops, and in extreme cases has the
+# potential to cause system instability.
+#
+wpa_hysteresis_event () {
+	echo "$(date +%s)" > "$WPA_CLI_TIMESTAMP" 2>/dev/null
+}
+
+wpa_hysteresis_check () {
+	if [ -f "$WPA_CLI_TIMESTAMP" ]; then
+		local TIME
+		local TIMESTAMP
+		local TIMEWAIT
+		TIME=$(date +%s)
+		# current time minus 4 second event buffer
+		TIMEWAIT=$(($TIME-4))
+		# get time of last event
+		TIMESTAMP=$(cat $WPA_CLI_TIMESTAMP)
+		# compare values, allowing new action to be processed 
+		# only if last action was more than 4 seconds ago
+		if [ "$TIMEWAIT" -le "$TIMESTAMP" ]; then
+			wpa_msg log "$WPA_ACTION event blocked by hysteresis check"
+			return 1
+		fi
+	fi
+
+	return 0
+}
+
+#####################################################################
+## ifupdown locking functions
+# A collection of rudimentary locking functions to lock ifup/ifdown
+# actions.
+#
+
+ifupdown_lock () {
+	ln -s lock "$WPA_CLI_IFUPDOWN"
+}
+
+ifupdown_locked () {
+	[ -L "$WPA_CLI_IFUPDOWN" ] && return 0
+
+	return 1
+}
+
+ifupdown_unlock () {
+	rm -f "$WPA_CLI_IFUPDOWN"
+}
+
+#####################################################################
+## apply mapping logic and ifup logical interface
+# Apply mapping logic via id_str or external mapping script, check
+# state of IFACE with respect to ifupdown and ifup logical interaface
+#
+ifup () {
+	local INTERFACES_FILE
+	local IFSTATE_FILE
+	local IFUP_RETVAL
+	local WPA_LOGICAL_IFACE
+
+	if [ -e /etc/network/interfaces ]; then
+		INTERFACES_FILE="/etc/network/interfaces"
+	else
+		wpa_msg log "/etc/network/interfaces does not exist, $WPA_IFACE will not be configured"
+		return 1
+	fi
+
+	if [ -e /etc/network/run/ifstate ]; then
+		# debian's ifupdown
+		IFSTATE_FILE="/etc/network/run/ifstate"
+	elif [ -e /run/network/ifstate ]; then
+		# ubuntu's
+		IFSTATE_FILE="/run/network/ifstate"
+	else
+		unset IFSTATE_FILE
+	fi
+	
+	if [ -z "$IF_WPA_MAPPING_SCRIPT_PRIORITY" ] && [ -n "$WPA_ID_STR" ]; then
+		WPA_LOGICAL_IFACE="$WPA_ID_STR"
+	fi
+	
+	if [ -z "$WPA_LOGICAL_IFACE" ] && [ -n "$IF_WPA_MAPPING_SCRIPT" ]; then
+		local WPA_MAP_STDIN
+		
+		WPA_MAP_STDIN=$(set | sed -n 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo \$\1/p')
+		
+		if [ -n "$WPA_MAP_STDIN" ]; then
+			WPA_LOGICAL_IFACE=$(eval "$WPA_MAP_STDIN" | "$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
+		else		
+			WPA_LOGICAL_IFACE=$("$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
+		fi
+		
+		if [ -n "$WPA_LOGICAL_IFACE" ]; then
+			wpa_msg log "mapping script result: $WPA_LOGICAL_IFACE"
+		else
+			wpa_msg log "mapping script failed."
+		fi
+	fi
+
+	if [ -z "$WPA_LOGICAL_IFACE" ]; then
+		if [ -n "$IF_WPA_ROAM_DEFAULT_IFACE" ]; then
+			WPA_LOGICAL_IFACE="$IF_WPA_ROAM_DEFAULT_IFACE"
+		else
+			WPA_LOGICAL_IFACE="default"
+		fi
+	fi
+
+	if [ -n "$WPA_LOGICAL_IFACE" ]; then
+		if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then
+			: # logical network is defined
+		else
+			wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE"
+			WPA_LOGICAL_IFACE="default"
+		fi
+
+		wpa_msg log "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
+
+		ifupdown_lock
+
+		if [ -n "$IFSTATE_FILE" ] && grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
+			# Force settings over the unconfigured "master" IFACE
+			/sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
+		else
+			/sbin/ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE"
+		fi
+		IFUP_RETVAL="$?"
+
+		ifupdown_unlock
+	fi
+
+	if [ -d "${WPA_SUP_OMIT_DIR}" ]; then
+		wpa_msg log "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	fi
+
+	return "$IFUP_RETVAL"
+}
+
+#####################################################################
+## ifdown IFACE
+# Check IFACE state and ifdown as requested.
+#
+ifdown () {
+	wpa_msg log "ifdown $WPA_IFACE"
+
+	ifupdown_lock
+
+	/sbin/ifdown -v "$WPA_IFACE"
+
+	ifupdown_unlock
+
+	wpa_msg log "removing sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+	rm -f "$WPA_SUP_OMIT_PIDFILE"
+}
+
+#####################################################################
+## keep IFACE scanning
+# After ifdown, the IFACE may be left "down", and inhibits 
+# wpa_supplicant's ability to continue roaming.
+#
+# NB: use iproute if present, flushing the IFACE first
+#
+if_post_down_up () {
+	if [ -x /bin/ip ]; then
+		ip addr flush dev "$WPA_IFACE" 2>/dev/null
+		ip link set "$WPA_IFACE" up
+	else
+		ifconfig "$WPA_IFACE" up
+	fi
+}

+ 172 - 0
board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/ifupdown.sh

@@ -0,0 +1,172 @@
+#!/bin/sh
+
+#####################################################################
+## Purpose
+# This file is executed by ifupdown in pre-up, post-up, pre-down and
+# post-down phases of network interface configuration. It allows
+# ifup(8), and ifdown(8) to manage wpa_supplicant(8) and wpa_cli(8)
+# processes running in daemon mode.
+#
+# /etc/wpa_supplicant/functions.sh is sourced by this file.
+#
+# This file is provided by the wpasupplicant package.
+
+#####################################################################
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
+# <pkg-wpa-devel@lists.alioth.debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+if [ -n "$IF_WPA_MAINT_DEBUG" ]; then
+	set -x
+fi
+
+# quit if we're called for the loopback
+if [ "$IFACE" = lo ]; then
+	exit 0
+fi
+
+# allow wpa_supplicant interface to be specified via wpa-iface
+# useful for starting wpa_supplicant on one interface of a bridge
+if [ -n "$IF_WPA_IFACE" ]; then
+	WPA_IFACE="$IF_WPA_IFACE"
+else
+	WPA_IFACE="$IFACE"
+fi
+
+# source functions
+if [ -f /etc/wpa_supplicant/functions.sh ]; then
+	. /etc/wpa_supplicant/functions.sh
+else
+	exit 0
+fi
+
+# quit if executables are not installed
+if [ ! -x "$WPA_SUP_BIN" ] || [ ! -x "$WPA_CLI_BIN" ]; then
+	exit 0
+fi
+
+do_start () {
+	if test_wpa_cli; then
+		# if wpa_action is active for this IFACE, do nothing
+		ifupdown_locked && exit 0
+
+		# if the administrator is calling ifup, say something useful
+		if [ "$PHASE" = "pre-up" ]; then
+			wpa_msg stderr "wpa_action is managing ifup/ifdown state of $WPA_IFACE"
+			wpa_msg stderr "execute \`ifdown --force $WPA_IFACE' to stop wpa_action"
+		fi
+		exit 1
+	elif ! set | grep -q "^IF_WPA"; then
+		# no wpa- option defined for IFACE, do nothing
+		exit 0
+	fi
+
+	# ensure stale ifupdown_lock marker is purged
+	ifupdown_unlock
+
+	# preliminary sanity checks for roaming daemon
+	if [ -n "$IF_WPA_ROAM" ]; then
+		if [ "$METHOD" != "manual" ]; then
+			wpa_msg stderr "wpa-roam can only be used with the \"manual\" inet METHOD"
+			exit 1
+		fi
+		if [ -n "$IF_WPA_MAPPING_SCRIPT" ]; then
+			if ! type "$IF_WPA_MAPPING_SCRIPT" >/dev/null; then
+				wpa_msg stderr "wpa-mapping-script \"$IF_WPA_MAPPING_SCRIPT\" is not valid"
+				exit 1
+			fi
+		fi
+		if [ -n "$IF_WPA_MAPPING_SCRIPT_PRIORITY" ] && [ -z "$IF_WPA_MAPPING_SCRIPT" ]; then
+			wpa_msg stderr "\"wpa-mapping-script-priority 1\" is invalid without a wpa-mapping-script"
+			exit 1
+		fi
+		IF_WPA_CONF="$IF_WPA_ROAM"
+		WPA_ACTION_SCRIPT="/sbin/wpa_action"
+	fi
+
+	# master function; determines if ifupdown.sh should do something or not
+	if [ -n "$IF_WPA_CONF" ] && [ "$IF_WPA_CONF" != "managed" ]; then
+		if [ ! -s "$IF_WPA_CONF" ]; then
+			wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
+			exit 1
+		fi	
+		WPA_SUP_CONF_CTRL_DIR=$(sed -n -e 's/[[:space:]]*#.*//g' -e 's/[[:space:]]\+.*$//g' \
+			-e 's/^ctrl_interface=\(DIR=\)\?\(.*\)/\2/p' "$IF_WPA_CONF")
+		if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
+			WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"
+			WPA_SUP_CONF="-c $IF_WPA_CONF"
+		else
+			# specify the default ctrl_interface since none was defined in
+			# the given IF_WPA_CONF
+			WPA_SUP_CONF="-c $IF_WPA_CONF -C $WPA_CTRL_DIR"
+		fi
+	else
+		# specify the default ctrl_interface
+		WPA_SUP_CONF="-C $WPA_CTRL_DIR"
+	fi
+}
+
+do_stop () {
+	if test_wpa_cli; then
+		# if wpa_action is active for this IFACE and calling ifdown,
+		# do nothing
+		ifupdown_locked && exit 0
+	elif test_wpa_supplicant; then
+		# wpa_supplicant process exists for this IFACE, but wpa_cli
+		# process does not. Allow stop mode to kill this process.
+		:
+	else
+		exit 0
+	fi
+}
+
+case "$MODE" in 
+	start)
+		do_start
+		case "$PHASE" in
+			pre-up)
+				kill_wpa_supplicant
+				init_wpa_supplicant	|| exit 1
+				conf_wpa_supplicant 	|| { kill_wpa_supplicant; exit 1; }
+				;;
+			post-up)
+				init_wpa_cli 		|| { kill_wpa_supplicant; exit 1; }
+				;;
+		esac
+		;;
+
+	stop)
+		do_stop
+		case "$PHASE" in
+			pre-down)
+				kill_wpa_cli
+				;;
+			post-down)
+				kill_wpa_supplicant
+				;;
+			*)
+				wpa_msg stderr "unknown phase: \"$PHASE\""
+				exit 1
+				;;
+		esac
+		;;
+	
+	*)
+		wpa_msg stderr "unknown mode: \"$MODE\""
+		exit 1
+		;;
+esac
+
+exit 0

+ 8 - 0
board/PSG/iot2000/rootfs_overlay/etc/wpa_supplicant/wpa_supplicant.conf

@@ -0,0 +1,8 @@
+ctrl_interface=/var/run/wpa_supplicant
+ap_scan=1
+
+
+network={
+	ssid="PSGWL1"
+	psk=8ea1c21c805dbc9fdf14c8ac482f8a1b1ad59ee3b43a2714a597ae51b95b2778
+}

binární
board/PSG/iot2000/rootfs_overlay/lib/libsnap7.so


+ 25 - 5
board/PSG/iot2000/rootfs_overlay/root/delportfwd.sh

@@ -8,11 +8,31 @@ SRCPORT=$3
 SRCIP=$4
 SRCIFACE=$5
 
-iptables -t nat -D PREROUTING -p tcp -i $SRCIFACE --dport $SRCPORT -j DNAT --to-destination $DESTIP:$DESTPORT
-iptables -D FORWARD -p tcp -d $SRCIP --dport $SRCPORT -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT
+iptables -t nat -D PREROUTING -p tcp -i $SRCIFACE --dport $SRCPORT -j DNAT --to-destination $DESTIP:$DESTPORT 2> /dev/null
+iptables -D FORWARD -p tcp -d $SRCIP --dport $SRCPORT -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT 2> /dev/null
 
 }
 
-del_portfwd 80 192.168.0.100 81 192.168.7.2 usb0
-del_portfwd 80 192.168.0.100 81 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-del_portfwd 80 192.168.0.100 81 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd () {
+DESTPORT=$1
+DESTIP=$2
+SRCPORT=$3
+SRCIP=$4
+SRCIFACE=$5
+
+del_portfwd $1 $2 $3 $4 $5
+
+iptables -t nat -A PREROUTING -p tcp -i $SRCIFACE --dport $SRCPORT -j DNAT --to-destination $DESTIP:$DESTPORT
+iptables -A FORWARD -p tcp -d $SRCIP --dport $SRCPORT -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT
+
+}
+
+#del_portfwd 80 192.168.0.1 80 192.168.7.2 usb0
+del_portfwd 80 192.168.0.1 80 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 80 192.168.0.1 80 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 102 192.168.0.1 102 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 102 192.168.0.1 102 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 443 192.168.0.1 443 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 443 192.168.0.1 443 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 5900 192.168.0.20 5900 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 5900 192.168.0.20 5900 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5

+ 0 - 15
board/PSG/iot2000/rootfs_overlay/root/monitoring/activation_queue_check.sh

@@ -1,15 +0,0 @@
-#!/bin/bash -ex
-
-SQL_QUERY="SELECT * FROM Slid WHERE EnableDone = 0 AND Date < DATE_SUB(NOW(), INTERVAL 1 HOUR);"
-
-result=$(mysql -u melasan -pMelasan2017 -D Melasan -B -N -e "$SQL_QUERY") 
-rows=$(echo "$result" | wc -l)
-#echo $rows
- 
-if [ $rows -eq 1 ]; then
-   echo "OK"
-else
-   echo "CRITICAL"          
-   exit 2
-fi
-

+ 0 - 14
board/PSG/iot2000/rootfs_overlay/root/monitoring/helios_api_check.sh

@@ -1,14 +0,0 @@
-#!/bin/bash -ex
-host="https://helios-api.authenticvision.com/api/status"
-
-curlRequest=$(curl $host)
- 
-#echo "$curlRequest"
- 
-if echo $curlRequest | grep -q "OK"; then
-   echo "OK"
-else
-   echo "CRITICAL"          
-   exit 2
-fi
-

+ 9 - 3
board/PSG/iot2000/rootfs_overlay/root/portfwd.sh

@@ -27,6 +27,12 @@ iptables -A FORWARD -p tcp -d $SRCIP --dport $SRCPORT -m state --state NEW,ESTAB
 
 }
 
-set_portfwd 80 192.168.0.100 81 192.168.7.2 usb0
-set_portfwd 80 192.168.0.100 81 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-set_portfwd 80 192.168.0.100 81 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+#set_portfwd 80 192.168.0.1 80 192.168.7.2 usb0
+set_portfwd 80 192.168.0.1 80 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 80 192.168.0.1 80 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 102 192.168.0.1 102 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 102 192.168.0.1 102 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 443 192.168.0.1 443 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 443 192.168.0.1 443 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 5900 192.168.0.20 5900 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 5900 192.168.0.20 5900 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5

+ 7 - 0
board/PSG/iot2000/rootfs_overlay/rules.d/70-persistent-net.rules

@@ -0,0 +1,7 @@
+# This file was automatically generated by the /lib/udev/write_net_rules
+# program, run by the persistent-net-generator.rules rules file.
+#
+# You can modify it, as long as you keep each rule on a single
+# line, and change only the value of the NAME= key.
+
+#ACTION=="add", SUBSYSTEM=="net", DRIVERS=="?*", KERNEL=="wlan*", ATTR{address}=="74:da:38:ec:a2:34", NAME="wlan0"

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/rules.d/80-wifi.rules

@@ -0,0 +1,2 @@
+ACTION=="add", SUBSYSTEM=="net", KERNEL=="wlan*", RUN+="/sbin/ifup %k"
+ACTION=="remove", SUBSYSTEM=="net", KERNEL=="wlan*", RUN+="/sbin/ifdown %k"

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/sbin/wpa_action

@@ -0,0 +1 @@
+/usr/sbin/wpa_action

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/sbin/wpa_cli

@@ -0,0 +1 @@
+/usr/sbin/wpa_cli

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/sbin/wpa_passphrase

@@ -0,0 +1 @@
+/usr/sbin/wpa_passphrase

+ 1 - 0
board/PSG/iot2000/rootfs_overlay/sbin/wpa_supplicant

@@ -0,0 +1 @@
+/usr/sbin/wpa_supplicant

+ 81 - 0
board/PSG/iot2000/rootfs_overlay/usr/sbin/wpa_action

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
+# <pkg-wpa-devel@lists.alioth.debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+if [ -n "$IF_WPA_ROAM_MAINT_DEBUG" ]; then
+	set -x
+fi
+
+if [ -z "$1" ] || [ -z "$2" ]; then
+	echo "Usage: $0 IFACE ACTION"
+	exit 1
+fi
+
+# network interface
+WPA_IFACE="$1"
+# [CONNECTED|DISCONNECTED|stop|reload|check]
+WPA_ACTION="$2"
+
+if [ -f /etc/wpa_supplicant/functions.sh ]; then
+	. /etc/wpa_supplicant/functions.sh
+else
+	exit 0
+fi
+
+case "$WPA_ACTION" in
+	"CONNECTED")
+		wpa_log_env
+		wpa_hysteresis_check || exit 1
+		wpa_hysteresis_event
+		if ifup; then
+			wpa_cli status | wpa_msg log
+		else
+			wpa_cli status | wpa_msg log
+			wpa_cli reassociate
+		fi
+		;;
+
+	"DISCONNECTED")
+		wpa_log_env
+		wpa_hysteresis_check || exit 1
+		ifdown
+		if_post_down_up
+		;;
+
+	"stop"|"down")
+		test_wpa_cli && kill_wpa_cli
+		ifdown
+		test_wpa_supplicant && kill_wpa_supplicant
+		;;
+
+	"restart"|"reload")
+		test_wpa_supplicant || exit 1
+		reload_wpa_supplicant
+		;;
+	
+	"check")
+		test_wpa_supplicant || exit 1
+		test_wpa_cli || exit 1
+		;;
+
+	*)
+		echo "Unknown action: \"$WPA_ACTION\""
+		exit 1
+		;;
+esac
+
+exit 0

binární
board/PSG/iot2000/rootfs_overlay/var/psg/Display_GSM


+ 2 - 5
configs/iot2000_defconfig

@@ -181,15 +181,12 @@ BR2_PACKAGE_BLUEZ_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_DHCP=y
-BR2_PACKAGE_DHCP_SERVER=y
-BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y
-BR2_PACKAGE_DHCP_CLIENT=y
+BR2_PACKAGE_DHCPCD=y
 BR2_PACKAGE_DNSMASQ=y
 # BR2_PACKAGE_DNSMASQ_TFTP is not set
-# BR2_PACKAGE_DNSMASQ_DHCP is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_HOSTAPD=y
+BR2_PACKAGE_HOSTAPD_DRIVER_RTW=y
 BR2_PACKAGE_HOSTAPD_EAP=y
 BR2_PACKAGE_HOSTAPD_WPS=y
 BR2_PACKAGE_HTTPING=y