From: Shan Palanisamy <shanp@qca.qualcomm.com>
Date: Sat, 25 Aug 2012 08:42:30 +0000 (+0300)
Subject: Allow hostapd to be started without interfaces
X-Git-Tag: hostap_2_0~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=268a499c08ab44a6577952ecd919222b44c96a1f;p=thirdparty%2Fhostap.git

Allow hostapd to be started without interfaces

If the control interface is enabled, allow hostapd to be started
without any configuration files specific on the command line since
the interfaces can be added dynamically.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/hostapd/main.c b/hostapd/main.c
index d6c914a9f..56f00023b 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -601,7 +601,7 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc)
+	if (optind == argc && interfaces.global_iface_path == NULL)
 		usage();
 
 	wpa_msg_register_ifname_cb(hostapd_msg_ifname_cb);
@@ -610,11 +610,13 @@ int main(int argc, char *argv[])
 		wpa_debug_open_file(log_file);
 
 	interfaces.count = argc - optind;
-	interfaces.iface = os_calloc(interfaces.count,
-				     sizeof(struct hostapd_iface *));
-	if (interfaces.iface == NULL) {
-		wpa_printf(MSG_ERROR, "malloc failed");
-		return -1;
+	if (interfaces.count) {
+		interfaces.iface = os_calloc(interfaces.count,
+					     sizeof(struct hostapd_iface *));
+		if (interfaces.iface == NULL) {
+			wpa_printf(MSG_ERROR, "malloc failed");
+			return -1;
+		}
 	}
 
 	if (hostapd_global_init(&interfaces, entropy_file))