Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ns_addr and ns_ntoa to compat libc. Add a stripped version of

Browse Source 
<netns/ns.h> which only include struct ns_addr and the ns_addr and ns_ntoa
function prototypes.
This commit is contained in:
matt 2006-08-26 16:07:01 +00:00
parent a5db205458
commit 95ff9c00a4
7 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libc/compat/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2006/03/11 23:04:03 christos Exp $
# $NetBSD: Makefile,v 1.3 2006/08/26 16:07:01 matt Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
@ -14,6 +14,7 @@ COMPATDIR=${.CURDIR}
.include "${.CURDIR}/db/Makefile.inc"
.include "${.CURDIR}/gen/Makefile.inc"
.include "${.CURDIR}/net/Makefile.inc"
.include "${.CURDIR}/stdlib/Makefile.inc"
.include "${.CURDIR}/sys/Makefile.inc"

3
lib/libc/compat/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.3 2006/03/11 23:04:03 christos Exp $
# $NetBSD: Makefile.inc,v 1.4 2006/08/26 16:07:01 matt Exp $
CPPFLAGS+= -I${NETBSDSRCDIR}/sys
@ -7,6 +7,7 @@ COMPATARCHDIR=${COMPATDIR}/arch/${ARCHSUBDIR}
.include "${COMPATDIR}/db/Makefile.inc"
.include "${COMPATDIR}/gen/Makefile.inc"
.include "${COMPATDIR}/net/Makefile.inc"
.include "${COMPATDIR}/stdlib/Makefile.inc"
.include "${COMPATDIR}/sys/Makefile.inc"
.include "${COMPATARCHDIR}/Makefile.inc"

66
lib/libc/compat/include/ns.h Normal file
View File

@ -0,0 +1,66 @@
/* $NetBSD: ns.h,v 1.1 2006/08/26 16:07:01 matt Exp $ */
/*
* Copyright (c) 1984, 1985, 1986, 1987, 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.
*
* @(#)ns.h 8.1 (Berkeley) 6/10/93
*/
#ifndef _NETNS_NS_H_
#define _NETNS_NS_H_
/*
* NS addressing
*/
union ns_host {
u_int8_t c_host[6];
u_int16_t s_host[3];
};
union ns_net {
u_int8_t c_net[4];
u_int16_t s_net[2];
};
union ns_net_u {
union ns_net net_e;
u_int32_t long_e;
};
struct ns_addr {
union ns_net x_net;
union ns_host x_host;
u_int16_t x_port;
};
__BEGIN_DECLS
extern struct ns_addr ns_addr __P((const char *));
extern char *ns_ntoa __P((struct ns_addr));
__END_DECLS
#endif /* !_NETNS_NS_H_ */

4
lib/libc/compat/net/Makefile.inc Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: Makefile.inc,v 1.1 2006/08/26 16:07:01 matt Exp $
.PATH: ${COMPATDIR}/net
SRCS+=compat_ns_addr.c compat_ns_ntoa.c

6
lib/libc/net/ns_addr.c → lib/libc/compat/net/compat_ns_addr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_addr.c,v 1.17 2004/05/09 11:25:20 kleink Exp $ */
/* $NetBSD: compat_ns_addr.c,v 1.1 2006/08/26 16:07:01 matt Exp $ */
/*
* Copyright (c) 1986, 1993
@ -37,13 +37,13 @@
#if 0
static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93";
#else
__RCSID("$NetBSD: ns_addr.c,v 1.17 2004/05/09 11:25:20 kleink Exp $");
__RCSID("$NetBSD: compat_ns_addr.c,v 1.1 2006/08/26 16:07:01 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#include <sys/param.h>
#include <netns/ns.h>
#include <compat/include/ns.h>
#include <assert.h>
#include <stdio.h>

6
lib/libc/net/ns_ntoa.c → lib/libc/compat/net/compat_ns_ntoa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_ntoa.c,v 1.12 2003/09/23 03:19:28 itojun Exp $ */
/* $NetBSD: compat_ns_ntoa.c,v 1.1 2006/08/26 16:07:01 matt Exp $ */
/*
* Copyright (c) 1986, 1993
@ -34,12 +34,12 @@
#if 0
static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: ns_ntoa.c,v 1.12 2003/09/23 03:19:28 itojun Exp $");
__RCSID("$NetBSD: compat_ns_ntoa.c,v 1.1 2006/08/26 16:07:01 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
#include <netns/ns.h>
#include <compat/include/ns.h>
#include <assert.h>
#include <stdio.h>

4
lib/libc/net/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.69 2006/05/05 00:03:21 rpaulo Exp $
# $NetBSD: Makefile.inc,v 1.70 2006/08/26 16:07:01 matt Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@ -11,7 +11,7 @@ SRCS+= __cmsg_alignbytes.c base64.c ethers.c gethnamaddr.c getifaddrs.c \
getservbyname.c getservbyport.c getservent.c \
getservbyname_r.c getservbyport_r.c getservent_r.c \
iso_addr.c linkaddr.c \
nsdispatch.c nslexer.l nsparser.y ns_addr.c ns_ntoa.c nsap_addr.c \
nsdispatch.c nslexer.l nsparser.y nsap_addr.c \
rcmd.c recv.c send.c sethostent.c \
sockatmark.c