--- embedtools/src/get1steth.c 2010/01/01 17:58:16 1.1.2.7 +++ embedtools/src/get1steth.c 2013/01/18 12:58:14 1.4 @@ -1,8 +1,53 @@ +/************************************************************************* + * (C) 2010 AITNET - Sofia/Bulgaria - + * by Michael Pounov + * + * $Author: misho $ + * $Id: get1steth.c,v 1.4 2013/01/18 12:58:14 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 "get1steth.h" -char szIface[MAX_STR]; +char szIface[STRSIZ]; int Verbose; extern char compiled[], compiledby[], compilehost[]; @@ -17,6 +62,7 @@ static void Usage() "\n", compiled, compiledby, compilehost); } +#ifdef HAVE_KLDNEXT static int kldLoad() { struct module_stat mstat; @@ -43,6 +89,7 @@ static int kldLoad() return 1; } +#endif // ------------------------------- @@ -74,16 +121,10 @@ int main(int argc, char **argv) argc -= optind; argv += optind; - openlog("get1steth", LOG_CONS | LOG_PERROR, LOG_CONSOLE | LOG_USER); + openlog("get1steth", LOG_CONS | LOG_PERROR, LOG_USER); - s = socket(AF_LOCAL, SOCK_DGRAM, 0); - if (-1 == s) { - syslog(LOG_ERR, "Error:: socket(LOCAL) #%d - %s\n", errno, strerror(errno)); - closelog(); - return 1; - } if (argc) { - strlcpy(szIface, *argv, MAX_STR); + strlcpy(szIface, *argv, sizeof szIface); VERB(1) syslog(LOG_NOTICE, "Info:: Get CUSTOM first interface %s\n", szIface); } else { s = socket(PF_INET, SOCK_DGRAM, 0); @@ -108,7 +149,7 @@ int main(int argc, char **argv) } if (IFM_ETHER == IFM_TYPE(ifmr.ifm_current)) { - strlcpy(szIface, ifp->ifa_name, MAX_STR); + strlcpy(szIface, ifp->ifa_name, sizeof szIface); sdl = (struct sockaddr_dl*) ifp->ifa_addr; VERB(2) syslog(LOG_NOTICE, "Info:: Get first interface=%s MAC=%s\n", szIface, ether_ntoa((struct ether_addr*) LLADDR(sdl))); @@ -134,12 +175,14 @@ int main(int argc, char **argv) return 0; } +#ifdef HAVE_KLDNEXT s = kldLoad(); if (s == -1) { syslog(LOG_ERR, "Error:: kldload(if_vlan) Can`t operate with vlans ...\n"); return 1; } else - VERB(1) syslog(LOG_NOTICE, "VLAN module ... %s\n", s ? "Loaded" : "Already loaded"); + VERB(3) syslog(LOG_NOTICE, "VLAN module ... %s\n", s ? "Loaded" : "Already loaded"); +#endif // create vlan memset(&ifr, 0, sizeof ifr); @@ -155,14 +198,21 @@ int main(int argc, char **argv) closelog(); return 2; } +#ifdef SIOCIFCREATE2 if (ioctl(s, SIOCIFCREATE2, &ifr) == -1 && errno != EEXIST) { +#else + if (ioctl(s, SIOCIFCREATE, &ifr) == -1 && errno != EEXIST) { +#endif syslog(LOG_ERR, "Error:: Create interface=%s ioctl(SIOCIFCREATE2) #%d - %s\n", MGMT_IFACE, errno, strerror(errno)); close(s); return 2; - } else - VERB(2) syslog(LOG_NOTICE, "Info:: Created interface=%s\n", MGMT_IFACE); + } + + memset(&ifra, 0, sizeof ifra); +#if defined(__FreeBSD__) // rename iface + VERB(2) syslog(LOG_NOTICE, "Info:: Created interface=%s\n", MGMT_IFACE); ifr.ifr_data = MGMT_NAME; if (errno != EEXIST && ioctl(s, SIOCSIFNAME, &ifr) == -1) { syslog(LOG_ERR, "Error:: Managment interface=%s ioctl(SIOCSIFNAME) #%d - %s\n", @@ -171,10 +221,12 @@ int main(int argc, char **argv) return 2; } else VERB(2) syslog(LOG_NOTICE, "Info:: Managment interface=%s\n", MGMT_NAME); + strlcpy(ifra.ifra_name, MGMT_NAME, IFNAMSIZ); +#else + strlcpy(ifra.ifra_name, MGMT_IFACE, IFNAMSIZ); +#endif // assign address & up - memset(&ifra, 0, sizeof ifra); - strlcpy(ifra.ifra_name, MGMT_NAME, IFNAMSIZ); sin = (struct sockaddr_in*) &ifra.ifra_addr; sin->sin_len = sizeof ifra.ifra_addr; sin->sin_family = AF_INET;