From 66cbe0543010064a1a4364afad215c2eb8c28ba3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 10 Jan 2013 22:39:25 +0100
Subject: [PATCH] connman: rework init script and change statedir/storagedir to
 write config persistent

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/build             |   2 +-
 packages/network/connman/init.d/21_network | 263 +--------------------
 2 files changed, 12 insertions(+), 253 deletions(-)

diff --git a/packages/network/connman/build b/packages/network/connman/build
index 9f46026db1..be2cebbecf 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -74,4 +74,4 @@ cd $PKG_BUILD
             --enable-datafiles \
             --disable-silent-rules \
 
-make
+make storagedir=/storage/.cache/connman statedir=/run/connman
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index f246e474ef..3bcf620607 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -20,261 +20,20 @@
 
 # setup networking
 #
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
 
-connman_state() {
-  local dbus_reply="$(mktemp)"
-  if [ -z "$1" ]; then
-    dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Manager.GetProperties >$dbus_reply 2>/dev/null
-  else
-    dbus-send --system --type=method_call --print-reply --dest=net.connman /net/connman/service/$1 net.connman.Service.GetProperties >$dbus_reply 2>/dev/null
-  fi
+mkdir -p /storage/.cache/connman
+mkdir -p /run/connman
 
-  ret=$(awk '
-  /string  *"State"/ {
-    getline line
-    if (line ~ /string "/){
-      sub(/.*string "/, "", line)
-      sub(/"/, "", line)
-      print line
-      break
-    }
-  }
-' $dbus_reply)
-
-  rm -f $dbus_reply
-  echo $ret
-}
-
-set_basic() {
-  # run it from here too - debugging
-  if [ -f /etc/init.d/06_systemconfig ]; then
-    . /etc/init.d/06_systemconfig
-  fi
-	
-  if [ -f /var/config/settings.conf ]; then
-    . /var/config/settings.conf
-  fi
-
-  [ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
-
-  # setup hostname
-  progress "Setup hostname"
-  echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
-
-  # create /etc/hosts file, useful for gethostbyname(localhost)
-  progress "creating /etc/hosts"
-  echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
-
-  # starting loopback device
+# starting loopback device
+  progress "starting loopback device"
   ifconfig lo up
 
-  # add user defined hosts.conf entry's
-  [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
-
-  CONNMAN_SETTINGS="/var/lib/connman/settings"
-
-  rm -rf /var/lib/connman
-  mkdir -p /var/lib/connman
-  mkdir -p /var/run/connman
-
-  cat > $CONNMAN_SETTINGS <<EOF
-[global]
-OfflineMode=false
-Timeservers=0.pool.ntp.org;1.pool.ntp.org;2.pool.ntp.org;3.pool.ntp.org
-[WiFi]
-Enable=true
-[Wired]
-Enable=true
-[Bluetooth]
-Enable=false
-[3G]
-Enable=false
-[WiMAX]
-Enable=false
-EOF
-}
-
-set_hwclock() {
-  # set hwclock
-  if [ -f /proc/driver/rtc ]; then
-    (
-      # sleep 30 seconds before hw clock is synced
-      usleep 30000000
-      progress "syncing hardware clock with system clock"
-      /sbin/hwclock --systohc --utc
-    )&
-  fi
-}
-
-set_ip_address() {
-  if [ -z "$NET_IPADDRESS" -o "$NET_IPADDRESS" = "0.0.0.0" ]; then
-    echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
-  else
-    echo "IPv4.method=manual" >> $CONNMAN_PROFILE
-    echo "IPv4.local_address=$NET_IPADDRESS" >> $CONNMAN_PROFILE
-    [ -n "$NET_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET_PREFIXLEN" >> $CONNMAN_PROFILE
-    [ -n "$NET_GATEWAY" ] && echo "IPv4.gateway=$NET_GATEWAY" >> $CONNMAN_PROFILE
-  fi
-
-  [ -n "$NET_DNS1" ] && NET_NAMESERVER="$NET_DNS1;"
-  [ -n "$NET_DNS2" ] && NET_NAMESERVER="${NET_NAMESERVER}$NET_DNS2;"
-  [ -n "$NET_DNS3" ] && NET_NAMESERVER="${NET_NAMESERVER}$NET_DNS3;"
-  [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER" >> $CONNMAN_PROFILE
-
-  (
-    local log_file="/var/log/${PROFILE_NAME}.log"
-
-    for i in $(seq 1 60); do
-      echo "--- $i $PROFILE_NAME ------------" >>$log_file 2>&1
-      dbus-send --system --dest=net.connman --print-reply /net/connman/service/${PROFILE_NAME} net.connman.Service.Connect >>$log_file 2>&1
-      usleep 500000
-
-      state=$(connman_state $PROFILE_NAME)
-      echo "state: <$state>" >>$log_file 2>&1
-
-      if [ "$state" = "online" -o "$state" = "ready" ]; then
-        echo "Done." >>$log_file 2>&1
-        break
-      else
-        usleep 1000000
-      fi
-    done
-  )&
-}
-
-set_wired_interface() {
-  local NET_MAC=""
-
-  for i in $(seq 1 30); do
-    if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
-      logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
-      usleep 500000
-    else
-      logger -t Connman "### [$i] found /sys/class/net/$NET_IFACE/address, continue ###"
-      NET_MAC=`cat /sys/class/net/$NET_IFACE/address | sed 's/://g'`
-      break
-    fi
-  done
-
-  # don't continue if interface is not found
-  [ -z "$NET_MAC" ] && return
-
-  PROFILE_NAME="ethernet_${NET_MAC}_cable"
-  CONNMAN_PROFILE=/var/lib/connman/${PROFILE_NAME}/settings
-
-  mkdir -p /var/lib/connman/${PROFILE_NAME}
-
-  echo "[${PROFILE_NAME}]" > $CONNMAN_PROFILE
-  echo "AutoConnect=true" >> $CONNMAN_PROFILE
-  if [ "$1" = "1" ]; then
-    echo "Favorite=true" >> $CONNMAN_PROFILE
-  else
-    echo "Favorite=false" >> $CONNMAN_PROFILE
-  fi
-
-  set_ip_address
-}
-
-set_wireless_interface() {
-  # we need ssid
-  [ -z "$NET_SSID" ] && return
-
-  local NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
-  local NET_MAC=""
-	
-  for i in $(seq 1 120); do
-    if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
-      logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
-      usleep 500000
-    else
-      logger -t Connman "### [$i] found /sys/class/net/$NET_IFACE/address, continue ###"
-      NET_MAC=`cat /sys/class/net/$NET_IFACE/address | sed 's/://g'`
-      break
-    fi
-  done
-
-  # don't continue if interface is not found
-  [ -z "$NET_MAC" ] && return
-  
-  # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
-  if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
-    MODE="managed_wep"
-  elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE"  ]; then
-    MODE="managed_psk"
-  else
-    MODE="managed_none"
-  fi
-
-  if [ "$NET_HIDDEN" = "true" ]; then
-    PROFILE_NAME="wifi_${NET_MAC}_hidden_${MODE}"
-  else
-    PROFILE_NAME="wifi_${NET_MAC}_${NET_SSID_HEX}_${MODE}"
-  fi
-
-  CONNMAN_PROFILE=/var/lib/connman/${PROFILE_NAME}/settings
-
-  mkdir -p /var/lib/connman/${PROFILE_NAME}
-
-  echo "[${PROFILE_NAME}]" > $CONNMAN_PROFILE
-  echo "Name=$NET_SSID" >> $CONNMAN_PROFILE
-  echo "SSID=$NET_SSID_HEX" >> $CONNMAN_PROFILE
-  [ -n "$NET_PASSPHRASE" ] && echo "Passphrase=$NET_PASSPHRASE" >> $CONNMAN_PROFILE
-  echo "AutoConnect=true" >> $CONNMAN_PROFILE	
-  if [ "$1" = "1" ]; then
-    echo "Favorite=true" >> $CONNMAN_PROFILE
-  else
-    echo "Favorite=false" >> $CONNMAN_PROFILE
-  fi
-  set_ip_address
-}
-
-set_interface() {
-  for i in 1 2; do
-    if [ "$i" = "2" ]; then
-      if [ -n "$NET2_NETWORK" -a "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE" != "$NET_IFACE" ]; then
-        # set second interface
-        NET_DNS1="$NET2_DNS1"
-        NET_DNS2="$NET2_DNS2"
-        NET_DNS3="$NET2_DNS3"
-        NET_GATEWAY="$NET2_GATEWAY"
-        NET_HIDDEN="$NET2_HIDDEN"
-        NET_IFACE="$NET2_IFACE"
-        NET_IPADDRESS="$NET2_IPADDRESS"
-        NET_NETWORK="$NET2_NETWORK"
-        NET_PASSPHRASE="$NET2_PASSPHRASE"
-        NET_PREFIXLEN="$NET2_PREFIXLEN"
-        NET_SECURITY="$NET2_SECURITY"
-        NET_SSID="$NET2_SSID"
-      else
-        break
-      fi
-    fi
-
-    if [ "$NET_NETWORK" = "WLAN" ]; then
-      progress "Setup networking $i WLAN"
-      set_wireless_interface $i
-    elif [ "$NET_NETWORK" = "LAN" ]; then
-      progress "Setup networking $i LAN"
-      set_wired_interface $i
-    fi
-  done
-}
-
-(
-  # starting Connection manager
+# starting Connection manager
   progress "starting Connection manager"
 
-  while true; do
-    set_basic
-    set_interface
-    set_hwclock
-
-    if [ -f $HOME/.config/debug.connman ]; then
-      /usr/sbin/connmand -nd > /dev/null 2>&1
-    else
-      /usr/sbin/connmand -n > /dev/null 2>&1
-    fi
-    usleep 250000
-  done
-)&
+  if [ -f $HOME/.config/debug.connman ]; then
+    /usr/sbin/connmand -d > /dev/null 2>&1
+  else
+    /usr/sbin/connmand > /dev/null 2>&1
+  fi