--- embedtools/src/vap.c	2010/10/28 15:45:27	1.1.2.6
+++ embedtools/src/vap.c	2011/06/13 20:23:35	1.2.2.1
@@ -1,3 +1,48 @@
+/*************************************************************************
+ * (C) 2010 AITNET - Sofia/Bulgaria - <office@aitbg.com>
+ *  by Michael Pounov <misho@aitbg.com>
+ *
+ * $Author: misho $
+ * $Id: vap.c,v 1.2.2.1 2011/06/13 20:23:35 misho Exp $
+ *
+ *************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 #include "dwds.h"
 
@@ -34,13 +79,13 @@ wifi_chkIface(const char *csVAP, char **ppsIF, int nIF
 	assert(csVAP);
 
 	if (wifi_getParent(csVAP, szParent, IFNAMSIZ) == -1)
-		return -1;
+		return 0;
 
 	for (i = 0; i < nIF; i++)
 		if (!strcasecmp(ppsIF[i], "any") || !strcmp(ppsIF[i], szParent))
 			return 1; /* OK, vap is child */
 
-	syslog(LOG_ERR, "Error:: Interface %s parent %s not being monitored", csVAP, szParent);
+	VERB(2) syslog(LOG_ERR, "Error:: Interface %s parent %s not being monitored", csVAP, szParent);
 	return 0;
 }
 
@@ -96,10 +141,12 @@ wifi_buildWDS(int fd, char **ppsIF, int nIF)
 	struct ether_addr bssid;
 	register int i;
 
+	FTRACE(5);
+
 	for (i = 0; i < 128; i++) {
 		memset(szVAP, 0, IFNAMSIZ);
 		snprintf(szVAP, IFNAMSIZ, "wlan%d", i);
-		if (wifi_chkIface(szVAP, ppsIF, nIF) > 0 && wifi_isWDS(fd, szVAP) > 0) {
+		if (wifi_chkIface(szVAP, ppsIF, nIF) && !wifi_isWDS(fd, szVAP)) {
 			p = malloc(sizeof(struct dwds_if));
 			if (!p) {
 				syslog(LOG_ERR, "Error:: can`t allocate memory #%d - %s\n", 
@@ -109,7 +156,8 @@ wifi_buildWDS(int fd, char **ppsIF, int nIF)
 			}
 			strlcpy(p->if_name, szVAP, IFNAMSIZ);
 			if (wifi_getBSSID(fd, szVAP, p->if_bssid, IEEE80211_ADDR_LEN) == -1) {
-				free(p);
+				syslog(LOG_ERR, "Error:: can`t get BSSID #%d - %s\n", 
+						errno, strerror(errno));
 				i = -1;
 				break;
 			}
@@ -135,6 +183,8 @@ wifi_destroyWDS(const char *csIface, struct dwds_if **
 {
 	struct dwds_if *p, **pp;
 
+	FTRACE(5);
+
 	assert(csIface);
 	assert(wds);
 
@@ -156,6 +206,8 @@ wifi_vapDestroy(const char *csVAP)
 	struct ieee80211req ifr;
 	int s;
 
+	FTRACE(5);
+
 	assert(csVAP);
 
 	s = socket(PF_INET, SOCK_DGRAM, 0);
@@ -177,17 +229,21 @@ wifi_vapDestroy(const char *csVAP)
 }
 
 inline int
-wifi_leaveWDS(struct ether_addr bssid, struct dwds_if **wds)
+wifi_leaveWDS(struct ether_addr bssid, struct dwds_if **wds, char *psVAP, int vapLen)
 {
 	struct dwds_if *p, **pp;
 
+	FTRACE(5);
+
 	assert(wds);
+	assert(psVAP);
 
 	for (pp = wds; (p = *pp); pp = &p->if_next)
 		if (!memcmp(p->if_bssid, &bssid, IEEE80211_ADDR_LEN))
 			break;
 	if (p) {
 		*pp = p->if_next;
+		strlcpy(psVAP, p->if_name, vapLen);
 		if (wifi_vapDestroy(p->if_name) != -1)
 		       VERB(1) syslog(LOG_INFO, "BSSID:%s WDS VAP %s destroyed\n", 
 				       ether_ntoa(&bssid), p->if_name);	
@@ -206,6 +262,8 @@ wifi_vapCreate(const char *csIface, struct dwds_if *p)
 	struct ether_addr bssid;
 	int s;
 
+	FTRACE(5);
+
 	assert(csIface);
 	assert(p);
 
@@ -244,6 +302,8 @@ wifi_createWDS(const char *csIface, struct ether_addr 
 	struct dwds_if *p;
 	char szParent[IFNAMSIZ];
 
+	FTRACE(5);
+
 	assert(csIface);
 	assert(wds);
 
@@ -264,7 +324,7 @@ wifi_createWDS(const char *csIface, struct ether_addr 
 		return -1;
 	} else
 		memcpy(p->if_bssid, &bssid, IEEE80211_ADDR_LEN);
-	if (wifi_vapCreate(csIface, p) == -1) {
+	if (wifi_vapCreate(szParent, p) == -1) {
 		free(p);
 		return -1;
 	} else {