diff options
author | rrs <rrs@FreeBSD.org> | 2007-01-18 09:58:43 +0000 |
---|---|---|
committer | rrs <rrs@FreeBSD.org> | 2007-01-18 09:58:43 +0000 |
commit | 1b181171ae63e565fff3af7d33d65d39a0d9e4cf (patch) | |
tree | 91228bff0a0de5565ce6b43594381b40506b287a /sys/netinet/sctp_pcb.h | |
parent | a40cd17e13e0b3a2db6098d58aaab8707ce82bf1 (diff) | |
download | FreeBSD-src-1b181171ae63e565fff3af7d33d65d39a0d9e4cf.zip FreeBSD-src-1b181171ae63e565fff3af7d33d65d39a0d9e4cf.tar.gz |
- most all includes (#include <>) migrate to the sctp_os_bsd.h file
- Finally all splxx() are removed
- Count error fixed in mapping array which might
cause a wrong cumack generation.
- Invariants around panic for case D + printf when no invariants.
- one-to-one model race condition fixed by using
a pre-formed connection and then completing the
work so accept won't happen on a non-formed
association.
- Some additional paranoia checks in sctp_output.
- Locks that were missing in the accept code.
Approved by: gnn
Diffstat (limited to 'sys/netinet/sctp_pcb.h')
-rw-r--r-- | sys/netinet/sctp_pcb.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index d64d97a..e822d41 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2001-2006, Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2001-2007, Cisco Systems, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -36,36 +36,8 @@ __FBSDID("$FreeBSD$"); #ifndef __sctp_pcb_h__ #define __sctp_pcb_h__ - - -/* - * We must have V6 so the size of the proto can be calculated. Otherwise we - * would not allocate enough for Net/Open BSD :-< - */ - -#if defined(_KERNEL) -#include <net/pfil.h> -#endif - -#include <sys/socket.h> -#include <sys/socketvar.h> -#include <net/if.h> -#include <net/if_types.h> -#include <net/if_var.h> -#include <net/route.h> -#include <netinet/in.h> -#include <netinet/ip6.h> -#include <netinet6/ip6_var.h> -#include <netinet6/ip6protosw.h> -#include <netinet6/in6_var.h> -#include <netinet6/in6_pcb.h> - -#ifndef in6pcb -#define in6pcb inpcb -#endif - -#include <netinet/sctp.h> #include <netinet/sctp_os.h> +#include <netinet/sctp.h> #include <netinet/sctp_constants.h> LIST_HEAD(sctppcbhead, sctp_inpcb); @@ -396,7 +368,6 @@ struct sctp_tcb { #include <netinet/sctp_lock_bsd.h> - #if defined(_KERNEL) extern struct sctp_epinfo sctppcbinfo; |