Added support for GSM in the modemmgr plugin.

src/service.c

 /*
  *
  *  Connection Manager
  *
  *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  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.
  *
@@ skipping 372 matching lines @@
         case CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATING:
                 return "activating";
         case CONNMAN_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED:
                 return "not-activated";
         case CONNMAN_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED:
                 return "partially-activated";
         }
         return NULL;
 }
 
-static enum connman_network_activation_state string2activation_state(
-                const char *state)
-{
-        if (g_strcmp0(state, "unknown") == 0)
-                return CONNMAN_NETWORK_ACTIVATION_STATE_UNKNOWN;
-        else if (g_strcmp0(state, "activated") == 0)
-                return CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATED;
-        else if (g_strcmp0(state, "activating") == 0)
-                return CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATING;
-        else if (g_strcmp0(state, "not-activated") == 0)
-                return CONNMAN_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED;
-        else if (g_strcmp0(state, "partially-activated") == 0)
-                return CONNMAN_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED;
-        return CONNMAN_NETWORK_ACTIVATION_STATE_UNKNOWN;
-}
-
 static const char *network_technology2string(
         enum connman_network_cellular_technology technology)
 {
         switch (technology) {
         case CONNMAN_NETWORK_TECHNOLOGY_1XRTT:
                 return "1xRTT";
         case CONNMAN_NETWORK_TECHNOLOGY_EVDO:
                 return "EVDO";
+        case CONNMAN_NETWORK_TECHNOLOGY_GSM:
+                return "GSM";
         case CONNMAN_NETWORK_TECHNOLOGY_GPRS:
                 return "GPRS";
         case CONNMAN_NETWORK_TECHNOLOGY_EDGE:
                 return "EDGE";
         case CONNMAN_NETWORK_TECHNOLOGY_UMTS:
                 return "UMTS";
         case CONNMAN_NETWORK_TECHNOLOGY_HSPA:
                 return "HSPA";
         case CONNMAN_NETWORK_TECHNOLOGY_HSPA_PLUS:
                 return "HSPA+";
@@ skipping 1130 matching lines @@
  * @service: service structure
  * @activation state: control interface
  * @err: if the activation failed a reason for the failure
  *
  * Set the activation state of the network
  */
 void __connman_service_set_activation_state(struct connman_service *service,
         enum connman_network_activation_state activation_state,
         enum connman_element_error err)
 {
-        struct connman_device *device;
-
         const char *state = activation_state2string(activation_state);
 
         if (err != CONNMAN_ELEMENT_ERROR_UNKNOWN) {
                 service->error = __connman_element_convert_error(err);
                 __connman_service_indicate_state(
                                 service,
                                 CONNMAN_SERVICE_STATE_ACTIVATION_FAILURE);
         }
 
-        if (service->cellular.activation_state != activation_state) {
-                service->cellular.activation_state = activation_state;
-                if (activation_state == CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATED) {
-                        device = connman_service_get_device(service);
-                        if (device != NULL)
-                                __connman_device_set_modem_update_time(device);
-                }
-                __connman_storage_save_service(service);
-        }
-
+        service->cellular.activation_state = activation_state;
         /* NB: connman_dbus_send_property_changed logs msg on failure */
         (void) connman_dbus_send_property_changed_variant(service->path,
                 CONNMAN_SERVICE_INTERFACE, "Cellular.ActivationState",
                 DBUS_TYPE_STRING, &state);
 }
 
 /**
  * __connman_service_set_operator_info:
  * @service: service structure
  * @name: operator name
@@ skipping 68 matching lines @@
  * @network_technology: e.g., GPRS, EDGE, HSPA, 1xRTT, EVDO, etc.
  * @roaming_state: e.g., Home, Roaming
  *
  * Set network technology and roaming status information for the service.
  */
 void __connman_service_set_registration_info(
                 struct connman_service *service,
                 enum connman_network_cellular_technology network_technology,
                 enum connman_network_cellular_roaming_state roaming_state)
 {
-        enum connman_network_cellular_technology otech =
-                        service->cellular.network_technology;
-        enum connman_network_cellular_roaming_state oroam =
-                        service->cellular.roaming_state;
-        const char *tech_str = network_technology2string(network_technology);
-        const char *roam_str = roaming_state2string(roaming_state);
+        const char *tech_str;
+        const char *roam_str;
 
-        service->cellular.network_technology = network_technology;
-        service->cellular.roaming_state = roaming_state;
-        if (otech != network_technology && tech_str != NULL) {
-                (void) connman_dbus_send_property_changed_variant(
-                                service->path,
-                                CONNMAN_SERVICE_INTERFACE,
-                                "Cellular.NetworkTechnology",
-                                DBUS_TYPE_STRING, &tech_str);
+        if (network_technology != CONNMAN_NETWORK_TECHNOLOGY_UNKNOWN) {
+                tech_str = network_technology2string(network_technology);
+                if (service->cellular.network_technology != network_technology &&
+                    tech_str != NULL) {
+                        (void) connman_dbus_send_property_changed_variant(
+                                        service->path,
+                                        CONNMAN_SERVICE_INTERFACE,
+                                        "Cellular.NetworkTechnology",
+                                        DBUS_TYPE_STRING, &tech_str);
+                }
+                service->cellular.network_technology = network_technology;
         }
-        if (oroam != roaming_state && roam_str != NULL) {
-                (void) connman_dbus_send_property_changed_variant(
-                                service->path,
-                                CONNMAN_SERVICE_INTERFACE,
-                                "Cellular.RoamingState",
-                                DBUS_TYPE_STRING, &roam_str);
+        if (roaming_state != CONNMAN_NETWORK_ROAMING_STATE_UNKNOWN) {
+                roam_str = roaming_state2string(roaming_state);
+                if (service->cellular.roaming_state != roaming_state &&
+                    roam_str != NULL) {
+                        (void) connman_dbus_send_property_changed_variant(
+                                        service->path,
+                                        CONNMAN_SERVICE_INTERFACE,
+                                        "Cellular.RoamingState",
+                                        DBUS_TYPE_STRING, &roam_str);
+                }
+                service->cellular.roaming_state = roaming_state;
         }
 }
 
 void connman_service_set_connectivity_state(struct connman_service *service,
       enum connman_service_connectivity_state connectivity)
 {
         enum connman_service_connectivity_state
                 oconnectivity = service->connectivity_state;
         const char *state_str = connectivity_state2string(connectivity);
 
@@ skipping 2094 matching lines @@
 
         case CONNMAN_SERVICE_TYPE_CELLULAR:
                 service->favorite = g_key_file_get_boolean(keyfile,
                                 service->identifier, "Favorite", NULL);
 
                 autoconnect = g_key_file_get_boolean(keyfile,
                                 service->identifier, "AutoConnect", &error);
                 if (error == NULL)
                         service->autoconnect = autoconnect;
                 g_clear_error(&error);
-                str = g_key_file_get_string(keyfile,
-                                            service->identifier,
-                                            "Cellular.ActivationState", NULL);
-                if (str != NULL) {
-                        service->cellular.activation_state =
-                                        string2activation_state(str);
-                }
                 break;
         default:
                 break;
         }
 
         str = g_key_file_get_string(keyfile,
                                 service->identifier, "Modified", NULL);
         if (str != NULL) {
                 g_time_val_from_iso8601(str, &service->modified);
                 g_free(str);
@@ skipping 130 matching lines @@
                                                         "Failure", NULL);
                 }
                 /* fall through */
         case CONNMAN_SERVICE_TYPE_CELLULAR:
                 g_key_file_set_boolean(keyfile, service->identifier,
                                         "Favorite", service->favorite);
 
                 if (service->favorite == TRUE)
                         g_key_file_set_boolean(keyfile, service->identifier,
                                         "AutoConnect", service->autoconnect);
-                if (service->cellular.activation_state !=
-                    CONNMAN_NETWORK_ACTIVATION_STATE_UNKNOWN)
-                        g_key_file_set_string(
-                                keyfile,
-                                service->identifier,
-                                "Cellular.ActivationState",
-                                activation_state2string(
-                                        service->cellular.activation_state));
                 break;
         default:
                 break;
         }
 
         str = g_time_val_to_iso8601(&service->modified);
         if (str != NULL) {
                 g_key_file_set_string(keyfile, service->identifier,
                                                         "Modified", str);
                 g_free(str);
@@ skipping 102 matching lines @@
         service_list = NULL;
 
         g_hash_table_destroy(service_hash);
         service_hash = NULL;
 
         connman_storage_unregister(&service_storage);
         connman_notifier_unregister(&service_notifier);
 
         dbus_connection_unref(connection);
 }