--- embedtools/src/dwds.c 2010/10/28 15:56:06 1.1.2.10 +++ 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 [...]]\n" + " Syntax: dwds [options] [interface [ath0, ...]]\n" "\n" "\t-v\t\tVerbose ...\n" "\t-f\t\tForeground, not demonize process ...\n" @@ -58,7 +58,8 @@ 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 }; + char szStr[STRSIZ] = { 0 }, szCmd[MAXPATHLEN] = { 0 }, szIdent[STRSIZ] = { 0 }, + szName[IFNAMSIZ] = { 0 }; int f, stat; assert(wds); @@ -94,17 +95,19 @@ 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) < 0) + 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)) { + 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 && strtol((char*) v, NULL, 0)) { + if (v) { memset(szCmd, 0, STRSIZ); - snprintf(szCmd, MAXPATHLEN, "%s/%s-%s", (char*) v, - ifan->ifan_name, ether_ntoa(&bssid)); + 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); } @@ -113,9 +116,11 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz 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", szStr, - ifan->ifan_name, ether_ntoa(&bssid)); + 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))) @@ -136,15 +141,17 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz 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) + 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 && strtol((char*) v, NULL, 0)) { + if (v) { memset(szCmd, 0, MAXPATHLEN); - snprintf(szCmd, MAXPATHLEN, "%s/%s-%s", (char*) v, - ifan->ifan_name, ether_ntoa(&bssid)); + 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); @@ -156,8 +163,8 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz CFG(szStr), STRSIZ, NULL); if (*szStr) { memset(szCmd, 0, MAXPATHLEN); - snprintf(szCmd, MAXPATHLEN, "%s %s %s", szStr, - ifan->ifan_name, ether_ntoa(&bssid)); + 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))) @@ -258,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);