From owner-svn-ports-head@freebsd.org  Wed Jan 20 07:50:40 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90161A89D84;
 Wed, 20 Jan 2016 07:50:40 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6140E14E8;
 Wed, 20 Jan 2016 07:50:40 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0K7odba024611;
 Wed, 20 Jan 2016 07:50:39 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0K7od3n024610;
 Wed, 20 Jan 2016 07:50:39 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201601200750.u0K7od3n024610@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 20 Jan 2016 07:50:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r406733 - head/net/igmpproxy/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jan 2016 07:50:40 -0000

Author: kevlo
Date: Wed Jan 20 07:50:39 2016
New Revision: 406733
URL: https://svnweb.freebsd.org/changeset/ports/406733

Log:
  FreeBSD -CURRENT expects ip_len in network order.

Modified:
  head/net/igmpproxy/files/patch-src__os-freebsd.h

Modified: head/net/igmpproxy/files/patch-src__os-freebsd.h
==============================================================================
--- head/net/igmpproxy/files/patch-src__os-freebsd.h	Wed Jan 20 06:50:52 2016	(r406732)
+++ head/net/igmpproxy/files/patch-src__os-freebsd.h	Wed Jan 20 07:50:39 2016	(r406733)
@@ -1,10 +1,12 @@
---- src/os-freebsd.h.orig	2014-10-11 14:15:20 UTC
-+++ src/os-freebsd.h
-@@ -14,7 +14,11 @@
+--- src/os-freebsd.h.orig	2009-10-06 02:07:06.000000000 +0800
++++ src/os-freebsd.h	2016-01-20 15:43:54.364740000 +0800
+@@ -14,10 +14,20 @@
  
  static inline u_short ip_data_len(const struct ip *ip)
  {
-+#if __FreeBSD_version >= 900044
++#if __FreeBSD_version >= 1100030
++	return ntohs(ip->ip_len) - (ip->ip_hl << 2);
++#elif __FreeBSD_version >= 900044
 +	return ip->ip_len - (ip->ip_hl << 2);
 +#else
  	return ip->ip_len;
@@ -12,3 +14,10 @@
  }
  
  static inline void ip_set_len(struct ip *ip, u_short len)
+ {
++#if __FreeBSD_version >= 1100030
++	ip->ip_len = htons(len);
++#else
+ 	ip->ip_len = len;
++#endif
+ }