From 63965540c248bf924a83bf07a84ed6cfa3dd5020 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 24 Oct 2016 19:13:40 +0200 Subject: [PATCH] routed(8): Remove SGI specific code. --- sbin/routed/defs.h | 28 +--------------------------- sbin/routed/if.c | 20 +------------------- sbin/routed/input.c | 2 +- sbin/routed/main.c | 11 +---------- sbin/routed/output.c | 2 +- sbin/routed/parms.c | 6 +++--- sbin/routed/radix.c | 2 +- sbin/routed/rdisc.c | 2 +- sbin/routed/rtquery/rtquery.c | 8 +------- sbin/routed/table.c | 2 +- sbin/routed/trace.c | 11 +---------- 11 files changed, 13 insertions(+), 81 deletions(-) diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h index 920310e578..8f34b8d988 100644 --- a/sbin/routed/defs.h +++ b/sbin/routed/defs.h @@ -29,13 +29,8 @@ * @(#)defs.h 8.1 (Berkeley) 6/5/93 * * $FreeBSD: src/sbin/routed/defs.h,v 1.13 1999/09/05 17:49:11 peter Exp $ - * $DragonFly: src/sbin/routed/defs.h,v 1.2 2003/06/17 04:27:34 dillon Exp $ */ -#ifdef sgi -#ident "$FreeBSD: src/sbin/routed/defs.h,v 1.13 1999/09/05 17:49:11 peter Exp $" -#endif - /* Definitions for RIPv2 routing process. * * This code is based on the 4.4BSD `routed` daemon, with extensions to @@ -67,10 +62,6 @@ #include #include #include -#ifdef sgi -#include -#include -#endif #include #include #include @@ -81,14 +72,9 @@ #include #include #include -#ifdef sgi -#define _USER_ROUTE_TREE -#include -#else #include "radix.h" #define UNUSED __attribute__((unused)) #define PATTRIB(f,l) __attribute__((format (printf,f,l))) -#endif #include #include #include @@ -104,9 +90,7 @@ * So define it here so it can be changed for the target system. * It should be defined somewhere netinet/in.h, but it is not. */ -#ifdef sgi -#define naddr u_int32_t -#elif defined (__NetBSD__) +#if defined (__NetBSD__) #define naddr u_int32_t #define _HAVE_SA_LEN #define _HAVE_SIN_LEN @@ -145,9 +129,7 @@ /* Router Discovery parameters */ -#ifndef sgi #define INADDR_ALLROUTERS_GROUP 0xe0000002 /* 224.0.0.2 */ -#endif #define MaxMaxAdvertiseInterval 1800 #define MinMaxAdvertiseInterval 4 #define DefMaxAdvertiseInterval 600 @@ -293,9 +275,6 @@ struct interface { u_int ierrors; u_int opackets; u_int oerrors; -#ifdef sgi - u_int odrops; -#endif time_t ts; /* timestamp on network stats */ } int_data; # define MAX_AUTH_KEYS 5 @@ -501,11 +480,6 @@ extern char inittracename[MAXPATHLEN+1]; extern struct radix_node_head *rhead; -#ifdef sgi -/* Fix conflicts */ -#define dup2(x,y) BSDdup2(x,y) -#endif /* sgi */ - extern void fix_sock(int, const char *); extern void fix_select(void); extern void rip_off(void); diff --git a/sbin/routed/if.c b/sbin/routed/if.c index b1b9ac455e..218a7515a3 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -32,7 +32,7 @@ #include "defs.h" #include "pathnames.h" -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)if.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) #include @@ -628,12 +628,7 @@ rt_xaddrs(struct rt_addrinfo *info, #ifdef _HAVE_SA_LEN static struct sockaddr sa_zero; #endif -#ifdef sgi -#define ROUNDUP(a) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(__uint64_t) - 1))) \ - : sizeof(__uint64_t)) -#else #define ROUNDUP(a) RT_ROUNDUP(a) -#endif memset(info, 0, sizeof(*info)); @@ -748,9 +743,6 @@ ifinit(void) ifs0.int_data.ierrors = ifm->ifm_data.ifi_ierrors; ifs0.int_data.opackets = ifm->ifm_data.ifi_opackets; ifs0.int_data.oerrors = ifm->ifm_data.ifi_oerrors; -#ifdef sgi - ifs0.int_data.odrops = ifm->ifm_data.ifi_odrops; -#endif sdl = (struct sockaddr_dl *)(ifm + 1); sdl->sdl_data[sdl->sdl_nlen] = 0; strncpy(ifs0.int_name, sdl->sdl_data, @@ -986,16 +978,6 @@ ifinit(void) ierr = ifs.int_data.ierrors - ifp->int_data.ierrors; out = ifs.int_data.opackets - ifp->int_data.opackets; oerr = ifs.int_data.oerrors - ifp->int_data.oerrors; -#ifdef sgi - /* Through at least IRIX 6.2, PPP and SLIP - * count packets dropped by the filters. - * But FDDI rings stuck non-operational count - * dropped packets as they wait for improvement. - */ - if (!(ifp->int_if_flags & IFF_POINTOPOINT)) - oerr += (ifs.int_data.odrops - - ifp->int_data.odrops); -#endif /* If the interface just awoke, restart the counters. */ if (ifp->int_data.ts == 0) { diff --git a/sbin/routed/input.c b/sbin/routed/input.c index 7dba896b79..d1931d3544 100644 --- a/sbin/routed/input.c +++ b/sbin/routed/input.c @@ -31,7 +31,7 @@ #include "defs.h" -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)input.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) #include diff --git a/sbin/routed/main.c b/sbin/routed/main.c index b82dc9f123..924080600c 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -31,14 +31,11 @@ #include "defs.h" #include "pathnames.h" -#ifdef sgi -#include "math.h" -#endif #include #include #include -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) char copyright[] = "@(#) Copyright (c) 1983, 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n"; @@ -282,14 +279,8 @@ usage: signal(SIGUSR2, sigtrace_off); /* get into the background */ -#ifdef sgi - if (0 > _daemonize(background ? 0 : (_DF_NOCHDIR|_DF_NOFORK), - STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO)) - BADERR(0, "_daemonize()"); -#else if (background && daemon(0, 1) < 0) BADERR(0,"daemon()"); -#endif mypid = getpid(); srandom((int)(clk.tv_sec ^ clk.tv_usec ^ mypid)); diff --git a/sbin/routed/output.c b/sbin/routed/output.c index 22156c5aa5..cc5248ef77 100644 --- a/sbin/routed/output.c +++ b/sbin/routed/output.c @@ -31,7 +31,7 @@ #include "defs.h" -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)output.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) __RCSID("$NetBSD$"); diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c index e005e76245..7ea0194980 100644 --- a/sbin/routed/parms.c +++ b/sbin/routed/parms.c @@ -33,7 +33,7 @@ #include "pathnames.h" #include -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)if.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) __RCSID("$NetBSD$"); @@ -431,7 +431,7 @@ parse_ts(time_t *tp, u_int bufsize) { struct tm tm; -#if defined(sgi) || defined(__NetBSD__) +#if defined(__NetBSD__) char *ptr; #endif @@ -444,7 +444,7 @@ parse_ts(time_t *tp, } strcat(buf,"\n"); memset(&tm, 0, sizeof(tm)); -#if defined(sgi) || defined(__NetBSD__) +#if defined(__NetBSD__) ptr = strptime(buf, "%y/%m/%d@%H:%M\n", &tm); if (ptr == NULL || *ptr != '\0') { sprintf(buf,"bad timestamp %.25s", val0); diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c index 906674281d..81ad1c13f7 100644 --- a/sbin/routed/radix.c +++ b/sbin/routed/radix.c @@ -37,7 +37,7 @@ #include "defs.h" -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c 8.1 (Berkeley) x/y/95"; #elif defined(__NetBSD__) __RCSID("$NetBSD$"); diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c index c19fee2a1a..0f7daf6548 100644 --- a/sbin/routed/rdisc.c +++ b/sbin/routed/rdisc.c @@ -34,7 +34,7 @@ #include #include -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c 8.1 (Berkeley) x/y/95"; #elif defined(__NetBSD__) __RCSID("$NetBSD$"); diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index 475cd07b7d..f02f46d1af 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -48,20 +48,14 @@ char copyright[] = #include #include #include -#ifdef sgi -#include -#include -#endif -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused))= "@(#)query.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) __RCSID("$NetBSD: rtquery.c,v 1.10 1999/02/23 10:47:41 christos Exp $"); #endif -#ifndef sgi #define _HAVE_SIN_LEN -#endif #define MD5_DIGEST_LEN 16 typedef struct { diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 08b12375fa..0065bb2c66 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -31,7 +31,7 @@ #include "defs.h" -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)tables.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) __RCSID("$NetBSD$"); diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c index acc749ceef..04d1470850 100644 --- a/sbin/routed/trace.c +++ b/sbin/routed/trace.c @@ -36,18 +36,13 @@ #include #include -#if !defined(sgi) && !defined(__NetBSD__) +#if !defined(__NetBSD__) static char sccsid[] __attribute__((unused)) = "@(#)trace.c 8.1 (Berkeley) 6/5/93"; #elif defined(__NetBSD__) __RCSID("$NetBSD$"); #endif -#ifdef sgi -/* use *stat64 for files on large filesystems */ -#define stat stat64 -#endif - #define NRECORDS 50 /* size of circular trace buffer */ int tracelevel, new_tracelevel; @@ -147,12 +142,8 @@ ts(time_t secs) { static char s[20]; secs += epoch.tv_sec; -#ifdef sgi - cftime(s, "%T", &secs); -#else memcpy(s, ctime(&secs)+11, 8); s[8] = '\0'; -#endif return s; } -- 2.11.4.GIT