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.9 and 1.2.2.3

version 1.1.2.9, 2010/03/24 16:43:01	version 1.2.2.3, 2012/04/05 12:27:52
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	*************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "get1steth.h"	#include "get1steth.h"

Line 25 static void Usage()	Line 62 static void Usage()
"\n", compiled, compiledby, compilehost);	"\n", compiled, compiledby, compilehost);
}	}

	#ifdef HAVE_KLDNEXT
static int kldLoad()	static int kldLoad()
{	{
struct module_stat mstat;	struct module_stat mstat;
Line 51 static int kldLoad()	Line 89 static int kldLoad()

return 1;	return 1;
}	}
	#endif

// -------------------------------	// -------------------------------

Line 82 int main(int argc, char **argv)	Line 121 int main(int argc, char **argv)
argc -= optind;	argc -= optind;
argv += optind;	argv += optind;

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

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

	#ifdef HAVE_KLDNEXT
s = kldLoad();	s = kldLoad();
if (s == -1) {	if (s == -1) {
syslog(LOG_ERR, "Error:: kldload(if_vlan) Can`t operate with vlans ...\n");	syslog(LOG_ERR, "Error:: kldload(if_vlan) Can`t operate with vlans ...\n");
return 1;	return 1;
} else	} else
VERB(3) 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	// create vlan
memset(&ifr, 0, sizeof ifr);	memset(&ifr, 0, sizeof ifr);
Line 157 int main(int argc, char **argv)	Line 198 int main(int argc, char **argv)
closelog();	closelog();
return 2;	return 2;
}	}
	#ifdef SIOCIFCREATE2
if (ioctl(s, SIOCIFCREATE2, &ifr) == -1 && errno != EEXIST) {	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",	syslog(LOG_ERR, "Error:: Create interface=%s ioctl(SIOCIFCREATE2) #%d - %s\n",
MGMT_IFACE, errno, strerror(errno));	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);
	memset(&ifra, 0, sizeof ifra);
	#if defined(__FreeBSD__)
// rename iface	// rename iface
	VERB(2) syslog(LOG_NOTICE, "Info:: Created interface=%s\n", MGMT_IFACE);
ifr.ifr_data = MGMT_NAME;	ifr.ifr_data = MGMT_NAME;
if (errno != EEXIST && 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",	syslog(LOG_ERR, "Error:: Managment interface=%s ioctl(SIOCSIFNAME) #%d - %s\n",
Line 173 int main(int argc, char **argv)	Line 221 int main(int argc, char **argv)
return 2;	return 2;
} else	} else
VERB(2) syslog(LOG_NOTICE, "Info:: Managment interface=%s\n", MGMT_NAME);	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	// assign address & up
memset(&ifra, 0, sizeof ifra);
strlcpy(ifra.ifra_name, MGMT_NAME, IFNAMSIZ);
sin = (struct sockaddr_in*) &ifra.ifra_addr;	sin = (struct sockaddr_in*) &ifra.ifra_addr;
sin->sin_len = sizeof ifra.ifra_addr;	sin->sin_len = sizeof ifra.ifra_addr;
sin->sin_family = AF_INET;	sin->sin_family = AF_INET;

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

Removed from v.1.1.2.9
changed lines
	Added in v.1.2.2.3