--- embedtools/src/get1steth.c 2012/07/22 22:46:47 1.3 +++ embedtools/src/get1steth.c 2014/01/30 01:03:23 1.4.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: get1steth.c,v 1.3 2012/07/22 22:46:47 misho Exp $ + * $Id: get1steth.c,v 1.4.2.3 2014/01/30 01:03:23 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,12 +47,13 @@ SUCH DAMAGE. #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" @@ -63,7 +64,8 @@ static void Usage() } #ifdef HAVE_KLDNEXT -static int kldLoad() +static int +kldLoad() { struct module_stat mstat; register int i, j; @@ -93,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; @@ -124,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); @@ -149,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))); @@ -184,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 @@ -211,7 +227,7 @@ int main(int argc, char **argv) memset(&ifra, 0, sizeof ifra); #if defined(__FreeBSD__) - // rename iface + /* 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) { @@ -226,7 +242,7 @@ int main(int argc, char **argv) strlcpy(ifra.ifra_name, MGMT_IFACE, IFNAMSIZ); #endif - // assign address & up + /* assign address & up */ sin = (struct sockaddr_in*) &ifra.ifra_addr; sin->sin_len = sizeof ifra.ifra_addr; sin->sin_family = AF_INET;