--- embedtools/src/dwds.c	2010/10/28 09:08:58	1.1.2.8
+++ embedtools/src/dwds.c	2010/11/02 02:25:46	1.1.2.13
@@ -13,7 +13,7 @@ Usage()
 {
 	printf(	"-= dWDS =- WiFi dynamic WDS service managment for VAP\n"
 		"=== %s === %s@%s ===\n\n"
-		"  Syntax: dwds [options] <interface|any> [interface [...]]\n"
+		"  Syntax: dwds [options] <interface|any> [interface [ath0, ...]]\n"
 		"\n"
 		"\t-v\t\tVerbose ...\n"
 		"\t-f\t\tForeground, not demonize process ...\n"
@@ -58,6 +58,9 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz
 	struct if_announcemsghdr *ifan;
 	const u_char *v;
 	struct ether_addr bssid;
+	char szStr[STRSIZ] = { 0 }, szCmd[MAXPATHLEN] = { 0 }, szIdent[STRSIZ] = { 0 }, 
+	     szName[IFNAMSIZ] = { 0 };
+	int f, stat;
 
 	assert(wds);
 	assert(msg);
@@ -92,6 +95,39 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz
 						break;
 					/* fall thru ... */
 				case RTM_IEEE80211_LEAVE:
+					if (!wifi_chkIface(ifan->ifan_name, ifs, nif))
+						break;
+					memcpy(&bssid, V(ieee80211_leave_event)->iev_addr, ETHER_ADDR_LEN);
+					VERB(1) syslog(LOG_INFO, "BSSID:%s Station leave\n", ether_ntoa(&bssid));
+					if (!wifi_leaveWDS(bssid, wds, szName, IFNAMSIZ)) {
+						cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("name"), 
+								CFG(szIdent), STRSIZ, DWDS_NAME);
+						/* delete state file ... */
+						v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("state_dir"));
+						if (v) {
+							memset(szCmd, 0, STRSIZ);
+							snprintf(szCmd, MAXPATHLEN, "%s/%s-%s-%s", (char*) v, 
+									szName, ether_ntoa(&bssid), szIdent);
+							unlink(szCmd);
+							VERB(2) syslog(LOG_DEBUG, "Debug:: delete session name %s\n", szCmd);
+						}
+
+						/* Launch script ... */
+						cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("disassoc_event"), 
+								CFG(szStr), STRSIZ, NULL);
+						if (*szStr) {
+							cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("name"), 
+									CFG(szIdent), STRSIZ, DWDS_NAME);
+							memset(szCmd, 0, MAXPATHLEN);
+							snprintf(szCmd, MAXPATHLEN, "%s %s %s %s", szStr, 
+									szName, ether_ntoa(&bssid), szIdent);
+							VERB(3) syslog(LOG_DEBUG, "Debug:: Command line: %s\n", szCmd);
+
+							if ((stat = system(szCmd)))
+								syslog(LOG_ERR, "VAP down script %s exited "
+										"with status %d\n", szStr, stat);
+						}
+					}
 					break;
 
 				case RTM_IEEE80211_JOIN:
@@ -103,6 +139,39 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz
 						break;
 					/* fall thru ... */
 				case RTM_IEEE80211_WDS:
+					memcpy(&bssid, V(ieee80211_leave_event)->iev_addr, ETHER_ADDR_LEN);
+					VERB(1) syslog(LOG_INFO, "BSSID:%s WDS discovery\n", ether_ntoa(&bssid));
+					if (!wifi_chkIface(ifan->ifan_name, ifs, nif))
+						break;
+					if (!wifi_createWDS(ifan->ifan_name, bssid, wds)) {
+						cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("name"), 
+								CFG(szIdent), STRSIZ, DWDS_NAME);
+						/* create state file ... */
+						v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("state_dir"));
+						if (v) {
+							memset(szCmd, 0, MAXPATHLEN);
+							snprintf(szCmd, MAXPATHLEN, "%s/%s-%s-%s", (char*) v, 
+									(*wds)->if_name, ether_ntoa(&bssid), szIdent);
+							f = open(szCmd, O_WRONLY | O_CREAT, 0644);
+							if (f != -1)
+								close(f);
+							VERB(2) syslog(LOG_DEBUG, "Debug:: create session name %s\n", szCmd);
+						}
+
+						/* Launch script ... */
+						cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("assoc_event"), 
+								CFG(szStr), STRSIZ, NULL);
+						if (*szStr) {
+							memset(szCmd, 0, MAXPATHLEN);
+							snprintf(szCmd, MAXPATHLEN, "%s %s %s %s", szStr, 
+									(*wds)->if_name, ether_ntoa(&bssid), szIdent);
+							VERB(3) syslog(LOG_DEBUG, "Debug:: Command line: %s\n", szCmd);
+
+							if ((stat = system(szCmd)))
+								syslog(LOG_ERR, "VAP up script %s exited "
+										"with status %d\n", szStr, stat);
+						}
+					}
 					break;
 			}
 #undef V
@@ -196,7 +265,7 @@ main(int argc, char **argv)
 	while (!Kill) {
 		len = read(s, (void*) msg, sizeof msg);
 		if (len == -1) {
-			syslog(LOG_ERR, "Error:: read() #%d - %s\n", errno, strerror(errno));
+			VERB(5) syslog(LOG_ERR, "Error:: read() #%d - %s\n", errno, strerror(errno));
 			Kill++;
 		} else
 			RtMsg(&wds, (struct rt_msghdr*) msg, len);