ofono: Remove support for CDMA
PATCH v2 1/2 ofono: Remove support for CDMA
oFono 2.2 removed all support for CDMA since most CDMA networks have now been shut down. Remove support for CDMA inside the ofono plugin as well.
--- plugins/ofono.c | 425 +----------------------------------------------- 1 file changed, 8 insertions(+), 417 deletions(-)
plugins/ofono.c +8 -417
@@ -52,8 +52,6 @@#define OFONO_NETREG_INTERFACE OFONO_SERVICE ".NetworkRegistration"#define OFONO_CM_INTERFACE OFONO_SERVICE ".ConnectionManager"#define OFONO_CONTEXT_INTERFACE OFONO_SERVICE ".ConnectionContext" -#define OFONO_CDMA_CM_INTERFACE OFONO_SERVICE ".cdma.ConnectionManager" -#define OFONO_CDMA_NETREG_INTERFACE OFONO_SERVICE ".cdma.NetworkRegistration"#define MODEM_ADDED "ModemAdded"#define MODEM_REMOVED "ModemRemoved"
@@ -72,8 +70,6 @@ enum ofono_api {OFONO_API_SIM =0x1 ,OFONO_API_NETREG =0x2 , OFONO_API_CM = 0x4, -OFONO_API_CDMA_NETREG =0x8 , - OFONO_API_CDMA_CM = 0x10, };/*
@@ -103,27 +99,6 @@ enum ofono_api {* successful the modem is connected to the network. oFono will inform * the plugin about IP configuration through the updating the context's * properties. -* -* CDMA working flow: -* -* When a new modem appears, the plugin always powers it up. This -* allows the plugin to create connman_device either using IMSI either -* using modem Serial if the modem got a SIM interface or not. -* -* As for GSM, the core will call modem_enable() if the technology -* is enabled. modem_enable() will then set the modem online. -* If the technology is disabled then modem_disable() will just set the -* modem offline. The modem is always kept powered all the time. -* -* After setting the modem online the plugin waits for CdmaConnectionManager -* interface to appear. Then, once CdmaNetworkRegistration appears, a new -* Service will be created and registered at the core. -* -* When asked to connect to the network (network_connect()) the plugin -* will power up the CdmaConnectionManager interface. -* If the operation is successful the modem is connected to the network. -* oFono will inform the plugin about IP configuration through the -* updating CdmaConnectionManager settings properties. */ static DBusConnection *connection;
@@ -166,9 +141,6 @@ struct modem_data {bool set_powered; -/* CDMA ConnectionManager Interface */ -bool cdma_cm_powered; -/* ConnectionManager Interface */ bool attached;bool cm_powered;
@@ -179,7 +151,6 @@ struct modem_data {/* Netreg Interface */ char *name;uint8_t strength; -uint8_t data_strength;/* 1xEVDO signal strength */ bool registered;bool roaming;
@@ -198,10 +169,6 @@ static const char *api2string(enum ofono_api api)return "netreg" ;case OFONO_API_CM :return "cm" ; -case OFONO_API_CDMA_NETREG : -return "cdma-netreg" ; -case OFONO_API_CDMA_CM : -return "cmda-cm" ; }return "unknown" ;
@@ -660,63 +627,6 @@ static int context_set_active(struct modem_data *modem,return err; } -static void cdma_cm_set_powered_reply (struct modem_data *modem, -struct network_context *context,bool success) -{ -DBG ("%s" , context->path); - -if (success) { -/* -* Don't handle do anything on success here. oFono will send -* the change via PropertyChanged signal. -*/ -return ; - } - -/* -* Powered = True might fail due a timeout. That means oFono -* still tries to go online. If we retry to set Powered = True, -* we just get a InProgress error message. Should we power -* cycle the modem in such cases? -*/ - -if (!context->network) { -/* -* In the case where we power down the device -* we don't wait for the reply, therefore the network -* might already be gone. -*/ -return ; - } - -connman_network_set_error (context->network, -CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL ); -} - -static int cdma_cm_set_powered (struct modem_data *modem,dbus_bool_t powered) -{ -int err; -struct network_context *context =NULL ; - -if (!modem->context_list) -return -1 ; - -DBG ("%s powered %d" , modem->path, powered); - -/* In case of CDMA, there is only one context */ - context = modem->context_list->data; - err =set_property (modem, context, modem->path, -OFONO_CDMA_CM_INTERFACE , -"Powered" ,DBUS_TYPE_BOOLEAN , - &powered, - cdma_cm_set_powered_reply); - -if (!powered && err == -EINPROGRESS ) -return 0 ; - -return err; -} -static int modem_set_online (struct modem_data *modem,dbus_bool_t online) {DBG ("%s online %d" , modem->path, online);
@@ -793,10 +703,6 @@ static uint8_t extract_interfaces(DBusMessageIter *array) interfaces |=OFONO_API_NETREG ; else if (g_str_equal(name, OFONO_CM_INTERFACE)) interfaces |= OFONO_API_CM; - else if (g_str_equal(name, OFONO_CDMA_CM_INTERFACE)) - interfaces |= OFONO_API_CDMA_CM; - else if (g_str_equal(name, OFONO_CDMA_NETREG_INTERFACE)) - interfaces |= OFONO_API_CDMA_NETREG;dbus_message_iter_next (&entry); }
@@ -1018,27 +924,19 @@ out:g_free (gateway); } +/* +* This functions tests if we have the necessary information gathered +* before we are able to create a device. +*/ static bool ready_to_create_device (struct modem_data *modem) { -/* -* There are three different modem types which behave slightly -* different: -* - GSM modems will expose the SIM interface then the -* CM interface. -* - CDMA modems will expose CM first and sometime later -* a unique serial number. -* -* This functions tests if we have the necessary information gathered -* before we are able to create a device. -*/ -if (modem->device)return false; -if (modem->imsi || modem->serial) -return true; +if (!modem->imsi) +return false; -return false; +return true; }static void create_device (struct modem_data *modem)
@@ -1050,8 +948,6 @@ static void create_device(struct modem_data *modem)if (modem->imsi) ident = modem->imsi; -else if (modem->serial) - ident = modem->serial;if (!connman_dbus_validate_ident (ident)) ident =connman_dbus_encode_string (ident);
@@ -1611,22 +1507,6 @@ static void netreg_update_strength(struct modem_data *modem,if (!modem->context_list)return ; -/* -* GSM: -* We don't have 2 signal notifications we always report the strength -* signal. data_strength is always equal to 0. -* -* CDMA: -* In the case we have a data_strength signal (from 1xEVDO network) -* we don't need to update the value with strength signal (from 1xCDMA) -* because the modem is registered to 1xEVDO network for data call. -* In case we have no data_strength signal (not registered to 1xEVDO -* network), we must report the strength signal (registered to 1xCDMA -* network e.g slow mode). -*/ -if (modem->data_strength !=0 ) -return ; -/* For all the context */ for (list = modem->context_list; list; list = list->next) {struct network_context *context = list->data;
@@ -1639,39 +1519,6 @@ static void netreg_update_strength(struct modem_data *modem, } } -/* Retrieve 1xEVDO Data Strength signal */ -static void netreg_update_datastrength (struct modem_data *modem, -DBusMessageIter *value) -{ -GSList *list; - -dbus_message_iter_get_basic (value, &modem->data_strength); - -DBG ("%s Data Strength %d" , modem->path, modem->data_strength); - -if (!modem->context_list) -return ; - -/* -* CDMA modem is not registered to 1xEVDO network, let -* update_signal_strength() reporting the value on the Strength signal -* notification. -*/ -if (modem->data_strength ==0 ) -return ; - -/* For all the context */ -for (list = modem->context_list; list; list = list->next) { -struct network_context *context = list->data; - -if (context->network) { -connman_network_set_strength (context->network, - modem->data_strength); -connman_network_update (context->network); - } - } -} -static void netreg_update_status (struct modem_data *modem,DBusMessageIter *value) {
@@ -1821,115 +1668,6 @@ static int netreg_get_properties(struct modem_data *modem) netreg_properties_reply, modem); } -static void add_cdma_network (struct modem_data *modem) -{ -struct network_context *context =NULL ; -/* Be sure that device is created before adding CDMA network */ -if (!modem->device) -return ; - -/* -* CDMA modems don't need contexts for data call, however the current -* add_network() logic needs one, so we create one to proceed. -*/ -if (!modem->context_list) { - context =network_context_alloc (modem->path); - modem->context_list =g_slist_prepend (modem->context_list, - context); - }else - context = modem->context_list->data; - -if (!modem->name) - modem->name =g_strdup ("CDMA Network" ); - -add_network (modem, context); - -if (modem->cdma_cm_powered) -set_connected (modem, context); -} - -static gboolean cdma_netreg_changed (DBusConnection *conn, -DBusMessage *message, -void *user_data) -{ -const char *path =dbus_message_get_path (message); -struct modem_data *modem; -DBusMessageIter iter, value; -const char *key; - -DBG ("" ); - - modem =g_hash_table_lookup (modem_hash, path); -if (!modem) -return TRUE; - -if (modem->ignore) -return TRUE; - -if (!dbus_message_iter_init (message, &iter)) -return TRUE; - -dbus_message_iter_get_basic (&iter, &key); - -dbus_message_iter_next (&iter); -dbus_message_iter_recurse (&iter, &value); - -if (g_str_equal (key,"Name" )) -netreg_update_name (modem, &value); -else if (g_str_equal (key,"Strength" )) -netreg_update_strength (modem, &value); -else if (g_str_equal (key,"DataStrength" )) -netreg_update_datastrength (modem, &value); -else if (g_str_equal (key,"Status" )) -netreg_update_status (modem, &value); - -if (modem->registered) -add_cdma_network (modem); -else -remove_all_networks (modem); - -return TRUE; -} - -static void cdma_netreg_properties_reply (struct modem_data *modem, -DBusMessageIter *dict) -{ -DBG ("%s" , modem->path); - -while (dbus_message_iter_get_arg_type (dict) ==DBUS_TYPE_DICT_ENTRY ) { -DBusMessageIter entry, value; -const char *key; - -dbus_message_iter_recurse (dict, &entry); -dbus_message_iter_get_basic (&entry, &key); - -dbus_message_iter_next (&entry); -dbus_message_iter_recurse (&entry, &value); - -if (g_str_equal (key,"Name" )) -netreg_update_name (modem, &value); -else if (g_str_equal (key,"Strength" )) -netreg_update_strength (modem, &value); -else if (g_str_equal (key,"DataStrength" )) -netreg_update_datastrength (modem, &value); -else if (g_str_equal (key,"Status" )) -netreg_update_status (modem, &value); - -dbus_message_iter_next (dict); - } - -if (modem->registered) -add_cdma_network (modem); -else -remove_all_networks (modem); -} - -static int cdma_netreg_get_properties (struct modem_data *modem) -{ -return get_properties (modem->path,OFONO_CDMA_NETREG_INTERFACE , - cdma_netreg_properties_reply, modem); -} -static void cm_update_attached (struct modem_data *modem,DBusMessageIter *value) {
@@ -1999,67 +1737,6 @@ static gboolean cm_changed(DBusConnection *conn, DBusMessage *message,return TRUE; } -static void cdma_cm_update_powered (struct modem_data *modem, -DBusMessageIter *value) -{ -struct network_context *context =NULL ; -dbus_bool_t cdma_cm_powered; - -dbus_message_iter_get_basic (value, &cdma_cm_powered); - modem->cdma_cm_powered = cdma_cm_powered; - -DBG ("%s CDMA cm Powered %d" , modem->path, modem->cdma_cm_powered); - -if (!modem->context_list) -return ; - -/* In case of CDMA, there is only one context */ - context = modem->context_list->data; -if (modem->cdma_cm_powered) -set_connected (modem, context); -else -set_disconnected (context); -} - -static void cdma_cm_update_settings (struct modem_data *modem, -DBusMessageIter *value) -{ -DBG ("%s Settings" , modem->path); - -extract_ipv4_settings (value, modem->context_list->data); -} - -static gboolean cdma_cm_changed (DBusConnection *conn, -DBusMessage *message,void *user_data) -{ -const char *path =dbus_message_get_path (message); -struct modem_data *modem; -DBusMessageIter iter, value; -const char *key; - - modem =g_hash_table_lookup (modem_hash, path); -if (!modem) -return TRUE; - -if (modem->online && !modem->context_list) -cdma_netreg_get_properties (modem); - -if (!dbus_message_iter_init (message, &iter)) -return TRUE; - -dbus_message_iter_get_basic (&iter, &key); - -dbus_message_iter_next (&iter); -dbus_message_iter_recurse (&iter, &value); - -if (g_str_equal (key,"Powered" )) -cdma_cm_update_powered (modem, &value); -if (g_str_equal (key,"Settings" )) -cdma_cm_update_settings (modem, &value); - -return TRUE; -} -static void cm_properties_reply (struct modem_data *modem,DBusMessageIter *dict) {DBG ("%s" , modem->path);
@@ -2089,39 +1766,6 @@ static int cm_get_properties(struct modem_data *modem) cm_properties_reply, modem); } -static void cdma_cm_properties_reply (struct modem_data *modem, -DBusMessageIter *dict) -{ -DBG ("%s" , modem->path); - -if (modem->online) -cdma_netreg_get_properties (modem); - -while (dbus_message_iter_get_arg_type (dict) ==DBUS_TYPE_DICT_ENTRY ) { -DBusMessageIter entry, value; -const char *key; - -dbus_message_iter_recurse (dict, &entry); -dbus_message_iter_get_basic (&entry, &key); - -dbus_message_iter_next (&entry); -dbus_message_iter_recurse (&entry, &value); - -if (g_str_equal (key,"Powered" )) -cdma_cm_update_powered (modem, &value); -if (g_str_equal (key,"Settings" )) -cdma_cm_update_settings (modem, &value); - -dbus_message_iter_next (dict); - } -} - -static int cdma_cm_get_properties (struct modem_data *modem) -{ -return get_properties (modem->path,OFONO_CDMA_CM_INTERFACE , - cdma_cm_properties_reply, modem); -} -static void sim_update_imsi (struct modem_data *modem,DBusMessageIter *value) {
@@ -2279,25 +1923,11 @@ static void modem_update_interfaces(struct modem_data *modem, } } -if (api_added (old_ifaces, new_ifaces,OFONO_API_CDMA_CM )) { -if (ready_to_create_device (modem)) { -create_device (modem); -if (modem->registered) -add_cdma_network (modem); - } - -if (modem->device) -cdma_cm_get_properties (modem); - } -if (api_added (old_ifaces, new_ifaces,OFONO_API_NETREG )) {if (modem->attached)netreg_get_properties (modem); } -if (api_added (old_ifaces, new_ifaces,OFONO_API_CDMA_NETREG )) -cdma_netreg_get_properties (modem); -if (api_removed (old_ifaces, new_ifaces,OFONO_API_CM )) {if (modem->call_get_contexts) {DBG ("cancelling pending GetContexts call" );
@@ -2308,14 +1938,8 @@ static void modem_update_interfaces(struct modem_data *modem,remove_all_contexts (modem); } -if (api_removed (old_ifaces, new_ifaces,OFONO_API_CDMA_CM )) -remove_all_contexts (modem); -if (api_removed (old_ifaces, new_ifaces,OFONO_API_NETREG ))remove_all_networks (modem); - -if (api_removed (old_ifaces, new_ifaces,OFONO_API_CDMA_NETREG )) -remove_all_networks (modem); } static gboolean modem_changed(DBusConnection *conn, DBusMessage *message,
@@ -2385,15 +2009,6 @@ static gboolean modem_changed(DBusConnection *conn, DBusMessage *message, modem->serial =g_strdup (serial);DBG ("%s Serial %s" , modem->path, modem->serial); - -if (has_interface (modem->interfaces, -OFONO_API_CDMA_CM )) { -if (ready_to_create_device (modem)) { -create_device (modem); -if (modem->registered) -add_cdma_network (modem); - } - } }return TRUE;
@@ -2717,8 +2332,6 @@ static int network_connect(struct connman_network *network)if (has_interface (modem->interfaces,OFONO_API_CM ))return context_set_active (modem, context, TRUE); -else if (has_interface (modem->interfaces,OFONO_API_CDMA_CM )) -return cdma_cm_set_powered (modem, TRUE);connman_error ("Connection manager interface not available" );
@@ -2741,8 +2354,6 @@ static int network_disconnect(struct connman_network *network)if (has_interface (modem->interfaces,OFONO_API_CM ))return context_set_active (modem, context, FALSE); -else if (has_interface (modem->interfaces,OFONO_API_CDMA_CM )) -return cdma_cm_set_powered (modem, FALSE);connman_error ("Connection manager interface not available" );
@@ -2833,8 +2444,6 @@ static guint context_added_watch;static guint context_removed_watch;static guint netreg_watch;static guint context_watch; -static guint cdma_cm_watch; -static guint cdma_netreg_watch;static int ofono_init (void ) {
@@ -2907,25 +2516,11 @@ static int ofono_init(void) netreg_changed, NULL, NULL); - cdma_cm_watch =g_dbus_add_signal_watch (connection,OFONO_SERVICE , -NULL ,OFONO_CDMA_CM_INTERFACE , -PROPERTY_CHANGED , - cdma_cm_changed, -NULL ,NULL ); - - cdma_netreg_watch =g_dbus_add_signal_watch (connection,OFONO_SERVICE , -NULL ,OFONO_CDMA_NETREG_INTERFACE , -PROPERTY_CHANGED , - cdma_netreg_changed, -NULL ,NULL ); - -if (watch ==0 || modem_added_watch ==0 || modem_removed_watch ==0 || modem_watch ==0 || cm_watch ==0 || sim_watch ==0 || context_added_watch ==0 || context_removed_watch ==0 || - context_watch ==0 || netreg_watch ==0 || - cdma_cm_watch ==0 || cdma_netreg_watch ==0 ) { + context_watch ==0 || netreg_watch ==0 ) { err = -EIO ; goto remove; }
@@ -2950,8 +2545,6 @@ static int ofono_init(void)return 0 ; remove: -g_dbus_remove_watch (connection, cdma_netreg_watch); -g_dbus_remove_watch (connection, cdma_cm_watch);g_dbus_remove_watch (connection, netreg_watch);g_dbus_remove_watch (connection, context_watch);g_dbus_remove_watch (connection, context_removed_watch);
@@ -2994,8 +2587,6 @@ static void ofono_exit(void)connman_device_driver_unregister (&modem_driver);connman_network_driver_unregister (&network_driver); -g_dbus_remove_watch (connection, cdma_netreg_watch); -g_dbus_remove_watch (connection, cdma_cm_watch);g_dbus_remove_watch (connection, netreg_watch);g_dbus_remove_watch (connection, context_watch);g_dbus_remove_watch (connection, context_removed_watch);
Signature · 1 line
2.43.0
PATCH v2 2/2 ofono: Don't invoke SetProperty unnecessarily
When org.ofono.Modem.Powered property changes, connman invokes the SetProperty method again with the new value. This is pointless and only creates unnecessary DBus traffic.
connmand[30]: plugins/ofono.c:modem_set_powered() /phonesim powered 1
connmand[30]: plugins/ofono.c:set_property() /phonesim path /phonesim org.ofono.Modem.Powered connmand[30]: plugins/ofono.c:set_property_reply() /phonesim path /phonesim org.ofono.Modem.Powered connmand[30]: plugins/ofono.c:modem_changed() /phonesim Powered 1
connmand[30]: plugins/ofono.c:modem_set_powered() /phonesim powered 1
connmand[30]: plugins/ofono.c:set_property() /phonesim path /phonesim org.ofono.Modem.Powered connmand[30]: plugins/ofono.c:set_property_reply() /phonesim path /phonesim org.ofono.Modem.Powered
--- plugins/ofono.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
plugins/ofono.c +2 -3
@@ -1969,12 +1969,11 @@ static gboolean modem_changed(DBusConnection *conn, DBusMessage *message,dbus_bool_t powered;dbus_message_iter_get_basic (&value, &powered); + modem->powered = powered; + modem->set_powered = powered;DBG ("%s Powered %d" , modem->path, modem->powered); - -/* Set the powered according to the value */ -modem_set_powered (modem, powered); }else if (g_str_equal (key,"Online" )) {dbus_bool_t online;
Signature · 1 line
2.43.0
This series was applied to connman.git (master) by Marcel Holtmann <[email protected]>:
Hello:
This series was applied to connman.git (master)
by Marcel Holtmann <[email protected]>:
Quoted 6 lines · On Thu, 25 Jan 2024 16:28:47 -0600 you wrote:
oFono 2.2 removed all support for CDMA since most CDMA networks have now been shut down. Remove support for CDMA inside the ofono plugin as well.
--- plugins/ofono.c | 425 +----------------------------------------------- 1 file changed, 8 insertions(+), 417 deletions(-)
Here is the summary with links:
- [v2,1/2] ofono: Remove support for CDMA
https://git.kernel.org/pub/scm/network/connman/connman.git/?id=ff19b5985aaf - [v2,2/2] ofono: Don't invoke SetProperty unnecessarily https://git.kernel.org/pub/scm/network/connman/connman.git/?id=ee0046efd0f3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html