Deleted Added
full compact
in6_mcast.c (302408) in6_mcast.c (321135)
1/*
2 * Copyright (c) 2009 Bruce Simpson.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

28 */
29
30/*
31 * IPv6 multicast socket, group, and socket option processing module.
32 * Normative references: RFC 2292, RFC 3492, RFC 3542, RFC 3678, RFC 3810.
33 */
34
35#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2009 Bruce Simpson.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

28 */
29
30/*
31 * IPv6 multicast socket, group, and socket option processing module.
32 * Normative references: RFC 2292, RFC 3492, RFC 3542, RFC 3678, RFC 3810.
33 */
34
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: stable/11/sys/netinet6/in6_mcast.c 298995 2016-05-03 18:05:43Z pfg $");
36__FBSDID("$FreeBSD: stable/11/sys/netinet6/in6_mcast.c 321135 2017-07-18 16:58:54Z ngie $");
37
38#include "opt_inet6.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/malloc.h>
44#include <sys/mbuf.h>

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

994 } else {
995 CTR1(KTR_MLD, "%s: transition to UNDEF", __func__);
996 inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED;
997 }
998
999 /* Decrement ASM listener count on transition out of ASM mode. */
1000 if (imf->im6f_st[0] == MCAST_EXCLUDE && nsrc0 == 0) {
1001 if ((imf->im6f_st[1] != MCAST_EXCLUDE) ||
37
38#include "opt_inet6.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/malloc.h>
44#include <sys/mbuf.h>

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

994 } else {
995 CTR1(KTR_MLD, "%s: transition to UNDEF", __func__);
996 inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED;
997 }
998
999 /* Decrement ASM listener count on transition out of ASM mode. */
1000 if (imf->im6f_st[0] == MCAST_EXCLUDE && nsrc0 == 0) {
1001 if ((imf->im6f_st[1] != MCAST_EXCLUDE) ||
1002 (imf->im6f_st[1] == MCAST_EXCLUDE && nsrc1 > 0))
1002 (imf->im6f_st[1] == MCAST_EXCLUDE && nsrc1 > 0)) {
1003 CTR1(KTR_MLD, "%s: --asm on inm at t1", __func__);
1004 --inm->in6m_st[1].iss_asm;
1003 CTR1(KTR_MLD, "%s: --asm on inm at t1", __func__);
1004 --inm->in6m_st[1].iss_asm;
1005 }
1005 }
1006
1007 /* Increment ASM listener count on transition to ASM mode. */
1008 if (imf->im6f_st[1] == MCAST_EXCLUDE && nsrc1 == 0) {
1009 CTR1(KTR_MLD, "%s: asm++ on inm at t1", __func__);
1010 inm->in6m_st[1].iss_asm++;
1011 }
1012

--- 1821 unchanged lines hidden ---
1006 }
1007
1008 /* Increment ASM listener count on transition to ASM mode. */
1009 if (imf->im6f_st[1] == MCAST_EXCLUDE && nsrc1 == 0) {
1010 CTR1(KTR_MLD, "%s: asm++ on inm at t1", __func__);
1011 inm->in6m_st[1].iss_asm++;
1012 }
1013

--- 1821 unchanged lines hidden ---