Browse Source

tests: Make RELOG command use global control interface

This allows RELOG to be used even if a wpa_supplicant process does not
have any interfaces configured.

Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen 10 years ago
parent
commit
5f797376f2
3 changed files with 5 additions and 2 deletions
  1. 1 1
      tests/hwsim/run-tests.py
  2. 1 1
      tests/hwsim/wpasupplicant.py
  3. 3 0
      wpa_supplicant/ctrl_iface.c

+ 1 - 1
tests/hwsim/run-tests.py

@@ -382,7 +382,7 @@ def main():
                     logger.info(e)
                     result = "FAIL"
             try:
-                wpas = WpaSupplicant("wlan5", "/tmp/wpas-wlan5")
+                wpas = WpaSupplicant("/tmp/wpas-wlan5")
                 d.dump_monitor()
                 rename_log(args.logdir, 'log5', name, wpas)
                 if not args.no_reset:

+ 1 - 1
tests/hwsim/wpasupplicant.py

@@ -834,7 +834,7 @@ class WpaSupplicant:
             raise Exception("Association with the AP timed out")
 
     def relog(self):
-        self.request("RELOG")
+        self.global_request("RELOG")
 
     def wait_completed(self, timeout=10):
         for i in range(0, timeout * 2):

+ 3 - 0
wpa_supplicant/ctrl_iface.c

@@ -7739,6 +7739,9 @@ char * wpa_supplicant_global_ctrl_iface_process(struct wpa_global *global,
 		if (wpas_module_tests() < 0)
 			reply_len = -1;
 #endif /* CONFIG_MODULE_TESTS */
+	} else if (os_strncmp(buf, "RELOG", 5) == 0) {
+		if (wpa_debug_reopen_file() < 0)
+			reply_len = -1;
 	} else {
 		os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
 		reply_len = 16;