| sctp_asconf.c (179783) | sctp_asconf.c (180387) |
|---|---|
| 1/*- 2 * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are met: 6 * 7 * a) Redistributions of source code must retain the above copyright notice, 8 * this list of conditions and the following disclaimer. --- 17 unchanged lines hidden (view full) --- 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 28 * THE POSSIBILITY OF SUCH DAMAGE. 29 */ 30 31/* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ 32 33#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are met: 6 * 7 * a) Redistributions of source code must retain the above copyright notice, 8 * this list of conditions and the following disclaimer. --- 17 unchanged lines hidden (view full) --- 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 28 * THE POSSIBILITY OF SUCH DAMAGE. 29 */ 30 31/* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 179783 2008-06-14 07:58:05Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 180387 2008-07-09 16:45:30Z rrs $"); |
| 35#include <netinet/sctp_os.h> 36#include <netinet/sctp_var.h> 37#include <netinet/sctp_sysctl.h> 38#include <netinet/sctp_pcb.h> 39#include <netinet/sctp_header.h> 40#include <netinet/sctputil.h> 41#include <netinet/sctp_output.h> 42#include <netinet/sctp_asconf.h> --- 829 unchanged lines hidden (view full) --- 872 from6->sin6_addr = ip6->ip6_src; 873 from6->sin6_port = sh->src_port; 874 /* 875 * Get the scopes in properly to the sin6 876 * addr's 877 */ 878 /* we probably don't need these operations */ 879 (void)sa6_recoverscope(from6); | 35#include <netinet/sctp_os.h> 36#include <netinet/sctp_var.h> 37#include <netinet/sctp_sysctl.h> 38#include <netinet/sctp_pcb.h> 39#include <netinet/sctp_header.h> 40#include <netinet/sctputil.h> 41#include <netinet/sctp_output.h> 42#include <netinet/sctp_asconf.h> --- 829 unchanged lines hidden (view full) --- 872 from6->sin6_addr = ip6->ip6_src; 873 from6->sin6_port = sh->src_port; 874 /* 875 * Get the scopes in properly to the sin6 876 * addr's 877 */ 878 /* we probably don't need these operations */ 879 (void)sa6_recoverscope(from6); |
| 880 sa6_embedscope(from6, ip6_use_defzone); | 880 sa6_embedscope(from6, 881 MODULE_GLOBAL(MOD_INET6, ip6_use_defzone)); 882 |
| 881 break; 882 } 883#endif 884 default: 885 /* unknown address type */ 886 from = NULL; 887 } 888 if (from != NULL) { --- 2351 unchanged lines hidden --- | 883 break; 884 } 885#endif 886 default: 887 /* unknown address type */ 888 from = NULL; 889 } 890 if (from != NULL) { --- 2351 unchanged lines hidden --- |