[meego-commits] 24431: Changes to MeeGo:1.2.0:oss/connman
jieyang
no_reply at build.meego.com
Fri Oct 28 07:46:43 UTC 2011
Hi,
I have made the following changes to connman in project MeeGo:1.2.0:oss. Please review and accept ASAP.
Thank You,
jieyang
[This message was auto-generated]
---
Request #24431:
submit: MeeGo:1.2.0:oss:Update:Testing/connman(r5) -> MeeGo:1.2.0:oss/connman
Message:
revert to 0.69.6
State: new 2011-10-28T00:33:07 jieyang
Comment: None
changes files:
--------------
--- connman.changes
+++ connman.changes
@@ -0,0 +1,16 @@
+* Thu Oct 20 2011 Arron <arron.wang at intel.com> - 0.77.3
+- Upgrade to the stable version 0.77.3
+- Fixed BMC#22947 BMC#18043
+
+* Mon Oct 17 2011 DengYingAn <ying.an.deng at intel.com> - 0.69.6
+- integrate patches for 3G enabling features, for BMC# 23628, etc.
+
+* Mon Sep 26 2011 Jussi Kukkonen <jku at linux.intel.com> - 0.69.6
+- upgrade to 0.69.6 from Meego:1.2:oss (BMC#23410)
+- service: Fix Manager.ConnectService D-Bus reply (BMC#23401)
+- tethering: Use tether device IP as DNS server (BMC#23402)
+- ntp: Fix ntpd_running return TRUE most of the time \
+- add ntpd build support and ntpd path at spec file (BMC#23341)
+- add localtime fixing patch \
+- and fix-double-free-error.patch (BMC #23403)
+
@@ -380 +396 @@
-* Fri Sept 26 2008 Martin Xu <martin.xu at intel.com>
+* Fri Sep 26 2008 Martin Xu <martin.xu at intel.com>
@@ -385 +401 @@
-* Wed Sept 25 2008 Martin Xu <martin.xu at intel.com>
+* Wed Sep 25 2008 Martin Xu <martin.xu at intel.com>
old:
----
connman-0.69.4.tar.bz2
new:
----
0001-ofono-add-cdma-modem-support-6.patch
connman-0.77.3.tar.bz2
spec files:
-----------
--- connman.spec
+++ connman.spec
@@ -1,24 +1,26 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.21
+# Generated by: spectacle version 0.22
#
# >> macros
# << macros
Name: connman
Summary: Connection Manager
-Version: 0.69.4
+Version: 0.77.3
Release: 1
Group: System/Networking
License: GPLv2
URL: http://connman.net/
Source0: http://www.kernel.org/pub/linux/network/connman/connman-%{version}.tar.bz2
Source100: connman.yaml
+Patch0: 0001-ofono-add-cdma-modem-support-6.patch
Requires: dbus
Requires: wpa_supplicant >= 0.7.1
Requires: bluez
Requires: ofono
Requires: pacrunner
+Requires: ntp
%ifarch %{ix86}
BuildRequires: pkgconfig(libiWmxSdk-0)
%endif
@@ -69,6 +71,8 @@
%prep
%setup -q -n %{name}-%{version}
+# 0001-ofono-add-cdma-modem-support-6.patch
+%patch0 -p1
# >> setup
# << setup
@@ -88,6 +92,8 @@
--enable-openconnect=builtin \
--enable-openvpn=builtin \
--enable-pacrunner=builtin \
+ --enable-ntpd=builtin \
+ --with-ntpd=/usr/sbin/ntpd \
%ifarch %{ix86}
--enable-iwmx \
%endif
other changes:
--------------
++++++ 0001-ofono-add-cdma-modem-support-6.patch (new)
--- 0001-ofono-add-cdma-modem-support-6.patch
+++ 0001-ofono-add-cdma-modem-support-6.patch
+---
+Change log from v4:
+ - manage CDMA network registration, netwok is retrieved like GSM case
+ - modem path is used as network hash_table key
+ - create CDMA_SERVICE macro to avoid over 80 characters lines
+
+ plugins/ofono.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 184 insertions(+), 9 deletions(-)
+
+diff --git a/plugins/ofono.c b/plugins/ofono.c
+index 060cd8e..adb715d 100644
+--- a/plugins/ofono.c
++++ b/plugins/ofono.c
+@@ -51,6 +51,11 @@
+ #define OFONO_SIM_INTERFACE OFONO_SERVICE ".SimManager"
+ #define OFONO_REGISTRATION_INTERFACE OFONO_SERVICE ".NetworkRegistration"
+
++#define CDMA_SERVICE OFONO_SERVICE ".cdma"
++
++#define OFONO_CDMA_INTERFACE CDMA_SERVICE ".ConnectionManager"
++#define OFONO_CDMA_NETREG_INTERFACE CDMA_SERVICE ".NetworkRegistration"
++
+ #define PROPERTY_CHANGED "PropertyChanged"
+ #define GET_PROPERTIES "GetProperties"
+ #define SET_PROPERTY "SetProperty"
+@@ -76,6 +81,8 @@ struct modem_data {
+ gboolean has_sim;
+ gboolean has_reg;
+ gboolean has_gprs;
++ gboolean has_cdma;
++ gboolean has_cdma_reg;
+ gboolean available;
+ gboolean pending_online;
+ dbus_bool_t requested_online;
+@@ -90,6 +97,7 @@ struct modem_data {
+ connman_bool_t roaming;
+ uint8_t strength, has_strength;
+ char *operator;
++ char *serial;
+ };
+
+ struct network_info {
+@@ -337,6 +345,7 @@ static struct connman_device_driver modem_driver = {
+
+ static void remove_device_networks(struct connman_device *device)
+ {
++ struct modem_data *modem = connman_device_get_data(device);
+ GHashTableIter iter;
+ gpointer key, value;
+ GSList *info_list = NULL;
+@@ -362,6 +371,11 @@ static void remove_device_networks(struct connman_device *device)
+ connman_device_remove_network(device, info->network);
+ }
+
++ if (modem->has_cdma == TRUE) {
++ g_hash_table_remove(network_hash, modem->path);
++ modem->has_cdma = FALSE;
++ }
++
+ g_slist_free(info_list);
+ }
+
+@@ -388,6 +402,7 @@ static void remove_modem(gpointer data)
+
+ g_free(modem->path);
+ g_free(modem->operator);
++ g_free(modem->serial);
+
+ g_free(modem);
+ }
+@@ -541,25 +556,57 @@ done:
+
+ static int set_network_active(struct connman_network *network)
+ {
++ struct connman_device *device;
++ struct modem_data *modem;
+ dbus_bool_t value = TRUE;
+ const char *path = connman_network_get_string(network, "Path");
+
+ DBG("network %p, path %s", network, path);
+
+- return set_property(path, OFONO_CONTEXT_INTERFACE,
+- "Active", DBUS_TYPE_BOOLEAN, &value,
+- set_active_reply, g_strdup(path), g_free);
++ device = connman_network_get_device(network);
++ if (device == NULL)
++ return -ENODEV;
++
++ modem = connman_device_get_data(device);
++ if (modem == NULL)
++ return -ENODEV;
++
++ if (modem->has_cdma == TRUE)
++ return set_property(path, OFONO_CDMA_INTERFACE,
++ "Powered", DBUS_TYPE_BOOLEAN, &value,
++ set_active_reply, g_strdup(path),
++ g_free);
++ else
++ return set_property(path, OFONO_CONTEXT_INTERFACE,
++ "Active", DBUS_TYPE_BOOLEAN, &value,
++ set_active_reply,
++ g_strdup(path), g_free);
+ }
+
+ static int set_network_inactive(struct connman_network *network)
+ {
++ struct connman_device *device;
++ struct modem_data *modem;
+ int err;
+ dbus_bool_t value = FALSE;
+ const char *path = connman_network_get_string(network, "Path");
+
+ DBG("network %p, path %s", network, path);
+
+- err = set_property(path, OFONO_CONTEXT_INTERFACE,
++ device = connman_network_get_device(network);
++ if (device == NULL)
++ return -ENODEV;
++
++ modem = connman_device_get_data(device);
++ if (modem == NULL)
++ return -ENODEV;
++
++ if (modem->has_cdma == TRUE)
++ err = set_property(path, OFONO_CDMA_INTERFACE,
++ "Powered", DBUS_TYPE_BOOLEAN, &value,
++ NULL, NULL, NULL);
++ else
++ err = set_property(path, OFONO_CONTEXT_INTERFACE,
+ "Active", DBUS_TYPE_BOOLEAN, &value,
+ NULL, NULL, NULL);
+
+@@ -587,7 +634,7 @@ static int network_connect(struct connman_network *network)
+ if (modem->registered == FALSE)
+ return -ENOLINK;
+
+- if (modem->powered == FALSE)
++ if (modem->powered == FALSE && modem->has_cdma == FALSE)
+ return -ENOLINK;
+
+ if (modem->roaming_allowed == FALSE && modem->roaming == TRUE)
+@@ -1213,9 +1260,14 @@ static void check_registration(struct modem_data *modem)
+
+ DBG("modem %p path %s", modem, path);
+
+- call_ofono(path, OFONO_REGISTRATION_INTERFACE, GET_PROPERTIES,
+- check_registration_reply, g_strdup(path), g_free,
+- DBUS_TYPE_INVALID);
++ if (modem->has_cdma)
++ call_ofono(path, OFONO_CDMA_NETREG_INTERFACE, GET_PROPERTIES,
++ check_registration_reply, g_strdup(path),
++ g_free, DBUS_TYPE_INVALID);
++ else
++ call_ofono(path, OFONO_REGISTRATION_INTERFACE, GET_PROPERTIES,
++ check_registration_reply, g_strdup(path),
++ g_free, DBUS_TYPE_INVALID);
+ }
+
+ static void modem_gprs_changed(struct modem_data *modem,
+@@ -1355,6 +1407,9 @@ static void add_device(const char *path, const char *imsi)
+
+ if (modem->has_gprs)
+ check_gprs(modem);
++
++ if (modem->has_cdma)
++ add_network(modem->device, modem->path, NULL);
+ }
+
+ static void sim_properties_reply(DBusPendingCall *call, void *user_data)
+@@ -1464,6 +1519,17 @@ static gboolean modem_has_gprs(DBusMessageIter *array)
+ return modem_has_interface(array, OFONO_GPRS_INTERFACE);
+ }
+
++static gboolean modem_has_cdma(DBusMessageIter *array)
++{
++ return modem_has_interface(array,
++ OFONO_CDMA_INTERFACE);
++}
++
++static gboolean modem_has_cdma_reg(DBusMessageIter *array)
++{
++ return modem_has_interface(array, OFONO_CDMA_NETREG_INTERFACE);
++}
++
+ static void add_modem(const char *path, DBusMessageIter *prop)
+ {
+ struct modem_data *modem;
+@@ -1473,6 +1539,8 @@ static void add_modem(const char *path, DBusMessageIter *prop)
+ gboolean has_sim = FALSE;
+ gboolean has_reg = FALSE;
+ gboolean has_gprs = FALSE;
++ gboolean has_cdma = FALSE;
++ gboolean has_cdma_reg = FALSE;
+
+ modem = g_hash_table_lookup(modem_hash, path);
+
+@@ -1486,6 +1554,8 @@ static void add_modem(const char *path, DBusMessageIter *prop)
+ modem->path = g_strdup(path);
(195 more lines skipped)
++++++ connman-0.69.4.tar.bz2 -> connman-0.77.3.tar.bz2
28572 lines of diff (skipped)
++++++ connman.yaml
--- connman.yaml
+++ connman.yaml
@@ -1,6 +1,6 @@
Name: connman
Summary: Connection Manager
-Version: 0.69.4
+Version: 0.77.3
Release: 1
Group: System/Networking
License: GPLv2
@@ -17,6 +17,7 @@
- bluez
- ofono
- pacrunner
+ - ntp
PkgBR:
- openconnect
- openvpn
@@ -26,7 +27,8 @@
- glib-2.0
- dbus-1
- libudev >= 145
-
+Patches:
+ - 0001-ofono-add-cdma-modem-support-6.patch
Configure: configure
ConfigOptions:
- --enable-ethernet=builtin
@@ -40,6 +42,8 @@
- --enable-openconnect=builtin
- --enable-openvpn=builtin
- --enable-pacrunner=builtin
+ - --enable-ntpd=builtin
+ - --with-ntpd=/usr/sbin/ntpd
- ix86:--enable-iwmx
- --enable-threads
- --enable-test
More information about the MeeGo-commits
mailing list