From 8e6fe4292186b53f5382e17633ac83584bb1760f Mon Sep 17 00:00:00 2001 From: Danny Jeongseok Seo Date: Thu, 31 May 2012 10:38:53 +0900 Subject: [PATCH] Update connman init script for supplicant 0.8 [Team] Data Network [Problem issues #] N/A [Cause] N/A [Solution] Revise debian/changelog OBS spec Revise DBus auto-activation Revise dhcp failure to enhance user experience during IP configuration failed Change-Id: I6a44f467bb769514071a595b9f61b6f83aab28b9 --- debian/changelog | 8 ++++++++ resources/etc/rc.d/init.d/connman | 21 ++++++++++++++++++++- .../usr/share/dbus-1/services/net.connman.service | 2 +- src/dhcp.c | 4 ++++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b85758b..5a994a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +connman (0.77.2-0slp2+76) unstable; urgency=low + + * Update ConnMan init script for Android suplicant + * Git: slp/pkgs/c/connman + * Tag: connman_0.77.2-0slp2+76 + + -- Danny Jeongseok Seo Tue, 24 Apr 2012 20:28:32 +0900 + connman (0.77.2-0slp2+75) unstable; urgency=low * Fix a bug which connman can't update MAC address of Wi-Fi diff --git a/resources/etc/rc.d/init.d/connman b/resources/etc/rc.d/init.d/connman index b01f831..b1b3b0a 100755 --- a/resources/etc/rc.d/init.d/connman +++ b/resources/etc/rc.d/init.d/connman @@ -1,2 +1,21 @@ #!/bin/sh -/usr/sbin/connmand -W wext & +HARDWARE_MODEL=`grep Hardware /proc/cpuinfo | awk "{print \\$3}"` +/bin/echo "Hardware Model=${HARDWARE_MODEL}" + +case $HARDWARE_MODEL in + "SLP_PQ") /bin/echo "This is PQ" + /usr/sbin/connmand -W nl80211 & + ;; + "U1SLP" | "U1HD") /bin/echo "This is U1SLP" + /usr/sbin/connmand -W wext & + ;; + "SLP7_C210") /bin/echo "This is C210" + /usr/sbin/connmand -W wext & + ;; + "SLP10_C210") + /usr/sbin/connmand -W wext & + ;; + *) + /usr/sbin/connmand -W nl80211 & + ;; +esac diff --git a/resources/usr/share/dbus-1/services/net.connman.service b/resources/usr/share/dbus-1/services/net.connman.service index 4ef877b..a1e5581 100644 --- a/resources/usr/share/dbus-1/services/net.connman.service +++ b/resources/usr/share/dbus-1/services/net.connman.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=net.connman -Exec=/usr/sbin/connmand -W wext +Exec=/etc/rc.d/init.d/connman User=root diff --git a/src/dhcp.c b/src/dhcp.c index 10e1403..09051a9 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -341,6 +341,9 @@ static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data) DBG("IPV4LL available"); +#if defined TIZEN_EXT + dhcp_invalidate(dhcp, TRUE); +#else service = __connman_service_lookup_from_network(dhcp->network); if (service == NULL) return; @@ -363,6 +366,7 @@ static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data) g_free(address); g_free(netmask); +#endif } static void dhcp_debug(const char *str, void *data) -- 2.7.4