--- embedtools/src/dwds.c	2010/10/27 16:39:47	1.1.2.6
+++ embedtools/src/dwds.c	2010/10/28 15:45:27	1.1.2.9
@@ -53,8 +53,100 @@ sigHandler(int sig)
 }
 
 static int
-RtMsg(struct dwds_if *wds, struct rt_msghdr *msg, size_t len)
+RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, size_t len)
 {
+	struct if_announcemsghdr *ifan;
+	const u_char *v;
+	struct ether_addr bssid;
+	char szStr[STRSIZ] = { 0 }, szCmd[MAXPATHLEN] = { 0 };
+	int stat;
+
+	assert(wds);
+	assert(msg);
+
+	if (msg->rtm_version != RTM_VERSION) {
+		syslog(LOG_ERR, "Error:: routing message version %d not understood!\n", msg->rtm_version);
+		return -1;
+	}
+
+	switch (msg->rtm_type) {
+		case RTM_IFANNOUNCE:
+			ifan = (struct if_announcemsghdr*) msg;
+			switch (ifan->ifan_what) {
+				case IFAN_ARRIVAL:
+					VERB(1) syslog(LOG_INFO, "RTM_IFANNOUNCE: if# %d, what: arrival\n", 
+							ifan->ifan_index);
+					break;
+				case IFAN_DEPARTURE:
+					VERB(1) syslog(LOG_INFO, "RTM_IFANNOUNCE: if# %d, what: departure\n", 
+							ifan->ifan_index);
+					wifi_destroyWDS(ifan->ifan_name, wds);
+					break;
+			}
+			break;
+		case RTM_IEEE80211:
+#define	V(type)	((struct type *)(&ifan[1]))
+			ifan = (struct if_announcemsghdr*) msg;
+			switch (ifan->ifan_what) {
+				case RTM_IEEE80211_DISASSOC:
+					v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("discover_on_join"));
+					if (!v || !strtol((char*) v, NULL, 0))
+						break;
+					/* fall thru ... */
+				case RTM_IEEE80211_LEAVE:
+					if (wifi_chkIface(ifan->ifan_name, ifs, nif) < 0)
+						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)) {
+						/* Launch script ... */
+						cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("disassoc_event"), 
+								CFG(szStr), STRSIZ, NULL);
+						if (*szStr) {
+							snprintf(szCmd, MAXPATHLEN, "%s %s %s", szStr, 
+									ifan->ifan_name, ether_ntoa(&bssid));
+							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:
+				case RTM_IEEE80211_REJOIN:
+				case RTM_IEEE80211_ASSOC:
+				case RTM_IEEE80211_REASSOC:
+					v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("discover_on_join"));
+					if (!v || !strtol((char*) v, NULL, 0))
+						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) < 0)
+						break;
+					if (!wifi_createWDS(ifan->ifan_name, bssid, wds)) {
+						/* Launch script ... */
+						cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("assoc_event"), 
+								CFG(szStr), STRSIZ, NULL);
+						if (*szStr) {
+							snprintf(szCmd, MAXPATHLEN, "%s %s %s", szStr, 
+									ifan->ifan_name, ether_ntoa(&bssid));
+							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
+			break;
+	}
+
 	return 0;
 }
 
@@ -101,7 +193,7 @@ main(int argc, char **argv)
 		return 1;
 	}
 
-	if (fg)
+	if (!fg)
 		switch (fork()) {
 			case -1:
 				printf("Error:: when fork() #%d - %s\n", errno, strerror(errno));
@@ -134,8 +226,10 @@ main(int argc, char **argv)
 		goto end;
 	}
 
-	if (!(wds = wifi_buildWDS(s, ifs, nif)))
+	if (!(wds = wifi_buildWDS(s, ifs, nif))) {
+		syslog(LOG_ERR, "Error:: Go to dead ...\n");
 		goto end;
+	}
 
 	while (!Kill) {
 		len = read(s, (void*) msg, sizeof msg);
@@ -143,7 +237,7 @@ main(int argc, char **argv)
 			syslog(LOG_ERR, "Error:: read() #%d - %s\n", errno, strerror(errno));
 			Kill++;
 		} else
-			RtMsg(wds, (struct rt_msghdr*) msg, len);
+			RtMsg(&wds, (struct rt_msghdr*) msg, len);
 	}
 
 	close(s);