--- embedtools/src/vap.c	2010/10/27 16:45:35	1.1.2.4
+++ embedtools/src/vap.c	2011/06/08 12:45:41	1.2
@@ -23,7 +23,7 @@ wifi_getParent(const char *csVAP, char *psParent, size
 	return 0;
 }
 
-static inline int
+inline int
 wifi_chkIface(const char *csVAP, char **ppsIF, int nIF)
 {
 	char szParent[IFNAMSIZ];
@@ -34,13 +34,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 +96,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 +111,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;
 			}
@@ -128,4 +131,162 @@ wifi_buildWDS(int fd, char **ppsIF, int nIF)
 		}
 
 	return wds;
+}
+
+inline int
+wifi_destroyWDS(const char *csIface, struct dwds_if **wds)
+{
+	struct dwds_if *p, **pp;
+
+	FTRACE(5);
+
+	assert(csIface);
+	assert(wds);
+
+	for (pp = wds; (p = *pp); pp = &p->if_next)
+		if (!strncmp(p->if_name, csIface, IFNAMSIZ))
+			break;
+	if (p) {
+		*pp = p->if_next;
+		free(p);
+		return 0;
+	}
+
+	return 1;
+}
+
+static int
+wifi_vapDestroy(const char *csVAP)
+{
+	struct ieee80211req ifr;
+	int s;
+
+	FTRACE(5);
+
+	assert(csVAP);
+
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) {
+		syslog(LOG_ERR, "Error:: destroy socket(vap) %m\n");
+		return -1;
+	}
+
+	memset(&ifr, 0, sizeof ifr);
+	strlcpy(ifr.i_name, csVAP, IFNAMSIZ);
+	if (ioctl(s, SIOCIFDESTROY, &ifr) == -1) {
+		syslog(LOG_ERR, "Error:: destroy ioctl(vap) %m\n");
+		close(s);
+		return -1;
+	} else
+		close(s);
+
+	return 0;
+}
+
+inline int
+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);	
+		free(p);
+		return 0;
+	}
+
+	return 1;
+}
+
+static int
+wifi_vapCreate(const char *csIface, struct dwds_if *p)
+{
+	struct ieee80211_clone_params cp;
+	struct ifreq ifr;
+	struct ether_addr bssid;
+	int s;
+
+	FTRACE(5);
+
+	assert(csIface);
+	assert(p);
+
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) {
+		syslog(LOG_ERR, "Error:: create socket(vap) %m\n");
+		return -1;
+	}
+
+	memset(&cp, 0, sizeof cp);
+	strlcpy(cp.icp_parent, csIface, IFNAMSIZ);
+	cp.icp_opmode = IEEE80211_M_WDS;
+	memcpy(cp.icp_bssid, p->if_bssid, IEEE80211_ADDR_LEN);
+
+	memset(&ifr, 0, sizeof ifr);
+	strlcpy(ifr.ifr_name, "wlan", IFNAMSIZ);
+	ifr.ifr_data = (void *) &cp;
+
+	if (ioctl(s, SIOCIFCREATE2, &ifr) == -1) {
+		memcpy(&bssid, cp.icp_bssid, IEEE80211_ADDR_LEN);
+		syslog(LOG_ERR, "Error:: create ioctl(vap) mode %u flags 0x%x parent %s bssid %s %m\n", 
+				cp.icp_opmode, cp.icp_flags, cp.icp_parent, ether_ntoa(&bssid));
+		close(s);
+		return -1;
+	} else {
+		strlcpy(p->if_name, ifr.ifr_name, IFNAMSIZ);
+		close(s);
+	}
+
+	return 0;
+}
+
+inline int
+wifi_createWDS(const char *csIface, struct ether_addr bssid, struct dwds_if **wds)
+{
+	struct dwds_if *p;
+	char szParent[IFNAMSIZ];
+
+	FTRACE(5);
+
+	assert(csIface);
+	assert(wds);
+
+	for (p = *wds; p; p = p->if_next)
+		if (!memcmp(p->if_bssid, &bssid, IEEE80211_ADDR_LEN)) {
+			VERB(1) syslog(LOG_INFO, "BSSID:%s WDS VAP already created (%s)\n",
+			    ether_ntoa(&bssid), csIface);
+			return 1;
+		}
+	if (wifi_getParent(csIface, szParent, IFNAMSIZ) == -1) {
+		syslog(LOG_ERR, "Error:: %s no pointer to parent interface\n", csIface);
+		return -1;
+	}
+
+	p = malloc(sizeof(struct dwds_if));
+	if (!p) {
+		syslog(LOG_ERR, "Error:: malloc failed: %m\n");
+		return -1;
+	} else
+		memcpy(p->if_bssid, &bssid, IEEE80211_ADDR_LEN);
+	if (wifi_vapCreate(szParent, p) == -1) {
+		free(p);
+		return -1;
+	} else {
+		p->if_next = *wds;
+		*wds = p;
+		VERB(1) syslog(LOG_INFO, "BSSID:%s create WDS VAP %s\n", ether_ntoa(&bssid), p->if_name);
+	}
+
+	return 0;
 }