diff options
Diffstat (limited to 'pjlib')
-rw-r--r-- | pjlib/include/pj/guid.h | 9 | ||||
-rw-r--r-- | pjlib/src/pj/config.c | 2 | ||||
-rw-r--r-- | pjlib/src/pj/guid_uuid.c | 47 |
3 files changed, 54 insertions, 4 deletions
diff --git a/pjlib/include/pj/guid.h b/pjlib/include/pj/guid.h index cb34d973..3eea11a3 100644 --- a/pjlib/include/pj/guid.h +++ b/pjlib/include/pj/guid.h @@ -48,10 +48,13 @@ PJ_BEGIN_DECL /** * PJ_GUID_STRING_LENGTH specifies length of GUID string. The value is * dependent on the algorithm used internally to generate the GUID string. - * If real GUID generator is used, then the length will be 128bit or - * 32 bytes. If shadow GUID generator is used, then the length + * If real GUID generator is used, then the length will be between 32 and + * 36 bytes. If shadow GUID generator is used, then the length * will be 20 bytes. Application should not assume which algorithm will * be used by GUID generator. + * + * Regardless of the actual length of the GUID, it will not exceed + * PJ_GUID_MAX_LENGTH characters. */ extern const unsigned PJ_GUID_STRING_LENGTH; @@ -59,7 +62,7 @@ extern const unsigned PJ_GUID_STRING_LENGTH; * PJ_GUID_MAX_LENGTH specifies the maximum length of GUID string, * regardless of which algorithm to use. */ -#define PJ_GUID_MAX_LENGTH 32 +#define PJ_GUID_MAX_LENGTH 36 /** * Create a globally unique string, which length is PJ_GUID_STRING_LENGTH diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c index f437ddde..4652bb02 100644 --- a/pjlib/src/pj/config.c +++ b/pjlib/src/pj/config.c @@ -21,7 +21,7 @@ #include <pj/ioqueue.h> static const char *id = "config.c"; -const char *PJ_VERSION = "0.7.0-rc1"; +const char *PJ_VERSION = "0.7.0-pre-rc2"; PJ_DEF(void) pj_dump_config(void) { diff --git a/pjlib/src/pj/guid_uuid.c b/pjlib/src/pj/guid_uuid.c new file mode 100644 index 00000000..c4b46a5d --- /dev/null +++ b/pjlib/src/pj/guid_uuid.c @@ -0,0 +1,47 @@ +/* $Id$ */ +/* + * Copyright (C)2003-2007 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <pj/guid.h> +#include <pj/assert.h> +#include <pj/errno.h> +#include <pj/os.h> +#include <pj/string.h> + +#include <uuid/uuid.h> + +const unsigned PJ_GUID_STRING_LENGTH=36; + +PJ_DEF(pj_str_t*) pj_generate_unique_string(pj_str_t *str) +{ + enum {GUID_LEN = 36}; + char sguid[GUID_LEN + 1]; + uuid_t uuid = {0}; + + PJ_ASSERT_RETURN(GUID_LEN <= PJ_GUID_STRING_LENGTH, NULL); + PJ_ASSERT_RETURN(str->ptr != NULL, NULL); + PJ_CHECK_STACK(); + + uuid_generate(uuid); + uuid_unparse(uuid, sguid); + + pj_memcpy(str->ptr, sguid, GUID_LEN); + str->slen = GUID_LEN; + + return str; +} + |