From: Damien Neil Date: Tue, 1 Aug 2000 22:34:36 +0000 (+0000) Subject: Moved convert.c from libdhcp to libomapi. (libomapi should not depend X-Git-Tag: V3-BETA-2-PATCH-1~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8d531a6f907224c176e7abaf3a53813fc5acea9;p=thirdparty%2Fdhcp.git Moved convert.c from libdhcp to libomapi. (libomapi should not depend on libdhcp.) --- diff --git a/common/Makefile.dist b/common/Makefile.dist index d1dfdbdd4..0f49a801d 100644 --- a/common/Makefile.dist +++ b/common/Makefile.dist @@ -21,11 +21,11 @@ CATMANPAGES = dhcp-options.cat5 dhcp-contrib.cat5 dhcp-eval.cat5 SEDMANPAGES = dhcp-options.man5 dhcp-contrib.man5 dhcp-eval.man5 SRC = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \ lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c options.c \ - inet.c convert.c tree.c tables.c hash.c alloc.c fddi.c \ + inet.c tree.c tables.c hash.c alloc.c fddi.c \ inet_addr.c dns.c resolv.c execute.c discover.c comapi.c OBJ = raw.o parse.o nit.o icmp.o dispatch.o conflex.o upf.o bpf.o socket.o \ lpf.o dlpi.o packet.o tr.o ethernet.o memory.o print.o options.o \ - inet.o convert.o tree.o tables.o hash.o alloc.o fddi.o \ + inet.o tree.o tables.o hash.o alloc.o fddi.o \ inet_addr.o dns.o resolv.o execute.o discover.o comapi.o MAN = dhcp-options.5 dhcp-contrib.5 dhcp-eval.5 diff --git a/includes/dhcpd.h b/includes/dhcpd.h index b29161ec4..444390830 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -1579,22 +1579,6 @@ extern struct universe server_universe; extern struct option server_options [256]; void initialize_server_option_spaces PROTO ((void)); -/* convert.c */ -u_int32_t getULong PROTO ((const unsigned char *)); -int32_t getLong PROTO ((const unsigned char *)); -u_int32_t getUShort PROTO ((const unsigned char *)); -int32_t getShort PROTO ((const unsigned char *)); -u_int32_t getUChar PROTO ((const unsigned char *)); -void putULong PROTO ((unsigned char *, u_int32_t)); -void putLong PROTO ((unsigned char *, int32_t)); -void putUShort PROTO ((unsigned char *, u_int32_t)); -void putShort PROTO ((unsigned char *, int32_t)); -void putUChar PROTO ((unsigned char *, u_int32_t)); -int converted_length PROTO ((const unsigned char *, - unsigned int, unsigned int)); -int binary_to_ascii PROTO ((unsigned char *, const unsigned char *, - unsigned int, unsigned int)); - /* inet.c */ struct iaddr subnet_number PROTO ((struct iaddr, struct iaddr)); struct iaddr ip_addr PROTO ((struct iaddr, struct iaddr, u_int32_t)); diff --git a/includes/omapip/convert.h b/includes/omapip/convert.h new file mode 100644 index 000000000..b6d2d9fb0 --- /dev/null +++ b/includes/omapip/convert.h @@ -0,0 +1,61 @@ +/* convert.h + + Safe copying of integers into and out of a non-aligned memory buffer. */ + +/* + * Copyright (c) 1996-1999 Internet Software Consortium. + * 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 Internet Software Consortium 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 INTERNET SOFTWARE CONSORTIUM 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 INTERNET SOFTWARE CONSORTIUM 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. + * + * This software has been written for the Internet Software Consortium + * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. + * To learn more about the Internet Software Consortium, see + * ``http://www.isc.org/''. To learn more about Vixie Enterprises, + * see ``http://www.vix.com''. To learn more about Nominum, Inc., see + * ``http://www.nominum.com''. + */ + +#ifndef OMAPI_CONVERT_H +#define OMAPI_CONVERT_H + +u_int32_t getULong (const unsigned char *); +int32_t getLong (const unsigned char *); +u_int32_t getUShort (const unsigned char *); +int32_t getShort (const unsigned char *); +u_int32_t getUChar (const unsigned char *); +void putULong (unsigned char *, u_int32_t); +void putLong (unsigned char *, int32_t); +void putUShort (unsigned char *, u_int32_t); +void putShort (unsigned char *, int32_t); +void putUChar (unsigned char *, u_int32_t); +int converted_length (const unsigned char *, unsigned int, unsigned int); +int binary_to_ascii (unsigned char *, const unsigned char *, + unsigned int, unsigned int); + +#endif /* OMAPI_CONVERT_H */ diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h index cb9b995ea..2be4a1305 100644 --- a/includes/omapip/omapip_p.h +++ b/includes/omapip/omapip_p.h @@ -70,6 +70,7 @@ #include +#include #include /* OMAPI protocol header, version 1.00 */ diff --git a/omapip/Makefile.dist b/omapip/Makefile.dist index 51a1c0263..b6c30714b 100644 --- a/omapip/Makefile.dist +++ b/omapip/Makefile.dist @@ -20,9 +20,11 @@ CATMANPAGES = omapi.cat3 SEDMANPAGES = omapi.man3 SRC = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \ - listener.c dispatch.c generic.c support.c handle.c message.c + listener.c dispatch.c generic.c support.c handle.c message.c \ + convert.c OBJ = protocol.o buffer.o alloc.o result.o connection.o errwarn.o \ - listener.o dispatch.o generic.o support.o handle.o message.o + listener.o dispatch.o generic.o support.o handle.o message.o \ + convert.o MAN = omapi.3 DEBUG = -g diff --git a/common/convert.c b/omapip/convert.c similarity index 96% rename from common/convert.c rename to omapip/convert.c index 1b5922c03..83d5fc3b2 100644 --- a/common/convert.c +++ b/omapip/convert.c @@ -44,10 +44,10 @@ #ifndef lint static char copyright[] = -"$Id: convert.c,v 1.12 2000/03/17 03:59:00 mellon Exp $ Copyright (c) 1996-1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: convert.c,v 1.1 2000/08/01 22:34:36 neild Exp $ Copyright (c) 1996-1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ -#include "dhcpd.h" +#include u_int32_t getULong (buf) const unsigned char *buf;