--- embedtools/src/get1steth.c 2010/01/01 17:24:04 1.1.2.6 +++ embedtools/src/get1steth.c 2010/03/24 16:43:01 1.1.2.9 @@ -1,3 +1,11 @@ +/************************************************************************* + * (C) 2010 AITNET - Sofia/Bulgaria - + * by Michael Pounov + * + * $Author: misho $ + * $Id: get1steth.c,v 1.1.2.9 2010/03/24 16:43:01 misho Exp $ + * + *************************************************************************/ #include "global.h" #include "get1steth.h" @@ -76,16 +84,17 @@ int main(int argc, char **argv) openlog("get1steth", LOG_CONS | LOG_PERROR, LOG_CONSOLE | LOG_USER); - s = socket(PF_INET, SOCK_STREAM, 0); - if (-1 == s) { - syslog(LOG_ERR, "Error:: socket(INET) #%d - %s\n", errno, strerror(errno)); - closelog(); - return 1; - } if (argc) { strlcpy(szIface, *argv, MAX_STR); VERB(1) syslog(LOG_NOTICE, "Info:: Get CUSTOM first interface %s\n", szIface); } else { + s = socket(PF_INET, SOCK_DGRAM, 0); + if (-1 == s) { + syslog(LOG_ERR, "Error:: socket(INET) #%d - %s\n", errno, strerror(errno)); + closelog(); + return 1; + } + getifaddrs(&ifa); for (ifp = ifa; ifp; ifp = ifp->ifa_next) { if (PF_LINK == ifp->ifa_addr->sa_family && @@ -110,11 +119,12 @@ int main(int argc, char **argv) } } freeifaddrs(ifa); + + close(s); } if (!*szIface) { syslog(LOG_NOTICE, "Info:: Ethernet interface not found!!!\n"); - close(s); closelog(); return 1; } @@ -122,7 +132,6 @@ int main(int argc, char **argv) if (GetOnly) { printf("%s\n", szIface); - close(s); closelog(); return 0; } @@ -130,10 +139,9 @@ int main(int argc, char **argv) s = kldLoad(); if (s == -1) { syslog(LOG_ERR, "Error:: kldload(if_vlan) Can`t operate with vlans ...\n"); - close(s); 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"); // create vlan memset(&ifr, 0, sizeof ifr); @@ -143,6 +151,12 @@ int main(int argc, char **argv) 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; + } if (ioctl(s, SIOCIFCREATE2, &ifr) == -1 && errno != EEXIST) { syslog(LOG_ERR, "Error:: Create interface=%s ioctl(SIOCIFCREATE2) #%d - %s\n", MGMT_IFACE, errno, strerror(errno));