From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [Patch 3/3] tabled: drop addr_af Date: Wed, 16 Dec 2009 00:48:21 -0500 Message-ID: <4B2874A5.8080209@garzik.org> References: <20091215221017.4cffc964@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=Vii7QeZYeWd8epn1nFDQ9phoTkwZkOGgA7e1xL+SCLQ=; b=cbeIr1KgkzSPSEnmmusV1/fAnaiiDDi9i+hvYfj5tncklZYg6IyVkeoh05FDT8S2gC le3yIfhNIWo+zaCpM+sImw1ufFm+wyXvVQohgE8ImOLMwop69/0OT789Yg+YDvGRRVwg 5ulr+Q2g+O45+D4tqKFO02pyLH8PdJJ3gqduk= In-Reply-To: <20091215221017.4cffc964@redhat.com> Sender: hail-devel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii"; format="flowed" To: Pete Zaitcev Cc: Project Hail List On 12/16/2009 12:10 AM, Pete Zaitcev wrote: > This flag was is a useless duplication and a fiction prompted by > getaddrinfo(). In reality it's not useful even if we decide to run > CLD over DCCP. > > Signed-off-by: Pete Zaitcev > > --- > server/storage.c | 8 ++++---- > server/tabled.h | 3 +-- > 2 files changed, 5 insertions(+), 6 deletions(-) > > commit 7b1efec72048557b1b51d07a95073dbe25cf08d1 > Author: Master > Date: Tue Dec 15 21:47:48 2009 -0700 > > Drop af flag, not needed. > > diff --git a/server/storage.c b/server/storage.c > index cc7066f..8298e60 100644 > --- a/server/storage.c > +++ b/server/storage.c > @@ -44,10 +44,10 @@ static int stor_new_stc(struct storage_node *stn, struct st_client **stcp) > struct sockaddr_in6 *a6; > unsigned short port; > > - if (stn->addr_af == AF_INET) { > + if (stn->addr.sin6_family == AF_INET) { > a4 = (struct sockaddr_in *)&stn->addr; > port = ntohs(a4->sin_port); > - } else if (stn->addr_af == AF_INET6) { > + } else if (stn->addr.sin6_family == AF_INET6) { > a6 =&stn->addr; > port = ntohs(a6->sin6_port); > } else { > @@ -419,9 +419,9 @@ static int stor_add_node_addr(struct storage_node *sn, > if (res->ai_addrlen> ADDRSIZE) /* should not happen */ > continue; > > - memcpy(&sn->addr, res->ai_addr, res->ai_addrlen); > - sn->addr_af = res->ai_family; > sn->alen = res->ai_addrlen; > + memcpy(&sn->addr, res->ai_addr, sn->alen); > + sn->addr.sin6_family = res->ai_family; applied 1-3, though I have a mild worry about how well this change works on non-Linux platforms. We'll see when I next boot my FreeBSD virtual machine... Jeff