--- embedtools/src/get1steth.c	2009/12/18 17:20:41	1.1.2.3
+++ embedtools/src/get1steth.c	2010/03/23 13:29:38	1.1.2.8
@@ -17,6 +17,33 @@ static void Usage()
 		"\n", compiled, compiledby, compilehost);
 }
 
+static int kldLoad()
+{
+	struct module_stat mstat;
+	register int i, j;
+	u_char flg = 0;
+
+	memset(&mstat, 0, sizeof mstat);
+	mstat.version = sizeof mstat;
+	for (i = kldnext(0); i > 0; i = kldnext(i))
+		for (j = kldfirstmod(i); j > 0; j = modfnext(j)) {
+			if (modstat(j, &mstat) == -1)
+				continue;
+
+			if (!strncmp(MODVLAN, mstat.name, sizeof MODVLAN)) {
+				flg = 1;
+				break;
+			}
+		}
+	if (flg)
+		return 0;
+
+	if (kldload(MODVLAN) == -1)
+		return -1;
+
+	return 1;
+}
+
 // -------------------------------
 
 int main(int argc, char **argv)
@@ -24,8 +51,11 @@ int main(int argc, char **argv)
 	char ch, GetOnly = 0;
 	struct ifaddrs *ifa, *ifp;
 	struct sockaddr_dl *sdl;
+	struct sockaddr_in *sin;
 	struct ifreq ifr;
 	struct vlanreq vlr;
+	struct ifaliasreq ifra;
+	struct ifmediareq ifmr;
 	int s;
 
 	while ((ch = getopt(argc, argv, "hvg")) != -1)
@@ -50,19 +80,47 @@ int main(int argc, char **argv)
 		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 && 
 					IFT_ETHER == ((struct sockaddr_dl*) ifp->ifa_addr)->sdl_type) {
-				strlcpy(szIface, ifp->ifa_name, MAX_STR);
-				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)));
-				break;
+				memset(&ifmr, 0, sizeof ifmr);
+				strlcpy(ifmr.ifm_name, ifp->ifa_name, IFNAMSIZ);
+				if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) {
+					syslog(LOG_ERR, "Error:: media interface=%s ioctl(SIOCGIFMEDIA) #%d - %s\n", 
+							ifmr.ifm_name, errno, strerror(errno));
+					close(s);
+					closelog();
+					return 1;
+				}
+
+				if (IFM_ETHER == IFM_TYPE(ifmr.ifm_current)) {
+					strlcpy(szIface, ifp->ifa_name, MAX_STR);
+					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)));
+					break;
+				}
 			}
 		}
 		freeifaddrs(ifa);
+
+		close(s);
 	}
+	if (!*szIface) {
+		syslog(LOG_NOTICE, "Info:: Ethernet interface not found!!!\n");
+
+		closelog();
+		return 1;
+	}
+
 	if (GetOnly) {
 		printf("%s\n", szIface);
 
@@ -70,6 +128,13 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
+	s = kldLoad();
+	if (s == -1) {
+		syslog(LOG_ERR, "Error:: kldload(if_vlan) Can`t operate with vlans ...\n");
+		return 1;
+	} else
+		VERB(3) syslog(LOG_NOTICE, "VLAN module ... %s\n", s ? "Loaded" : "Already loaded");
+
 	// create vlan
 	memset(&ifr, 0, sizeof ifr);
 	strlcpy(vlr.vlr_parent, szIface, IFNAMSIZ);
@@ -78,12 +143,13 @@ int main(int argc, char **argv)
 	strlcpy(ifr.ifr_name, MGMT_IFACE, IFNAMSIZ);
 	ifr.ifr_data = (void *) &vlr;
 
-	s = socket(PF_LOCAL, SOCK_DGRAM, 0);
+	s = socket(PF_INET, SOCK_DGRAM, 0);
 	if (-1 == s) {
-		syslog(LOG_ERR, "Error:: socket(LOCAL) #%d - %s\n", errno, strerror(errno));
+		syslog(LOG_ERR, "Error:: socket(INET) #%d - %s\n", errno, strerror(errno));
+		closelog();
 		return 2;
 	}
-	if (ioctl(s, SIOCIFCREATE2, &ifr) == -1) {
+	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));
 		close(s);
@@ -92,15 +158,32 @@ int main(int argc, char **argv)
 		VERB(2) syslog(LOG_NOTICE, "Info:: Created interface=%s\n", MGMT_IFACE);
 	// rename iface
 	ifr.ifr_data = MGMT_NAME;
-	if (ioctl(s, SIOCSIFNAME, &ifr) == -1) {
+	if (errno != EEXIST && ioctl(s, SIOCSIFNAME, &ifr) == -1) {
 		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
-	ifr.ifr_flags |= IFF_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;
+	sin->sin_addr.s_addr = inet_addr(MGMT_ADDR);
+	sin = (struct sockaddr_in*) &ifra.ifra_mask;
+	sin->sin_len = sizeof ifra.ifra_mask;
+	sin->sin_family = AF_INET;
+	sin->sin_addr.s_addr = inet_addr(MGMT_MASK);
+	if (ioctl(s, SIOCAIFADDR, &ifra) == -1) {
+		syslog(LOG_ERR, "Error:: IP %s ioctl(SIOCAIFADDR) #%d - %s\n", 
+				MGMT_ADDR, errno, strerror(errno));
+		close(s);
+		return 2;
+	} else
+		VERB(2) syslog(LOG_NOTICE, "Info:: IP %s\n", MGMT_ADDR);
 
 	close(s);
 	closelog();