System tray could still be loading so just warn and continue.

[dhcpcd-ui] / src / dhcpcd-gtk / wpa.c

diff --git a/src/dhcpcd-gtk/wpa.c b/src/dhcpcd-gtk/wpa.c
index 6459709fc3c800fe29a8c02205ded7248f96517b..58feda10b3e4b38a85c7d1dde7a5a4798a0e34ba 100644 (file)
--- a/src/dhcpcd-gtk/wpa.c
+++ b/src/dhcpcd-gtk/wpa.c
@@ -24,6 +24,8 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <errno.h>
+

 #include "dhcpcd-gtk.h"
 
 static void
 #include "dhcpcd-gtk.h"
 
 static void


@@ -38,55 +40,6 @@ wpa_dialog(const char *title, const char *txt)
        gtk_widget_destroy(dialog);
 }
 
        gtk_widget_destroy(dialog);
 }
 

-static bool
-configure_network(DHCPCD_CONNECTION *con, DHCPCD_IF *i,
-    int id, const char *mgmt, const char *var, const char *val, bool quote)
-{
-       char *str;
-       static bool warned = false;
-
-       if (!dhcpcd_wpa_set_network(con, i, id, "key_mgmt", mgmt))
-               return false;
-       if (quote)
-               str = g_strconcat("\"", val, "\"", NULL);
-       else
-               str = NULL;
-       if (!dhcpcd_wpa_set_network(con, i, id, var, quote ? str : val)) {
-               g_warning("libdhcpcd: %s", dhcpcd_error(con));
-               dhcpcd_error_clear(con);
-               g_free(str);
-               wpa_dialog(_("Error setting password"),
-                   _("Failed to set password, probably too short."));
-               return false;
-       }
-       g_free(str);
-       if (!dhcpcd_wpa_command(con, i, "EnableNetwork", id))
-               return false;
-       if (!dhcpcd_wpa_command(con, i, "SaveConfig", -1)) {
-               g_warning("libdhcpcd: %s", dhcpcd_error(con));
-               dhcpcd_error_clear(con);
-               if (!warned) {
-                       warned = true;
-                       wpa_dialog(_("Error saving configuration"),
-                           _("Failed to save wpa_supplicant configuration.\n\nYou should add update_config=1 to /etc/wpa_supplicant.conf.\nThis warning will not appear again until program restarted."));
-               }
-               return false;
-       }
-/*
-  if (!dbus_g_proxy_call(dbus, "Disconnect", &error,
-  G_TYPE_STRING, ifname,
-  G_TYPE_INVALID,
-  G_TYPE_INVALID))
-  {
-  g_warning("Disconnect: %s", error->message);
-  g_error_free(error);
-  }
-*/
-       if (!dhcpcd_wpa_command(con, i, "Reassociate", -1))
-               return false;
-       return true;
-}
-

 static void
 onEnter(_unused GtkWidget *widget, gpointer *data)
 {
 static void
 onEnter(_unused GtkWidget *widget, gpointer *data)
 {


@@ -94,14 +47,19 @@ onEnter(_unused GtkWidget *widget, gpointer *data)
 }
 
 bool
 }
 
 bool

-wpa_configure(DHCPCD_CONNECTION *con, DHCPCD_IF *i, DHCPCD_WI_SCAN *s)
+wpa_configure(DHCPCD_WPA *wpa, DHCPCD_WI_SCAN *scan)

 {
 {

+       DHCPCD_WI_SCAN s;

        GtkWidget *dialog, *label, *psk, *vbox, *hbox;
        GtkWidget *dialog, *label, *psk, *vbox, *hbox;

-       const char *var, *mgt;
-       int result, id;
+       const char *var, *errt;
+       int result;

        bool retval;
 
        bool retval;
 

-       dialog = gtk_dialog_new_with_buttons(s->ssid,
+       /* Take a copy of scan incase it's destroyed by a scan update */
+       memcpy(&s, scan, sizeof(s));
+       s.next = NULL;
+
+       dialog = gtk_dialog_new_with_buttons(s.ssid,

            NULL,
            GTK_DIALOG_MODAL,
            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
            NULL,
            GTK_DIALOG_MODAL,
            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,


@@ -128,23 +86,34 @@ wpa_configure(DHCPCD_CONNECTION *con, DHCPCD_IF *i, DHCPCD_WI_SCAN *s)
 again:
        result = gtk_dialog_run(GTK_DIALOG(dialog));
 
 again:
        result = gtk_dialog_run(GTK_DIALOG(dialog));
 

-       id = -1;

        retval = false;
        if (result == GTK_RESPONSE_ACCEPT) {
        retval = false;
        if (result == GTK_RESPONSE_ACCEPT) {

-               id = dhcpcd_wpa_find_network_new(con, i, s->ssid);
-               if (g_strcmp0(s->flags, "[WEP]") == 0) {
-                       mgt = "NONE";
-                       var = "wep_key0";
-               } else {
-                       mgt = "WPA-PSK";
-                       var = "psk";
-               }
-               if (id != -1) {
-                       retval = configure_network(con, i, id, mgt, var,
-                           gtk_entry_get_text(GTK_ENTRY(psk)), true);
+               var = gtk_entry_get_text(GTK_ENTRY(psk));
+               switch (dhcpcd_wpa_configure_psk(wpa, &s, var)) {
+               case DHCPCD_WPA_SUCCESS:
+                       retval = true;
+                       break;
+               case DHCPCD_WPA_ERR_SET:
+                       errt = _("Failed to set key management.");
+                       break;
+               case DHCPCD_WPA_ERR_SET_PSK:
+                       errt = _("Failed to set password, probably too short.");
+                       break;
+               case DHCPCD_WPA_ERR_ENABLE:
+                       errt = _("Failed to enable the network.");
+                       break;
+               case DHCPCD_WPA_ERR_ASSOC:
+                       errt = _("Failed to start association.");
+                       break;
+               case DHCPCD_WPA_ERR_WRITE:
+                       errt =_("Failed to save wpa_supplicant configuration.\n\nYou should add update_config=1 to /etc/wpa_supplicant.conf.");
+                       break;
+               default:
+                       errt = strerror(errno);
+                       break;

                }
                }

-               if (!retval && dhcpcd_error(con)) {
-                       wpa_dialog(_("Error"), dhcpcd_error(con));
+               if (!retval) {
+                       wpa_dialog(_("Error enabling network"), errt);

                        goto again;
                }
        }
                        goto again;
                }
        }