| sctp_timer.c (196260) | sctp_timer.c (197288) |
|---|---|
| 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_timer.c,v 1.29 2005/03/06 16:04:18 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_timer.c,v 1.29 2005/03/06 16:04:18 itojun Exp $ */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 196260 2009-08-15 21:10:52Z tuexen $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 197288 2009-09-17 15:11:12Z rrs $"); |
| 35 36#define _IP_VHL 37#include <netinet/sctp_os.h> 38#include <netinet/sctp_pcb.h> 39#ifdef INET6 40#endif 41#include <netinet/sctp_var.h> 42#include <netinet/sctp_sysctl.h> --- 1725 unchanged lines hidden (view full) --- 1768 net->ro._s_addr = NULL; 1769 net->src_addr_selected = 0; 1770 } else if (net->ro._s_addr == NULL) { 1771#if defined(INET6) && defined(SCTP_EMBEDDED_V6_SCOPE) 1772 if (net->ro._l_addr.sa.sa_family == AF_INET6) { 1773 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&net->ro._l_addr; 1774 1775 /* KAME hack: embed scopeid */ | 35 36#define _IP_VHL 37#include <netinet/sctp_os.h> 38#include <netinet/sctp_pcb.h> 39#ifdef INET6 40#endif 41#include <netinet/sctp_var.h> 42#include <netinet/sctp_sysctl.h> --- 1725 unchanged lines hidden (view full) --- 1768 net->ro._s_addr = NULL; 1769 net->src_addr_selected = 0; 1770 } else if (net->ro._s_addr == NULL) { 1771#if defined(INET6) && defined(SCTP_EMBEDDED_V6_SCOPE) 1772 if (net->ro._l_addr.sa.sa_family == AF_INET6) { 1773 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&net->ro._l_addr; 1774 1775 /* KAME hack: embed scopeid */ |
| 1776 (void)sa6_embedscope(sin6, MODULE_GLOBAL(MOD_INET6, ip6_use_defzone)); | 1776 (void)sa6_embedscope(sin6, MODULE_GLOBAL(ip6_use_defzone)); |
| 1777 } 1778#endif 1779 1780 net->ro._s_addr = sctp_source_address_selection(inp, 1781 stcb, 1782 (sctp_route_t *) & net->ro, 1783 net, 0, stcb->asoc.vrf_id); 1784#if defined(INET6) && defined(SCTP_EMBEDDED_V6_SCOPE) --- 238 unchanged lines hidden --- | 1777 } 1778#endif 1779 1780 net->ro._s_addr = sctp_source_address_selection(inp, 1781 stcb, 1782 (sctp_route_t *) & net->ro, 1783 net, 0, stcb->asoc.vrf_id); 1784#if defined(INET6) && defined(SCTP_EMBEDDED_V6_SCOPE) --- 238 unchanged lines hidden --- |