From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/2315 Path: news.gmane.org!not-for-mail From: Isaac Dunham Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] Re: [musl] missing inet_makeaddr Date: Mon, 19 Nov 2012 21:51:16 -0800 Message-ID: <20121119215116.e86014f1.idunham@lavabit.com> References: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Mon__19_Nov_2012_21_51_16_-0800_zLxU9eiztji_7FX0" X-Trace: ger.gmane.org 1353390694 9616 80.91.229.3 (20 Nov 2012 05:51:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 20 Nov 2012 05:51:34 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-2316-gllmg-musl=m.gmane.org@lists.openwall.com Tue Nov 20 06:51:42 2012 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1TagkH-0007JJ-Ow for gllmg-musl@plane.gmane.org; Tue, 20 Nov 2012 06:51:41 +0100 Original-Received: (qmail 25980 invoked by uid 550); 20 Nov 2012 05:51:30 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 25972 invoked from network); 20 Nov 2012 05:51:30 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=o82+fp1hGIv1B4jcpVXvk0nDGWrtazxFvp0fH6vy7QtXyFeRvnvuEsWhTzXk+swuUgt08EL2V8ac9tylHeRg58R1XQrL3kc6zwoV4EyPIP9yhZ7atPbU8P1/zVY9oKP8sej9TUBO0vYAijSI3nIzzipDN87werJ+tFXJXBApCxY=; h=Date:From:To:Subject:Message-Id:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type; In-Reply-To: X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Xref: news.gmane.org gmane.linux.lib.musl.general:2315 Archived-At: This is a multi-part message in MIME format. --Multipart=_Mon__19_Nov_2012_21_51_16_-0800_zLxU9eiztji_7FX0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 20 Nov 2012 01:18:05 +0000 (UTC) Roy wrote: > > samba > 3.3 needs inet_makeaddr which is missing in musl. 1: This is a portability issue that should be tested in configure. 2. Here's a patch for musl, based on the NetBSD code. -- Isaac Dunham --Multipart=_Mon__19_Nov_2012_21_51_16_-0800_zLxU9eiztji_7FX0 Content-Type: text/x-diff; name="makeaddr.diff" Content-Disposition: attachment; filename="makeaddr.diff" Content-Transfer-Encoding: 7bit commit d95ac554fb5cd7ed48a4cb1768cc102e0b002c12 Author: Isaac Dunham Date: Mon Nov 19 21:45:54 2012 -0800 Add inet_makeaddr. This is a BSD network function which Samba wants. diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 9293840..95f046e 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -29,6 +29,7 @@ int inet_pton (int, const char *__restrict, void *__restrict); const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t); int inet_aton (const char *, struct in_addr *); /* nonstandard but widely used */ +struct in_addr inet_makeaddr (in_addr_t net, in_addr_t host); #undef INET_ADDRSTRLEN #undef INET6_ADDRSTRLEN diff --git a/src/network/inet_makeaddr.c b/src/network/inet_makeaddr.c new file mode 100644 index 0000000..e205168 --- /dev/null +++ b/src/network/inet_makeaddr.c @@ -0,0 +1,55 @@ +/* $NetBSD: inet_makeaddr.c,v 1.1 2004/05/20 23:13:02 christos Exp $ */ + +/* + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#define _BSD_SOURCE +#include +#include + +/* + * Formulate an Internet address from network + host. Used in + * building addresses stored in the ifnet structure. + */ +struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host) +{ + in_addr_t addr; + struct in_addr ret; + + if (net < 128) + addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST); + else if (net < 65536) + addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST); + else if (net < 16777216L) + addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST); + else + addr = net | host; + ret.s_addr = htonl(addr); + return ret; +} --Multipart=_Mon__19_Nov_2012_21_51_16_-0800_zLxU9eiztji_7FX0--