gsupplicant: use term managed in object path
authorKalle Valo <kalle.valo@canonical.com>
Mon, 27 Sep 2010 21:44:14 +0000 (00:44 +0300)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 27 Sep 2010 22:06:13 +0000 (00:06 +0200)
gsupplicant uses term "infra" instead of "managed" used by the old
wifi plugin. This forced connman to create a new service instead of using
the stored. For example, wifi_0026b6675606_76616c6f_managed_psk
vs wifi_0026b6675606_76616c6f_infra_psk.

Convert gsupplicant to use term "managed". That way old services work with
the new plugin.

gsupplicant/supplicant.c

index 8b9f777..f23ec47 100644 (file)
@@ -231,7 +231,7 @@ static const char *mode2string(GSupplicantMode mode)
        case G_SUPPLICANT_MODE_UNKNOWN:
                break;
        case G_SUPPLICANT_MODE_INFRA:
-               return "infra";
+               return "managed";
        case G_SUPPLICANT_MODE_IBSS:
                return "adhoc";
        }
@@ -736,7 +736,7 @@ static void merge_network(GSupplicantNetwork *network)
                g_string_append_printf(str, "%02x", ssid[i]);
 
        if (g_strcmp0(mode, "0") == 0)
-               g_string_append_printf(str, "_infra");
+               g_string_append_printf(str, "_managed");
        else if (g_strcmp0(mode, "1") == 0)
                g_string_append_printf(str, "_adhoc");