Revert superfluous changes

This commit is contained in:
Sebastian Huber 2013-10-30 13:23:59 +01:00
parent e48f546574
commit 24042643b3
83 changed files with 42 additions and 191 deletions

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -77,11 +75,11 @@ __rec_close(DB *dbp)
/* Committed to closing. */ /* Committed to closing. */
status = RET_SUCCESS; status = RET_SUCCESS;
#ifndef __rtems__
#ifndef __rtems__ /* XXX */
if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize)) if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
status = RET_ERROR; status = RET_ERROR;
#endif #endif /* __rtems__ */
if (!F_ISSET(t, R_INMEM)) { if (!F_ISSET(t, R_INMEM)) {
if (F_ISSET(t, R_CLOSEFP)) { if (F_ISSET(t, R_CLOSEFP)) {
if (fclose(t->bt_rfp)) if (fclose(t->bt_rfp))

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1991, 1993, 1994 * Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993, 1994 * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996,1999 by Internet Software Consortium. * Copyright (c) 1996,1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996,1999 by Internet Software Consortium. * Copyright (c) 1996,1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996,1999 by Internet Software Consortium. * Copyright (c) 1996,1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-1999 by Internet Software Consortium. * Copyright (c) 1996-1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996,1999 by Internet Software Consortium. * Copyright (c) 1996,1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1996, 1998 by Internet Software Consortium. * Copyright (c) 1996, 1998 by Internet Software Consortium.
* *

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>. * Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
* Copyright (c) 2007 Robert N. M. Watson * Copyright (c) 2007 Robert N. M. Watson

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */ /* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */
/* /*

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* ++Copyright++ 1985, 1988, 1993 * ++Copyright++ 1985, 1988, 1993
* - * -

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1985, 1988, 1993 * Copyright (c) 1985, 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1994, Garrett Wollman * Copyright (c) 1994, Garrett Wollman
* *

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1994, Garrett Wollman * Copyright (c) 1994, Garrett Wollman
* *

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */
/* /*

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2003 Bruce M. Simpson. * Copyright (c) 2003 Bruce M. Simpson.
* All rights reserved * All rights reserved

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */ /* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */
/* /*

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1985, 1988, 1993 * Copyright (c) 1985, 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1994, Garrett Wollman * Copyright (c) 1994, Garrett Wollman
* *

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1994, Garrett Wollman * Copyright (c) 1994, Garrett Wollman
* *

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */ /* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */
/*- /*-

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $ */ /* $KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $ */
/*- /*-

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* ++Copyright++ 1985, 1988, 1993 * ++Copyright++ 1985, 1988, 1993
* - * -

View File

@ -1,4 +1,3 @@
#include "port_before.h"
/* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */ /* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */
/* /*

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $ */ /* $NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $ */
/*- /*-
@ -76,9 +74,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/sys/param.h> #include <rtems/bsd/sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifndef __rtems__
#include <dlfcn.h> #include <dlfcn.h>
#endif /* __rtems__ */
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#define _NS_PRIVATE #define _NS_PRIVATE

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1983, 1993, 1994 * Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1988, 1993 * Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1988, 1993 * Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1987, 1993 * Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1985, 1993 * Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-1999 by Internet Software Consortium. * Copyright (c) 1995-1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1985 * Copyright (c) 1985
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1985, 1989, 1993 * Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1985, 1993 * Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-1999 by Internet Software Consortium. * Copyright (c) 1996-1999 by Internet Software Consortium.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
#ifndef res_private_h #ifndef res_private_h
#define res_private_h #define res_private_h

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1988, 1993 * Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* /*
* Copyright (c) 1985, 1989, 1993 * Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 2006 The FreeBSD Project. All rights reserved. * Copyright (c) 2006 The FreeBSD Project. All rights reserved.
* *

View File

@ -1,5 +1,3 @@
#include "port_before.h"
#if !defined(lint) && !defined(SABER) #if !defined(lint) && !defined(SABER)
static const char rcsid[] = "$Id: res_update.c,v 1.12.18.1 2005/04/27 05:01:12 sra Exp $"; static const char rcsid[] = "$Id: res_update.c,v 1.12.18.1 2005/04/27 05:01:12 sra Exp $";
#endif /* not lint */ #endif /* not lint */

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.

View File

@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <netipsec/ipsec.h> #include <netipsec/ipsec.h>
#include <net/pfkeyv2.h> #include <net/pfkeyv2.h>
#include "ipsec_strerror.h" #include "ipsec_strerror.h"
int int

View File

@ -34,7 +34,7 @@
#define _KVM_H_ #define _KVM_H_
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <rtems/bsd/sys/types.h> #include <rtems/bsd/sys/_types.h>
#include <nlist.h> #include <nlist.h>
/* Default version symbol. */ /* Default version symbol. */

View File

@ -1,4 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 2005 Robert N. M. Watson * Copyright (c) 2005 Robert N. M. Watson
* All rights reserved. * All rights reserved.
@ -34,9 +33,7 @@
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#ifndef __rtems__
#include <kvm.h> #include <kvm.h>
#endif
#include <nlist.h> #include <nlist.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -1,4 +1,3 @@
#include "port_before.h"
/*- /*-
* Copyright (c) 2005-2006 Robert N. M. Watson * Copyright (c) 2005-2006 Robert N. M. Watson
* All rights reserved. * All rights reserved.
@ -39,9 +38,7 @@
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#ifndef __rtems__
#include <kvm.h> #include <kvm.h>
#endif
#include <nlist.h> #include <nlist.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>

View File

@ -40,18 +40,13 @@
#endif #endif
#if __BSD_VISIBLE #if __BSD_VISIBLE
#ifdef __rtems__
#include <rtems/bsd/sys/time.h>
#else
#ifndef _KERNEL
/* /*
* <net/if.h> does not depend on <sys/time.h> on most other systems. This * <net/if.h> does not depend on <sys/time.h> on most other systems. This
* helps userland compatibility. (struct timeval ifi_lastchange) * helps userland compatibility. (struct timeval ifi_lastchange)
*/ */
#ifndef _KERNEL
#include <rtems/bsd/sys/time.h> #include <rtems/bsd/sys/time.h>
#endif #endif
#endif /* __rtems__ */
struct ifnet; struct ifnet;
#endif #endif

View File

@ -926,7 +926,7 @@ epair_modevent(module_t mod, int type, void *data)
#ifndef __rtems__ #ifndef __rtems__
if (TUNABLE_INT_FETCH("net.link.epair.netisr_maxqlen", &qlimit)) if (TUNABLE_INT_FETCH("net.link.epair.netisr_maxqlen", &qlimit))
epair_nh.nh_qlimit = qlimit; epair_nh.nh_qlimit = qlimit;
#endif #endif /* __rtems__ */
netisr_register(&epair_nh); netisr_register(&epair_nh);
if_clone_attach(&epair_cloner); if_clone_attach(&epair_cloner);
if (bootverbose) if (bootverbose)

View File

@ -312,7 +312,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
error = EINVAL; /* is there better errno? */ error = EINVAL; /* is there better errno? */
goto end; goto end;
} }
memset(&mob_h, 0, MOB_HH_SIZ_L); memset(&mob_h, 0, MOB_H_SIZ_L);
mob_h.proto = (ip->ip_p) << 8; mob_h.proto = (ip->ip_p) << 8;
mob_h.odst = ip->ip_dst.s_addr; mob_h.odst = ip->ip_dst.s_addr;
ip->ip_dst.s_addr = sc->g_dst.s_addr; ip->ip_dst.s_addr = sc->g_dst.s_addr;
@ -323,12 +323,12 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
* Else we also need to save and change the source * Else we also need to save and change the source
*/ */
if (in_hosteq(ip->ip_src, sc->g_src)) { if (in_hosteq(ip->ip_src, sc->g_src)) {
msiz = MOB_HH_SIZ_S; msiz = MOB_H_SIZ_S;
} else { } else {
mob_h.proto |= MOB_HH_SBIT; mob_h.proto |= MOB_H_SBIT;
mob_h.osrc = ip->ip_src.s_addr; mob_h.osrc = ip->ip_src.s_addr;
ip->ip_src.s_addr = sc->g_src.s_addr; ip->ip_src.s_addr = sc->g_src.s_addr;
msiz = MOB_HH_SIZ_L; msiz = MOB_H_SIZ_L;
} }
mob_h.proto = htons(mob_h.proto); mob_h.proto = htons(mob_h.proto);
mob_h.hcrc = gre_in_cksum((u_int16_t *)&mob_h, msiz); mob_h.hcrc = gre_in_cksum((u_int16_t *)&mob_h, msiz);

View File

@ -162,9 +162,9 @@ struct mobip_h {
} __packed; } __packed;
#define MOB_HH_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t)) #define MOB_H_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t))
#define MOB_HH_SIZ_L (sizeof(struct mobile_h)) #define MOB_H_SIZ_L (sizeof(struct mobile_h))
#define MOB_HH_SBIT 0x0080 #define MOB_H_SBIT 0x0080
#define GRE_TTL 30 #define GRE_TTL 30

View File

@ -35,7 +35,11 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <rtems/bsd/sys/_types.h> #include <rtems/bsd/sys/_types.h>
#ifndef __rtems__
#include <machine/endian.h>
#else /* __rtems__ */
#include <machine/rtems-bsd-endian.h> #include <machine/rtems-bsd-endian.h>
#endif /* __rtems__ */
/* Protocols common to RFC 1700, POSIX, and X/Open. */ /* Protocols common to RFC 1700, POSIX, and X/Open. */
#define IPPROTO_IP 0 /* dummy for IP */ #define IPPROTO_IP 0 /* dummy for IP */
@ -786,9 +790,9 @@ void in_ifdetach(struct ifnet *);
/* INET6 stuff */ /* INET6 stuff */
#if __POSIX_VISIBLE >= 200112 #if __POSIX_VISIBLE >= 200112
#define __KAME_NETINET_IN_HH_INCLUDED_ #define __KAME_NETINET_IN_H_INCLUDED_
#include <netinet6/in6.h> #include <netinet6/in6.h>
#undef __KAME_NETINET_IN_HH_INCLUDED_ #undef __KAME_NETINET_IN_H_INCLUDED_
#endif #endif
#endif /* !_NETINET_IN_H_*/ #endif /* !_NETINET_IN_H_*/

View File

@ -254,11 +254,11 @@ gre_mobile_input(struct mbuf *m, int hlen)
GRE2IFP(sc)->if_ipackets++; GRE2IFP(sc)->if_ipackets++;
GRE2IFP(sc)->if_ibytes += m->m_pkthdr.len; GRE2IFP(sc)->if_ibytes += m->m_pkthdr.len;
if (ntohs(mip->mh.proto) & MOB_HH_SBIT) { if (ntohs(mip->mh.proto) & MOB_H_SBIT) {
msiz = MOB_HH_SIZ_L; msiz = MOB_H_SIZ_L;
mip->mi.ip_src.s_addr = mip->mh.osrc; mip->mi.ip_src.s_addr = mip->mh.osrc;
} else } else
msiz = MOB_HH_SIZ_S; msiz = MOB_H_SIZ_S;
if (m->m_len < (ip->ip_hl << 2) + msiz) { if (m->m_len < (ip->ip_hl << 2) + msiz) {
m = m_pullup(m, (ip->ip_hl << 2) + msiz); m = m_pullup(m, (ip->ip_hl << 2) + msiz);

View File

@ -61,7 +61,7 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef __KAME_NETINET_IN_HH_INCLUDED_ #ifndef __KAME_NETINET_IN_H_INCLUDED_
#error "do not include netinet6/in6.h directly, include netinet/in.h. see RFC2553" #error "do not include netinet6/in6.h directly, include netinet/in.h. see RFC2553"
#endif #endif