sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BSD (freebsd,openbsd,netbsd..) generate uuid use os native api (#2816)

This commit is contained in:
jimying 2021-09-10 09:54:38 +08:00 committed by GitHub
parent a097ebcdee
commit 06e28755d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aconfigure
View File

@ -6018,6 +6018,9 @@ case $target in
*darwin*)
ac_os_objs="$ac_os_objs guid_darwin.o"
;;
*bsd*)
ac_os_objs="$ac_os_objs guid_bsd.o"
;;
*)
if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
ac_os_objs="$ac_os_objs guid_uuid.o"

3
aconfigure.ac
View File

@ -520,6 +520,9 @@ case $target in
*darwin*)
ac_os_objs="$ac_os_objs guid_darwin.o"
;;
*bsd*)
ac_os_objs="$ac_os_objs guid_bsd.o"
;;
*)
if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
ac_os_objs="$ac_os_objs guid_uuid.o"

50
pjlib/src/pj/guid_bsd.c Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (C) 2021-2021 Teluu Inc. (http://www.teluu.com)
*
* 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/os.h>
#include <pj/string.h>
#include <uuid.h>
PJ_DEF_DATA(const unsigned) PJ_GUID_STRING_LENGTH = 36;
PJ_DEF(unsigned) pj_GUID_STRING_LENGTH()
{
return PJ_GUID_STRING_LENGTH;
}
PJ_DEF(pj_str_t *) pj_generate_unique_string(pj_str_t *str)
{
uint32_t status;
uuid_t u;
char *s = NULL;
pj_str_t sguid;
PJ_ASSERT_RETURN(str && str->ptr, NULL);
PJ_CHECK_STACK();
uuid_create(&u, &status);
PJ_ASSERT_RETURN(status == uuid_s_ok, NULL);
uuid_to_string(&u, &s, &status);
PJ_ASSERT_RETURN(status == uuid_s_ok, NULL);
sguid = pj_str(s);
pj_strncpy(str, &sguid, PJ_GUID_STRING_LENGTH);
free(s);
return str;
}