r.i.p.

no in new routed.

4 files changed, 0 insertions, 447 deletions

diff --git a/sbin/routed/query/Makefile b/sbin/routed/query/Makefile
deleted file mode 100644
index 225c1b27694..00000000000
--- a/sbin/routed/query/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/23 14:32:35 deraadt Exp $
-#	$NetBSD: Makefile,v 1.6 1995/03/18 15:00:51 cgd Exp $
-
-PROG=	query
-NOMAN=	noman
-
-.include "../../Makefile.inc"
-.include <bsd.prog.mk>
diff --git a/sbin/routed/query/query.c b/sbin/routed/query/query.c
deleted file mode 100644
index c2476b41b63..00000000000
--- a/sbin/routed/query/query.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*	$OpenBSD: query.c,v 1.2 1996/06/23 14:32:36 deraadt Exp $	*/
-/*	$NetBSD: query.c,v 1.10 1995/06/20 22:28:08 christos Exp $	*/
-
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  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 the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 THE REGENTS 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1982, 1986, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)query.c	8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: query.c,v 1.2 1996/06/23 14:32:36 deraadt Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <signal.h>
-#include <netinet/in.h>
-#include <protocols/routed.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define	WTIME	5		/* Time to wait for all responses */
-#define	STIME	500000		/* usec to wait for another response */
-
-int	s;
-int	timedout;
-void	timeout();
-char	packet[MAXPACKETSIZE];
-int	nflag;
-
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	extern char *optarg;
-	extern int optind;
-	int ch, cc, count, bits;
-	struct sockaddr from;
-	struct sigaction sigact;
-	int fromlen = sizeof(from), size = 32*1024;
-	struct timeval shorttime;
-
-	while ((ch = getopt(argc, argv, "n")) != EOF)
-		switch (ch) {
-		case 'n':
-			nflag++;
-			break;
-		case '?':
-		default:
-			goto usage;
-		}
-	argv += optind;
-
-	if (!*argv) {
-usage:		printf("usage: query [-n] hosts...\n");
-		exit(1);
-	}
-
-	s = socket(AF_INET, SOCK_DGRAM, 0);
-	if (s < 0) {
-		perror("socket");
-		exit(2);
-	}
-	if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)) < 0)
-		perror("setsockopt SO_RCVBUF");
-
-	while (*argv) {
-		query(*argv++);
-		count++;
-	}
-
-	/*
-	 * Listen for returning packets;
-	 * may be more than one packet per host.
-	 */
-	bits = 1 << s;
-	memset(&shorttime, 0, sizeof(shorttime));
-	shorttime.tv_usec = STIME;
-	memset(&sigact, 0, sizeof(sigact));
-	sigact.sa_handler = timeout;
-	/*sigact.sa_flags = 0;		/* no restart */
-	if (sigaction(SIGALRM, &sigact, (struct sigaction *)NULL) == -1)
-		perror("sigaction");
-	alarm(WTIME);
-	while ((count > 0 && !timedout) ||
-	    select(20, (fd_set *)&bits, NULL, NULL, &shorttime) > 0) {
-		cc = recvfrom(s, packet, sizeof (packet), 0,
-		  &from, &fromlen);
-		if (cc <= 0) {
-			if (cc < 0) {
-				if (errno == EINTR)
-					continue;
-				perror("recvfrom");
-				(void) close(s);
-				exit(1);
-			}
-			continue;
-		}
-		rip_input(&from, cc);
-		count--;
-	}
-	exit (count > 0 ? count : 0);
-}
-
-query(host)
-	char *host;
-{
-	struct sockaddr_in router;
-	register struct rip *msg = (struct rip *)packet;
-	struct hostent *hp;
-	struct servent *sp;
-
-	memset(&router, 0, sizeof (router));
-	router.sin_family = AF_INET;
-	if (inet_aton(host, &router.sin_addr) == 0) {
-		hp = gethostbyname(host);
-		if (hp == NULL) {
-			fprintf(stderr, "query: %s: ", host);
-			herror((char *)NULL);
-			exit(1);
-		}
-		memcpy(&router.sin_addr, hp->h_addr, hp->h_length);
-	}
-	sp = getservbyname("router", "udp");
-	if (sp == 0) {
-		printf("udp/router: service unknown\n");
-		exit(1);
-	}
-	router.sin_port = sp->s_port;
-	msg->rip_cmd = RIPCMD_REQUEST;
-	msg->rip_vers = RIP_VERSION_1;
-	msg->rip_nets[0].rip_dst.sa_family = htons(AF_UNSPEC);
-	msg->rip_nets[0].rip_metric = htonl(HOPCNT_INFINITY);
-	if (sendto(s, packet, sizeof (struct rip), 0,
-	  (struct sockaddr *)&router, sizeof(router)) < 0)
-		perror(host);
-}
-
-/*
- * Handle an incoming routing packet.
- */
-rip_input(from, size)
-	struct sockaddr_in *from;
-	int size;
-{
-	register struct rip *msg = (struct rip *)packet;
-	register struct netinfo *n;
-	char *name;
-	int lna, net, subnet;
-	struct hostent *hp;
-	struct netent *np;
-
-	if (msg->rip_cmd != RIPCMD_RESPONSE)
-		return;
-	printf("%d bytes from ", size);
-	if (nflag)
-		printf("%s:\n", inet_ntoa(from->sin_addr));
-	else {
-		hp = gethostbyaddr((char *)&from->sin_addr,
-		    sizeof (struct in_addr), AF_INET);
-		name = hp == 0 ? "???" : hp->h_name;
-		printf("%s(%s):\n", name, inet_ntoa(from->sin_addr));
-	}
-	size -= sizeof (int);
-	n = msg->rip_nets;
-	while (size > 0) {
-	    if (size < sizeof (struct netinfo))
-		    break;
-	    if (msg->rip_vers > 0) {
-		    n->rip_dst.sa_family =
-			    ntohs(n->rip_dst.sa_family);
-		    n->rip_metric = ntohl(n->rip_metric);
-	    }
-	    switch (n->rip_dst.sa_family) {
-
-	    case AF_INET:
-		{ register struct sockaddr_in *sin;
-
-		sin = (struct sockaddr_in *)&n->rip_dst;
-		net = inet_netof(sin->sin_addr);
-		subnet = inet_subnetof(sin->sin_addr);
-		lna = inet_lnaof(sin->sin_addr);
-		name = "???";
-		if (!nflag) {
-			if (sin->sin_addr.s_addr == 0)
-				name = "default";
-			else if (lna == INADDR_ANY) {
-				np = getnetbyaddr(net, AF_INET);
-				if (np)
-					name = np->n_name;
-				else if (net == 0)
-					name = "default";
-			} else if ((lna & 0xff) == 0 &&
-			    (np = getnetbyaddr(subnet, AF_INET))) {
-				struct in_addr subnaddr, inet_makeaddr();
-
-				subnaddr = inet_makeaddr(subnet, INADDR_ANY);
-				if (memcmp(&sin->sin_addr, &subnaddr,
-				    sizeof(subnaddr)) == 0)
-					name = np->n_name;
-				else
-					goto host;
-			} else {
-	host:
-				hp = gethostbyaddr((char *)&sin->sin_addr,
-				    sizeof (struct in_addr), AF_INET);
-				if (hp)
-					name = hp->h_name;
-			}
-			printf("\t%-17s metric %2d name %s\n",
-				inet_ntoa(sin->sin_addr), n->rip_metric, name);
-		} else
-			printf("\t%-17s metric %2d\n",
-				inet_ntoa(sin->sin_addr), n->rip_metric);
-		break;
-		}
-
-	    default:
-		{ u_short *p = (u_short *)n->rip_dst.sa_data;
-
-		printf("\t(af %d) %x %x %x %x %x %x %x, metric %d\n",
-		    p[0], p[1], p[2], p[3], p[4], p[5], p[6],
-		    n->rip_dst.sa_family,
-		    n->rip_metric);
-		break;
-		}
-			
-	    }
-	    size -= sizeof (struct netinfo), n++;
-	}
-}
-
-void
-timeout()
-{
-	timedout = 1;
-}
-
-/*
- * Return the possible subnetwork number from an internet address.
- * SHOULD FIND OUT WHETHER THIS IS A LOCAL NETWORK BEFORE LOOKING
- * INSIDE OF THE HOST PART.  We can only believe this if we have other
- * information (e.g., we can find a name for this number).
- */
-inet_subnetof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i & IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else if (IN_CLASSB(i))
-		return ((i & IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-	else
-		return ((i & 0xffffffc0) >> 28);
-}
diff --git a/sbin/routed/trace/Makefile b/sbin/routed/trace/Makefile
deleted file mode 100644
index e0e5451cbf8..00000000000
--- a/sbin/routed/trace/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/23 14:32:37 deraadt Exp $
-#	$NetBSD: Makefile,v 1.6 1995/03/18 15:00:54 cgd Exp $
-
-PROG=	trace
-NOMAN=	noman
-
-.include "../../Makefile.inc"
-.include <bsd.prog.mk>
diff --git a/sbin/routed/trace/trace.c b/sbin/routed/trace/trace.c
deleted file mode 100644
index 37532d8a3ec..00000000000
--- a/sbin/routed/trace/trace.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$OpenBSD: trace.c,v 1.2 1996/06/23 14:32:38 deraadt Exp $	*/
-/*	$NetBSD: trace.c,v 1.9 1995/06/20 22:28:11 christos Exp $	*/
-
-/*-
- * Copyright (c) 1983, 1988, 1993
- *	The Regents of the University of California.  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 the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 THE REGENTS 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1988, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)trace.c	8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: trace.c,v 1.2 1996/06/23 14:32:38 deraadt Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <protocols/routed.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct	sockaddr_in myaddr;
-char	packet[MAXPACKETSIZE];
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	int size, s;
-	struct sockaddr from;
-	struct sockaddr_in router;
-	register struct rip *msg = (struct rip *)packet;
-	struct hostent *hp;
-	struct servent *sp;
-	
-	if (argc < 3) {
-usage:
-		printf("usage: trace cmd machines,\n");
-		printf("cmd either \"on filename\", or \"off\"\n");
-		exit(1);
-	}
-	s = socket(AF_INET, SOCK_DGRAM, 0);
-	if (s < 0) {
-		perror("socket");
-		exit(2);
-	}
-	myaddr.sin_family = AF_INET;
-	myaddr.sin_port = htons(IPPORT_RESERVED-1);
-	if (bind(s, (struct sockaddr *)&myaddr, sizeof(myaddr)) < 0) {
-		perror("bind");
-		exit(2);
-	}
-
-	argv++, argc--;
-	msg->rip_cmd = strcmp(*argv, "on") == 0 ?
-		RIPCMD_TRACEON : RIPCMD_TRACEOFF;
-	msg->rip_vers = RIP_VERSION_1;
-	argv++, argc--;
-	size = sizeof (int);
-	if (msg->rip_cmd == RIPCMD_TRACEON) {
-		strcpy(msg->rip_tracefile, *argv);
-		size += strlen(*argv);
-		argv++, argc--;
-	}
-	if (argc == 0)
-		goto usage;
-	memset(&router, 0, sizeof (router));
-	router.sin_family = AF_INET;
-	sp = getservbyname("router", "udp");
-	if (sp == 0) {
-		printf("udp/router: service unknown\n");
-		exit(1);
-	}
-	router.sin_port = sp->s_port;
-	while (argc > 0) {
-		router.sin_family = AF_INET;
-		if (inet_aton(*argv, &router.sin_addr) == 0) {
-			hp = gethostbyname(*argv);
-			if (hp == NULL) {
-				fprintf(stderr, "trace: %s: ", *argv);
-				herror((char *)NULL);
-				continue;
-			}
-			memcpy(&router.sin_addr, hp->h_addr, hp->h_length);
-		}
-		if (sendto(s, packet, size, 0,
-		    (struct sockaddr *)&router, sizeof(router)) < 0)
-			perror(*argv);
-		argv++, argc--;
-	}
-}