From 3073a60ce93e71acad3ab8cbe9dd105205680343 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Thu, 1 Jan 2009 21:27:24 -0500 Subject: [PATCH] Import the uuid_enc_le(), uuid_dec_le(), uuid_enc_be() and uuid_dec_be() functions. These routines are not part of the DCE RPC API. They are provided for convenience. Obtained-from: FreeBSD --- lib/libc/uuid/Makefile.inc | 10 ++-- lib/libc/uuid/uuid.3 | 32 ++++++++++++- lib/libc/uuid/uuid_stream.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 lib/libc/uuid/uuid_stream.c diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc index f26ba7c49c..585b805074 100644 --- a/lib/libc/uuid/Makefile.inc +++ b/lib/libc/uuid/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.4 2006/03/13 01:15:01 deischen Exp $ +# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.5 2008/08/14 22:23:16 emax Exp $ # $DragonFly: src/lib/libc/uuid/Makefile.inc,v 1.4 2007/06/17 10:53:25 swildner Exp $ # DCE 1.1 UUID implementation sources @@ -7,8 +7,8 @@ .PATH: ${.CURDIR}/../libc/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ - uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c \ - uuid_name_lookup.c + uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_name_lookup.c \ + uuid_stream.c uuid_to_string.c SYM_MAPS+= ${.CURDIR}/uuid/Symbol.map MAN+= uuid.3 @@ -16,6 +16,10 @@ MLINKS+=uuid.3 uuid_addr_lookup.3 MLINKS+=uuid.3 uuid_compare.3 MLINKS+=uuid.3 uuid_create.3 MLINKS+=uuid.3 uuid_create_nil.3 +MLINKS+=uuid.3 uuid_dec_be.3 +MLINKS+=uuid.3 uuid_dec_le.3 +MLINKS+=uuid.3 uuid_enc_be.3 +MLINKS+=uuid.3 uuid_enc_le.3 MLINKS+=uuid.3 uuid_equal.3 MLINKS+=uuid.3 uuid_from_string.3 MLINKS+=uuid.3 uuid_hash.3 diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3 index 1bdffc9b55..8ee22ff333 100644 --- a/lib/libc/uuid/uuid.3 +++ b/lib/libc/uuid/uuid.3 @@ -23,10 +23,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.6 2005/11/24 07:04:20 ru Exp $ +.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.7 2008/08/14 22:23:16 emax Exp $ .\" $DragonFly: src/lib/libc/uuid/uuid.3,v 1.8 2008/08/21 21:41:55 swildner Exp $ .\" -.Dd June 17, 2007 +.Dd August 13, 2008 .Dt UUID 3 .Os .Sh NAME @@ -68,6 +68,14 @@ .Fn uuid_reset_lookup "void" .Ft void .Fn uuid_to_string "const uuid_t *uuid" "char **str" "uint32_t *status" +.Ft void +.Fn uuid_enc_le "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_le "const void *buf" "uuid_t *" +.Ft void +.Fn uuid_enc_be "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_be "const void *buf" "uuid_t *" .Sh DESCRIPTION The family of DCE 1.1 compliant UUID functions allow applications to operate on universally unique identifiers, or UUIDs. @@ -133,6 +141,26 @@ The .Fn uuid_reset_lookup function will clear its in-memory cache of UUID<->NAME conversions. The next lookup will reload the cache. +.Pp +The +.Fn uuid_enc_le +and +.Fn uuid_enc_be +functions encode a binary representation of a UUID into an octet stream +in little-endian and big-endian byte-order, respectively. +The destination buffer must be pre-allocated by the caller, and must be +large enough to hold the 16-octet binary UUID. +These routines are not part of the DCE RPC API. +They are provided for convenience. +.Pp +The +.Fn uuid_dec_le +and +.Fn uuid_dec_be +functions decode a UUID from an octet stream in little-endian and +big-endian byte-order, respectively. +These routines are not part of the DCE RPC API. +They are provided for convenience. .Sh FILES .Bl -tag -width ".Pa /etc/defaults/uuids" .It Pa /etc/defaults/uuids diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c new file mode 100644 index 0000000000..c8f773a914 --- /dev/null +++ b/lib/libc/uuid/uuid_stream.c @@ -0,0 +1,112 @@ +/* $NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $ */ + +/*- + * Copyright (c) 2002 Marcel Moolenaar + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + * + * $FreeBSD: src/lib/libc/uuid/uuid_stream.c,v 1.1 2008/08/14 22:23:16 emax Exp $ + */ + +#include +#include + +/* + * Encode/Decode UUID into octet-stream. + * http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | time_low | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | time_mid | time_hi_and_version | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * |clk_seq_hi_res | clk_seq_low | node (0-1) | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | node (2-5) | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * NOTE: These routines are not part of the DCE RPC API. They are + * provided for convenience. + */ + +void +uuid_enc_le(void *buf, const uuid_t *uuid) +{ + uint8_t *p = buf; + int i; + + le32enc(p, uuid->time_low); + le16enc(p + 4, uuid->time_mid); + le16enc(p + 6, uuid->time_hi_and_version); + p[8] = uuid->clock_seq_hi_and_reserved; + p[9] = uuid->clock_seq_low; + for (i = 0; i < _UUID_NODE_LEN; i++) + p[10 + i] = uuid->node[i]; +} + +void +uuid_dec_le(const void *buf, uuid_t *uuid) +{ + const uint8_t *p = buf; + int i; + + uuid->time_low = le32dec(p); + uuid->time_mid = le16dec(p + 4); + uuid->time_hi_and_version = le16dec(p + 6); + uuid->clock_seq_hi_and_reserved = p[8]; + uuid->clock_seq_low = p[9]; + for (i = 0; i < _UUID_NODE_LEN; i++) + uuid->node[i] = p[10 + i]; +} + +void +uuid_enc_be(void *buf, const uuid_t *uuid) +{ + uint8_t *p = buf; + int i; + + be32enc(p, uuid->time_low); + be16enc(p + 4, uuid->time_mid); + be16enc(p + 6, uuid->time_hi_and_version); + p[8] = uuid->clock_seq_hi_and_reserved; + p[9] = uuid->clock_seq_low; + for (i = 0; i < _UUID_NODE_LEN; i++) + p[10 + i] = uuid->node[i]; +} + +void +uuid_dec_be(const void *buf, uuid_t *uuid) +{ + const uint8_t *p = buf; + int i; + + uuid->time_low = be32dec(p); + uuid->time_mid = be16dec(p + 4); + uuid->time_hi_and_version = be16dec(p + 6); + uuid->clock_seq_hi_and_reserved = p[8]; + uuid->clock_seq_low = p[9]; + for (i = 0; i < _UUID_NODE_LEN; i++) + uuid->node[i] = p[10 + i]; +} -- 2.11.4.GIT