--- embedtools/src/get1steth.c 2011/06/08 12:45:41 1.2 +++ embedtools/src/get1steth.c 2014/02/05 15:44:06 1.5 @@ -3,19 +3,57 @@ * by Michael Pounov * * $Author: misho $ - * $Id: get1steth.c,v 1.2 2011/06/08 12:45:41 misho Exp $ + * $Id: get1steth.c,v 1.5 2014/02/05 15:44:06 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 - 2014 + 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[]; -static void Usage() +static void +Usage() { printf("-= GET_FIRST_ETHERNET =- Get First Ethernet Interface tool\n" "=== %s === %s@%s ===\n\n" @@ -26,7 +64,8 @@ static void Usage() } #ifdef HAVE_KLDNEXT -static int kldLoad() +static int +kldLoad() { struct module_stat mstat; register int i, j; @@ -56,7 +95,8 @@ static int kldLoad() // ------------------------------- -int main(int argc, char **argv) +int +main(int argc, char **argv) { char ch, GetOnly = 0; struct ifaddrs *ifa, *ifp; @@ -87,7 +127,7 @@ int main(int argc, char **argv) openlog("get1steth", LOG_CONS | LOG_PERROR, LOG_USER); 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); @@ -112,7 +152,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))); @@ -147,20 +187,33 @@ int main(int argc, char **argv) VERB(3) syslog(LOG_NOTICE, "VLAN module ... %s\n", s ? "Loaded" : "Already loaded"); #endif - // create vlan + s = socket(PF_INET, SOCK_DGRAM, 0); + if (-1 == s) { + syslog(LOG_ERR, "Error:: socket(INET) #%d - %s\n", errno, strerror(errno)); + closelog(); + return 2; + } + + /* up parent interface */ memset(&ifr, 0, sizeof ifr); + strlcpy(ifr.ifr_name, szIface, IFNAMSIZ); + ifr.ifr_flags |= IFF_UP; + + if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1 && errno != EEXIST) { + syslog(LOG_ERR, "Error:: UP interface=%s ioctl(SIOCSIFFLAGS) #%d - %s\n", + szIface, errno, strerror(errno)); + close(s); + return 2; + } + + /* create vlan */ + memset(&ifr, 0, sizeof ifr); strlcpy(vlr.vlr_parent, szIface, IFNAMSIZ); vlr.vlr_tag = MGMT_VTAG; strlcpy(ifr.ifr_name, MGMT_IFACE, IFNAMSIZ); ifr.ifr_data = (void *) &vlr; - s = socket(PF_INET, SOCK_DGRAM, 0); - if (-1 == s) { - syslog(LOG_ERR, "Error:: socket(INET) #%d - %s\n", errno, strerror(errno)); - closelog(); - return 2; - } #ifdef SIOCIFCREATE2 if (ioctl(s, SIOCIFCREATE2, &ifr) == -1 && errno != EEXIST) { #else @@ -170,25 +223,26 @@ int main(int argc, char **argv) MGMT_IFACE, errno, strerror(errno)); close(s); return 2; - } else - VERB(2) syslog(LOG_NOTICE, "Info:: Created interface=%s\n", MGMT_IFACE); - // rename 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; -#ifdef SIOCSIFNAME if (errno != EEXIST && ioctl(s, SIOCSIFNAME, &ifr) == -1) { -#else - if (errno != EEXIST && ioctl(s, SIOCGIFDESCR, &ifr) == -1) { -#endif syslog(LOG_ERR, "Error:: Managment interface=%s ioctl(SIOCSIFNAME) #%d - %s\n", MGMT_NAME, errno, strerror(errno)); close(s); return 2; } else VERB(2) syslog(LOG_NOTICE, "Info:: Managment interface=%s\n", MGMT_NAME); - - // assign address & up - memset(&ifra, 0, sizeof ifra); strlcpy(ifra.ifra_name, MGMT_NAME, IFNAMSIZ); +#else + strlcpy(ifra.ifra_name, MGMT_IFACE, IFNAMSIZ); +#endif + + /* assign address & up */ sin = (struct sockaddr_in*) &ifra.ifra_addr; sin->sin_len = sizeof ifra.ifra_addr; sin->sin_family = AF_INET;