We finally work with PSK/WEPKEY_0 entry and we now save our config.

[dhcpcd-ui] / main.c

diff --git a/main.c b/main.c
index 080b7708fe8daa8d3159f0c1a950e3f58ad9f7b0..edb4db6fedf0d939368a6131a1dfd0abfe57b444 100644 (file)
--- a/main.c
+++ b/main.c
@@ -85,7 +85,7 @@ find_if_msg(const char *iface)
 
        for (gl = interfaces; gl; gl = gl->next) {
                ifm = (struct if_msg *)gl->data;
-               if (g_strcmp0(ifm->name, iface) == 0)
+               if (g_strcmp0(ifm->ifname, iface) == 0)
                        return ifm;
        }
        return NULL;
@@ -94,6 +94,7 @@ find_if_msg(const char *iface)
 static void
 free_if_ap(struct if_ap *ifa)
 {
+       g_free(ifa->ifname);
        g_free(ifa->bssid);
        g_free(ifa->flags);
        g_free(ifa->ssid);
@@ -105,7 +106,7 @@ free_if_msg(struct if_msg *ifm)
 {
        GSList *gl;
 
-       g_free(ifm->name);
+       g_free(ifm->ifname);
        g_free(ifm->reason);
        g_free(ifm->ssid);
        for (gl = ifm->scan_results; gl; gl = gl->next)
@@ -160,10 +161,10 @@ get_scan_results(struct if_msg *ifm)
        otype = dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
        otype = dbus_g_type_get_collection("GPtrArray", otype);
 
-       if (!dbus_g_proxy_call(dbus, "GetScanResults", &error,
-                              G_TYPE_STRING, ifm->name, G_TYPE_INVALID,
+       if (!dbus_g_proxy_call(dbus, "ScanResults", &error,
+                              G_TYPE_STRING, ifm->ifname, G_TYPE_INVALID,
                               otype, &array, G_TYPE_INVALID))
-               error_exit(_("GetScanResults"), error);
+               error_exit(_("ScanResults"), error);
 
        for (i = 0; i < array->len; i++) {
                config = g_ptr_array_index(array, i);
@@ -171,6 +172,7 @@ get_scan_results(struct if_msg *ifm)
                if (val == NULL)
                        continue;
                ifa = g_malloc0(sizeof(*ifa));
+               ifa->ifname = g_strdup(ifm->ifname);
                ifa->bssid = g_strdup(g_value_get_string(val));
                val = g_hash_table_lookup(config, "Frequency");
                if (val)
@@ -205,7 +207,7 @@ make_if_msg(GHashTable *config)
        if (val == NULL)
                return NULL;
        ifm = g_malloc0(sizeof(*ifm));
-       ifm->name = g_strdup(g_value_get_string(val));
+       ifm->ifname = g_strdup(g_value_get_string(val));
        val = g_hash_table_lookup(config, "Reason");
        if (val)
                ifm->reason = g_strdup(g_value_get_string(val));
@@ -280,7 +282,7 @@ print_if_msg(const struct if_msg *ifm)
        if (reason == NULL)
                reason = ifm->reason;
        
-       len = strlen(ifm->name) + 3;
+       len = strlen(ifm->ifname) + 3;
        len += strlen(reason) + 1;
        if (ifm->ip.s_addr != 0) {
                len += 16; /* 000. * 4 */
@@ -290,7 +292,7 @@ print_if_msg(const struct if_msg *ifm)
        if (showssid)
                len += strlen(ifm->ssid) + 1;
        msg = p = g_malloc(len);
-       p += g_snprintf(msg, len, "%s: %s", ifm->name, reason);
+       p += g_snprintf(msg, len, "%s: %s", ifm->ifname, reason);
        if (showssid)
                p += g_snprintf(p, len - (p - msg), " %s", ifm->ssid);
        if (ifm->ip.s_addr != 0 && showip) {
@@ -310,9 +312,9 @@ if_msg_comparer(gconstpointer a, gconstpointer b)
        ifa = (const struct if_msg *)a;
        ifb = (const struct if_msg *)b;
        for (order = (const char *const *)interface_order; *order; order++) {
-               if (g_strcmp0(*order, ifa->name) == 0)
+               if (g_strcmp0(*order, ifa->ifname) == 0)
                        return -1;
-               if (g_strcmp0(*order, ifb->name) == 0)
+               if (g_strcmp0(*order, ifb->ifname) == 0)
                        return 1;
        }
        return 0;
@@ -464,7 +466,7 @@ dhcpcd_event(_unused DBusGProxy *proxy, GHashTable *config, _unused void *data)
        ifp = NULL;
        for (gl = interfaces; gl; gl = gl->next) {
                ifp = (struct if_msg *)gl->data;
-               if (g_strcmp0(ifp->name, ifm->name) == 0) {
+               if (g_strcmp0(ifp->ifname, ifm->ifname) == 0) {
                        ifm->scan_results = ifp->scan_results;
                        ifp->scan_results = NULL;
                        free_if_msg(ifp);
@@ -565,11 +567,11 @@ dhcpcd_get_interfaces()
                ifm = (struct if_msg *)gl->data;
                if (!ifm->wireless)
                        continue;
-               if (!dbus_g_proxy_call(dbus, "GetScanResults", &error,
-                                      G_TYPE_STRING, ifm->name, G_TYPE_INVALID,
+               if (!dbus_g_proxy_call(dbus, "ScanResults", &error,
+                                      G_TYPE_STRING, ifm->ifname, G_TYPE_INVALID,
                                       otype, &array, G_TYPE_INVALID)) 
                {
-                       g_message("GetScanResults: %s", error->message);
+                       g_message("ScanResults: %s", error->message);
                        g_clear_error(&error);
                        continue;
                }
@@ -583,7 +585,7 @@ dhcpcd_get_interfaces()
        update_online(&msg);
        // GTK+ 2.16 msg = gtk_status_icon_get_tooltip_text(status_icon);
        if (msg != NULL) {
-               notify("Interface status", msg, GTK_STOCK_NETWORK);
+               notify(N_("Interface status"), msg, GTK_STOCK_NETWORK);
                g_free(msg);
        }
 }
@@ -644,16 +646,41 @@ static void
 dhcpcd_scan_results(_unused DBusGProxy *proxy, const char *iface, _unused void *data)
 {
        struct if_msg *ifm;
-       GSList *gl;
+       struct if_ap *ifa, *ifa2;
+       GSList *gl, *aps, *l;
+       char *txt, *ntxt;
 
        ifm = find_if_msg(iface);
        if (ifm == NULL)
                return;
-       g_message(_("%s: Received scan results"), ifm->name);
+       g_message(_("%s: Received scan results"), ifm->ifname);
+       aps = get_scan_results(ifm);
+       txt = NULL;
+       for (gl = aps; gl; gl = gl->next) {
+               ifa = (struct if_ap *)gl->data;
+               for (l = ifm->scan_results; l; l = l->next) {
+                       ifa2 = (struct if_ap *)l->data;
+                       if (g_strcmp0(ifa->ssid, ifa2->ssid) == 0)
+                               break;
+               }
+               if (l == NULL) {
+                       if (txt == NULL)
+                               txt = g_strdup(ifa->ssid);
+                       else {
+                               ntxt =  g_strconcat(txt, "\n", ifa->ssid, NULL);
+                               g_free(txt);
+                               txt = ntxt;
+                       }
+               }
+       }
        for (gl = ifm->scan_results; gl; gl = gl->next)
                free_if_ap((struct if_ap *)gl->data);
        g_slist_free(ifm->scan_results);
-       ifm->scan_results = get_scan_results(ifm);
+       ifm->scan_results = aps;
+       if (txt != NULL) {
+               notify(N_("Found new AP"), txt, GTK_STOCK_NETWORK);
+               g_free(txt);
+       }
 }
 
 int