--- embedtools/src/dwds.c 2011/06/08 12:45:41 1.2 +++ embedtools/src/dwds.c 2012/07/22 22:46:47 1.3 @@ -1,8 +1,53 @@ +/************************************************************************* + * (C) 2010 AITNET - Sofia/Bulgaria - + * by Michael Pounov + * + * $Author: misho $ + * $Id: dwds.c,v 1.3 2012/07/22 22:46:47 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 + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . 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 +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" -sl_config cfg; +cfg_root_t cfg; int Verbose, Kill, nif; char **ifs, szConfig[MAXPATHLEN] = DWDS_CONFIG; extern char compiled[], compiledby[], compilehost[]; @@ -25,22 +70,23 @@ static void sigHandler(int sig) { int stat; - const u_char *v; - char szStr[STRSIZ]; + ait_val_t name; + const char *v; switch (sig) { case SIGHUP: - UnloadConfig(&cfg); - if (LoadConfig(szConfig, &cfg)) { + cfgUnloadConfig(&cfg); + if (cfgLoadConfig(szConfig, &cfg)) { printf("Error:: can`t load config %s ...\n", szConfig); Kill++; } else { closelog(); - cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("name"), CFG(szStr), STRSIZ, DWDS_NAME); - openlog(szStr, LOG_PID | LOG_CONS, LOG_DAEMON); - v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("syslog_upto")); - setlogmask(v ? strtol((char*) v, NULL, 0) : 0); + cfg_loadAttribute(&cfg, "dwds", "name", &name, DWDS_NAME); + openlog(AIT_GET_STR(&name), LOG_PID | LOG_CONS, LOG_DAEMON); + AIT_FREE_VAL(&name); + v = cfg_getAttribute(&cfg, "dwds", "syslog_upto"); + setlogmask(v ? strtol(v, NULL, 0) : 0); } break; case SIGTERM: @@ -56,10 +102,10 @@ static int RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, size_t len) { struct if_announcemsghdr *ifan; - const u_char *v; + const char *v; struct ether_addr bssid; - char szStr[STRSIZ] = { 0 }, szCmd[MAXPATHLEN] = { 0 }, szIdent[STRSIZ] = { 0 }, - szName[IFNAMSIZ] = { 0 }; + ait_val_t Str, Ident; + char szCmd[MAXPATHLEN] = { 0 }, szName[IFNAMSIZ] = { 0 }; int f, stat; assert(wds); @@ -90,8 +136,8 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz 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)) + v = cfg_getAttribute(&cfg, "dwds", "discover_on_join"); + if (!v || !strtol(v, NULL, 0)) break; /* fall thru ... */ case RTM_IEEE80211_LEAVE: @@ -100,33 +146,32 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz 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); + cfg_loadAttribute(&cfg, "dwds", "name", &Ident, DWDS_NAME); /* delete state file ... */ - v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("state_dir")); + v = cfg_getAttribute(&cfg, "dwds", "state_dir"); if (v) { memset(szCmd, 0, STRSIZ); - snprintf(szCmd, MAXPATHLEN, "%s/%s-%s-%s", (char*) v, - szName, ether_ntoa(&bssid), szIdent); + snprintf(szCmd, MAXPATHLEN, "%s/%s-%s-%s", v, szName, + ether_ntoa(&bssid), AIT_GET_STR(&Ident)); 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); + cfg_loadAttribute(&cfg, "dwds", "disassoc_event", &Str, NULL); + if (!AIT_ISEMPTY(&Str)) { memset(szCmd, 0, MAXPATHLEN); - snprintf(szCmd, MAXPATHLEN, "%s %s %s %s", szStr, - szName, ether_ntoa(&bssid), szIdent); + snprintf(szCmd, MAXPATHLEN, "%s %s %s %s", AIT_GET_STR(&Str), + szName, ether_ntoa(&bssid), AIT_GET_STR(&Ident)); 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); + "with status %d\n", + AIT_GET_STR(&Str), stat); + AIT_FREE_VAL(&Str); } + AIT_FREE_VAL(&Ident); } break; @@ -134,8 +179,8 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz 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)) + v = cfg_getAttribute(&cfg, "dwds", "discover_on_join"); + if (!v || !strtol(v, NULL, 0)) break; /* fall thru ... */ case RTM_IEEE80211_WDS: @@ -144,14 +189,14 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz 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); + cfg_loadAttribute(&cfg, "dwds", "name", &Ident, DWDS_NAME); /* create state file ... */ - v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("state_dir")); + v = cfg_getAttribute(&cfg, "dwds", "state_dir"); if (v) { memset(szCmd, 0, MAXPATHLEN); snprintf(szCmd, MAXPATHLEN, "%s/%s-%s-%s", (char*) v, - (*wds)->if_name, ether_ntoa(&bssid), szIdent); + (*wds)->if_name, ether_ntoa(&bssid), + AIT_GET_STR(&Ident)); f = open(szCmd, O_WRONLY | O_CREAT, 0644); if (f != -1) close(f); @@ -159,18 +204,21 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz } /* Launch script ... */ - cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("assoc_event"), - CFG(szStr), STRSIZ, NULL); - if (*szStr) { + cfg_loadAttribute(&cfg, "dwds", "assoc_event", &Str, NULL); + if (!AIT_ISEMPTY(&Str)) { memset(szCmd, 0, MAXPATHLEN); - snprintf(szCmd, MAXPATHLEN, "%s %s %s %s", szStr, - (*wds)->if_name, ether_ntoa(&bssid), szIdent); + snprintf(szCmd, MAXPATHLEN, "%s %s %s %s", AIT_GET_STR(&Str), + (*wds)->if_name, ether_ntoa(&bssid), + AIT_GET_STR(&Ident)); 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); + "with status %d\n", + AIT_GET_STR(&Str), stat); + AIT_FREE_VAL(&Str); } + AIT_FREE_VAL(&Ident); } break; } @@ -181,13 +229,13 @@ RtMsg(struct dwds_if **wds, struct rt_msghdr *msg, siz return 0; } -// --------------------------------------------------------------- int main(int argc, char **argv) { - char ch, szStr[STRSIZ], fg = 0; - const u_char *v, msg[2048]; + char ch, fg = 0; + ait_val_t Ident; + const char *v, msg[2048]; int s; struct sigaction sa; size_t len; @@ -219,7 +267,7 @@ main(int argc, char **argv) nif = argc; ifs = argv; } - if (LoadConfig(szConfig, &cfg)) { + if (cfgLoadConfig(szConfig, &cfg)) { printf("Error:: can`t load config %s ...\n", szConfig); return 1; } @@ -228,7 +276,7 @@ main(int argc, char **argv) switch (fork()) { case -1: printf("Error:: when fork() #%d - %s\n", errno, strerror(errno)); - UnloadConfig(&cfg); + cfgUnloadConfig(&cfg); return 2; case 0 : VERB(1) printf("Going to shadow land ...\n"); @@ -246,10 +294,11 @@ main(int argc, char **argv) goto end; } - cfg_LoadAttribute(&cfg, CFG("dwds"), CFG("name"), CFG(szStr), STRSIZ, DWDS_NAME); - openlog(szStr, LOG_PID | LOG_CONS, LOG_DAEMON); - v = cfg_GetAttribute(&cfg, CFG("dwds"), CFG("syslog_upto")); - setlogmask(v ? strtol((char*) v, NULL, 0) : 0); + cfg_loadAttribute(&cfg, "dwds", "name", &Ident, DWDS_NAME); + openlog(AIT_GET_STR(&Ident), LOG_PID | LOG_CONS, LOG_DAEMON); + AIT_FREE_VAL(&Ident); + v = cfg_getAttribute(&cfg, "dwds", "syslog_upto"); + setlogmask(v ? strtol(v, NULL, 0) : 0); s = socket(PF_ROUTE, SOCK_RAW, 0); if (s == -1) { @@ -274,6 +323,6 @@ main(int argc, char **argv) close(s); end: closelog(); - UnloadConfig(&cfg); + cfgUnloadConfig(&cfg); return 0; }