--- embedtools/src/get1steth.c	2009/12/18 17:20:41	1.1.2.3
+++ embedtools/src/get1steth.c	2009/12/28 13:25:04	1.1.2.4
@@ -24,8 +24,10 @@ 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;
 	int s;
 
 	while ((ch = getopt(argc, argv, "hvg")) != -1)
@@ -78,12 +80,12 @@ 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_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) {
+	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 +94,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();