From owner-svn-src-head@FreeBSD.ORG Thu Sep 11 08:11:53 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 523D5852; Thu, 11 Sep 2014 08:11:53 +0000 (UTC) Received: from cyrus.watson.org (cyrus.watson.org [198.74.231.69]) by mx1.freebsd.org (Postfix) with ESMTP id 2AE9DEEA; Thu, 11 Sep 2014 08:11:53 +0000 (UTC) Received: from fledge.watson.org (fledge.watson.org [198.74.231.63]) by cyrus.watson.org (Postfix) with ESMTPS id 40FD746B2A; Thu, 11 Sep 2014 04:11:52 -0400 (EDT) Date: Thu, 11 Sep 2014 09:11:51 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Gleb Smirnoff Subject: Re: svn commit: r271418 - head/sbin/dhclient In-Reply-To: <201409110548.s8B5md65014322@svn.freebsd.org> Message-ID: References: <201409110548.s8B5md65014322@svn.freebsd.org> User-Agent: Alpine 2.11 (BSF 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2014 08:11:53 -0000 A bit behind on commits, but: does this mean that an older userspace dhclient will no longer work with a newer kernel? Robert On Thu, 11 Sep 2014, Gleb Smirnoff wrote: > Author: glebius > Date: Thu Sep 11 05:48:39 2014 > New Revision: 271418 > URL: http://svnweb.freebsd.org/changeset/base/271418 > > Log: > Since r270929 raw sockets expect network byte order. > > Submitted by: avg > > Modified: > head/sbin/dhclient/packet.c > > Modified: head/sbin/dhclient/packet.c > ============================================================================== > --- head/sbin/dhclient/packet.c Thu Sep 11 03:16:57 2014 (r271417) > +++ head/sbin/dhclient/packet.c Thu Sep 11 05:48:39 2014 (r271418) > @@ -127,17 +127,6 @@ assemble_udp_ip_header(unsigned char *bu > ip.ip_dst.s_addr = to; > > ip.ip_sum = wrapsum(checksum((unsigned char *)&ip, sizeof(ip), 0)); > - > - /* > - * While the BPF -- used for broadcasts -- expects a "true" IP header > - * with all the bytes in network byte order, the raw socket interface > - * which is used for unicasts expects the ip_len field to be in host > - * byte order. In both cases, the checksum has to be correct, so this > - * is as good a place as any to turn the bytes around again. > - */ > - if (to != INADDR_BROADCAST) > - ip.ip_len = ntohs(ip.ip_len); > - > memcpy(&buf[*bufix], &ip, sizeof(ip)); > *bufix += sizeof(ip); > > >