diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-12-09 03:45:22 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-12-09 03:45:22 +0000 |
| commit | f636c31445ce47e42482681a6e56146a86d9fe84 (patch) | |
| tree | 0f52fb33cb639ee8e21e081efc6eae35d05a41eb /sys/netinet/in_gif.c | |
| parent | 185e772094898d80cb78a30845384a9d02d48570 (diff) | |
Minor cleanup
Diffstat (limited to 'sys/netinet/in_gif.c')
| -rw-r--r-- | sys/netinet/in_gif.c | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 5abb3007660..15e2fcf716d 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_gif.c,v 1.1 1999/12/08 06:50:19 itojun Exp $ */ +/* $OpenBSD: in_gif.c,v 1.2 1999/12/09 03:45:21 angelos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -33,29 +33,13 @@ * in_gif.c */ -#ifdef __FreeBSD__ -#include "opt_mrouting.h" -#endif -#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__) -#include "opt_inet.h" -#ifdef __NetBSD__ /*XXX*/ -#include "opt_ipsec.h" -#endif -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/errno.h> -#ifdef __FreeBSD__ -#include <sys/kernel.h> -#include <sys/sysctl.h> -#endif -#if !defined(__FreeBSD__) || __FreeBSD__ < 3 #include <sys/ioctl.h> -#endif #include <sys/protosw.h> #include <net/if.h> @@ -90,10 +74,6 @@ int ip_gif_ttl = GIF_TTL; #else int ip_gif_ttl = 0; #endif -#ifdef __FreeBSD__ -SYSCTL_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, - &ip_gif_ttl, 0, ""); -#endif int in_gif_output(ifp, family, m, rt) @@ -107,7 +87,7 @@ in_gif_output(ifp, family, m, rt) struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc; struct sockaddr_in *sin_dst = (struct sockaddr_in *)sc->gif_pdst; struct ip iphdr; /* capsule IP header, host byte ordered */ - int proto, error; + int proto; u_int8_t tos; if (sin_src == NULL || sin_dst == NULL || @@ -234,12 +214,8 @@ in_gif_output(ifp, family, m, rt) m->m_pkthdr.rcvif = NULL; #endif #endif /*IPSEC*/ -#ifndef __OpenBSD__ - error = ip_output(m, NULL, &sc->gif_ro, 0, NULL); -#else - error = ip_output(m, NULL, &sc->gif_ro, 0, NULL, NULL); -#endif - return(error); + + return ip_output(m, NULL, &sc->gif_ro, 0, NULL, NULL); } void |