diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-05-16 13:41:00 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-05-16 13:41:00 +0000 |
| commit | b7002d89c144ac5f120a3ca95c1234953e9577cb (patch) | |
| tree | 35204ff75e7d783b803c59168b4666fcfedfb513 /pjlib/src | |
| parent | ae8f7f7c9c33ea41e257846e43b6bd264e506528 (diff) | |
Fixed ticet #277: GUID generation cannot generate more than 2^16 unique numbers (thanks Igor Sobinov)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1282 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
| -rw-r--r-- | pjlib/src/pj/config.c | 2 | ||||
| -rw-r--r-- | pjlib/src/pj/guid_uuid.c | 47 |
2 files changed, 48 insertions, 1 deletions
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; +} + |