From owner-freebsd-net@freebsd.org Mon Oct 12 17:01:35 2020 Return-Path: Delivered-To: freebsd-net@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 074A243C28F for ; Mon, 12 Oct 2020 17:01:35 +0000 (UTC) (envelope-from dkandula@gmail.com) Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C94hZ28TFz4QqM for ; Mon, 12 Oct 2020 17:01:34 +0000 (UTC) (envelope-from dkandula@gmail.com) Received: by mail-ot1-x32d.google.com with SMTP id n61so16442274ota.10 for ; Mon, 12 Oct 2020 10:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=VqWFdPaCiPZDS2TsIFL3ly/H8E9buKo+LNtLMQhcCrA=; b=MPBV1sHxtJrEm9Uu80E9RXPTSx0U4pPVwQ7EFqCKUwioCttNlzrfvWZx+2VlKBQVxy fSPygKNzN2PMG68kFoBEnD7n92YDi9H96y+bGCfR09D5K+0g5Wpsqc1PEZiM1o9SxSEO +nKYoQteeR0vWQaCbHlQAcKelalp2iW7kGN4uuB9J1PnzbtryMel7lhJICH1gVYYLsb6 IPQOn6uLzEfby9wfKP5so3Av6Woj/96Nld1gpwhREtAT9LOSk2PxhtjMKECT1gtNn9uu zggaXblNVqQQ4Mov5ud3FvCIU5t9J8VJ6lP6AF5HjxQ99IoutVlrUYckVikdEkp0zaUk ZMhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=VqWFdPaCiPZDS2TsIFL3ly/H8E9buKo+LNtLMQhcCrA=; b=ZG9mthUuSVyqaFDoyxu7rjTORqZD2qG1NllFEr2r45Ts49y/bYHEUp2ByXTJiKgIpm dsOhYoMdKqUa0Vjia6eOC6BnZYixEQpd/tus6cwfBuUzzTwQt2l8sAAdHvjwprDR6kH4 jYjim6ZAa7SXmDOlDH2xxBYktkPNtIfD1dITjIsD1Q9KDhOurvuXxz/hDvl+jPUxNSMG r8Vs5VsIDZ6G1hmjZ82CT5ogZAXF1rviaGfIQvERkpiQ2U749Z/fdF0PS7hU26XUPOhz sFPCO0m4ZREd+C30CBGbFf9ob10XAfPpkd7tPTDAyO4yaYsj3/Sc4R/59a7WFKquHv9/ 0Tbg== X-Gm-Message-State: AOAM530FJqdYBnaeLr81otJLz7gTwK0wP/i5TWzt4SR1SsUMT69C7aTh kgM8bzVjkXqd2kXBiUHsdMe9Gpt2/RxZQ6mjIFvs5cgGZ85piQ== X-Google-Smtp-Source: ABdhPJznwfCagaewgRJelthgjbTJ+6sWtJhbLswFh7bbzYOBHZ5sApdgDwMdUhs4cJ7Dt9R3vbD2d48zu0v6lfN1rjQ= X-Received: by 2002:a9d:6d99:: with SMTP id x25mr17804472otp.57.1602522091827; Mon, 12 Oct 2020 10:01:31 -0700 (PDT) MIME-Version: 1.0 From: Dheeraj Kandula Date: Mon, 12 Oct 2020 13:01:19 -0400 Message-ID: Subject: ims_merge in in_mcast.c and in6_mcast.c To: freebsd-net@freebsd.org X-Rspamd-Queue-Id: 4C94hZ28TFz4QqM X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=MPBV1sHx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of dkandula@gmail.com designates 2607:f8b0:4864:20::32d as permitted sender) smtp.mailfrom=dkandula@gmail.com X-Spamd-Result: default: False [-2.90 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.03)[-1.027]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-net@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-0.996]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::32d:from]; NEURAL_SPAM_SHORT(0.12)[0.121]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-net]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2020 17:01:35 -0000 974 /* 975 * Merge socket-layer source into IGMP-layer source. 976 * If rollback is non-zero, perform the inverse of the merge. 977 */ 978 static void 979 ims_merge(struct ip_msource *ims, const struct in_msource *lims, 980 const int rollback) 981 { 982 int n = rollback ? -1 : 1; 983 984 if (lims->imsl_st[0] == MCAST_EXCLUDE) { 985 CTR3(KTR_IGMPV3, "%s: t1 ex -= %d on 0x%08x", 986 __func__, n, ims->ims_haddr); 987 ims->ims_st[1].ex -= n; 988 } else if (lims->imsl_st[0] == MCAST_INCLUDE) { 989 CTR3(KTR_IGMPV3, "%s: t1 in -= %d on 0x%08x", 990 __func__, n, ims->ims_haddr); 991 ims->ims_st[1].in -= n; 992 } 993 994 if (lims->imsl_st[1] == MCAST_EXCLUDE) { 995 CTR3(KTR_IGMPV3, "%s: t1 ex += %d on 0x%08x", 996 __func__, n, ims->ims_haddr); 997 ims->ims_st[1].ex += n; 998 } else if (lims->imsl_st[1] == MCAST_INCLUDE) { 999 CTR3(KTR_IGMPV3, "%s: t1 in += %d on 0x%08x", 1000 __func__, n, ims->ims_haddr); 1001 ims->ims_st[1].in += n; 1002 } 1003 } On line 987 and 991 shouldn't the index be 0 instead of 1. i.e. ims->ims_st[0].ex -= n; and ims->ims_st[0].in -= n; On a rollback, the entry at index 0 is incremented and the entry at index 1 is decremented. On a non-rollback merge, the entry at index 0 is decremented and the entry at index 1 is incremented. Dheeraj