code dump

Author: mattiaswal

src/confd/src/ietf-interfaces.c

@@ -457,7 +457,18 @@ static int netdag_gen_afspec_set(sr_session_ctx_t *session, struct dagger *net,
 		return netdag_gen_ethtool(net, cif, dif);
 	case IFT_WIFI:
 		return wifi_gen(dif, cif, net);
-	case IFT_WIFI_AP:
+	case IFT_WIFI_AP: {
+		struct lyd_node *wifi = lydx_get_child(cif, "wifi");
+		if (wifi) {
+			const char *radio = lydx_get_cattr(wifi, "radio");
+			if (radio) {
+				struct lyd_node *radio_if = lydx_get_xpathf(cif, "../interface[name='%s']", radio);
+				if (radio_if)
+					return wifi_ap_gen(radio_if, net);
+			}
+		}
+		return 0;
+	}
 	case IFT_DUMMY:
 	case IFT_GRE:
 	case IFT_GRETAP:

src/confd/src/infix-if-wifi.c

@@ -45,7 +45,7 @@ static int wifi_gen_station_config(const char *ifname, const char *ssid, const c
 			"autoscan=periodic:10\n"
 			"ap_scan=1\n");
 	} else {
-		if (!encryption) {
+		if (!strcmp(encryption, "disabled")) {
 			asprintf(&encryption_str, "key_mgmt=NONE");
 		} else {
 			asprintf(&encryption_str, "key_mgmt=SAE WPA-PSK\npsk=\"%s\"", secret);
@@ -177,7 +177,7 @@ int wifi_station_gen(struct lyd_node *cif, struct dagger *net)
 	ssid_name   = lydx_get_cattr(wifi, "ssid");
 	secret_name = lydx_get_cattr(wifi, "secret");
 	encryption  = lydx_get_cattr(wifi, "encryption");
-	if (encryption && secret_name) {
+	if (secret_name) {
 		secret_node = lydx_get_xpathf(cif, "../../keystore/symmetric-keys/symmetric-key[name='%s']", secret_name);
 		secret      = lydx_get_cattr(secret_node, "cleartext-key");
 	}
@@ -253,9 +253,6 @@ int wifi_ap_gen(struct lyd_node *cif, struct dagger *net)
 	fprintf(hostapd_conf, "# Generated by Infix confd\n");
 
 	country = lydx_get_cattr(wifi, "country-code");
-	if (!country)
-		country = "00";
-
 	band = lydx_get_cattr(wifi, "band");
 	channel = lydx_get_cattr(wifi, "channel");
 	freq_24GHz = !strcmp(band, "2.4GHz");
@@ -267,15 +264,19 @@ int wifi_ap_gen(struct lyd_node *cif, struct dagger *net)
 		"interface=%s\n"
 		"driver=nl80211\n"
 		"hw_mode=%c\n"
-		"country_code=%s\n"
 		"wmm_enabled=1\n"      /* QoS */
 		"channel=%s\n"
 		"logger_syslog=-1\n"
 		"logger_syslog_level=0\n"
 		"logger_stdout=0\n"
 		"ctrl_interface=/var/run/hostapd\n"
 		"ctrl_interface_group=0\n\n",
-		ifname, freq_24GHz ? 'g' : 'a', country, channel);
+		ifname, freq_24GHz ? 'g' : 'a', channel);
+
+
+	ERROR("Country: %s", country);
+	if (strcmp(country, "00"))
+		fprintf(hostapd_conf, "country_code=%s\n", country);
 
 	if (freq_24GHz)
 		fprintf(hostapd_conf, "ieee80211n=1\n");
@@ -350,7 +351,7 @@ int wifi_ap_gen(struct lyd_node *cif, struct dagger *net)
 		fprintf(hostapd_conf, "bss=%s\n", ap_ifname);
 		fprintf(hostapd_conf, "# SSID: %s\n", ssid);
 		fprintf(hostapd_conf, "ssid=%s\n", ssid);
-		if (encryption) {
+		if (!strcmp(encryption, "mixed-wpa2-wpa3")) {
 			fprintf(hostapd_conf, "wpa_key_mgmt=WPA-PSK SAE\n");
 			fprintf(hostapd_conf, "wpa_passphrase=%s\n", secret);
 			fprintf(hostapd_conf, "sae_password=%s\n", secret);
@@ -362,7 +363,7 @@ int wifi_ap_gen(struct lyd_node *cif, struct dagger *net)
 		fputs("ignore_broadcast_ssid=0\n", hostapd_conf);
 	}
 	ly_set_free(ap_interfaces, NULL);
-
+	fclose(hostapd_conf);
 	hostapd_finit = dagger_fopen_net_init(net, ifname, NETDAG_INIT_POST, "hostapd.sh");
 	if (!hostapd_finit)
 	       return SR_ERR_INTERNAL;
@@ -381,6 +382,7 @@ int wifi_ap_gen(struct lyd_node *cif, struct dagger *net)
 
 bool wifi_ap_must_delete(struct lyd_node *dif)
 {
+
 	struct lyd_node *cwifi;
 	const char *radio_name;
 	struct lyd_node *radio_dif;

src/confd/yang/confd/infix-if-wifi.yang

@@ -61,9 +61,9 @@ submodule infix-if-wifi {
   }
   typedef encryption {
     type enumeration {
-      enum auto {
+      enum mixed-wpa2-wpa3 {
         description
-          "Enables WPA/WPA2/WPA3 encryption with automatic protocol
+          "Enables WPA2/WPA3 mixed mode encryption with automatic protocol
            negotiation. The system uses the strongest supported variant supported by Access Point.";
       }
       enum disabled {
@@ -77,7 +77,7 @@ submodule infix-if-wifi {
     description
       "Encryption modes available for WiFi connections.
 
-       - auto: Secure connection using WPA3/WPA2/WPA (auto-selected)
+       - mixed-wpa2-wpa3: Secure connection using WPA2/WPA3 (auto-selected)
        - disabled: Open network (unencrypted)";
   }
 
@@ -189,7 +189,7 @@ submodule infix-if-wifi {
       }
 
       leaf encryption {
-        default auto;
+        default mixed-wpa2-wpa3;
         type encryption;
         when "(derived-from-or-self(../../if:type, 'infixift:wifi') and ../mode = 'station') or derived-from-or-self(../../if:type, 'infixift:wifi-ap')" {
           description "Available for wifi interfaces in station mode or wifi-ap interfaces.";
@@ -198,11 +198,11 @@ submodule infix-if-wifi {
           "WiFi encryption method.
 
            For station interfaces: 
-           - auto (default): Enables WPA2/WPA3 auto-negotiation
+           - mixed-wpa2-wpa3 (default): Enables WPA2/WPA3 auto-negotiation
            - disabled: Disables encryption (open network)
            
            For AP interfaces:
-           - auto: Enables WPA2/WPA3 encryption
+           - mixed-wpa2-wpa3: Enables WPA2/WPA3 encryption
            - disabled: Disables encryption (open network)";
       }