From owner-freebsd-current@FreeBSD.ORG  Sun Jan 19 01:42:54 2014
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 31857B31;
 Sun, 19 Jan 2014 01:42:54 +0000 (UTC)
Received: from mail-vb0-x236.google.com (mail-vb0-x236.google.com
 [IPv6:2607:f8b0:400c:c02::236])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A64E61261;
 Sun, 19 Jan 2014 01:42:53 +0000 (UTC)
Received: by mail-vb0-f54.google.com with SMTP id w20so2220696vbb.13
 for <multiple recipients>; Sat, 18 Jan 2014 17:42:52 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date:message-id
 :subject:to:cc:content-type;
 bh=txlSrkG18VxqdC9HA3N0fS0tt4Kt1swx2izVkHA4+Wc=;
 b=JwHVFel//a5lD0ZPaJMEE/FicflgJalgnNEsHH/TILs3XwMPJESsfvd3cTKH+Sh7D2
 1tL4a2qAXOQdGQXJsZOM3zyoIPW/ZQ3HJ31PfIMTKjytRiCTsE2cFGdHBgi4rXlcojNN
 NwMYmqq8GILmJr56PV+21zBnWIMjXVY6gE9ft3Cy0gKGCwxPQe/m+oMqDmLYPbx4kVPR
 J5BIBYhZkZOGaMWW0MUNdwAlFa3itJwoIBbEPmAZJ6jgQLiHI3khI+eqQ/JjyHGK244t
 EJCj3KSv1oJ/HMAicRKVKIfuNcRxNQ8SVWB+1wSt7ySjz31RmFad+HtMU1qxjEjCaqn3
 diJw==
X-Received: by 10.52.244.49 with SMTP id xd17mr2400085vdc.26.1390095772638;
 Sat, 18 Jan 2014 17:42:52 -0800 (PST)
MIME-Version: 1.0
Sender: cochard@gmail.com
Received: by 10.58.171.1 with HTTP; Sat, 18 Jan 2014 17:42:32 -0800 (PST)
In-Reply-To: <20140115113430.GK26504@FreeBSD.org>
References: <CA+q+TcpFs_vff-r5e-Hw=F7QvGLc-9HGM-vm5TB1C4zik+0d8A@mail.gmail.com>
 <20140115113430.GK26504@FreeBSD.org>
From: =?ISO-8859-1?Q?Olivier_Cochard=2DLabb=E9?= <olivier@cochard.me>
Date: Sun, 19 Jan 2014 02:42:32 +0100
X-Google-Sender-Auth: sbrCmL7p60RZD0oI-qigzWcg6FA
Message-ID: <CA+q+TcrCVmH9-9jNGbeTTjV9wUs=jrK2uFGvDRY0Du5oUVEGvQ@mail.gmail.com>
Subject: Re: Regression on 10-RC5 with a multicast routing daemon
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.17
Cc: "freebsd-net@freebsd.org" <freebsd-net@freebsd.org>,
 "freebsd-current@freebsd.org" <freebsd-current@freebsd.org>,
 Andre Oppermann <andre@freebsd.org>
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jan 2014 01:42:54 -0000

On Wed, Jan 15, 2014 at 12:34 PM, Gleb Smirnoff <glebius@freebsd.org> wrote:

>   Olivier,
>
>
> TL;DR version: you need not subtract iphdrlen in 10.0. Code in
> igmp.c:accept_igmp()
> should be smth like:
>
>     iphdrlen  = ip->ip_hl << 2;
> #ifdef RAW_INPUT_IS_RAW /* Linux */
>     ipdatalen = ntohs(ip->ip_len) - iphdrlen;
> #else
>  #if __FreeBSD_version >= 1000000
>     ipdatalen = ip->ip_len - iphdrlen;
>  #else
>     ipdatalen = ip->ip_len;
>  #endif
> #endif
>
>
With this patch I've no more the message "warning - Received packet from
x.x.x.x shorter (28 bytes) than hdr+data length (20+28)":Thanks!
But there is still a regression regarding the PIM socket behavior not
related to the packet format.
The pim.c include 2 functions (pim_read and pim_accept) that are called
when the socket received a packet: There functions are never triggered when
PIM packets are received on 10.0.
In the same time igmp_read() and igmp_accept() are correctly triggered on
9.2 and 10.0.
tcpdump in non-promiscious mode correctly see input of PIM packet: This
should confirm that once this daemon is started, it correctly open a PIM
socket and the multicast filter is updated.