Disconnect when same SSID selected (#1)

Modify gui functions so that when the entry of the currently
associated SSID is selected, the interface is disconnected.

Co-authored-by: Jorge Natz <jorgenatzdev@gmail.com>

Author: rsmarples

src/dhcpcd-gtk/wpa.c

@@ -108,6 +108,7 @@ bool
 wpa_configure(DHCPCD_WPA *wpa, DHCPCD_WI_SCAN *scan)
 {
 	DHCPCD_WI_SCAN s;
+	DHCPCD_IF *i;
 	GtkWidget *label, *psk, *vbox, *hbox;
 	const char *var;
 	int result;
@@ -117,6 +118,14 @@ wpa_configure(DHCPCD_WPA *wpa, DHCPCD_WI_SCAN *scan)
 	memcpy(&s, scan, sizeof(s));
 	s.next = NULL;
 
+	i = dhcpcd_wpa_if(wpa);
+	if (i == NULL)
+		return false;
+
+	/* Disconnect if same interface selected */
+	if (dhcpcd_wi_associated(i, &s))
+		return dhcpcd_wpa_disconnect(wpa);
+
 	if (!(s.flags & WSF_PSK))
 		return wpa_conf(dhcpcd_wpa_configure(wpa, &s, NULL));
 

src/dhcpcd-qt/dhcpcd-wi.cpp

@@ -295,13 +295,23 @@ void DhcpcdWi::ping()
 void DhcpcdWi::connectSsid(DHCPCD_WI_SCAN *scan)
 {
 	DHCPCD_WI_SCAN s;
+	DHCPCD_IF *i;
 	int err;
 
 	/* Take a copy of scan incase it's destroyed by a scan update */
 	memcpy(&s, scan, sizeof(s));
 	s.next = NULL;
 
-	if (s.flags & WSF_PSK) {
+	i = dhcpcd_wpa_if(wpa);
+	if (i == NULL)
+		err = DHCPCD_WPA_ERR;
+	else if (dhcpcd_wi_associated(i, &s)) {
+		/* Disconnect if same interface selected */
+		if (!dhcpcd_wpa_disconnect(wpa))
+			err = DHCPCD_WPA_ERR_DISCONN;
+		else
+			err = DHCPCD_WPA_SUCCESS;
+	} else if (s.flags & WSF_PSK) {
 		bool ok;
 		QString pwd;
 
@@ -322,11 +332,14 @@ void DhcpcdWi::connectSsid(DHCPCD_WI_SCAN *scan)
 	switch (err) {
 	case DHCPCD_WPA_SUCCESS:
 		return;
+	case DHCPCD_WPA_ERR:
+		errt = tr("Failed.");
+		break;
 	case DHCPCD_WPA_ERR_DISCONN:
 		errt = tr("Failed to disconnect.");
 		break;
 	case DHCPCD_WPA_ERR_RECONF:
-		errt = tr("Faile to reconfigure.");
+		errt = tr("Failed to reconfigure.");
 		break;
 	case DHCPCD_WPA_ERR_SET:
 		errt = tr("Failed to set key management.");