start antimony branch

src/drivers/driver_nl80211_event.c

@@ -974,6 +974,7 @@ static void send_scan_event(struct wpa_driver_nl80211_data *drv, int aborted,
 	struct nlattr *nl;
 	int rem;
 	struct scan_info *info;
+	//v-was 50
 #define MAX_REPORT_FREQS 50
 	int freqs[MAX_REPORT_FREQS];
 	int num_freqs = 0;

src/drivers/driver_nl80211_scan.c

@@ -153,6 +153,20 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd,
 				goto fail;
 		}
 		nla_nest_end(msg, freqs);
+	} else if (0) {
+		struct nlattr *freqs;
+		freqs = nla_nest_start(msg, NL80211_ATTR_SCAN_FREQUENCIES);
+		if (freqs == NULL)
+			goto fail;
+
+		i = 0;
+        if (nla_put_u32(msg,  1, 2412))
+            goto fail;
+        if (nla_put_u32(msg, 2, 2437))
+            goto fail;
+        if (nla_put_u32(msg, 3, 2462))
+            goto fail;
+		nla_nest_end(msg, freqs);
 	}
 
 	os_free(drv->filter_ssids);

src/utils/wpa_debug.c

@@ -29,7 +29,7 @@ static FILE *wpa_debug_tracing_file = NULL;
 #endif /* CONFIG_DEBUG_LINUX_TRACING */
 
 
-int wpa_debug_level = MSG_INFO;
+int wpa_debug_level = MSG_DEBUG; //bzt:mls MSG_INFO;
 int wpa_debug_show_keys = 0;
 int wpa_debug_timestamp = 0;
 

wpa_supplicant/android.config

@@ -436,7 +436,7 @@ CONFIG_INTERWORKING=y
 CONFIG_HS20=y
 
 # Disable roaming in wpa_supplicant
-CONFIG_NO_ROAMING=y
+#CONFIG_NO_ROAMING=y
 
 # AP mode operations with wpa_supplicant
 # This can be used for controlling AP mode operations with wpa_supplicant. It

wpa_supplicant/bgscan_learn.c

@@ -486,7 +486,7 @@ static int bgscan_learn_notify_scan(void *priv,
 {
 	struct bgscan_learn_data *data = priv;
 	size_t i, j;
-#define MAX_BSS 50
+#define MAX_BSS 75
 	u8 bssid[MAX_BSS * ETH_ALEN];
 	size_t num_bssid = 0;
 

wpa_supplicant/config_file.c

@@ -165,8 +165,8 @@ static struct wpa_ssid * wpa_config_read_network(FILE *f, int *line, int id)
 	int errors = 0, end = 0;
 	char buf[2000], *pos, *pos2;
 
-	wpa_printf(MSG_MSGDUMP, "Line: %d - start of a new network block",
-		   *line);
+	wpa_printf(MSG_DEBUG, "Line: %d - start of a new network block",
+		   *line);//^-bzt was MSG_MSGDUMP
 	ssid = os_zalloc(sizeof(*ssid));
 	if (ssid == NULL)
 		return NULL;
@@ -199,6 +199,10 @@ static struct wpa_ssid * wpa_config_read_network(FILE *f, int *line, int id)
 			}
 		}
 
+        wpa_printf(MSG_DEBUG, "Line: %d :'%s' = %s",
+               *line, pos, pos2);
+        //^-bzt added for testing
+
 		if (wpa_config_set(ssid, pos, pos2, *line) < 0)
 			errors++;
 	}
@@ -398,6 +402,8 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
 	}
 
 	while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) {
+        wpa_printf(MSG_DEBUG, "Line: %d :'%s'",
+               line, pos);
 		if (os_strcmp(pos, "network={") == 0) {
 			ssid = wpa_config_read_network(f, &line, id++);
 			if (ssid == NULL) {
@@ -477,6 +483,7 @@ static void write_str(FILE *f, const char *field, struct wpa_ssid *ssid)
 	if (value == NULL)
 		return;
 	fprintf(f, "\t%s=%s\n", field, value);
+    wpa_printf(MSG_DEBUG, "write str %s: %s", field, value);
 	os_free(value);
 }
 
@@ -486,6 +493,7 @@ static void write_int(FILE *f, const char *field, int value, int def)
 	if (value == def)
 		return;
 	fprintf(f, "\t%s=%d\n", field, value);
+    wpa_printf(MSG_DEBUG, "write int %s: %d", field, value);
 }
 
 

wpa_supplicant/main.c

@@ -297,6 +297,7 @@ int main(int argc, char *argv[])
 			goto out;
 		}
 	}
+//	params.wpa_debug_level = MSG_DEBUG;
 
 	exitcode = 0;
 	global = wpa_supplicant_init(&params);
@@ -309,6 +310,10 @@ int main(int argc, char *argv[])
 			   "wpa_supplicant");
 	}
 
+    for (i = 0; i<argc; i++) {
+        wpa_printf(MSG_DEBUG, " %s", argv[i]);
+    }
+
 	for (i = 0; exitcode == 0 && i < iface_count; i++) {
 		struct wpa_supplicant *wpa_s;
 
@@ -322,6 +327,7 @@ int main(int argc, char *argv[])
 			exitcode = -1;
 			break;
 		}
+	    wpa_printf(MSG_DEBUG, "iface %d confanother '%s'", i, iface->confanother ? iface->confanother : "N/A");
 		wpa_s = wpa_supplicant_add_iface(global, &ifaces[i], NULL);
 		if (wpa_s == NULL) {
 			exitcode = -1;

wpa_supplicant/wpa_supplicant.c

@@ -1981,7 +1981,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
 		const u8 *ie, *md = NULL;
 #endif /* CONFIG_IEEE80211R */
 		wpa_msg(wpa_s, MSG_INFO, "Trying to associate with " MACSTR
-			" (SSID='%s' freq=%d MHz)", MAC2STR(bss->bssid),
+			" (SSID='%s' freq=%d Mhz)", MAC2STR(bss->bssid),
 			wpa_ssid_txt(bss->ssid, bss->ssid_len), bss->freq);
 		bssid_changed = !is_zero_ether_addr(wpa_s->bssid);
 		os_memset(wpa_s->bssid, 0, ETH_ALEN);
@@ -4033,11 +4033,13 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
 	int capa_res;
 
 	wpa_printf(MSG_DEBUG, "Initializing interface '%s' conf '%s' driver "
-		   "'%s' ctrl_interface '%s' bridge '%s'", iface->ifname,
+		   "'%s' ctrl_interface '%s' bridge '%s' overlay '%s'", iface->ifname,
 		   iface->confname ? iface->confname : "N/A",
 		   iface->driver ? iface->driver : "default",
 		   iface->ctrl_interface ? iface->ctrl_interface : "N/A",
-		   iface->bridge_ifname ? iface->bridge_ifname : "N/A");
+		   iface->bridge_ifname ? iface->bridge_ifname : "N/A",
+		   iface->confanother ? iface->confanother : "N/A"
+		   );
 
 	if (iface->confname) {
 #ifdef CONFIG_BACKEND_FILE

wpa_supplicant/wpa_supplicant_template.conf

@@ -4,3 +4,4 @@ eapol_version=1
 ap_scan=1
 fast_reauth=1
 pmf=1
+