--- embedtools/src/get1steth.c	2009/12/28 14:22:25	1.1.2.5
+++ embedtools/src/get1steth.c	2010/01/01 17:24:04	1.1.2.6
@@ -55,6 +55,7 @@ int main(int argc, char **argv)
 	struct ifreq ifr;
 	struct vlanreq vlr;
 	struct ifaliasreq ifra;
+	struct ifmediareq ifmr;
 	int s;
 
 	while ((ch = getopt(argc, argv, "hvg")) != -1)
@@ -75,6 +76,12 @@ 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);
@@ -83,28 +90,50 @@ int main(int argc, char **argv)
 		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);
 	}
+	if (!*szIface) {
+		syslog(LOG_NOTICE, "Info:: Ethernet interface not found!!!\n");
+
+		close(s);
+		closelog();
+		return 1;
+	}
+
 	if (GetOnly) {
 		printf("%s\n", szIface);
 
+		close(s);
 		closelog();
 		return 0;
 	}
 
 	s = kldLoad();
 	if (s == -1) {
-		printf("Error:: kldload(if_vlan) Can`t operate with vlans ...\n");
+		syslog(LOG_ERR, "Error:: kldload(if_vlan) Can`t operate with vlans ...\n");
+		close(s);
 		return 1;
 	} else
-		VERB(1) printf("VLAN module ... %s\n", s ? "Loaded" : "Already loaded");
+		VERB(1) syslog(LOG_NOTICE, "VLAN module ... %s\n", s ? "Loaded" : "Already loaded");
 
 	// create vlan
 	memset(&ifr, 0, sizeof ifr);
@@ -114,11 +143,6 @@ int main(int argc, char **argv)
 	strlcpy(ifr.ifr_name, MGMT_IFACE, IFNAMSIZ);
 	ifr.ifr_data = (void *) &vlr;
 
-	s = socket(PF_INET, SOCK_STREAM, 0);
-	if (-1 == s) {
-		syslog(LOG_ERR, "Error:: socket(LOCAL) #%d - %s\n", errno, strerror(errno));
-		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));