embedtools/src/get1steth.c - diff

Return to get1steth.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedtools / src

Diff for /embedtools/src/get1steth.c between versions 1.1.2.2 and 1.1.2.4

version 1.1.2.2, 2009/12/18 16:18:51	version 1.1.2.4, 2009/12/28 13:25:04
Line 24 int main(int argc, char **argv)	Line 24 int main(int argc, char **argv)
char ch, GetOnly = 0;	char ch, GetOnly = 0;
struct ifaddrs ifa, ifp;	struct ifaddrs ifa, ifp;
struct sockaddr_dl *sdl;	struct sockaddr_dl *sdl;
	struct sockaddr_in *sin;
struct ifreq ifr;	struct ifreq ifr;
	struct vlanreq vlr;
	struct ifaliasreq ifra;
int s;	int s;

while ((ch = getopt(argc, argv, "hvg")) != -1)	while ((ch = getopt(argc, argv, "hvg")) != -1)
Line 43 int main(int argc, char **argv)	Line 46 int main(int argc, char **argv)
argc -= optind;	argc -= optind;
argv += optind;	argv += optind;

openlog("get1steth", LOG_CONS, LOG_CONSOLE);	openlog("get1steth", LOG_CONS \| LOG_PERROR, LOG_CONSOLE \| LOG_USER);

if (argc) {	if (argc) {
strlcpy(szIface, *argv, MAX_STR);	strlcpy(szIface, *argv, MAX_STR);
Line 69 int main(int argc, char **argv)	Line 72 int main(int argc, char **argv)
return 0;	return 0;
}	}

	// create vlan
memset(&ifr, 0, sizeof ifr);	memset(&ifr, 0, sizeof ifr);
strlcpy(ifr.ifr_name, szIface, sizeof ifr.ifr_name);	strlcpy(vlr.vlr_parent, szIface, IFNAMSIZ);
	vlr.vlr_tag = MGMT_VTAG;

s = socket(PF_LOCAL, SOCK_DGRAM, 0);	strlcpy(ifr.ifr_name, MGMT_IFACE, IFNAMSIZ);
	ifr.ifr_data = (void *) &vlr;

	s = socket(PF_INET, SOCK_STREAM, 0);
if (-1 == s) {	if (-1 == s) {
syslog(LOG_ERR, "Error:: socket(LOCAL) #%d - %s\n", errno, strerror(errno));	syslog(LOG_ERR, "Error:: socket(LOCAL) #%d - %s\n", errno, strerror(errno));
return 2;	return 2;
}	}
if (ioctl(s, SIOCIFCREATE2, &ifr) == -1) {	if (ioctl(s, SIOCIFCREATE2, &ifr) == -1 && errno != EEXIST) {
syslog(LOG_ERR, "Error:: ioctl(SIOCIFCREATE2) #%d - %s\n", errno, strerror(errno));	syslog(LOG_ERR, "Error:: Create interface=%s ioctl(SIOCIFCREATE2) #%d - %s\n",
	MGMT_IFACE, errno, strerror(errno));
close(s);	close(s);
return 2;	return 2;
}	} else
	VERB(2) syslog(LOG_NOTICE, "Info:: Created interface=%s\n", MGMT_IFACE);
	// rename 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",
	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
	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);	close(s);
closelog();	closelog();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.2
changed lines
	Added in v.1.1.2.4