mesh: Make inactivity timer configurable

[mech_eap.git] / wpa_supplicant / config_file.c

diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 618e524..9c9685a 100644 (file)
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -143,6 +143,15 @@ static int wpa_config_validate_network(struct wpa_ssid *ssid, int line)
                ssid->group_cipher &= ~WPA_CIPHER_CCMP;
        }
 
+       if (ssid->mode == WPAS_MODE_MESH &&
+           (ssid->key_mgmt != WPA_KEY_MGMT_NONE &&
+           ssid->key_mgmt != WPA_KEY_MGMT_SAE)) {
+               wpa_printf(MSG_ERROR,
+                          "Line %d: key_mgmt for mesh network should be open or SAE",
+                          line);
+               errors++;
+       }
+
        return errors;
 }
 
@@ -599,7 +608,7 @@ static void write_wep_key(FILE *f, int idx, struct wpa_ssid *ssid)
        int res;
 
        res = os_snprintf(field, sizeof(field), "wep_key%d", idx);
-       if (res < 0 || (size_t) res >= sizeof(field))
+       if (os_snprintf_error(sizeof(field), res))
                return;
        value = wpa_config_get(ssid, field);
        if (value) {
@@ -682,6 +691,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
        STR(subject_match);
        STR(altsubject_match);
        STR(domain_suffix_match);
+       STR(domain_match);
        STR(ca_cert2);
        STR(ca_path2);
        STR(client_cert2);
@@ -691,6 +701,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
        STR(subject_match2);
        STR(altsubject_match2);
        STR(domain_suffix_match2);
+       STR(domain_match2);
        STR(phase1);
        STR(phase2);
        STR(pcsc);
@@ -707,6 +718,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
        INTe(engine);
        INTe(engine2);
        INT_DEF(eapol_flags, DEFAULT_EAPOL_FLAGS);
+       INTe(erp);
 #endif /* IEEE8021X_EAPOL */
        for (i = 0; i < 4; i++)
                write_wep_key(f, i, ssid);
@@ -739,6 +751,17 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
 #ifdef CONFIG_MACSEC
        INT(macsec_policy);
 #endif /* CONFIG_MACSEC */
+#ifdef CONFIG_HS20
+       INT(update_identifier);
+#endif /* CONFIG_HS20 */
+       write_int(f, "mac_addr", ssid->mac_addr, -1);
+#ifdef CONFIG_MESH
+       STR(mesh_basic_rates);
+       INT_DEF(dot11MeshMaxRetries, DEFAULT_MESH_MAX_RETRIES);
+       INT_DEF(dot11MeshRetryTimeout, DEFAULT_MESH_RETRY_TIMEOUT);
+       INT_DEF(dot11MeshConfirmTimeout, DEFAULT_MESH_CONFIRM_TIMEOUT);
+       INT_DEF(dot11MeshHoldingTimeout, DEFAULT_MESH_HOLDING_TIMEOUT);
+#endif /* CONFIG_MESH */
 
 #undef STR
 #undef INT
@@ -934,6 +957,8 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
        if (config->pkcs11_module_path)
                fprintf(f, "pkcs11_module_path=%s\n",
                        config->pkcs11_module_path);
+       if (config->openssl_ciphers)
+               fprintf(f, "openssl_ciphers=%s\n", config->openssl_ciphers);
        if (config->pcsc_reader)
                fprintf(f, "pcsc_reader=%s\n", config->pcsc_reader);
        if (config->pcsc_pin)
@@ -1016,6 +1041,9 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
                fprintf(f, "p2p_intra_bss=%u\n", config->p2p_intra_bss);
        if (config->p2p_group_idle)
                fprintf(f, "p2p_group_idle=%u\n", config->p2p_group_idle);
+       if (config->p2p_passphrase_len)
+               fprintf(f, "p2p_passphrase_len=%u\n",
+                       config->p2p_passphrase_len);
        if (config->p2p_pref_chan) {
                unsigned int i;
                fprintf(f, "p2p_pref_chan=");
@@ -1035,6 +1063,10 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
        }
        if (config->p2p_add_cli_chan)
                fprintf(f, "p2p_add_cli_chan=%d\n", config->p2p_add_cli_chan);
+       if (config->p2p_optimize_listen_chan !=
+           DEFAULT_P2P_OPTIMIZE_LISTEN_CHAN)
+               fprintf(f, "p2p_optimize_listen_chan=%d\n",
+                       config->p2p_optimize_listen_chan);
        if (config->p2p_go_ht40)
                fprintf(f, "p2p_go_ht40=%u\n", config->p2p_go_ht40);
        if (config->p2p_go_vht)
@@ -1160,11 +1192,41 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
                        config->tdls_external_control);
 
        if (config->wowlan_triggers)
-               fprintf(f, "wowlan_triggers=\"%s\"\n",
+               fprintf(f, "wowlan_triggers=%s\n",
                        config->wowlan_triggers);
 
        if (config->bgscan)
                fprintf(f, "bgscan=\"%s\"\n", config->bgscan);
+
+       if (config->p2p_search_delay != DEFAULT_P2P_SEARCH_DELAY)
+               fprintf(f, "p2p_search_delay=%u\n",
+                       config->p2p_search_delay);
+
+       if (config->mac_addr)
+               fprintf(f, "mac_addr=%d\n", config->mac_addr);
+
+       if (config->rand_addr_lifetime != DEFAULT_RAND_ADDR_LIFETIME)
+               fprintf(f, "rand_addr_lifetime=%u\n",
+                       config->rand_addr_lifetime);
+
+       if (config->preassoc_mac_addr)
+               fprintf(f, "preassoc_mac_addr=%d\n", config->preassoc_mac_addr);
+
+       if (config->key_mgmt_offload != DEFAULT_KEY_MGMT_OFFLOAD)
+               fprintf(f, "key_mgmt_offload=%u\n", config->key_mgmt_offload);
+
+       if (config->user_mpm != DEFAULT_USER_MPM)
+               fprintf(f, "user_mpm=%d\n", config->user_mpm);
+
+       if (config->max_peer_links != DEFAULT_MAX_PEER_LINKS)
+               fprintf(f, "max_peer_links=%d\n", config->max_peer_links);
+
+       if (config->cert_in_cb != DEFAULT_CERT_IN_CB)
+               fprintf(f, "cert_in_cb=%d\n", config->cert_in_cb);
+
+       if (config->mesh_max_inactivity != DEFAULT_MESH_MAX_INACTIVITY)
+               fprintf(f, "mesh_max_inactivity=%d\n",
+                       config->mesh_max_inactivity);
 }
 
 #endif /* CONFIG_NO_CONFIG_WRITE */