Deleted Added
full compact
mld6.c (215317) mld6.c (215701)
1/*-
2 * Copyright (c) 2009 Bruce Simpson.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 50 unchanged lines hidden (view full) ---

59 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
60 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 * SUCH DAMAGE.
62 *
63 * @(#)igmp.c 8.1 (Berkeley) 7/19/93
64 */
65
66#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009 Bruce Simpson.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 50 unchanged lines hidden (view full) ---

59 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
60 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 * SUCH DAMAGE.
62 *
63 * @(#)igmp.c 8.1 (Berkeley) 7/19/93
64 */
65
66#include <sys/cdefs.h>
67__FBSDID("$FreeBSD: head/sys/netinet6/mld6.c 215317 2010-11-14 20:38:11Z dim $");
67__FBSDID("$FreeBSD: head/sys/netinet6/mld6.c 215701 2010-11-22 19:32:54Z dim $");
68
69#include "opt_inet.h"
70#include "opt_inet6.h"
71
72#include <sys/param.h>
73#include <sys/systm.h>
74#include <sys/mbuf.h>
75#include <sys/socket.h>

--- 122 unchanged lines hidden (view full) ---

198#define MLD_EMBEDSCOPE(pin6, zoneid) \
199 if (IN6_IS_SCOPE_LINKLOCAL(pin6) || \
200 IN6_IS_ADDR_MC_INTFACELOCAL(pin6)) \
201 (pin6)->s6_addr16[1] = htons((zoneid) & 0xFFFF) \
202
203/*
204 * VIMAGE-wide globals.
205 */
68
69#include "opt_inet.h"
70#include "opt_inet6.h"
71
72#include <sys/param.h>
73#include <sys/systm.h>
74#include <sys/mbuf.h>
75#include <sys/socket.h>

--- 122 unchanged lines hidden (view full) ---

198#define MLD_EMBEDSCOPE(pin6, zoneid) \
199 if (IN6_IS_SCOPE_LINKLOCAL(pin6) || \
200 IN6_IS_ADDR_MC_INTFACELOCAL(pin6)) \
201 (pin6)->s6_addr16[1] = htons((zoneid) & 0xFFFF) \
202
203/*
204 * VIMAGE-wide globals.
205 */
206STATIC_VNET_DEFINE(struct timeval, mld_gsrdelay) = {10, 0};
207STATIC_VNET_DEFINE(LIST_HEAD(, mld_ifinfo), mli_head);
208STATIC_VNET_DEFINE(int, interface_timers_running6);
209STATIC_VNET_DEFINE(int, state_change_timers_running6);
210STATIC_VNET_DEFINE(int, current_state_timers_running6);
206static VNET_DEFINE(struct timeval, mld_gsrdelay) = {10, 0};
207static VNET_DEFINE(LIST_HEAD(, mld_ifinfo), mli_head);
208static VNET_DEFINE(int, interface_timers_running6);
209static VNET_DEFINE(int, state_change_timers_running6);
210static VNET_DEFINE(int, current_state_timers_running6);
211
212#define V_mld_gsrdelay VNET(mld_gsrdelay)
213#define V_mli_head VNET(mli_head)
214#define V_interface_timers_running6 VNET(interface_timers_running6)
215#define V_state_change_timers_running6 VNET(state_change_timers_running6)
216#define V_current_state_timers_running6 VNET(current_state_timers_running6)
217
218SYSCTL_DECL(_net_inet6); /* Note: Not in any common header. */

--- 3091 unchanged lines hidden ---
211
212#define V_mld_gsrdelay VNET(mld_gsrdelay)
213#define V_mli_head VNET(mli_head)
214#define V_interface_timers_running6 VNET(interface_timers_running6)
215#define V_state_change_timers_running6 VNET(state_change_timers_running6)
216#define V_current_state_timers_running6 VNET(current_state_timers_running6)
217
218SYSCTL_DECL(_net_inet6); /* Note: Not in any common header. */

--- 3091 unchanged lines hidden ---