cvs commit: patches/net-tools net-tools-1.60-arp-1.patch net-tools-1.60-ether-wake-1.patch net-tools-1.60-ipv6-1.patch net-tools-1.60-ipx-1.patch net-tools-1.60-man-1.patch net-tools-1.60-manydevs-1.patch net-tools-1.60-miiioctl-1.patch net-tools-1.60-nameif-1.patch net-tools-1.60-virtualname-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Oct 5 15:08:34 PDT 2003


jim         03/10/05 16:08:34

  Added:       net-tools net-tools-1.60-arp-1.patch
                        net-tools-1.60-ether-wake-1.patch
                        net-tools-1.60-ipv6-1.patch
                        net-tools-1.60-ipx-1.patch
                        net-tools-1.60-man-1.patch
                        net-tools-1.60-manydevs-1.patch
                        net-tools-1.60-miiioctl-1.patch
                        net-tools-1.60-nameif-1.patch
                        net-tools-1.60-virtualname-1.patch
  Log:
  Added: Net-Tools Patches arp ether-wake ipv6 ipx man manydevs miiioctl nameif virtualname
  
  Revision  Changes    Path
  1.1                  patches/net-tools/net-tools-1.60-arp-1.patch
  
  Index: net-tools-1.60-arp-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Allows ARP to display in a Linux Style
  
  diff -Naur net-tools-1.60.orig/arp.c net-tools-1.60/arp.c
  --- net-tools-1.60.orig/arp.c	2001-04-08 17:05:05.000000000 +0000
  +++ net-tools-1.60/arp.c	2003-09-12 22:36:51.000000000 +0000
  @@ -619,6 +619,7 @@
       fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
       
       fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
  +    fprintf(stderr, _("        -e                       display (all) hosts in default (Linux) style\n"));
       fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
       fprintf(stderr, _("        -d, --delete             delete a specified entry\n"));
       fprintf(stderr, _("        -v, --verbose            be verbose\n"));
  diff -Naur net-tools-1.60.orig/man/en_US/arp.8 net-tools-1.60/man/en_US/arp.8
  --- net-tools-1.60.orig/man/en_US/arp.8	2000-10-28 10:59:42.000000000 +0000
  +++ net-tools-1.60/man/en_US/arp.8	2003-09-12 22:36:51.000000000 +0000
  @@ -3,7 +3,7 @@
   arp \- manipulate the system ARP cache
   .SH SYNOPSIS
   .B arp 
  -.RB [ \-vn ] 
  +.RB [ \-evn ] 
   .RB [ "\-H type" ] 
   .RB [ "-i if" ] 
   .B -a 
  @@ -60,7 +60,7 @@
   shows numerical addresses instead of trying to determine symbolic host, port
   or user names.
   .TP
  -.B "\-H type, \-\-hw-type type"
  +.B "\-H type, \-\-hw-type type, \-t type"
   When setting or reading the ARP cache, this optional parameter tells
   .B arp
   which class of entries it should check for.  The default value of
  @@ -81,7 +81,8 @@
   .B hostname
   parameter is not used,
   .B all
  -entries will be displayed.
  +entries will be displayed.  
  +The entries will be displayed in alternate (BSD) style.
   .TP
   .B "\-d hostname, \-\-delete hostname"
   Remove any entry for the specified host.  This can be used if the
  @@ -92,6 +93,9 @@
   .BR ifa "'s"
   hardware address.
   .TP
  +.B "\-e"
  +Shows the entries in default (Linux) style.
  +.TP
   .B "\-i If, \-\-device If"
   Select an interface. When dumping the ARP cache only entries matching
   the specified interface will be printed. When setting a permanent or
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-ether-wake-1.patch
  
  Index: net-tools-1.60-ether-wake-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Jim Gifford and Rawhide
  Description: Ether-wake.c from Rawhide
  	     Modification of Makefile by Jim Gifford
  
  	     This patches adds a utility to wake up
  	     sleeping machines.
  
  diff -Naur net-tools-1.60.orig/Makefile net-tools-1.60/Makefile
  --- net-tools-1.60.orig/Makefile	2001-04-15 14:34:31.000000000 +0000
  +++ net-tools-1.60/Makefile	2003-09-12 23:42:57.000000000 +0000
  @@ -76,7 +76,7 @@
   NET_LIB_PATH = lib
   NET_LIB_NAME = net-tools
   
  -PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif
  +PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif ether-wake
   
   -include config.make
   ifeq ($(HAVE_IP_TOOLS),1)
  @@ -193,6 +193,9 @@
   hostname:	hostname.o
   		$(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB)
   
  +ether-wake:	ether-wake.o
  +		$(CC) $(LDFLAGS) -o ether-wake ether-wake.o $(DNLIB)
  +
   route:		$(NET_LIB) route.o
   		$(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB)
   
  @@ -232,6 +235,7 @@
   	install -m 0755 rarp       ${BASEDIR}/sbin
   	install -m 0755 route      ${BASEDIR}/sbin
   	install -m 0755 slattach   $(BASEDIR)/sbin
  +	install -m 0755 ether-wake $(BASE_DIR)/sbin
   ifeq ($(HAVE_IP_TOOLS),1)
   	install -m 0755 ipmaddr    $(BASEDIR)/sbin
   	install -m 0755 iptunnel   $(BASEDIR)/sbin
  diff -Naur net-tools-1.60.orig/ether-wake.c net-tools-1.60/ether-wake.c
  --- net-tools-1.60.orig/ether-wake.c	1970-01-01 00:00:00.000000000 +0000
  +++ net-tools-1.60/ether-wake.c	2003-09-12 23:44:40.000000000 +0000
  @@ -0,0 +1,339 @@
  +/* ether-wake.c: Send a magic packet to wake up sleeping machines. */
  +
  +static char version_msg[] =
  +"ether-wake.c: v1.05 12/28/2000 Donald Becker, http://www.scyld.com/";
  +static char brief_usage_msg[] =
  +"usage: ether-wake [-i <ifname>] [-p aa:bb:cc:dd[:ee:ff]] 00:11:22:33:44:55\n"
  +"   Use '-u' to see the complete set of options.\n";
  +static char usage_msg[] =
  +"usage: ether-wake [-i <ifname>] [-p aa:bb:cc:dd[:ee:ff]] 00:11:22:33:44:55\n"
  +"\n"
  +"	This program generates and transmits a Wake-On-LAN (WOL) \"Magic Packet\",\n"
  +"	used for restarting machines that have been soft-powered-down\n"
  +"	(ACPI D3-warm state).  It currently generates the standard AMD Magic Packet\n"
  +"	format, with an optional password appended.\n"
  +"\n"
  +"	The single required parameter is the Ethernet MAC (station) address\n"
  +"	of the machine to wake.  This is typically retrieved with the 'arp'\n"
  +"	program while the target machine is awake.\n"
  +"\n"
  +"	Options:\n"
  +"		-b	Send wake-up packet to the broadcast address.\n"
  +"		-D	Increase the debug level.\n"
  +"		-i ifname	Use interface IFNAME instead of the default 'eth0'.\n"
  +"		-p <pw>		Append the four or six byte password PW to the packet.\n"
  +"					A password is only required for a few adapter types.\n"
  +"					The password may be specified in ethernet hex format\n"
  +"					or dotted decimal (Internet address)\n"
  +"		-p 00:22:44:66:88:aa\n"
  +"		-p 192.168.1.1\n";
  +
  +/*
  +	This program generates and transmits a Wake-On-LAN (WOL) "Magic Packet",
  +	used for restarting machines that have been soft-powered-down
  +	(ACPI D3-warm state).  It currently generates the standard AMD Magic Packet
  +	format, with an optional password appended.
  +
  +	This software may be used and distributed according to the terms
  +	of the GNU Public License, incorporated herein by reference.
  +	Contact the author for use under other terms.
  +
  +	This source file is part of the network tricks package.
  +
  +	The author may be reached as becker at scyld, or C/O
  +	 Scyld Computing Corporation
  +	 410 Severn Ave., Suite 210
  +	 Annapolis MD 21403
  +
  +	The single required parameter is the Ethernet MAC (station) address
  +	of the machine to wake.  This is typically retrieved with the 'arp'
  +	program while the target machine is awake.
  +
  +	Options:
  +		-b	Send wake-up packet to the broadcast address.
  +		-D	Increase the debug level.
  +		-i ifname	Use interface IFNAME instead of the default "eth0".
  +		-p <pw>		Append the four or six byte password PW to the packet.
  +					A password is only required for a few adapter types.
  +					The password may be specified in ethernet hex format
  +					or dotted decimal (Internet address)
  +		-p 00:22:44:66:88:aa
  +		-p 192.168.1.1
  +
  +  Note: On some systems dropping root capability allows the process to be
  +  dumped, traced or debugged.
  +  If someone traces this program, they get control of a raw socket.
  +  Linux handles this safely, but beware when porting this program.
  +
  +*/
  +
  +#include <unistd.h>
  +#include <stdlib.h>
  +#include <stdio.h>
  +#include <errno.h>
  +#include <ctype.h>
  +#include <string.h>
  +
  +#if 0							/* Only exists on some versions. */
  +#include <ioctls.h>
  +#endif
  +
  +#include <sys/socket.h>
  +
  +#include <sys/types.h>
  +#include <sys/ioctl.h>
  +#include <linux/if.h>
  +
  +#ifdef UIO_MAXIOV
  +/*extern int setsockopt __P ((int __fd, int __level, int __optname,
  +  __ptr_t __optval, int __optlen));*/
  +#else				/* New, correct head files.  */
  +#include <sys/socket.h>
  +#endif
  +#ifdef USE_SENDMSG
  +#include <iovec.h>
  +#endif
  +
  +u_char outpack[1000];
  +int outpack_sz = 0;
  +int debug = 0;
  +u_char wol_passwd[6];
  +int wol_passwd_sz = 0;
  +
  +static int opt_no_src_addr = 0, opt_broadcast = 0;
  +
  +static int get_fill(unsigned char *pkt, char *arg);
  +static int get_wol_pw(const char *optarg);
  +
  +int main(int argc, char *argv[])
  +{
  +	struct sockaddr whereto;	/* who to wake up */
  +	char *ifname = "eth0";
  +	int one = 1;				/* True, for socket options. */
  +	int s;						/* Raw socket */
  +	int errflag = 0, verbose = 0, do_version = 0;
  +	int i, c, pktsize;
  +
  +	while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1)
  +		switch (c) {
  +		case 'b': opt_broadcast++;	break;
  +		case 'D': debug++;			break;
  +		case 'i': ifname = optarg;	break;
  +		case 'p': get_wol_pw(optarg); break;
  +		case 'u': printf(usage_msg); return 0;
  +		case 'v': verbose++;		break;
  +		case 'V': do_version++;		break;
  +		case '?':
  +			errflag++;
  +		}
  +	if (verbose || do_version)
  +		printf("%s\n", version_msg);
  +	if (errflag) {
  +		fprintf(stderr, brief_usage_msg);
  +		return 3;
  +	}
  +
  +	if (optind == argc) {
  +		fprintf(stderr, "Specify the Ethernet address as 00:11:22:33:44:55.\n");
  +		return 3;
  +	}
  +
  +	/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
  +	   work as non-root, but we need SOCK_PACKET to specify the Ethernet
  +	   destination address. */
  +	if ((s = socket(AF_INET, SOCK_PACKET, SOCK_PACKET)) < 0) {
  +		if (errno == EPERM)
  +			fprintf(stderr, "ether-wake must run as root\n");
  +		else
  +			perror("ether-wake: socket");
  +		if (! debug)
  +			return 2;
  +	}
  +	/* Don't revert if debugging allows a normal user to get the raw socket. */
  +	setuid(getuid());
  +
  +	pktsize = get_fill(outpack, argv[optind]);
  +
  +	/* Fill in the source address, if possible.
  +	   The code to retrieve the local station address is Linux specific. */
  +	if (! opt_no_src_addr){
  +		struct ifreq if_hwaddr;
  +		unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
  +
  +		strcpy(if_hwaddr.ifr_name, ifname);
  +		if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) {
  +			fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname,
  +					strerror(errno));
  +			return 1;
  +		}
  +		memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6);
  +
  +		if (verbose) {
  +			printf("The hardware address (SIOCGIFHWADDR) of %s is type %d  "
  +				   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", ifname,
  +				   if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
  +				   hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
  +		}
  +	}
  +
  +	if (wol_passwd_sz > 0) {
  +		memcpy(outpack+pktsize, wol_passwd, wol_passwd_sz);
  +		pktsize += wol_passwd_sz;
  +	}
  +
  +	if (verbose > 1) {
  +		printf("The final packet is: ");
  +		for (i = 0; i < pktsize; i++)
  +			printf(" %2.2x", outpack[i]);
  +		printf(".\n");
  +	}
  +
  +	/* This is necessary for broadcasts to work */
  +	if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char *)&one, sizeof(one)) < 0)
  +		perror("setsockopt: SO_BROADCAST");
  +
  +	whereto.sa_family = 0;
  +	strcpy(whereto.sa_data, ifname);
  +
  +	if ((i = sendto(s, outpack, pktsize, 0, &whereto, sizeof(whereto))) < 0)
  +		perror("sendto");
  +	else if (debug)
  +		printf("Sendto worked ! %d.\n", i);
  +
  +#ifdef USE_SEND
  +	if (bind(s, &whereto, sizeof(whereto)) < 0)
  +		perror("bind");
  +	else if (send(s, outpack, 100, 0) < 0)
  +		perror("send");
  +#endif
  +#ifdef USE_SENDMSG
  +	{
  +		struct msghdr msghdr;
  +		struct iovec iovector[1];
  +		msghdr.msg_name = &whereto;
  +		msghdr.msg_namelen = sizeof(whereto);
  +		msghdr.msg_iov = iovector;
  +		msghdr.msg_iovlen = 1;
  +		iovector[0].iov_base = outpack;
  +		iovector[0].iov_len = pktsize;
  +		if ((i = sendmsg(s, &msghdr, 0)) < 0)
  +			perror("sendmsg");
  +		else if (debug)
  +			printf("sendmsg worked, %d (%d).\n", i, errno);
  +	}
  +#endif
  +
  +	return 0;
  +}
  +
  +static int get_fill(unsigned char *pkt, char *arg)
  +{
  +	int sa[6];
  +	unsigned char station_addr[6];
  +	int byte_cnt;
  +	int offset, i;
  +	char *cp;
  +
  +	for (cp = arg; *cp; cp++)
  +		if (*cp != ':' && !isxdigit(*cp)) {
  +			(void)fprintf(stderr,
  +						  "ping: patterns must be specified as hex digits.\n");
  +			exit(2);
  +		}
  +
  +	byte_cnt = sscanf(arg, "%2x:%2x:%2x:%2x:%2x:%2x",
  +					  &sa[0], &sa[1], &sa[2], &sa[3], &sa[4], &sa[5]);
  +	for (i = 0; i < 6; i++)
  +		station_addr[i] = sa[i];
  +	if (debug)
  +		fprintf(stderr, "Command line stations address is "
  +				"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n",
  +				sa[0], sa[1], sa[2], sa[3], sa[4], sa[5]);
  +
  +	if (byte_cnt != 6) {
  +		(void)fprintf(stderr,
  +					  "ping: The Magic Packet address must be specified as "
  +					  "00:11:22:33:44:55.\n");
  +		exit(2);
  +	}
  +
  +	if (opt_broadcast)
  +		memset(pkt+0, 0xff, 6);
  +	else
  +		memcpy(pkt, station_addr, 6);
  +	memcpy(pkt+6, station_addr, 6);
  +	pkt[12] = 0x08;				/* Or 0x0806 for ARP, 0x8035 for RARP */
  +	pkt[13] = 0x42;
  +	offset = 14;
  +
  +	memset(pkt+offset, 0xff, 6);
  +	offset += 6;
  +
  +	for (i = 0; i < 16; i++) {
  +		memcpy(pkt+offset, station_addr, 6);
  +		offset += 6;
  +	}
  +	if (debug) {
  +		fprintf(stderr, "Packet is ");
  +		for (i = 0; i < offset; i++)
  +			fprintf(stderr, " %2.2x", pkt[i]);
  +		fprintf(stderr, ".\n");
  +	}
  +	return offset;
  +}
  +
  +static int get_wol_pw(const char *optarg)
  +{
  +	int passwd[6];
  +	int byte_cnt;
  +	int i;
  +
  +	byte_cnt = sscanf(optarg, "%2x:%2x:%2x:%2x:%2x:%2x",
  +					  &passwd[0], &passwd[1], &passwd[2],
  +					  &passwd[3], &passwd[4], &passwd[5]);
  +	if (byte_cnt < 4)
  +		byte_cnt = sscanf(optarg, "%d.%d.%d.%d",
  +						  &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
  +	if (byte_cnt < 4) {
  +		fprintf(stderr, "Unable to read the Wake-On-LAN password.\n");
  +		return 0;
  +	}
  +	printf(" The Magic packet password is %2.2x %2.2x %2.2x %2.2x (%d).\n",
  +		   passwd[0], passwd[1], passwd[2], passwd[3], byte_cnt);
  +	for (i = 0; i < byte_cnt; i++)
  +		wol_passwd[i] = passwd[i];
  +	return wol_passwd_sz = byte_cnt;
  +}
  +
  +#if 0
  +{
  +	to = (struct sockaddr_in *)&whereto;
  +	to->sin_family = AF_INET;
  +	if (inet_aton(target, &to->sin_addr)) {
  +		hostname = target;
  +	}
  +	memset (&sa, 0, sizeof sa);
  +	sa.sa_family = AF_INET;
  +	strncpy (sa.sa_data, interface, sizeof sa.sa_data);
  +	sendto (sock, buf, bufix + len, 0, &sa, sizeof sa);
  +	strncpy (sa.sa_data, interface, sizeof sa.sa_data);
  +#if 1
  +	sendto (sock, buf, bufix + len, 0, &sa, sizeof sa);
  +#else
  +	bind (sock, &sa, sizeof sa);
  +	connect();
  +	send (sock, buf, bufix + len, 0);
  +#endif
  +}
  +#endif
  +
  +
  +/*
  + * Local variables:
  + *  compile-command: "gcc -O -Wall -o ether-wake ether-wake.c"
  + *  c-indent-level: 4
  + *  c-basic-offset: 4
  + *  c-indent-level: 4
  + *  tab-width: 4
  + * End:
  + */
  diff -Naur net-tools-1.60.orig/man/en_US/ether-wake.8 net-tools-1.60/man/en_US/ether-wake.8
  --- net-tools-1.60.orig/man/en_US/ether-wake.8	1970-01-01 00:00:00.000000000 +0000
  +++ net-tools-1.60/man/en_US/ether-wake.8	2003-09-12 23:42:57.000000000 +0000
  @@ -0,0 +1,65 @@
  +.\"                                      Hey, EMACS: -*- nroff -*-
  +.\" First parameter, NAME, should be all caps
  +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
  +.\" other parameters are allowed: see man(7), man(1)
  +.TH ETHER-WAKE 8 "December  17, 2002"
  +.\" Please adjust this date whenever revising the manpage.
  +.\"
  +.\" Some roff macros, for reference:
  +.\" .nh        disable hyphenation
  +.\" .hy        enable hyphenation
  +.\" .ad l      left justify
  +.\" .ad b      justify to both left and right margins
  +.\" .nf        disable filling
  +.\" .fi        enable filling
  +.\" .br        insert line break
  +.\" .sp <n>    insert n+1 empty lines
  +.\" for manpage-specific macros, see man(7)
  +.SH NAME
  +ether-wake \- A tool to send magic WOL packages
  +.SH SYNOPSIS
  +.B ether-wake
  +.RI [ options ] " MAC-Address"
  +.SH DESCRIPTION
  +This manual page documents briefly the
  +.B ether-wake
  +commands.
  +.PP
  +.\" TeX users may be more comfortable with the \fB<whatever>\fP and
  +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
  +.\" respectively.
  +\fBether-wake\fP is a program that generates and transmits Wake-On-LAN 
  +(WOL) "Magic Packet", used for restarting machines that have been
  +soft-powered-down (ACPI D3-warm state). It currently generates the standard
  +AMD Magic Packet format, with an optional password appended.
  +.SH OPTIONS
  +\fBether-wake\fP needs a single dash (´-´) in front of the option.
  +A summary of options is included below.
  +.TP
  +.B \-b
  +Send wake-up packet to the broadcast address.
  +.TP
  +.B \-D
  +Increase the Debug Level.
  +.TP
  +.B \-i ifname
  +Use interface ifname instead of the default "eth0".
  +.TP
  +.B \-p passwd
  +Append a four or six byte password to the packet. Only very few adapters
  +need or support this. The password may be also specified in ethernet hex
  +format (00:22:44:66:88:aa) or dotted decimal (192.168.1.1).
  +.SH SEE ALSO
  +.BR arp (8).
  +.br
  +.SH KNOWN BUGS
  +On some systems dropping root capability allows the process to be
  +dumped, traced or debugged.
  +If someone traces this program, they get control of a raw socket.
  +Linux handles this safely, but beware when porting this program.
  +.SH AUTHOR
  +The ether-wake program was written by Donald Becker at Scyld Computing
  +Corporation.
  +This manual page was formatted by Alain Schroeder <alain at mini.gt.owl.de>
  +from the on-line manual in the program.
  +
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-ipv6-1.patch
  
  Index: net-tools-1.60-ipv6-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Fixes IPV6 Lookup
  
  diff -Naur net-tools-1.60.orig/lib/inet6.c net-tools-1.60/lib/inet6.c
  --- net-tools-1.60.orig/lib/inet6.c	2000-10-28 11:04:00.000000000 +0000
  +++ net-tools-1.60/lib/inet6.c	2003-09-12 22:40:45.000000000 +0000
  @@ -133,28 +133,9 @@
   }
   
   
  -static int INET6_getsock(char *bufp, struct sockaddr *sap)
  -{
  -    struct sockaddr_in6 *sin6;
  -
  -    sin6 = (struct sockaddr_in6 *) sap;
  -    sin6->sin6_family = AF_INET6;
  -    sin6->sin6_port = 0;
  -
  -    if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
  -	return (-1);
  -
  -    return 16;			/* ?;) */
  -}
  -
   static int INET6_input(int type, char *bufp, struct sockaddr *sap)
   {
  -    switch (type) {
  -    case 1:
  -	return (INET6_getsock(bufp, sap));
  -    default:
  -	return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap));
  -    }
  +    return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap));
   }
   
   
  diff -Naur net-tools-1.60.orig/lib/inet6_gr.c net-tools-1.60/lib/inet6_gr.c
  --- net-tools-1.60.orig/lib/inet6_gr.c	2001-04-01 14:48:06.000000000 +0000
  +++ net-tools-1.60/lib/inet6_gr.c	2003-09-12 22:40:45.000000000 +0000
  @@ -100,7 +100,7 @@
   		 addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
   	inet6_aftype.input(1, addr6, (struct sockaddr *) &saddr6);
   	snprintf(addr6, sizeof(addr6), "%s/%d",
  -		 inet6_aftype.sprint((struct sockaddr *) &saddr6, 1),
  +		 inet6_aftype.sprint((struct sockaddr *) &saddr6, numeric),
   		 prefix_len);
   
   	/* Fetch and resolve the nexthop address. */
  @@ -109,7 +109,7 @@
   		 naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7]);
   	inet6_aftype.input(1, naddr6, (struct sockaddr *) &snaddr6);
   	snprintf(naddr6, sizeof(naddr6), "%s",
  -		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
  +		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, numeric));
   
   	/* Decode the flags. */
   	strcpy(flags, "U");
  diff -Naur net-tools-1.60.orig/lib/inet6_sr.c net-tools-1.60/lib/inet6_sr.c
  --- net-tools-1.60.orig/lib/inet6_sr.c	2000-05-22 21:18:37.000000000 +0000
  +++ net-tools-1.60/lib/inet6_sr.c	2003-09-12 22:40:45.000000000 +0000
  @@ -63,7 +63,7 @@
       if (*args == NULL)
   	return (usage());
   
  -    strcpy(target, *args++);
  +    safe_strncpy(target, *args++, sizeof(target));
       if (!strcmp(target, "default")) {
           prefix_len = 0;
   	memset(&sa6, 0, sizeof(sa6));
  @@ -112,7 +112,7 @@
   		return (usage());
   	    if (rt.rtmsg_flags & RTF_GATEWAY)
   		return (usage());
  -	    strcpy(gateway, *args);
  +	    safe_strncpy(gateway, *args, sizeof(gateway));
   	    if (inet6_aftype.input(1, gateway,
   				   (struct sockaddr *) &sa6) < 0) {
   		inet6_aftype.herror(gateway);
  @@ -152,7 +152,7 @@
       }
       if (devname) {
   	memset(&ifr, 0, sizeof(ifr));
  -	strcpy(ifr.ifr_name, devname);
  +	safe_strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
   
   	if (ioctl(skfd, SIOGIFINDEX, &ifr) < 0) {
   	    perror("SIOGIFINDEX");
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-ipx-1.patch
  
  Index: net-tools-1.60-ipx-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Fixes IPX Netstat
  
  diff -Naur net-tools-1.60.orig/lib/ipx_gr.c net-tools-1.60/lib/ipx_gr.c
  --- net-tools-1.60.orig/lib/ipx_gr.c	2000-10-28 10:59:42.000000000 +0000
  +++ net-tools-1.60/lib/ipx_gr.c	2003-09-12 22:41:54.000000000 +0000
  @@ -64,7 +64,7 @@
   	    continue;
   
   	/* Fetch and resolve the Destination */
  -	(void) ap->input(5, net, &sa);
  +	(void) ap->input(1, net, &sa);
   	strcpy(net, ap->sprint(&sa, numeric));
   
   	/* Fetch and resolve the Router Net */
  diff -Naur net-tools-1.60.orig/netstat.c net-tools-1.60/netstat.c
  --- net-tools-1.60.orig/netstat.c	2001-04-15 14:41:17.000000000 +0000
  +++ net-tools-1.60/netstat.c	2003-09-12 22:41:55.000000000 +0000
  @@ -1412,13 +1412,13 @@
   	}
   
   	/* Fetch and resolve the Source */
  -	(void) ap->input(4, sad, &sa);
  +	(void) ap->input(0, sad, &sa);
   	safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf));
   	snprintf(sad, sizeof(sad), "%s:%04X", buf, sport);
   
   	if (!nc) {
   	    /* Fetch and resolve the Destination */
  -	    (void) ap->input(4, dad, &sa);
  +	    (void) ap->input(0, dad, &sa);
   	    safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf));
   	    snprintf(dad, sizeof(dad), "%s:%04X", buf, dport);
   	} else
  diff -Naur net-tools-1.60.orig/version.h net-tools-1.60/version.h
  --- net-tools-1.60.orig/version.h	1970-01-01 00:00:00.000000000 +0000
  +++ net-tools-1.60/version.h	2003-09-12 22:41:55.000000000 +0000
  @@ -0,0 +1 @@
  +#define RELEASE "net-tools 1.60"
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-man-1.patch
  
  Index: net-tools-1.60-man-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Removes nodename from Hostname man page
  
  diff -Naur net-tools-1.60.orig/man/de_DE/hostname.1 net-tools-1.60/man/de_DE/hostname.1
  --- net-tools-1.60.orig/man/de_DE/hostname.1	1999-03-15 20:31:16.000000000 +0000
  +++ net-tools-1.60/man/de_DE/hostname.1	2003-09-12 22:44:09.000000000 +0000
  @@ -15,8 +15,6 @@
   nisdomainname \- den NIS/YP Domainnamen anzeigen oder setzen
   .br
   ypdomainname \- den NIS/YP Domainnamen anzeigen oder setzen
  -.br
  -nodename \- den DECnet-Knotennamen anzeigen oder setzen
   
   .SH SYNOPSIS
   .B hostname
  @@ -101,12 +99,6 @@
   des Systems genannt.
   
   .LP
  -.B nodename
  -druckt den DECnet-Knotennamen des Systems, wie er von der
  -.BR getnodename (2)
  -Function ermittelt wird, aus.
  -
  -.LP
   .B dnsdomainname
   druckt den Domainteil des FQDN (Fully Qualified Domain Name oder zu deutsch
   vollst\(:andig spezifizierter Domainname) aus.  Der vollst\(:andige FQDN
  @@ -117,8 +109,8 @@
   .SS "NAME SETZEN"
   Wenn mit nur einem Argument oder mit der
   .B \-\-file
  -Option aufgerufen, dann setzen diese Kommandos den Rechnernamen, den NIS/YP
  -Domainnamen oder den DECnet-Knotennamen.
  +Option aufgerufen, dann setzen diese Kommandos den Rechnernamen oder den NIS/YP
  +Domainnamen.
   
   .LP
   Nur der Superuser darf den Namen \(:andern.
  @@ -198,11 +190,6 @@
   .I "\-i, \-\-ip-address"
   Die IP-Adresse(n) des Rechners anzeigen und beenden.
   .TP
  -.I "\-n, \-\-node"
  -Den DECnet-Knotennamen anzeigen.  Wenn ein Argument oder die
  -.B \-\-file name
  -Option angegeben wird, dann kann Root auch einen neuen Knotennamen setzen.
  -.TP
   .I "\-s, \-\-short"
   Den Kurznamen anzeigen.  Dies ist der ab dem ersten Punkt abgeschnittene
   Rechnername.
  diff -Naur net-tools-1.60.orig/man/en_US/hostname.1 net-tools-1.60/man/en_US/hostname.1
  --- net-tools-1.60.orig/man/en_US/hostname.1	1999-02-27 12:11:14.000000000 +0000
  +++ net-tools-1.60/man/en_US/hostname.1	2003-09-12 22:44:09.000000000 +0000
  @@ -10,8 +10,6 @@
   nisdomainname \- show or set system's NIS/YP domain name
   .br
   ypdomainname \- show or set the system's NIS/YP domain name
  -.br
  -nodename \- show or set the system's DECnet node name
   
   .SH SYNOPSIS
   .B hostname
  @@ -96,12 +94,6 @@
   function. This is also known as the YP/NIS domain name of the system.
   
   .LP
  -.B nodename
  -will print the DECnet node name of the system as returned by the
  -.BR getnodename (2)
  -function.
  -
  -.LP
   .B dnsdomainname
   will print the domain part of the FQDN (Fully Qualified Domain Name). The
   complete FQDN of the system is returned with
  @@ -184,11 +176,6 @@
   .I "\-i, \-\-ip-address"
   Display the IP address(es) of the host.
   .TP
  -.I "\-n, \-\-node"
  -Display the DECnet node name. If a parameter is given (or
  -.B \-\-file name
  -) the root can also set a new node name.
  -.TP
   .I "\-s, \-\-short"
   Display the short host name. This is the host name cut at the first dot.
   .TP
  diff -Naur net-tools-1.60.orig/man/fr_FR/hostname.1 net-tools-1.60/man/fr_FR/hostname.1
  --- net-tools-1.60.orig/man/fr_FR/hostname.1	1999-04-18 19:23:46.000000000 +0000
  +++ net-tools-1.60/man/fr_FR/hostname.1	2003-09-12 22:44:09.000000000 +0000
  @@ -9,8 +9,6 @@
   nisdomainname \- affiche ou définit le nom de domaine NIS/YP du système
   .br
   ypdomainname \- affiche ou définit le nom de domaine NIS/YP du système
  -.br
  -nodename \- affiche ou définit le nom de domaine DECnet du système
   
   .SH SYNOPSIS
   .B hostname
  @@ -87,14 +85,6 @@
   .BR getdomainname (2)
   . Ceci est connu comme nom de domaine YP/NIS du système.
   
  -
  -.LP
  -.B nodename
  -fournit le nom de noeud DECnet du système tel qu'il est retourné par la
  -fonction
  -.BR getnodename (2)
  -.
  -
   .LP
   .B dnsdomainname
   fournit la partie domaine du nom complètement qualifié - FQDN (Fully
  @@ -180,11 +170,6 @@
   .I "\-i, \-\-ip-address"
   Affiche la (les) adresse(s) IP de l'hôte.
   .TP
  -.I "\-n, \-\-node"
  -Affiche le nom de noeud DECnet. Si un paramètre est fourni (ou
  -.B \-\-file nom_fichier
  -) le super-utilisateur peut également définir un nouveau nom de neud.
  -.TP
   .I "\-s, \-\-short"
   Affiche le nom d'hôte en format court. Il s'agit du nom d'hôte coupé au
   premier point.
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-manydevs-1.patch
  
  Index: net-tools-1.60-manydevs-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Allows check of multiple devices
  
  diff -Naur net-tools-1.60.orig/lib/nstrcmp.c net-tools-1.60/lib/nstrcmp.c
  --- net-tools-1.60.orig/lib/nstrcmp.c	1999-01-09 15:55:20.000000000 +0000
  +++ net-tools-1.60/lib/nstrcmp.c	2003-09-12 22:46:13.000000000 +0000
  @@ -16,8 +16,8 @@
   	b++;
       }
       if (isdigit(*a)) {
  -	if (!isdigit(*b))
  -	    return -1;
  +        if (!isdigit(*b))
  +	    return 1;
   	while (a > astr) {
   	    a--;
   	    if (!isdigit(*a)) {
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-miiioctl-1.patch
  
  Index: net-tools-1.60-miiioctl-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Updates mii ioctls
  
  diff -Naur net-tools-1.60.orig/include/mii.h net-tools-1.60/include/mii.h
  --- net-tools-1.60.orig/include/mii.h	2000-05-21 14:21:27.000000000 +0000
  +++ net-tools-1.60/include/mii.h	2003-09-12 22:47:27.000000000 +0000
  @@ -11,11 +11,9 @@
   
   /* network interface ioctl's for MII commands */
   #ifndef SIOCGMIIPHY
  -#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
  -#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
  -#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
  -#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
  -#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
  +#define SIOCGMIIPHY 0x8947 	/* Read from current PHY */
  +#define SIOCGMIIREG 0x8948 	/* Read any PHY register */
  +#define SIOCSMIIREG 0x8949 	/* Write any PHY register */
   #endif
   
   #include <linux/types.h>
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-nameif-1.patch
  
  Index: net-tools-1.60-nameif-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Sometimes the wrong device information is shown
  	     It would show the previous interfaces information
  	     This patch corrects this issue
  
  diff -Naur net-tools-1.60.orig/nameif.c net-tools-1.60/nameif.c
  --- net-tools-1.60.orig/nameif.c	2000-10-18 17:26:29.000000000 +0000
  +++ net-tools-1.60/nameif.c	2003-09-12 22:48:57.000000000 +0000
  @@ -3,7 +3,7 @@
    * Writen 2000 by Andi Kleen.
    * Subject to the Gnu Public License, version 2.  
    * TODO: make it support token ring etc.
  - * $Id: net-tools-1.60-nameif-1.patch,v 1.1 2003/10/05 22:08:34 jim Exp $
  + * $Id: net-tools-1.60-nameif-1.patch,v 1.1 2003/10/05 22:08:34 jim Exp $
    */ 
   #ifndef _GNU_SOURCE 
   #define _GNU_SOURCE
  @@ -117,7 +117,8 @@
   }
   
   struct change { 
  -	struct change *next,**pprev;
  +	struct change *next;
  +	int found;
   	char ifname[IFNAMSIZ+1];
   	unsigned char mac[6];
   }; 
  @@ -139,10 +140,7 @@
   			ch->ifname, pos); 
   	if (parsemac(p,ch->mac) < 0) 
   		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
  -	if (clist) 
  -		clist->pprev = &ch->next;
   	ch->next = clist;
  -	ch->pprev = &clist;
   	clist = ch;
   	return 0; 
   }
  @@ -200,7 +198,7 @@
   
   void usage(void)
   {
  -	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
  +	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
   	exit(1); 
   }
   
  @@ -277,21 +275,21 @@
   		ch = lookupmac(mac); 
   		if (!ch) 
   			continue;
  -			
  -		*ch->pprev = ch->next;
  +		
  +		ch->found = 1;	
   		if (strcmp(p, ch->ifname)) { 
   			if (setname(p, ch->ifname) < 0)  
   				complain(_("cannot change name of %s to %s: %s"),
   						p, ch->ifname, strerror(errno)); 
   		} 
  -		free(ch);
   	} 
   	fclose(ifh); 
   	
   	while (clist) { 
   		struct change *ch = clist;
   		clist = clist->next;
  -		warning(_("interface '%s' not found"), ch->ifname); 
  +		if (!ch->found)
  +			warning(_("interface '%s' not found"), ch->ifname); 
   		free(ch); 
   	}
   
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-virtualname-1.patch
  
  Index: net-tools-1.60-virtualname-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 2003-09-12
  Initial Package Version: 1.60
  Origin: Rawhide
  Description: Show Virtual Name in netstat
  
  diff -Naur net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c
  --- net-tools-1.60.orig/lib/interface.c	2001-02-10 19:31:15.000000000 +0000
  +++ net-tools-1.60/lib/interface.c	2003-09-12 22:50:35.000000000 +0000
  @@ -579,7 +579,7 @@
   
   void ife_print_short(struct interface *ptr)
   {
  -    printf("%-5.5s ", ptr->name);
  +    printf("%-9.8s ", ptr->name);
       printf("%5d %3d", ptr->mtu, ptr->metric);
       /* If needed, display the interface statistics. */
       if (ptr->statistics_valid) {
  diff -Naur net-tools-1.60.orig/netstat.c net-tools-1.60/netstat.c
  --- net-tools-1.60.orig/netstat.c	2003-09-12 22:43:54.000000000 +0000
  +++ net-tools-1.60/netstat.c	2003-09-12 22:50:35.000000000 +0000
  @@ -1449,7 +1449,7 @@
       }
       if (flag_exp < 2) {
   	ife_short = 1;
  -	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
  +	printf(_("Iface     MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
       }
   
       if (for_all_interfaces(do_if_print, &flag_all) < 0) {
  
  
  



More information about the patches mailing list