--- embedtools/src/get1steth.c 2010/01/01 17:58:16 1.1.2.7 +++ embedtools/src/get1steth.c 2011/06/13 20:04:12 1.2.2.1 @@ -1,3 +1,11 @@ +/************************************************************************* + * (C) 2010 AITNET - Sofia/Bulgaria - + * by Michael Pounov + * + * $Author: misho $ + * $Id: get1steth.c,v 1.2.2.1 2011/06/13 20:04:12 misho Exp $ + * + *************************************************************************/ #include "global.h" #include "get1steth.h" @@ -17,6 +25,7 @@ static void Usage() "\n", compiled, compiledby, compilehost); } +#ifdef HAVE_KLDNEXT static int kldLoad() { struct module_stat mstat; @@ -43,6 +52,7 @@ static int kldLoad() return 1; } +#endif // ------------------------------- @@ -74,14 +84,8 @@ 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); VERB(1) syslog(LOG_NOTICE, "Info:: Get CUSTOM first interface %s\n", szIface); @@ -134,12 +138,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 +161,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 +184,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;