From ab7224983abff49598ab12544c52de6c57491a05 Mon Sep 17 00:00:00 2001
From: Mike Karels <karels@ucbvax.Berkeley.EDU>
Date: Mon, 25 Feb 1985 21:46:47 -0800
Subject: [PATCH] remove 4.1a compat

SCCS-vsn: sbin/routed/af.c 4.16
SCCS-vsn: sbin/routed/defs.h 4.16
SCCS-vsn: sbin/routed/main.c 4.12
---
 usr/src/sbin/routed/af.c   |  6 +-----
 usr/src/sbin/routed/defs.h |  4 +---
 usr/src/sbin/routed/main.c | 23 +----------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/usr/src/sbin/routed/af.c b/usr/src/sbin/routed/af.c
index 898f6f3558..45fdf06e56 100644
--- a/usr/src/sbin/routed/af.c
+++ b/usr/src/sbin/routed/af.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)af.c	4.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)af.c	4.16 (Berkeley) %G%";
 #endif
 
 #include "defs.h"
@@ -51,10 +51,6 @@ inet_portmatch(sin)
 	register struct sockaddr_in *sin;
 {
 	
-#ifdef COMPAT
-	if (ntohs(sin->sin_port) == ntohs(sp->s_port) + 1)
-		return (1);
-#endif
 	return (sin->sin_port == sp->s_port);
 }
 
diff --git a/usr/src/sbin/routed/defs.h b/usr/src/sbin/routed/defs.h
index 22accc50e7..14d72d7e49 100644
--- a/usr/src/sbin/routed/defs.h
+++ b/usr/src/sbin/routed/defs.h
@@ -1,4 +1,4 @@
-/*	defs.h	4.15	84/08/29	*/
+/*	defs.h	4.16	85/02/25	*/
 
 /*
  * Internal data structure definitions for
@@ -21,8 +21,6 @@
 #include "table.h"
 #include "af.h"
 
-/* #define	COMPAT	1		/* stay compatible with 4.1a daemons */
-
 /*
  * When we find any interfaces marked down we rescan the
  * kernel every CHECK_INTERVAL seconds to see if they've
diff --git a/usr/src/sbin/routed/main.c b/usr/src/sbin/routed/main.c
index b605783e03..f641302541 100644
--- a/usr/src/sbin/routed/main.c
+++ b/usr/src/sbin/routed/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)main.c	4.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c	4.12 (Berkeley) %G%";
 #endif
 
 /*
@@ -29,9 +29,6 @@ main(argc, argv)
 	int cc;
 	struct sockaddr from;
 	u_char retry;
-#ifdef COMPAT
-	int snoroute;
-#endif
 	
 	argv0 = argv;
 	openlog("routed", LOG_PID, 0);
@@ -45,14 +42,6 @@ main(argc, argv)
 	s = getsocket(AF_INET, SOCK_DGRAM, &addr);
 	if (s < 0)
 		exit(1);
-#ifdef COMPAT
-	bzero(&addr, sizeof (addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(ntohs(sp->s_port) + 1);
-	snoroute = getsocket(AF_INET, SOCK_DGRAM, &addr);
-	if (snoroute < 0)
-		exit(1);
-#endif
 	argv++, argc--;
 	while (argc > 0 && **argv == '-') {
 		if (strcmp(*argv, "-s") == 0) {
@@ -92,9 +81,6 @@ main(argc, argv)
 			exit(0);
 		for (t = 0; t < 20; t++)
 			if (t != s)
-#ifdef COMPAT
-				if (t != snoroute)
-#endif
 				(void) close(cc);
 		(void) open("/", 0);
 		(void) dup2(0, 1);
@@ -141,18 +127,11 @@ main(argc, argv)
 		register int n;
 
 		ibits = 1 << s;
-#ifdef COMPAT
-		ibits |= 1 << snoroute;
-#endif
 		n = select(20, &ibits, 0, 0, 0);
 		if (n < 0)
 			continue;
 		if (ibits & (1 << s))
 			process(s);
-#ifdef COMPAT
-		if (ibits & (1 << snoroute))
-			process(snoroute);
-#endif
 		/* handle ICMP redirects */
 	}
 }
-- 
2.20.1