acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Use talloc for all memory pool (#1263)

This commit is contained in:
Sukchan Lee 2022-01-04 08:29:18 +09:00
parent 49d9ed03c7
commit b988e7edce
768 changed files with 4632 additions and 4901 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/debian/latest/base/Dockerfile
View File

@ -29,7 +29,7 @@ RUN apt-get update && \
libcurl4-gnutls-dev \ libcurl4-gnutls-dev \
libnghttp2-dev \ libnghttp2-dev \
libtins-dev \ libtins-dev \
libtalloc-devel \ libtalloc-dev \
iproute2 \ iproute2 \
ca-certificates \ ca-certificates \
netbase \ netbase \

53
lib/asn1c/common/asn_internal.h
View File

@ -41,20 +41,45 @@ int get_asn1c_environment_version(void); /* Run-time version */
#define FREEMEM(ptr) free(ptr) #define FREEMEM(ptr) free(ptr)
#else #else
#include "ogs-core.h" #include "ogs-core.h"
#if 1
#define CALLOC(nmemb, size) \ static ogs_inline void *ogs_asn_malloc(size_t size, const char *file_line)
ogs_talloc_zero_size(__ogs_talloc_asn1c, (nmemb) * (size), __location__) {
#define MALLOC(size) \ void *ptr = ogs_malloc(size);
ogs_talloc_size(__ogs_talloc_asn1c, size, __location__) if (!ptr) {
#define REALLOC(oldptr, size) \ ogs_fatal("asn_malloc() failed in `%s`", file_line);
ogs_talloc_realloc_size(__ogs_talloc_asn1c, oldptr, size, __location__) ogs_assert_if_reached();
#define FREEMEM(ptr) ogs_talloc_free(ptr, __location__) }
#else
#define CALLOC(nmemb, size) ogs_calloc_or_assert(nmemb, size) return ptr;
#define MALLOC(size) ogs_malloc_or_assert(size) }
#define REALLOC(oldptr, size) ogs_realloc_or_assert(oldptr, size) static ogs_inline void *ogs_asn_calloc(
#define FREEMEM(ptr) ogs_free_debug(ptr) size_t nmemb, size_t size, const char *file_line)
#endif {
void *ptr = ogs_calloc(nmemb, size);
if (!ptr) {
ogs_fatal("asn_calloc() failed in `%s`", file_line);
ogs_assert_if_reached();
}
return ptr;
}
static ogs_inline void *ogs_asn_realloc(
void *oldptr, size_t size, const char *file_line)
{
void *ptr = ogs_realloc(oldptr, size);
if (!ptr) {
ogs_fatal("asn_realloc() failed in `%s`", file_line);
ogs_assert_if_reached();
}
return ptr;
}
#define CALLOC(nmemb, size) ogs_asn_calloc(nmemb, size, OGS_FILE_LINE)
#define MALLOC(size) ogs_asn_malloc(size, OGS_FILE_LINE)
#define REALLOC(oldptr, size) ogs_asn_realloc(oldptr, size, OGS_FILE_LINE)
#define FREEMEM(ptr) ogs_free(ptr)
#endif #endif
#define asn_debug_indent 0 #define asn_debug_indent 0

6
lib/core/ogs-conv.c
View File

@ -187,7 +187,7 @@ char *ogs_uint64_to_0string(uint64_t x)
char *ogs_uint64_to_string(uint64_t x) char *ogs_uint64_to_string(uint64_t x)
{ {
char *str, *p; char *str, *p, *dup;
str = ogs_uint64_to_0string(x); str = ogs_uint64_to_0string(x);
ogs_expect_or_return_val(str, NULL); ogs_expect_or_return_val(str, NULL);
@ -195,8 +195,10 @@ char *ogs_uint64_to_string(uint64_t x)
p = ogs_left_trimcharacter(str, '0'); p = ogs_left_trimcharacter(str, '0');
ogs_expect_or_return_val(p, NULL); ogs_expect_or_return_val(p, NULL);
dup = ogs_strdup(p);
ogs_free(str); ogs_free(str);
return ogs_strdup(p);
return dup;
} }
ogs_uint24_t ogs_uint24_from_string(char *str) ogs_uint24_t ogs_uint24_from_string(char *str)

2
lib/core/ogs-core.h
View File

@ -24,6 +24,8 @@
#define OGS_CORE_INSIDE #define OGS_CORE_INSIDE
#define OGS_USE_TALLOC 1
#include "core/ogs-compat.h" #include "core/ogs-compat.h"
#include "core/ogs-macros.h" #include "core/ogs-macros.h"
#include "core/ogs-list.h" #include "core/ogs-list.h"

66
lib/core/ogs-epoll.c
View File

@ -54,7 +54,7 @@ struct epoll_context_s {
int epfd; int epfd;
ogs_hash_t *map_hash; ogs_hash_t *map_hash;
struct epoll_event *event_list; struct epoll_event *event_list;
}; };
static void epoll_init(ogs_pollset_t *pollset) static void epoll_init(ogs_pollset_t *pollset)
@ -66,9 +66,9 @@ static void epoll_init(ogs_pollset_t *pollset)
ogs_assert(context); ogs_assert(context);
pollset->context = context; pollset->context = context;
context->event_list = ogs_calloc( context->event_list = ogs_calloc(
pollset->capacity, sizeof(struct epoll_event)); pollset->capacity, sizeof(struct epoll_event));
ogs_assert(context->event_list); ogs_assert(context->event_list);
context->map_hash = ogs_hash_make(); context->map_hash = ogs_hash_make();
ogs_assert(context->map_hash); ogs_assert(context->map_hash);
@ -89,7 +89,7 @@ static void epoll_cleanup(ogs_pollset_t *pollset)
ogs_notify_final(pollset); ogs_notify_final(pollset);
close(context->epfd); close(context->epfd);
ogs_free(context->event_list); ogs_free(context->event_list);
ogs_hash_destroy(context->map_hash); ogs_hash_destroy(context->map_hash);
ogs_free(context); ogs_free(context);
@ -130,13 +130,13 @@ static int epoll_add(ogs_poll_t *poll)
ee.events |= (EPOLLIN|EPOLLRDHUP); ee.events |= (EPOLLIN|EPOLLRDHUP);
if (map->write) if (map->write)
ee.events |= EPOLLOUT; ee.events |= EPOLLOUT;
ee.data.ptr = map; ee.data.fd = poll->fd;
rv = epoll_ctl(context->epfd, op, poll->fd, &ee); rv = epoll_ctl(context->epfd, op, poll->fd, &ee);
if (rv < 0) { if (rv < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno, ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"epoll_ctl[%d] failed", op); "epoll_ctl[%d] failed", op);
return OGS_ERROR; return OGS_ERROR;
} }
return OGS_OK; return OGS_OK;
@ -172,18 +172,18 @@ static int epoll_remove(ogs_poll_t *poll)
if (map->read || map->write) { if (map->read || map->write) {
op = EPOLL_CTL_MOD; op = EPOLL_CTL_MOD;
ee.data.ptr = map; ee.data.fd = poll->fd;
} else { } else {
op = EPOLL_CTL_DEL; op = EPOLL_CTL_DEL;
ee.data.ptr = NULL; ee.data.fd = INVALID_SOCKET;
ogs_free(map);
ogs_hash_set(context->map_hash, &poll->fd, sizeof(poll->fd), NULL); ogs_hash_set(context->map_hash, &poll->fd, sizeof(poll->fd), NULL);
ogs_free(map);
} }
rv = epoll_ctl(context->epfd, op, poll->fd, &ee); rv = epoll_ctl(context->epfd, op, poll->fd, &ee);
if (rv < 0) { if (rv < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno, ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"epoll_remove[%d] failed", op); "epoll_remove[%d] failed", op);
return OGS_ERROR; return OGS_ERROR;
} }
@ -194,14 +194,14 @@ static int epoll_remove(ogs_poll_t *poll)
static int epoll_process(ogs_pollset_t *pollset, ogs_time_t timeout) static int epoll_process(ogs_pollset_t *pollset, ogs_time_t timeout)
{ {
struct epoll_context_s *context = NULL; struct epoll_context_s *context = NULL;
int num_of_poll; int num_of_poll;
int i; int i;
ogs_assert(pollset); ogs_assert(pollset);
context = pollset->context; context = pollset->context;
ogs_assert(context); ogs_assert(context);
num_of_poll = epoll_wait(context->epfd, context->event_list, num_of_poll = epoll_wait(context->epfd, context->event_list,
pollset->capacity, pollset->capacity,
timeout == OGS_INFINITE_TIME ? OGS_INFINITE_TIME : timeout == OGS_INFINITE_TIME ? OGS_INFINITE_TIME :
ogs_time_to_msec(timeout)); ogs_time_to_msec(timeout));
@ -212,36 +212,52 @@ static int epoll_process(ogs_pollset_t *pollset, ogs_time_t timeout)
return OGS_TIMEUP; return OGS_TIMEUP;
} }
for (i = 0; i < num_of_poll; i++) { for (i = 0; i < num_of_poll; i++) {
struct epoll_map_s *map = NULL; struct epoll_map_s *map = NULL;
uint32_t received; uint32_t received;
short when = 0; short when = 0;
ogs_socket_t fd;
received = context->event_list[i].events; received = context->event_list[i].events;
if (received & (EPOLLERR|EPOLLHUP)) { if (received & EPOLLERR) {
when = OGS_POLLIN|OGS_POLLOUT; when = OGS_POLLIN|OGS_POLLOUT;
} else { } else if ((received & EPOLLHUP) && !(received & EPOLLRDHUP)) {
if (received & (EPOLLIN|EPOLLRDHUP)) { when = OGS_POLLIN|OGS_POLLOUT;
} else {
if (received & EPOLLIN) {
when |= OGS_POLLIN; when |= OGS_POLLIN;
} }
if (received & EPOLLOUT) { if (received & EPOLLOUT) {
when |= OGS_POLLOUT; when |= OGS_POLLOUT;
} }
if (received & EPOLLRDHUP) {
when |= OGS_POLLIN;
}
} }
if (!when) if (!when)
continue; continue;
map = context->event_list[i].data.ptr; fd = context->event_list[i].data.fd;
ogs_assert(fd != INVALID_SOCKET);
map = ogs_hash_get(context->map_hash, &fd, sizeof(fd));
ogs_assert(map); ogs_assert(map);
if (map->read && map->write && map->read == map->write) { if (map->read && map->write && map->read == map->write) {
map->read->handler(when, map->read->fd, map->read->data); map->read->handler(when, map->read->fd, map->read->data);
} else { } else {
if (map->read && (when & OGS_POLLIN)) if ((when & OGS_POLLIN) && map->read)
map->read->handler(when, map->read->fd, map->read->data); map->read->handler(when, map->read->fd, map->read->data);
if (map->write && (when & OGS_POLLOUT))
map->write->handler(when, map->write->fd, map->write->data); /*
* map->read->handler() can call ogs_remove_epoll()
* So, we need to check map instance
*/
map = ogs_hash_get(context->map_hash, &fd, sizeof(fd));
if (map) {
if ((when & OGS_POLLOUT) && map->write)
map->write->handler(when, map->write->fd, map->write->data);
}
} }
} }

11
lib/core/ogs-hash.c
View File

@ -61,7 +61,9 @@ struct ogs_hash_t {
static ogs_hash_entry_t **alloc_array(ogs_hash_t *ht, unsigned int max) static ogs_hash_entry_t **alloc_array(ogs_hash_t *ht, unsigned int max)
{ {
return ogs_calloc_or_assert(1, sizeof(*ht->array) * (max + 1)); ogs_hash_entry_t **ptr = ogs_calloc(1, sizeof(*ht->array) * (max + 1));
ogs_assert(ptr);
return ptr;
} }
ogs_hash_t *ogs_hash_make() ogs_hash_t *ogs_hash_make()
@ -285,13 +287,8 @@ static ogs_hash_entry_t **find_entry(ogs_hash_t *ht,
if ((he = ht->free) != NULL) if ((he = ht->free) != NULL)
ht->free = he->next; ht->free = he->next;
else { else {
#if OGS_USE_TALLOC he = ogs_malloc(sizeof(*he));
he = ogs_talloc_size(__ogs_talloc_core,
sizeof(*he), file_line);
ogs_assert(he); ogs_assert(he);
#else
he = ogs_malloc_debug(sizeof(*he), file_line, true);
#endif
} }
he->next = NULL; he->next = NULL;
he->hash = hash; he->hash = hash;

55
lib/core/ogs-memory.c
View File

@ -26,7 +26,6 @@
* Memory Pool - Use talloc library * Memory Pool - Use talloc library
*****************************************/ *****************************************/
void *__ogs_talloc_asn1c;
void *__ogs_talloc_core; void *__ogs_talloc_core;
static ogs_thread_mutex_t mutex; static ogs_thread_mutex_t mutex;
@ -35,24 +34,27 @@ void ogs_mem_init(void)
{ {
ogs_thread_mutex_init(&mutex); ogs_thread_mutex_init(&mutex);
talloc_enable_null_tracking();
#define TALLOC_MEMSIZE 1 #define TALLOC_MEMSIZE 1
__ogs_talloc_core = talloc_named_const(NULL, TALLOC_MEMSIZE, "core"); __ogs_talloc_core = talloc_named_const(NULL, TALLOC_MEMSIZE, "core");
__ogs_talloc_asn1c = talloc_named_const(NULL, TALLOC_MEMSIZE, "asn1c");
} }
void ogs_mem_final(void) void ogs_mem_final(void)
{ {
if (talloc_total_size(__ogs_talloc_asn1c) != TALLOC_MEMSIZE)
talloc_report_full(__ogs_talloc_asn1c, stderr);
if (talloc_total_size(__ogs_talloc_core) != TALLOC_MEMSIZE) if (talloc_total_size(__ogs_talloc_core) != TALLOC_MEMSIZE)
talloc_report_full(__ogs_talloc_core, stderr); talloc_report_full(__ogs_talloc_core, stderr);
talloc_free(__ogs_talloc_asn1c);
talloc_free(__ogs_talloc_core); talloc_free(__ogs_talloc_core);
ogs_thread_mutex_destroy(&mutex); ogs_thread_mutex_destroy(&mutex);
} }
void *ogs_mem_get_mutex(void)
{
return &mutex;
}
void *ogs_talloc_size(const void *ctx, size_t size, const char *name) void *ogs_talloc_size(const void *ctx, size_t size, const char *name)
{ {
void *ptr = NULL; void *ptr = NULL;
@ -109,7 +111,11 @@ int ogs_talloc_free(void *ptr, const char *location)
return ret; return ret;
} }
void *ogs_malloc_debug(size_t size, const char *file_line, bool abort) /*****************************************
* Memory Pool - Use pkbuf library
*****************************************/
void *ogs_malloc_debug(size_t size, const char *file_line)
{ {
size_t headroom = 0; size_t headroom = 0;
ogs_pkbuf_t *pkbuf = NULL; ogs_pkbuf_t *pkbuf = NULL;
@ -118,11 +124,7 @@ void *ogs_malloc_debug(size_t size, const char *file_line, bool abort)
headroom = sizeof(ogs_pkbuf_t *); headroom = sizeof(ogs_pkbuf_t *);
pkbuf = ogs_pkbuf_alloc_debug(NULL, headroom + size, file_line); pkbuf = ogs_pkbuf_alloc_debug(NULL, headroom + size, file_line);
ogs_expect_or_return_val(pkbuf, NULL);
if (abort == true)
ogs_assert(pkbuf);
else
ogs_expect_or_return_val(pkbuf, NULL);
ogs_pkbuf_reserve(pkbuf, headroom); ogs_pkbuf_reserve(pkbuf, headroom);
memcpy(pkbuf->head, &pkbuf, headroom); memcpy(pkbuf->head, &pkbuf, headroom);
@ -148,23 +150,18 @@ int ogs_free_debug(void *ptr)
return OGS_OK; return OGS_OK;
} }
void *ogs_calloc_debug( void *ogs_calloc_debug(size_t nmemb, size_t size, const char *file_line)
size_t nmemb, size_t size, const char *file_line, bool abort)
{ {
void *ptr = NULL; void *ptr = NULL;
ptr = ogs_malloc_debug(nmemb * size, file_line, abort); ptr = ogs_malloc_debug(nmemb * size, file_line);
if (abort == true) ogs_expect_or_return_val(ptr, NULL);
ogs_assert(ptr);
else
ogs_expect_or_return_val(ptr, NULL);
memset(ptr, 0, nmemb * size); memset(ptr, 0, nmemb * size);
return ptr; return ptr;
} }
void *ogs_realloc_debug( void *ogs_realloc_debug(void *ptr, size_t size, const char *file_line)
void *ptr, size_t size, const char *file_line, bool abort)
{ {
size_t headroom = 0; size_t headroom = 0;
ogs_pkbuf_t *pkbuf = NULL; ogs_pkbuf_t *pkbuf = NULL;
@ -177,16 +174,10 @@ void *ogs_realloc_debug(
memcpy(&pkbuf, (unsigned char*)ptr - headroom, headroom); memcpy(&pkbuf, (unsigned char*)ptr - headroom, headroom);
if (abort == true) ogs_expect_or_return_val(pkbuf, NULL);
ogs_assert(pkbuf);
else
ogs_expect_or_return_val(pkbuf, NULL);
cluster = pkbuf->cluster; cluster = pkbuf->cluster;
if (abort == true) ogs_expect_or_return_val(cluster, NULL);
ogs_assert(cluster);
else
ogs_expect_or_return_val(cluster, NULL);
if (!size) { if (!size) {
ogs_pkbuf_free(pkbuf); ogs_pkbuf_free(pkbuf);
@ -196,12 +187,8 @@ void *ogs_realloc_debug(
if (size > (cluster->size - headroom)) { if (size > (cluster->size - headroom)) {
void *new = NULL; void *new = NULL;
new = ogs_malloc_debug(size, file_line, abort); new = ogs_malloc_debug(size, file_line);
ogs_expect_or_return_val(new, NULL);
if (abort == true)
ogs_assert(new);
else
ogs_expect_or_return_val(new, NULL);
memcpy(new, ptr, pkbuf->len); memcpy(new, ptr, pkbuf->len);

28
lib/core/ogs-memory.h
View File

@ -28,11 +28,11 @@
extern "C" { extern "C" {
#endif #endif
#define OGS_USE_TALLOC 0
void ogs_mem_init(void); void ogs_mem_init(void);
void ogs_mem_final(void); void ogs_mem_final(void);
void *ogs_mem_get_mutex(void);
#define OGS_MEM_CLEAR(__dATA) \ #define OGS_MEM_CLEAR(__dATA) \
do { \ do { \
if ((__dATA)) { \ if ((__dATA)) { \
@ -43,7 +43,6 @@ void ogs_mem_final(void);
#include <talloc.h> #include <talloc.h>
extern void *__ogs_talloc_asn1c;
extern void *__ogs_talloc_core; extern void *__ogs_talloc_core;
void *ogs_talloc_size(const void *ctx, size_t size, const char *name); void *ogs_talloc_size(const void *ctx, size_t size, const char *name);
@ -52,11 +51,11 @@ void *ogs_talloc_realloc_size(
const void *context, void *oldptr, size_t size, const char *name); const void *context, void *oldptr, size_t size, const char *name);
int ogs_talloc_free(void *ptr, const char *location); int ogs_talloc_free(void *ptr, const char *location);
void *ogs_malloc_debug(size_t size, const char *file_line, bool abort); void *ogs_malloc_debug(size_t size, const char *file_line);
void *ogs_calloc_debug( void *ogs_calloc_debug(
size_t nmemb, size_t size, const char *file_line, bool abort); size_t nmemb, size_t size, const char *file_line);
void *ogs_realloc_debug( void *ogs_realloc_debug(
void *ptr, size_t size, const char *file_line, bool abort); void *ptr, size_t size, const char *file_line);
int ogs_free_debug(void *ptr); int ogs_free_debug(void *ptr);
#if OGS_USE_TALLOC #if OGS_USE_TALLOC
@ -71,9 +70,6 @@ int ogs_free_debug(void *ptr);
ogs_talloc_zero_size(__ogs_talloc_core, (nmemb) * (size), __location__) ogs_talloc_zero_size(__ogs_talloc_core, (nmemb) * (size), __location__)
#define ogs_realloc(oldptr, size) \ #define ogs_realloc(oldptr, size) \
ogs_talloc_realloc_size(__ogs_talloc_core, oldptr, size, __location__) ogs_talloc_realloc_size(__ogs_talloc_core, oldptr, size, __location__)
#define ogs_malloc_or_assert(size) ogs_malloc(size)
#define ogs_calloc_or_assert(nmemb, size) ogs_calloc(nmemb, size)
#define ogs_realloc_or_assert(ptr, size) ogs_realloc(ptr, size)
#define ogs_free(ptr) ogs_talloc_free(ptr, __location__) #define ogs_free(ptr) ogs_talloc_free(ptr, __location__)
#else #else
@ -82,17 +78,9 @@ int ogs_free_debug(void *ptr);
* Memory Pool - Use pkbuf library * Memory Pool - Use pkbuf library
*****************************************/ *****************************************/
#define ogs_malloc(size) ogs_malloc_debug(size, OGS_FILE_LINE, false) #define ogs_malloc(size) ogs_malloc_debug(size, OGS_FILE_LINE)
#define ogs_malloc_or_assert(size) \ #define ogs_calloc(nmemb, size) ogs_calloc_debug(nmemb, size, OGS_FILE_LINE)
ogs_malloc_debug(size, OGS_FILE_LINE, true) #define ogs_realloc(ptr, size) ogs_realloc_debug(ptr, size, OGS_FILE_LINE)
#define ogs_calloc(nmemb, size) \
ogs_calloc_debug(nmemb, size, OGS_FILE_LINE, false)
#define ogs_calloc_or_assert(nmemb, size) \
ogs_calloc_debug(nmemb, size, OGS_FILE_LINE, true)
#define ogs_realloc(ptr, size) \
ogs_realloc_debug(ptr, size, OGS_FILE_LINE, false)
#define ogs_realloc_or_assert(ptr, size) \
ogs_realloc_debug(ptr, size, OGS_FILE_LINE, true)
#define ogs_free(ptr) ogs_free_debug(ptr) #define ogs_free(ptr) ogs_free_debug(ptr)
#endif #endif

210
lib/core/ogs-strings.c
View File

@ -120,62 +120,6 @@ char *ogs_slprintf(char *str, char *last, const char *format, ...)
return r; return r;
} }
char *ogs_strdup_debug(const char *s, const char *file_line, bool abort)
{
char *res;
size_t len;
if (s == NULL)
return NULL;
len = strlen(s) + 1;
res = ogs_memdup_debug(s, len, file_line, abort);
if (abort == true) ogs_assert(res);
ogs_expect_or_return_val(res, res);
return res;
}
char *ogs_strndup_debug(
const char *s, size_t n, const char *file_line, bool abort)
{
char *res;
const char *end;
if (s == NULL)
return NULL;
end = memchr(s, '\0', n);
if (end != NULL)
n = end - s;
#if OGS_USE_TALLOC
res = ogs_talloc_size(__ogs_talloc_core, n + 1, file_line);
#else
res = ogs_malloc_debug(n + 1, file_line, abort);
#endif
ogs_expect_or_return_val(res, res);
memcpy(res, s, n);
res[n] = '\0';
return res;
}
void *ogs_memdup_debug(
const void *m, size_t n, const char *file_line, bool abort)
{
void *res;
if (m == NULL)
return NULL;
#if OGS_USE_TALLOC
res = ogs_talloc_size(__ogs_talloc_core, n, file_line);
#else
res = ogs_malloc_debug(n, file_line, abort);
#endif
ogs_expect_or_return_val(res, res);
memcpy(res, m, n);
return res;
}
char *ogs_cpystrn(char *dst, const char *src, size_t dst_size) char *ogs_cpystrn(char *dst, const char *src, size_t dst_size)
{ {
char *d = dst, *end; char *d = dst, *end;
@ -194,11 +138,142 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size)
} }
} }
*d = '\0'; /* always null terminate */ *d = '\0'; /* always null terminate */
return (d); return (d);
} }
/*****************************************
* Memory Pool - Use talloc library
*****************************************/
char *ogs_talloc_strdup(const void *t, const char *p)
{
char *ptr = NULL;
ogs_thread_mutex_lock(ogs_mem_get_mutex());
ptr = talloc_strdup(t, p);
ogs_expect(ptr);
ogs_thread_mutex_unlock(ogs_mem_get_mutex());
return ptr;
}
char *ogs_talloc_strndup(const void *t, const char *p, size_t n)
{
char *ptr = NULL;
ogs_thread_mutex_lock(ogs_mem_get_mutex());
ptr = talloc_strndup(t, p, n);
ogs_expect(ptr);
ogs_thread_mutex_unlock(ogs_mem_get_mutex());
return ptr;
}
void *ogs_talloc_memdup(const void *t, const void *p, size_t size)
{
void *ptr = NULL;
ogs_thread_mutex_lock(ogs_mem_get_mutex());
ptr = talloc_memdup(t, p, size);
ogs_expect(ptr);
ogs_thread_mutex_unlock(ogs_mem_get_mutex());
return ptr;
}
char *ogs_talloc_asprintf(const void *t, const char *fmt, ...)
{
va_list ap;
char *ret;
ogs_thread_mutex_lock(ogs_mem_get_mutex());
va_start(ap, fmt);
ret = talloc_vasprintf(t, fmt, ap);
ogs_expect(ret);
va_end(ap);
ogs_thread_mutex_unlock(ogs_mem_get_mutex());
return ret;
}
char *ogs_talloc_asprintf_append(char *s, const char *fmt, ...)
{
va_list ap;
ogs_thread_mutex_lock(ogs_mem_get_mutex());
va_start(ap, fmt);
s = talloc_vasprintf_append(s, fmt, ap);
ogs_expect(s);
va_end(ap);
ogs_thread_mutex_unlock(ogs_mem_get_mutex());
return s;
}
/*****************************************
* Memory Pool - Use pkbuf library
*****************************************/
char *ogs_strdup_debug(const char *s, const char *file_line)
{
char *res;
size_t len;
if (s == NULL)
return NULL;
len = strlen(s) + 1;
res = ogs_memdup_debug(s, len, file_line);
ogs_expect_or_return_val(res, res);
return res;
}
char *ogs_strndup_debug(
const char *s, size_t n, const char *file_line)
{
char *res;
const char *end;
if (s == NULL)
return NULL;
end = memchr(s, '\0', n);
if (end != NULL)
n = end - s;
res = ogs_malloc_debug(n + 1, file_line);
ogs_expect_or_return_val(res, res);
memcpy(res, s, n);
res[n] = '\0';
return res;
}
void *ogs_memdup_debug(
const void *m, size_t n, const char *file_line)
{
void *res;
if (m == NULL)
return NULL;
res = ogs_malloc_debug(n, file_line);
ogs_expect_or_return_val(res, res);
memcpy(res, m, n);
return res;
}
/* /*
* char *ogs_msprintf(const char *message, ...) * char *ogs_msprintf(const char *message, ...)
* char *mstrcatf(char *source, const char *message, ...) * char *mstrcatf(char *source, const char *message, ...)
@ -210,7 +285,7 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size)
* https://github.com/babelouest/orcania.git * https://github.com/babelouest/orcania.git
*/ */
char *ogs_msprintf_debug( char *ogs_msprintf_debug(
const char *file_line, bool abort, const char *message, ...) const char *file_line, const char *message, ...)
{ {
va_list argp, argp_cpy; va_list argp, argp_cpy;
size_t out_len = 0; size_t out_len = 0;
@ -221,12 +296,7 @@ char *ogs_msprintf_debug(
in some architectures, in some architectures,
vsnprintf can modify argp */ vsnprintf can modify argp */
out_len = vsnprintf(NULL, 0, message, argp); out_len = vsnprintf(NULL, 0, message, argp);
#if OGS_USE_TALLOC out = ogs_malloc_debug(out_len + sizeof(char), file_line);
out = ogs_talloc_size(__ogs_talloc_core,
out_len + sizeof(char), file_line);
#else
out = ogs_malloc_debug(out_len + sizeof(char), file_line, abort);
#endif
if (out == NULL) { if (out == NULL) {
va_end(argp); va_end(argp);
va_end(argp_cpy); va_end(argp_cpy);
@ -240,8 +310,7 @@ char *ogs_msprintf_debug(
} }
char *ogs_mstrcatf_debug( char *ogs_mstrcatf_debug(
char *source, const char *file_line, bool abort, char *source, const char *file_line, const char *message, ...)
const char *message, ...)
{ {
va_list argp, argp_cpy; va_list argp, argp_cpy;
char *out = NULL, *message_formatted = NULL; char *out = NULL, *message_formatted = NULL;
@ -259,7 +328,7 @@ char *ogs_mstrcatf_debug(
vsnprintf(message_formatted, vsnprintf(message_formatted,
(message_formatted_len+sizeof(char)), message, argp_cpy); (message_formatted_len+sizeof(char)), message, argp_cpy);
out = ogs_msprintf_debug( out = ogs_msprintf_debug(
file_line, abort, "%s%s", source, message_formatted); file_line, "%s%s", source, message_formatted);
ogs_free(message_formatted); ogs_free(message_formatted);
ogs_free(source); ogs_free(source);
} }
@ -271,12 +340,7 @@ char *ogs_mstrcatf_debug(
in some architectures, in some architectures,
vsnprintf can modify argp */ vsnprintf can modify argp */
out_len = vsnprintf(NULL, 0, message, argp); out_len = vsnprintf(NULL, 0, message, argp);
#if OGS_USE_TALLOC out = ogs_malloc_debug(out_len+sizeof(char), file_line);
out = ogs_talloc_size(__ogs_talloc_core,
out_len + sizeof(char), file_line);
#else
out = ogs_malloc_debug(out_len+sizeof(char), file_line, abort);
#endif
if (out != NULL) { if (out != NULL) {
vsnprintf(out, (out_len+sizeof(char)), message, argp_cpy); vsnprintf(out, (out_len+sizeof(char)), message, argp_cpy);
} }

74
lib/core/ogs-strings.h
View File

@ -82,20 +82,20 @@ char *ogs_slprintf(char *str, char *last, const char *format, ...)
ogs_assert(__dST); \ ogs_assert(__dST); \
} while(0) } while(0)
#define ogs_strdup(s) ogs_strdup_debug(s, OGS_FILE_LINE, false)
#define ogs_strdup_or_assert(s) ogs_strdup_debug(s, OGS_FILE_LINE, true)
char *ogs_strdup_debug(const char *s, const char *file_line, bool abort);
#define ogs_strndup(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE, false)
#define ogs_strndup_or_assert(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE, true)
char *ogs_strndup_debug
(const char *s, size_t n, const char *file_line, bool abort);
#define ogs_memdup(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE, false)
#define ogs_memdup_or_assert(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE, true)
void *ogs_memdup_debug
(const void *m, size_t n, const char *file_line, bool abort);
char *ogs_cpystrn(char *dst, const char *src, size_t dst_size); char *ogs_cpystrn(char *dst, const char *src, size_t dst_size);
char *ogs_talloc_strdup(const void *t, const char *p);
char *ogs_talloc_strndup(const void *t, const char *p, size_t n);
void *ogs_talloc_memdup(const void *t, const void *p, size_t size);
char *ogs_talloc_asprintf(const void *t, const char *fmt, ...)
OGS_GNUC_PRINTF(2, 3);
char *ogs_talloc_asprintf_append(char *s, const char *fmt, ...)
OGS_GNUC_PRINTF(2, 3);
char *ogs_strdup_debug(const char *s, const char *file_line);
char *ogs_strndup_debug(const char *s, size_t n, const char *file_line);
void *ogs_memdup_debug(const void *m, size_t n, const char *file_line);
/* /*
* char *ogs_msprintf(const char *message, ...) * char *ogs_msprintf(const char *message, ...)
* char *mstrcatf(char *source, const char *message, ...) * char *mstrcatf(char *source, const char *message, ...)
@ -106,20 +106,44 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size);
* *
* https://github.com/babelouest/orcania.git * https://github.com/babelouest/orcania.git
*/ */
#define ogs_msprintf(...) ogs_msprintf_debug(OGS_FILE_LINE, false, __VA_ARGS__) char *ogs_msprintf_debug(const char *file_line, const char *message, ...)
#define ogs_msprintf_or_assert(...) \ OGS_GNUC_PRINTF(2, 3);
ogs_msprintf_debug(OGS_FILE_LINE, true, __VA_ARGS__)
char *ogs_msprintf_debug
(const char *file_line, bool abort, const char *message, ...)
OGS_GNUC_PRINTF(3, 4);
#define ogs_mstrcatf(source, ...) \
ogs_mstrcatf_debug(source, OGS_FILE_LINE, false, __VA_ARGS__)
#define ogs_mstrcatf_or_assert(source, ...) \
ogs_mstrcatf_debug(source, OGS_FILE_LINE, true, __VA_ARGS__)
char *ogs_mstrcatf_debug( char *ogs_mstrcatf_debug(
char *source, const char *file_line, bool abort, char *source, const char *file_line, const char *message, ...)
const char *message, ...) OGS_GNUC_PRINTF(3, 4);
OGS_GNUC_PRINTF(4, 5);
#if OGS_USE_TALLOC
/*****************************************
* Memory Pool - Use talloc library
*****************************************/
#define ogs_strdup(p) \
ogs_talloc_strdup(__ogs_talloc_core, p)
#define ogs_strndup(p, n) \
ogs_talloc_strndup(__ogs_talloc_core, p, n)
#define ogs_memdup(p, size) \
ogs_talloc_memdup(__ogs_talloc_core, p, size)
#define ogs_msprintf(...) \
ogs_talloc_asprintf(__ogs_talloc_core, __VA_ARGS__)
#define ogs_mstrcatf(s, ...) \
ogs_talloc_asprintf_append(s, __VA_ARGS__)
#else
/*****************************************
* Memory Pool - Use pkbuf library
*****************************************/
#define ogs_strdup(s) ogs_strdup_debug(s, OGS_FILE_LINE)
#define ogs_strndup(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE)
#define ogs_memdup(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE)
#define ogs_msprintf(...) ogs_msprintf_debug(OGS_FILE_LINE, __VA_ARGS__)
#define ogs_mstrcatf(source, ...) \
ogs_mstrcatf_debug(source, OGS_FILE_LINE, __VA_ARGS__)
#endif
char *ogs_trimwhitespace(char *str); char *ogs_trimwhitespace(char *str);

3
lib/crypt/snow-3g.c
View File

@ -413,7 +413,8 @@ void snow_3g_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, u32 length)
/* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/
snow_3g_initialize(K,IV); snow_3g_initialize(K,IV);
KS = (u32 *)ogs_malloc_or_assert(4*n); KS = (u32 *)ogs_malloc(4*n);
ogs_assert(KS);
snow_3g_generate_key_stream(n,(u32*)KS); snow_3g_generate_key_stream(n,(u32*)KS);
/* Exclusive-OR the input data with keystream to generate the output bit /* Exclusive-OR the input data with keystream to generate the output bit

6
lib/crypt/zuc.c
View File

@ -296,7 +296,8 @@ void zuc_eea3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION,
u32 lastbits = (8-(LENGTH%8))%8; u32 lastbits = (8-(LENGTH%8))%8;
L = (LENGTH+31)/32; L = (LENGTH+31)/32;
z = (u32 *) ogs_malloc_or_assert(L*sizeof(u32)); z = (u32 *) ogs_malloc(L*sizeof(u32));
ogs_assert(z);
L8 = (LENGTH+7)/8; L8 = (LENGTH+7)/8;
@ -387,7 +388,8 @@ void zuc_eia3(u8* IK, u32 COUNT, u32 BEARER, u32 DIRECTION,
N = LENGTH + 64; N = LENGTH + 64;
L = (N + 31) / 32; L = (N + 31) / 32;
z = (u32 *) ogs_malloc_or_assert(L*sizeof(u32)); z = (u32 *) ogs_malloc(L*sizeof(u32));
ogs_assert(z);
ZUC(IK, IV, z, L); ZUC(IK, IV, z, L);
T = 0; T = 0;

3
lib/gtp/context.c
View File

@ -517,9 +517,6 @@ void ogs_gtp_node_free(ogs_gtp_node_t *node)
{ {
ogs_assert(node); ogs_assert(node);
if (node->sock)
ogs_sock_destroy(node->sock);
ogs_gtp_xact_delete_all(node); ogs_gtp_xact_delete_all(node);
ogs_freeaddrinfo(node->sa_list); ogs_freeaddrinfo(node->sa_list);

3
lib/pfcp/context.c
View File

@ -662,9 +662,6 @@ void ogs_pfcp_node_free(ogs_pfcp_node_t *node)
ogs_gtpu_resource_remove_all(&node->gtpu_resource_list); ogs_gtpu_resource_remove_all(&node->gtpu_resource_list);
if (node->sock)
ogs_sock_destroy(node->sock);
ogs_pfcp_xact_delete_all(node); ogs_pfcp_xact_delete_all(node);
ogs_freeaddrinfo(node->sa_list); ogs_freeaddrinfo(node->sa_list);

13
lib/sbi/client.c
View File

@ -41,6 +41,8 @@ typedef struct connection_s {
char **headers; char **headers;
struct curl_slist *header_list; struct curl_slist *header_list;
char *content;
char *memory; char *memory;
size_t size; size_t size;
@ -298,8 +300,11 @@ static connection_t *connection_add(
curl_easy_setopt(conn->easy, curl_easy_setopt(conn->easy,
CURLOPT_CUSTOMREQUEST, request->h.method); CURLOPT_CUSTOMREQUEST, request->h.method);
if (request->http.content) { if (request->http.content) {
conn->content = ogs_memdup(
request->http.content, request->http.content_length);
ogs_assert(conn->content);
curl_easy_setopt(conn->easy, curl_easy_setopt(conn->easy,
CURLOPT_POSTFIELDS, request->http.content); CURLOPT_POSTFIELDS, conn->content);
curl_easy_setopt(conn->easy, curl_easy_setopt(conn->easy,
CURLOPT_POSTFIELDSIZE, request->http.content_length); CURLOPT_POSTFIELDSIZE, request->http.content_length);
#if 1 /* Disable HTTP/1.1 100 Continue : Use "Expect:" in libcurl */ #if 1 /* Disable HTTP/1.1 100 Continue : Use "Expect:" in libcurl */
@ -365,6 +370,9 @@ static void connection_remove(connection_t *conn)
ogs_assert(conn->method); ogs_assert(conn->method);
ogs_free(conn->method); ogs_free(conn->method);
if (conn->content)
ogs_free(conn->content);
if (conn->location) if (conn->location)
ogs_free(conn->location); ogs_free(conn->location);
@ -516,9 +524,10 @@ static size_t write_cb(void *contents, size_t size, size_t nmemb, void *data)
ogs_assert(conn); ogs_assert(conn);
realsize = size * nmemb; realsize = size * nmemb;
ptr = ogs_realloc_or_assert(conn->memory, conn->size + realsize + 1); ptr = ogs_realloc(conn->memory, conn->size + realsize + 1);
if(!ptr) { if(!ptr) {
ogs_fatal("not enough memory (realloc returned NULL)"); ogs_fatal("not enough memory (realloc returned NULL)");
ogs_assert_if_reached();
return 0; return 0;
} }

3
lib/sbi/conv.c
View File

@ -118,8 +118,9 @@ static char *url_decode(const char *str)
{ {
if (str != NULL) { if (str != NULL) {
char *pstr = (char*)str; char *pstr = (char*)str;
char *buf = ogs_malloc_or_assert(strlen(str) + 1); char *buf = ogs_malloc(strlen(str) + 1);
char *pbuf = buf; char *pbuf = buf;
ogs_assert(buf);
while (*pstr) { while (*pstr) {
if (*pstr == '%') { if (*pstr == '%') {
if (pstr[1] && pstr[2]) { if (pstr[1] && pstr[2]) {

11
lib/sbi/custom/patch_item.c
View File

@ -11,10 +11,9 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_create(
OpenAPI_any_type_t *value OpenAPI_any_type_t *value
) )
{ {
OpenAPI_patch_item_t *patch_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_patch_item_t)); OpenAPI_patch_item_t *patch_item_local_var = ogs_malloc(sizeof(OpenAPI_patch_item_t));
if (!patch_item_local_var) { ogs_assert(patch_item_local_var);
return NULL;
}
patch_item_local_var->op = op; patch_item_local_var->op = op;
patch_item_local_var->path = path; patch_item_local_var->path = path;
patch_item_local_var->from = from; patch_item_local_var->from = from;
@ -142,8 +141,8 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON)
patch_item_local_var = OpenAPI_patch_item_create ( patch_item_local_var = OpenAPI_patch_item_create (
opVariable, opVariable,
ogs_strdup_or_assert(path->valuestring), ogs_strdup(path->valuestring),
from ? ogs_strdup_or_assert(from->valuestring) : NULL, from ? ogs_strdup(from->valuestring) : NULL,
any_type_value any_type_value
); );

14
lib/sbi/custom/ue_authentication_ctx.c
View File

@ -12,10 +12,9 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_create(
char *serving_network_name char *serving_network_name
) )
{ {
OpenAPI_ue_authentication_ctx_t *ue_authentication_ctx_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_authentication_ctx_t)); OpenAPI_ue_authentication_ctx_t *ue_authentication_ctx_local_var = ogs_malloc(sizeof(OpenAPI_ue_authentication_ctx_t));
if (!ue_authentication_ctx_local_var) { ogs_assert(ue_authentication_ctx_local_var);
return NULL;
}
ue_authentication_ctx_local_var->auth_type = auth_type; ue_authentication_ctx_local_var->auth_type = auth_type;
ue_authentication_ctx_local_var->_5g_auth_data = _5g_auth_data; ue_authentication_ctx_local_var->_5g_auth_data = _5g_auth_data;
ue_authentication_ctx_local_var->eap_payload = eap_payload; ue_authentication_ctx_local_var->eap_payload = eap_payload;
@ -42,6 +41,7 @@ void OpenAPI_ue_authentication_ctx_free(OpenAPI_ue_authentication_ctx_t *ue_auth
if (ue_authentication_ctx->_links) { if (ue_authentication_ctx->_links) {
OpenAPI_list_for_each(ue_authentication_ctx->_links, node) { OpenAPI_list_for_each(ue_authentication_ctx->_links, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_links_value_schema_free(localKeyValue->value); OpenAPI_links_value_schema_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -174,7 +174,7 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_parseFromJSON(cJS
goto end; goto end;
} }
localMapKeyPair = OpenAPI_map_create( localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_links_value_schema_parseFromJSON(localMapObject)); ogs_strdup(localMapObject->string), OpenAPI_links_value_schema_parseFromJSON(localMapObject));
OpenAPI_list_add(_linksList , localMapKeyPair); OpenAPI_list_add(_linksList , localMapKeyPair);
} }
@ -190,9 +190,9 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_parseFromJSON(cJS
ue_authentication_ctx_local_var = OpenAPI_ue_authentication_ctx_create ( ue_authentication_ctx_local_var = OpenAPI_ue_authentication_ctx_create (
auth_typeVariable, auth_typeVariable,
_5g_auth_data ? _5g_auth_data_local_nonprim : NULL, _5g_auth_data ? _5g_auth_data_local_nonprim : NULL,
eap_payload ? ogs_strdup_or_assert(eap_payload->valuestring) : NULL, eap_payload ? ogs_strdup(eap_payload->valuestring) : NULL,
_linksList, _linksList,
serving_network_name ? ogs_strdup_or_assert(serving_network_name->valuestring) : NULL serving_network_name ? ogs_strdup(serving_network_name->valuestring) : NULL
); );
return ue_authentication_ctx_local_var; return ue_authentication_ctx_local_var;

2
lib/sbi/message.c
View File

@ -2113,6 +2113,7 @@ static void http_message_free(ogs_sbi_http_message_t *http)
for (hi = ogs_hash_first(http->params); hi; hi = ogs_hash_next(hi)) { for (hi = ogs_hash_first(http->params); hi; hi = ogs_hash_next(hi)) {
char *key = (char *)ogs_hash_this_key(hi); char *key = (char *)ogs_hash_this_key(hi);
char *val = ogs_hash_this_val(hi); char *val = ogs_hash_this_val(hi);
ogs_hash_set(http->params, key, strlen(key), NULL);
ogs_free(key); ogs_free(key);
ogs_free(val); ogs_free(val);
} }
@ -2124,6 +2125,7 @@ static void http_message_free(ogs_sbi_http_message_t *http)
for (hi = ogs_hash_first(http->headers); hi; hi = ogs_hash_next(hi)) { for (hi = ogs_hash_first(http->headers); hi; hi = ogs_hash_next(hi)) {
char *key = (char *)ogs_hash_this_key(hi); char *key = (char *)ogs_hash_this_key(hi);
char *val = ogs_hash_this_val(hi); char *val = ogs_hash_this_val(hi);
ogs_hash_set(http->headers, key, strlen(key), NULL);
ogs_free(key); ogs_free(key);
ogs_free(val); ogs_free(val);
} }

8
lib/sbi/openapi/external/cJSON.c vendored
View File

@ -148,7 +148,9 @@ static void *internal_realloc(void *pointer, size_t size)
#include "ogs-core.h" #include "ogs-core.h"
static void *internal_malloc(size_t size) static void *internal_malloc(size_t size)
{ {
return ogs_malloc_or_assert(size); void *ptr = ogs_malloc(size);
ogs_assert(ptr);
return ptr;
} }
static void internal_free(void *pointer) static void internal_free(void *pointer)
{ {
@ -156,7 +158,9 @@ static void internal_free(void *pointer)
} }
static void *internal_realloc(void *pointer, size_t size) static void *internal_realloc(void *pointer, size_t size)
{ {
return ogs_realloc_or_assert(pointer, size); void *ptr = ogs_realloc(pointer, size);
ogs_assert(ptr);
return ptr;
} }
#endif #endif

2
lib/sbi/openapi/include/list.h
View File

@ -8,8 +8,6 @@
extern "C" { extern "C" {
#endif #endif
#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc_or_assert(__sIZE)
typedef struct OpenAPI_list_s OpenAPI_list_t; typedef struct OpenAPI_list_s OpenAPI_list_t;
typedef struct OpenAPI_lnode_s OpenAPI_lnode_t; typedef struct OpenAPI_lnode_s OpenAPI_lnode_t;

9
lib/sbi/openapi/model/acc_net_ch_id.c
View File

@ -11,10 +11,9 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_create(
int session_ch_scope int session_ch_scope
) )
{ {
OpenAPI_acc_net_ch_id_t *acc_net_ch_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_acc_net_ch_id_t)); OpenAPI_acc_net_ch_id_t *acc_net_ch_id_local_var = ogs_malloc(sizeof(OpenAPI_acc_net_ch_id_t));
if (!acc_net_ch_id_local_var) { ogs_assert(acc_net_ch_id_local_var);
return NULL;
}
acc_net_ch_id_local_var->acc_net_cha_id_value = acc_net_cha_id_value; acc_net_ch_id_local_var->acc_net_cha_id_value = acc_net_cha_id_value;
acc_net_ch_id_local_var->ref_pcc_rule_ids = ref_pcc_rule_ids; acc_net_ch_id_local_var->ref_pcc_rule_ids = ref_pcc_rule_ids;
acc_net_ch_id_local_var->is_session_ch_scope = is_session_ch_scope; acc_net_ch_id_local_var->is_session_ch_scope = is_session_ch_scope;
@ -108,7 +107,7 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_parseFromJSON(cJSON *acc_net_ch_i
ogs_error("OpenAPI_acc_net_ch_id_parseFromJSON() failed [ref_pcc_rule_ids]"); ogs_error("OpenAPI_acc_net_ch_id_parseFromJSON() failed [ref_pcc_rule_ids]");
goto end; goto end;
} }
OpenAPI_list_add(ref_pcc_rule_idsList , ogs_strdup_or_assert(ref_pcc_rule_ids_local->valuestring)); OpenAPI_list_add(ref_pcc_rule_idsList , ogs_strdup(ref_pcc_rule_ids_local->valuestring));
} }
} }

11
lib/sbi/openapi/model/acc_net_charging_address.c
View File

@ -9,10 +9,9 @@ OpenAPI_acc_net_charging_address_t *OpenAPI_acc_net_charging_address_create(
char *an_charg_ipv6_addr char *an_charg_ipv6_addr
) )
{ {
OpenAPI_acc_net_charging_address_t *acc_net_charging_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_acc_net_charging_address_t)); OpenAPI_acc_net_charging_address_t *acc_net_charging_address_local_var = ogs_malloc(sizeof(OpenAPI_acc_net_charging_address_t));
if (!acc_net_charging_address_local_var) { ogs_assert(acc_net_charging_address_local_var);
return NULL;
}
acc_net_charging_address_local_var->an_charg_ipv4_addr = an_charg_ipv4_addr; acc_net_charging_address_local_var->an_charg_ipv4_addr = an_charg_ipv4_addr;
acc_net_charging_address_local_var->an_charg_ipv6_addr = an_charg_ipv6_addr; acc_net_charging_address_local_var->an_charg_ipv6_addr = an_charg_ipv6_addr;
@ -80,8 +79,8 @@ OpenAPI_acc_net_charging_address_t *OpenAPI_acc_net_charging_address_parseFromJS
} }
acc_net_charging_address_local_var = OpenAPI_acc_net_charging_address_create ( acc_net_charging_address_local_var = OpenAPI_acc_net_charging_address_create (
an_charg_ipv4_addr ? ogs_strdup_or_assert(an_charg_ipv4_addr->valuestring) : NULL, an_charg_ipv4_addr ? ogs_strdup(an_charg_ipv4_addr->valuestring) : NULL,
an_charg_ipv6_addr ? ogs_strdup_or_assert(an_charg_ipv6_addr->valuestring) : NULL an_charg_ipv6_addr ? ogs_strdup(an_charg_ipv6_addr->valuestring) : NULL
); );
return acc_net_charging_address_local_var; return acc_net_charging_address_local_var;

16
lib/sbi/openapi/model/acceptable_service_info.c
View File

@ -10,10 +10,9 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_create(
char *mar_bw_dl char *mar_bw_dl
) )
{ {
OpenAPI_acceptable_service_info_t *acceptable_service_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_acceptable_service_info_t)); OpenAPI_acceptable_service_info_t *acceptable_service_info_local_var = ogs_malloc(sizeof(OpenAPI_acceptable_service_info_t));
if (!acceptable_service_info_local_var) { ogs_assert(acceptable_service_info_local_var);
return NULL;
}
acceptable_service_info_local_var->acc_bw_med_comps = acc_bw_med_comps; acceptable_service_info_local_var->acc_bw_med_comps = acc_bw_med_comps;
acceptable_service_info_local_var->mar_bw_ul = mar_bw_ul; acceptable_service_info_local_var->mar_bw_ul = mar_bw_ul;
acceptable_service_info_local_var->mar_bw_dl = mar_bw_dl; acceptable_service_info_local_var->mar_bw_dl = mar_bw_dl;
@ -29,6 +28,7 @@ void OpenAPI_acceptable_service_info_free(OpenAPI_acceptable_service_info_t *acc
OpenAPI_lnode_t *node; OpenAPI_lnode_t *node;
OpenAPI_list_for_each(acceptable_service_info->acc_bw_med_comps, node) { OpenAPI_list_for_each(acceptable_service_info->acc_bw_med_comps, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_media_component_free(localKeyValue->value); OpenAPI_media_component_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -107,9 +107,9 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_parseFromJSON
cJSON *localMapObject = acc_bw_med_comps_local_map; cJSON *localMapObject = acc_bw_med_comps_local_map;
if (cJSON_IsObject(acc_bw_med_comps_local_map)) { if (cJSON_IsObject(acc_bw_med_comps_local_map)) {
localMapKeyPair = OpenAPI_map_create( localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_media_component_parseFromJSON(localMapObject)); ogs_strdup(localMapObject->string), OpenAPI_media_component_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(acc_bw_med_comps_local_map)) { } else if (cJSON_IsNull(acc_bw_med_comps_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else { } else {
ogs_error("OpenAPI_acceptable_service_info_parseFromJSON() failed [acc_bw_med_comps]"); ogs_error("OpenAPI_acceptable_service_info_parseFromJSON() failed [acc_bw_med_comps]");
goto end; goto end;
@ -138,8 +138,8 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_parseFromJSON
acceptable_service_info_local_var = OpenAPI_acceptable_service_info_create ( acceptable_service_info_local_var = OpenAPI_acceptable_service_info_create (
acc_bw_med_comps ? acc_bw_med_compsList : NULL, acc_bw_med_comps ? acc_bw_med_compsList : NULL,
mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL
); );
return acceptable_service_info_local_var; return acceptable_service_info_local_var;

29
lib/sbi/openapi/model/access_and_mobility_data.c
View File

@ -28,10 +28,9 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_create(
char *supp_feat char *supp_feat
) )
{ {
OpenAPI_access_and_mobility_data_t *access_and_mobility_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_and_mobility_data_t)); OpenAPI_access_and_mobility_data_t *access_and_mobility_data_local_var = ogs_malloc(sizeof(OpenAPI_access_and_mobility_data_t));
if (!access_and_mobility_data_local_var) { ogs_assert(access_and_mobility_data_local_var);
return NULL;
}
access_and_mobility_data_local_var->location = location; access_and_mobility_data_local_var->location = location;
access_and_mobility_data_local_var->location_ts = location_ts; access_and_mobility_data_local_var->location_ts = location_ts;
access_and_mobility_data_local_var->time_zone = time_zone; access_and_mobility_data_local_var->time_zone = time_zone;
@ -519,26 +518,26 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_parseFromJS
access_and_mobility_data_local_var = OpenAPI_access_and_mobility_data_create ( access_and_mobility_data_local_var = OpenAPI_access_and_mobility_data_create (
location ? location_local_nonprim : NULL, location ? location_local_nonprim : NULL,
location_ts ? ogs_strdup_or_assert(location_ts->valuestring) : NULL, location_ts ? ogs_strdup(location_ts->valuestring) : NULL,
time_zone ? ogs_strdup_or_assert(time_zone->valuestring) : NULL, time_zone ? ogs_strdup(time_zone->valuestring) : NULL,
time_zone_ts ? ogs_strdup_or_assert(time_zone_ts->valuestring) : NULL, time_zone_ts ? ogs_strdup(time_zone_ts->valuestring) : NULL,
access_type ? access_typeVariable : 0, access_type ? access_typeVariable : 0,
reg_states ? reg_statesList : NULL, reg_states ? reg_statesList : NULL,
reg_states_ts ? ogs_strdup_or_assert(reg_states_ts->valuestring) : NULL, reg_states_ts ? ogs_strdup(reg_states_ts->valuestring) : NULL,
conn_states ? conn_statesList : NULL, conn_states ? conn_statesList : NULL,
conn_states_ts ? ogs_strdup_or_assert(conn_states_ts->valuestring) : NULL, conn_states_ts ? ogs_strdup(conn_states_ts->valuestring) : NULL,
reachability_status ? reachability_status_local_nonprim : NULL, reachability_status ? reachability_status_local_nonprim : NULL,
reachability_status_ts ? ogs_strdup_or_assert(reachability_status_ts->valuestring) : NULL, reachability_status_ts ? ogs_strdup(reachability_status_ts->valuestring) : NULL,
sms_over_nas_status ? sms_over_nas_statusVariable : 0, sms_over_nas_status ? sms_over_nas_statusVariable : 0,
sms_over_nas_status_ts ? ogs_strdup_or_assert(sms_over_nas_status_ts->valuestring) : NULL, sms_over_nas_status_ts ? ogs_strdup(sms_over_nas_status_ts->valuestring) : NULL,
roaming_status ? true : false, roaming_status ? true : false,
roaming_status ? roaming_status->valueint : 0, roaming_status ? roaming_status->valueint : 0,
roaming_status_ts ? ogs_strdup_or_assert(roaming_status_ts->valuestring) : NULL, roaming_status_ts ? ogs_strdup(roaming_status_ts->valuestring) : NULL,
current_plmn ? current_plmn_local_nonprim : NULL, current_plmn ? current_plmn_local_nonprim : NULL,
current_plmn_ts ? ogs_strdup_or_assert(current_plmn_ts->valuestring) : NULL, current_plmn_ts ? ogs_strdup(current_plmn_ts->valuestring) : NULL,
rat_type ? rat_typeList : NULL, rat_type ? rat_typeList : NULL,
rat_types_ts ? ogs_strdup_or_assert(rat_types_ts->valuestring) : NULL, rat_types_ts ? ogs_strdup(rat_types_ts->valuestring) : NULL,
supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL
); );
return access_and_mobility_data_local_var; return access_and_mobility_data_local_var;

24
lib/sbi/openapi/model/access_and_mobility_subscription_data.c
View File

@ -66,10 +66,9 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction
) )
{ {
OpenAPI_access_and_mobility_subscription_data_t *access_and_mobility_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_t)); OpenAPI_access_and_mobility_subscription_data_t *access_and_mobility_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_t));
if (!access_and_mobility_subscription_data_local_var) { ogs_assert(access_and_mobility_subscription_data_local_var);
return NULL;
}
access_and_mobility_subscription_data_local_var->supported_features = supported_features; access_and_mobility_subscription_data_local_var->supported_features = supported_features;
access_and_mobility_subscription_data_local_var->gpsis = gpsis; access_and_mobility_subscription_data_local_var->gpsis = gpsis;
access_and_mobility_subscription_data_local_var->internal_group_ids = internal_group_ids; access_and_mobility_subscription_data_local_var->internal_group_ids = internal_group_ids;
@ -150,6 +149,7 @@ void OpenAPI_access_and_mobility_subscription_data_free(OpenAPI_access_and_mobil
OpenAPI_list_free(access_and_mobility_subscription_data->internal_group_ids); OpenAPI_list_free(access_and_mobility_subscription_data->internal_group_ids);
OpenAPI_list_for_each(access_and_mobility_subscription_data->shared_vn_group_data_ids, node) { OpenAPI_list_for_each(access_and_mobility_subscription_data->shared_vn_group_data_ids, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
ogs_free(localKeyValue->value); ogs_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -759,7 +759,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [gpsis]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [gpsis]");
goto end; goto end;
} }
OpenAPI_list_add(gpsisList , ogs_strdup_or_assert(gpsis_local->valuestring)); OpenAPI_list_add(gpsisList , ogs_strdup(gpsis_local->valuestring));
} }
} }
@ -779,7 +779,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [internal_group_ids]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [internal_group_ids]");
goto end; goto end;
} }
OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring));
} }
} }
@ -1021,7 +1021,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [shared_am_data_ids]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [shared_am_data_ids]");
goto end; goto end;
} }
OpenAPI_list_add(shared_am_data_idsList , ogs_strdup_or_assert(shared_am_data_ids_local->valuestring)); OpenAPI_list_add(shared_am_data_idsList , ogs_strdup(shared_am_data_ids_local->valuestring));
} }
} }
@ -1052,7 +1052,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [subscribed_dnn_list]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [subscribed_dnn_list]");
goto end; goto end;
} }
OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup_or_assert(subscribed_dnn_list_local->valuestring)); OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup(subscribed_dnn_list_local->valuestring));
} }
} }
@ -1295,7 +1295,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
} }
access_and_mobility_subscription_data_local_var = OpenAPI_access_and_mobility_subscription_data_create ( access_and_mobility_subscription_data_local_var = OpenAPI_access_and_mobility_subscription_data_create (
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, supported_features ? ogs_strdup(supported_features->valuestring) : NULL,
gpsis ? gpsisList : NULL, gpsis ? gpsisList : NULL,
internal_group_ids ? internal_group_idsList : NULL, internal_group_ids ? internal_group_idsList : NULL,
shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL,
@ -1335,13 +1335,13 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
mdt_configuration ? mdt_configuration_local_nonprim : NULL, mdt_configuration ? mdt_configuration_local_nonprim : NULL,
trace_data ? trace_data_local_nonprim : NULL, trace_data ? trace_data_local_nonprim : NULL,
cag_data ? cag_data_local_nonprim : NULL, cag_data ? cag_data_local_nonprim : NULL,
stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL,
c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL,
nb_io_tue_priority ? true : false, nb_io_tue_priority ? true : false,
nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0, nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0,
nssai_inclusion_allowed ? true : false, nssai_inclusion_allowed ? true : false,
nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0, nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0,
rg_wireline_characteristics ? ogs_strdup_or_assert(rg_wireline_characteristics->valuestring) : NULL, rg_wireline_characteristics ? ogs_strdup(rg_wireline_characteristics->valuestring) : NULL,
ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL, ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL,
ec_restriction_data_nb ? true : false, ec_restriction_data_nb ? true : false,
ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0, ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0,

24
lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c
View File

@ -66,10 +66,9 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction
) )
{ {
OpenAPI_access_and_mobility_subscription_data_1_t *access_and_mobility_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_1_t)); OpenAPI_access_and_mobility_subscription_data_1_t *access_and_mobility_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_1_t));
if (!access_and_mobility_subscription_data_1_local_var) { ogs_assert(access_and_mobility_subscription_data_1_local_var);
return NULL;
}
access_and_mobility_subscription_data_1_local_var->supported_features = supported_features; access_and_mobility_subscription_data_1_local_var->supported_features = supported_features;
access_and_mobility_subscription_data_1_local_var->gpsis = gpsis; access_and_mobility_subscription_data_1_local_var->gpsis = gpsis;
access_and_mobility_subscription_data_1_local_var->internal_group_ids = internal_group_ids; access_and_mobility_subscription_data_1_local_var->internal_group_ids = internal_group_ids;
@ -150,6 +149,7 @@ void OpenAPI_access_and_mobility_subscription_data_1_free(OpenAPI_access_and_mob
OpenAPI_list_free(access_and_mobility_subscription_data_1->internal_group_ids); OpenAPI_list_free(access_and_mobility_subscription_data_1->internal_group_ids);
OpenAPI_list_for_each(access_and_mobility_subscription_data_1->shared_vn_group_data_ids, node) { OpenAPI_list_for_each(access_and_mobility_subscription_data_1->shared_vn_group_data_ids, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
ogs_free(localKeyValue->value); ogs_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -759,7 +759,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [gpsis]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [gpsis]");
goto end; goto end;
} }
OpenAPI_list_add(gpsisList , ogs_strdup_or_assert(gpsis_local->valuestring)); OpenAPI_list_add(gpsisList , ogs_strdup(gpsis_local->valuestring));
} }
} }
@ -779,7 +779,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [internal_group_ids]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [internal_group_ids]");
goto end; goto end;
} }
OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring));
} }
} }
@ -1021,7 +1021,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [shared_am_data_ids]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [shared_am_data_ids]");
goto end; goto end;
} }
OpenAPI_list_add(shared_am_data_idsList , ogs_strdup_or_assert(shared_am_data_ids_local->valuestring)); OpenAPI_list_add(shared_am_data_idsList , ogs_strdup(shared_am_data_ids_local->valuestring));
} }
} }
@ -1052,7 +1052,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [subscribed_dnn_list]"); ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [subscribed_dnn_list]");
goto end; goto end;
} }
OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup_or_assert(subscribed_dnn_list_local->valuestring)); OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup(subscribed_dnn_list_local->valuestring));
} }
} }
@ -1295,7 +1295,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
} }
access_and_mobility_subscription_data_1_local_var = OpenAPI_access_and_mobility_subscription_data_1_create ( access_and_mobility_subscription_data_1_local_var = OpenAPI_access_and_mobility_subscription_data_1_create (
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, supported_features ? ogs_strdup(supported_features->valuestring) : NULL,
gpsis ? gpsisList : NULL, gpsis ? gpsisList : NULL,
internal_group_ids ? internal_group_idsList : NULL, internal_group_ids ? internal_group_idsList : NULL,
shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL,
@ -1335,13 +1335,13 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
mdt_configuration ? mdt_configuration_local_nonprim : NULL, mdt_configuration ? mdt_configuration_local_nonprim : NULL,
trace_data ? trace_data_local_nonprim : NULL, trace_data ? trace_data_local_nonprim : NULL,
cag_data ? cag_data_local_nonprim : NULL, cag_data ? cag_data_local_nonprim : NULL,
stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL,
c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL,
nb_io_tue_priority ? true : false, nb_io_tue_priority ? true : false,
nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0, nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0,
nssai_inclusion_allowed ? true : false, nssai_inclusion_allowed ? true : false,
nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0, nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0,
rg_wireline_characteristics ? ogs_strdup_or_assert(rg_wireline_characteristics->valuestring) : NULL, rg_wireline_characteristics ? ogs_strdup(rg_wireline_characteristics->valuestring) : NULL,
ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL, ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL,
ec_restriction_data_nb ? true : false, ec_restriction_data_nb ? true : false,
ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0, ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0,

7
lib/sbi/openapi/model/access_net_charging_identifier.c
View File

@ -9,10 +9,9 @@ OpenAPI_access_net_charging_identifier_t *OpenAPI_access_net_charging_identifier
OpenAPI_list_t *flows OpenAPI_list_t *flows
) )
{ {
OpenAPI_access_net_charging_identifier_t *access_net_charging_identifier_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_net_charging_identifier_t)); OpenAPI_access_net_charging_identifier_t *access_net_charging_identifier_local_var = ogs_malloc(sizeof(OpenAPI_access_net_charging_identifier_t));
if (!access_net_charging_identifier_local_var) { ogs_assert(access_net_charging_identifier_local_var);
return NULL;
}
access_net_charging_identifier_local_var->acc_net_cha_id_value = acc_net_cha_id_value; access_net_charging_identifier_local_var->acc_net_cha_id_value = acc_net_cha_id_value;
access_net_charging_identifier_local_var->flows = flows; access_net_charging_identifier_local_var->flows = flows;

7
lib/sbi/openapi/model/access_right_status.c
View File

@ -7,10 +7,9 @@
OpenAPI_access_right_status_t *OpenAPI_access_right_status_create( OpenAPI_access_right_status_t *OpenAPI_access_right_status_create(
) )
{ {
OpenAPI_access_right_status_t *access_right_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_right_status_t)); OpenAPI_access_right_status_t *access_right_status_local_var = ogs_malloc(sizeof(OpenAPI_access_right_status_t));
if (!access_right_status_local_var) { ogs_assert(access_right_status_local_var);
return NULL;
}
return access_right_status_local_var; return access_right_status_local_var;
} }

7
lib/sbi/openapi/model/access_tech.c
View File

@ -7,10 +7,9 @@
OpenAPI_access_tech_t *OpenAPI_access_tech_create( OpenAPI_access_tech_t *OpenAPI_access_tech_create(
) )
{ {
OpenAPI_access_tech_t *access_tech_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_tech_t)); OpenAPI_access_tech_t *access_tech_local_var = ogs_malloc(sizeof(OpenAPI_access_tech_t));
if (!access_tech_local_var) { ogs_assert(access_tech_local_var);
return NULL;
}
return access_tech_local_var; return access_tech_local_var;
} }

11
lib/sbi/openapi/model/access_token_err.c
View File

@ -33,10 +33,9 @@ OpenAPI_access_token_err_t *OpenAPI_access_token_err_create(
char *error_uri char *error_uri
) )
{ {
OpenAPI_access_token_err_t *access_token_err_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_token_err_t)); OpenAPI_access_token_err_t *access_token_err_local_var = ogs_malloc(sizeof(OpenAPI_access_token_err_t));
if (!access_token_err_local_var) { ogs_assert(access_token_err_local_var);
return NULL;
}
access_token_err_local_var->error = error; access_token_err_local_var->error = error;
access_token_err_local_var->error_description = error_description; access_token_err_local_var->error_description = error_description;
access_token_err_local_var->error_uri = error_uri; access_token_err_local_var->error_uri = error_uri;
@ -124,8 +123,8 @@ OpenAPI_access_token_err_t *OpenAPI_access_token_err_parseFromJSON(cJSON *access
access_token_err_local_var = OpenAPI_access_token_err_create ( access_token_err_local_var = OpenAPI_access_token_err_create (
errorVariable, errorVariable,
error_description ? ogs_strdup_or_assert(error_description->valuestring) : NULL, error_description ? ogs_strdup(error_description->valuestring) : NULL,
error_uri ? ogs_strdup_or_assert(error_uri->valuestring) : NULL error_uri ? ogs_strdup(error_uri->valuestring) : NULL
); );
return access_token_err_local_var; return access_token_err_local_var;

21
lib/sbi/openapi/model/access_token_req.c
View File

@ -46,10 +46,9 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_create(
char *target_nf_service_set_id char *target_nf_service_set_id
) )
{ {
OpenAPI_access_token_req_t *access_token_req_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_token_req_t)); OpenAPI_access_token_req_t *access_token_req_local_var = ogs_malloc(sizeof(OpenAPI_access_token_req_t));
if (!access_token_req_local_var) { ogs_assert(access_token_req_local_var);
return NULL;
}
access_token_req_local_var->grant_type = grant_type; access_token_req_local_var->grant_type = grant_type;
access_token_req_local_var->nf_instance_id = nf_instance_id; access_token_req_local_var->nf_instance_id = nf_instance_id;
access_token_req_local_var->nf_type = nf_type; access_token_req_local_var->nf_type = nf_type;
@ -500,7 +499,7 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [target_nsi_list]"); ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [target_nsi_list]");
goto end; goto end;
} }
OpenAPI_list_add(target_nsi_listList , ogs_strdup_or_assert(target_nsi_list_local->valuestring)); OpenAPI_list_add(target_nsi_listList , ogs_strdup(target_nsi_list_local->valuestring));
} }
} }
@ -524,21 +523,21 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
access_token_req_local_var = OpenAPI_access_token_req_create ( access_token_req_local_var = OpenAPI_access_token_req_create (
grant_typeVariable, grant_typeVariable,
ogs_strdup_or_assert(nf_instance_id->valuestring), ogs_strdup(nf_instance_id->valuestring),
nf_type ? nf_typeVariable : 0, nf_type ? nf_typeVariable : 0,
target_nf_type ? target_nf_typeVariable : 0, target_nf_type ? target_nf_typeVariable : 0,
ogs_strdup_or_assert(scope->valuestring), ogs_strdup(scope->valuestring),
target_nf_instance_id ? ogs_strdup_or_assert(target_nf_instance_id->valuestring) : NULL, target_nf_instance_id ? ogs_strdup(target_nf_instance_id->valuestring) : NULL,
requester_plmn ? requester_plmn_local_nonprim : NULL, requester_plmn ? requester_plmn_local_nonprim : NULL,
requester_plmn_list ? requester_plmn_listList : NULL, requester_plmn_list ? requester_plmn_listList : NULL,
requester_snssai_list ? requester_snssai_listList : NULL, requester_snssai_list ? requester_snssai_listList : NULL,
requester_fqdn ? ogs_strdup_or_assert(requester_fqdn->valuestring) : NULL, requester_fqdn ? ogs_strdup(requester_fqdn->valuestring) : NULL,
requester_snpn_list ? requester_snpn_listList : NULL, requester_snpn_list ? requester_snpn_listList : NULL,
target_plmn ? target_plmn_local_nonprim : NULL, target_plmn ? target_plmn_local_nonprim : NULL,
target_snssai_list ? target_snssai_listList : NULL, target_snssai_list ? target_snssai_listList : NULL,
target_nsi_list ? target_nsi_listList : NULL, target_nsi_list ? target_nsi_listList : NULL,
target_nf_set_id ? ogs_strdup_or_assert(target_nf_set_id->valuestring) : NULL, target_nf_set_id ? ogs_strdup(target_nf_set_id->valuestring) : NULL,
target_nf_service_set_id ? ogs_strdup_or_assert(target_nf_service_set_id->valuestring) : NULL target_nf_service_set_id ? ogs_strdup(target_nf_service_set_id->valuestring) : NULL
); );
return access_token_req_local_var; return access_token_req_local_var;

7
lib/sbi/openapi/model/access_type_rm.c
View File

@ -7,10 +7,9 @@
OpenAPI_access_type_rm_t *OpenAPI_access_type_rm_create( OpenAPI_access_type_rm_t *OpenAPI_access_type_rm_create(
) )
{ {
OpenAPI_access_type_rm_t *access_type_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_type_rm_t)); OpenAPI_access_type_rm_t *access_type_rm_local_var = ogs_malloc(sizeof(OpenAPI_access_type_rm_t));
if (!access_type_rm_local_var) { ogs_assert(access_type_rm_local_var);
return NULL;
}
return access_type_rm_local_var; return access_type_rm_local_var;
} }

9
lib/sbi/openapi/model/accu_usage_report.c
View File

@ -24,10 +24,9 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_create(
int next_time_usage int next_time_usage
) )
{ {
OpenAPI_accu_usage_report_t *accu_usage_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_accu_usage_report_t)); OpenAPI_accu_usage_report_t *accu_usage_report_local_var = ogs_malloc(sizeof(OpenAPI_accu_usage_report_t));
if (!accu_usage_report_local_var) { ogs_assert(accu_usage_report_local_var);
return NULL;
}
accu_usage_report_local_var->ref_um_ids = ref_um_ids; accu_usage_report_local_var->ref_um_ids = ref_um_ids;
accu_usage_report_local_var->is_vol_usage = is_vol_usage; accu_usage_report_local_var->is_vol_usage = is_vol_usage;
accu_usage_report_local_var->vol_usage = vol_usage; accu_usage_report_local_var->vol_usage = vol_usage;
@ -221,7 +220,7 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_parseFromJSON(cJSON *accu
} }
accu_usage_report_local_var = OpenAPI_accu_usage_report_create ( accu_usage_report_local_var = OpenAPI_accu_usage_report_create (
ogs_strdup_or_assert(ref_um_ids->valuestring), ogs_strdup(ref_um_ids->valuestring),
vol_usage ? true : false, vol_usage ? true : false,
vol_usage ? vol_usage->valuedouble : 0, vol_usage ? vol_usage->valuedouble : 0,
vol_usage_uplink ? true : false, vol_usage_uplink ? true : false,

7
lib/sbi/openapi/model/accumulated_usage.c
View File

@ -15,10 +15,9 @@ OpenAPI_accumulated_usage_t *OpenAPI_accumulated_usage_create(
long uplink_volume long uplink_volume
) )
{ {
OpenAPI_accumulated_usage_t *accumulated_usage_local_var = OpenAPI_malloc(sizeof(OpenAPI_accumulated_usage_t)); OpenAPI_accumulated_usage_t *accumulated_usage_local_var = ogs_malloc(sizeof(OpenAPI_accumulated_usage_t));
if (!accumulated_usage_local_var) { ogs_assert(accumulated_usage_local_var);
return NULL;
}
accumulated_usage_local_var->is_duration = is_duration; accumulated_usage_local_var->is_duration = is_duration;
accumulated_usage_local_var->duration = duration; accumulated_usage_local_var->duration = duration;
accumulated_usage_local_var->is_total_volume = is_total_volume; accumulated_usage_local_var->is_total_volume = is_total_volume;

15
lib/sbi/openapi/model/acknowledge_info.c
View File

@ -13,10 +13,9 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_create(
int ue_not_reachable int ue_not_reachable
) )
{ {
OpenAPI_acknowledge_info_t *acknowledge_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_acknowledge_info_t)); OpenAPI_acknowledge_info_t *acknowledge_info_local_var = ogs_malloc(sizeof(OpenAPI_acknowledge_info_t));
if (!acknowledge_info_local_var) { ogs_assert(acknowledge_info_local_var);
return NULL;
}
acknowledge_info_local_var->sor_mac_iue = sor_mac_iue; acknowledge_info_local_var->sor_mac_iue = sor_mac_iue;
acknowledge_info_local_var->upu_mac_iue = upu_mac_iue; acknowledge_info_local_var->upu_mac_iue = upu_mac_iue;
acknowledge_info_local_var->secured_packet = secured_packet; acknowledge_info_local_var->secured_packet = secured_packet;
@ -138,10 +137,10 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_parseFromJSON(cJSON *acknow
} }
acknowledge_info_local_var = OpenAPI_acknowledge_info_create ( acknowledge_info_local_var = OpenAPI_acknowledge_info_create (
sor_mac_iue ? ogs_strdup_or_assert(sor_mac_iue->valuestring) : NULL, sor_mac_iue ? ogs_strdup(sor_mac_iue->valuestring) : NULL,
upu_mac_iue ? ogs_strdup_or_assert(upu_mac_iue->valuestring) : NULL, upu_mac_iue ? ogs_strdup(upu_mac_iue->valuestring) : NULL,
secured_packet ? ogs_strdup_or_assert(secured_packet->valuestring) : NULL, secured_packet ? ogs_strdup(secured_packet->valuestring) : NULL,
ogs_strdup_or_assert(provisioning_time->valuestring), ogs_strdup(provisioning_time->valuestring),
ue_not_reachable ? true : false, ue_not_reachable ? true : false,
ue_not_reachable ? ue_not_reachable->valueint : 0 ue_not_reachable ? ue_not_reachable->valueint : 0
); );

13
lib/sbi/openapi/model/acs_info.c
View File

@ -10,10 +10,9 @@ OpenAPI_acs_info_t *OpenAPI_acs_info_create(
char *acs_ipv6_addr char *acs_ipv6_addr
) )
{ {
OpenAPI_acs_info_t *acs_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_acs_info_t)); OpenAPI_acs_info_t *acs_info_local_var = ogs_malloc(sizeof(OpenAPI_acs_info_t));
if (!acs_info_local_var) { ogs_assert(acs_info_local_var);
return NULL;
}
acs_info_local_var->acs_url = acs_url; acs_info_local_var->acs_url = acs_url;
acs_info_local_var->acs_ipv4_addr = acs_ipv4_addr; acs_info_local_var->acs_ipv4_addr = acs_ipv4_addr;
acs_info_local_var->acs_ipv6_addr = acs_ipv6_addr; acs_info_local_var->acs_ipv6_addr = acs_ipv6_addr;
@ -99,9 +98,9 @@ OpenAPI_acs_info_t *OpenAPI_acs_info_parseFromJSON(cJSON *acs_infoJSON)
} }
acs_info_local_var = OpenAPI_acs_info_create ( acs_info_local_var = OpenAPI_acs_info_create (
acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, acs_url ? ogs_strdup(acs_url->valuestring) : NULL,
acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL,
acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL
); );
return acs_info_local_var; return acs_info_local_var;

13
lib/sbi/openapi/model/acs_info_1.c
View File

@ -10,10 +10,9 @@ OpenAPI_acs_info_1_t *OpenAPI_acs_info_1_create(
char *acs_ipv6_addr char *acs_ipv6_addr
) )
{ {
OpenAPI_acs_info_1_t *acs_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_acs_info_1_t)); OpenAPI_acs_info_1_t *acs_info_1_local_var = ogs_malloc(sizeof(OpenAPI_acs_info_1_t));
if (!acs_info_1_local_var) { ogs_assert(acs_info_1_local_var);
return NULL;
}
acs_info_1_local_var->acs_url = acs_url; acs_info_1_local_var->acs_url = acs_url;
acs_info_1_local_var->acs_ipv4_addr = acs_ipv4_addr; acs_info_1_local_var->acs_ipv4_addr = acs_ipv4_addr;
acs_info_1_local_var->acs_ipv6_addr = acs_ipv6_addr; acs_info_1_local_var->acs_ipv6_addr = acs_ipv6_addr;
@ -99,9 +98,9 @@ OpenAPI_acs_info_1_t *OpenAPI_acs_info_1_parseFromJSON(cJSON *acs_info_1JSON)
} }
acs_info_1_local_var = OpenAPI_acs_info_1_create ( acs_info_1_local_var = OpenAPI_acs_info_1_create (
acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, acs_url ? ogs_strdup(acs_url->valuestring) : NULL,
acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL,
acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL
); );
return acs_info_1_local_var; return acs_info_1_local_var;

13
lib/sbi/openapi/model/acs_info_rm.c
View File

@ -10,10 +10,9 @@ OpenAPI_acs_info_rm_t *OpenAPI_acs_info_rm_create(
char *acs_ipv6_addr char *acs_ipv6_addr
) )
{ {
OpenAPI_acs_info_rm_t *acs_info_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_acs_info_rm_t)); OpenAPI_acs_info_rm_t *acs_info_rm_local_var = ogs_malloc(sizeof(OpenAPI_acs_info_rm_t));
if (!acs_info_rm_local_var) { ogs_assert(acs_info_rm_local_var);
return NULL;
}
acs_info_rm_local_var->acs_url = acs_url; acs_info_rm_local_var->acs_url = acs_url;
acs_info_rm_local_var->acs_ipv4_addr = acs_ipv4_addr; acs_info_rm_local_var->acs_ipv4_addr = acs_ipv4_addr;
acs_info_rm_local_var->acs_ipv6_addr = acs_ipv6_addr; acs_info_rm_local_var->acs_ipv6_addr = acs_ipv6_addr;
@ -99,9 +98,9 @@ OpenAPI_acs_info_rm_t *OpenAPI_acs_info_rm_parseFromJSON(cJSON *acs_info_rmJSON)
} }
acs_info_rm_local_var = OpenAPI_acs_info_rm_create ( acs_info_rm_local_var = OpenAPI_acs_info_rm_create (
acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, acs_url ? ogs_strdup(acs_url->valuestring) : NULL,
acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL,
acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL
); );
return acs_info_rm_local_var; return acs_info_rm_local_var;

7
lib/sbi/openapi/model/additional_access_info.c
View File

@ -9,10 +9,9 @@ OpenAPI_additional_access_info_t *OpenAPI_additional_access_info_create(
OpenAPI_rat_type_e rat_type OpenAPI_rat_type_e rat_type
) )
{ {
OpenAPI_additional_access_info_t *additional_access_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_additional_access_info_t)); OpenAPI_additional_access_info_t *additional_access_info_local_var = ogs_malloc(sizeof(OpenAPI_additional_access_info_t));
if (!additional_access_info_local_var) { ogs_assert(additional_access_info_local_var);
return NULL;
}
additional_access_info_local_var->access_type = access_type; additional_access_info_local_var->access_type = access_type;
additional_access_info_local_var->rat_type = rat_type; additional_access_info_local_var->rat_type = rat_type;

7
lib/sbi/openapi/model/additional_snssai_data.c
View File

@ -9,10 +9,9 @@ OpenAPI_additional_snssai_data_t *OpenAPI_additional_snssai_data_create(
int required_authn_authz int required_authn_authz
) )
{ {
OpenAPI_additional_snssai_data_t *additional_snssai_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_additional_snssai_data_t)); OpenAPI_additional_snssai_data_t *additional_snssai_data_local_var = ogs_malloc(sizeof(OpenAPI_additional_snssai_data_t));
if (!additional_snssai_data_local_var) { ogs_assert(additional_snssai_data_local_var);
return NULL;
}
additional_snssai_data_local_var->is_required_authn_authz = is_required_authn_authz; additional_snssai_data_local_var->is_required_authn_authz = is_required_authn_authz;
additional_snssai_data_local_var->required_authn_authz = required_authn_authz; additional_snssai_data_local_var->required_authn_authz = required_authn_authz;

11
lib/sbi/openapi/model/af_event_exposure_data.c
View File

@ -10,10 +10,9 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_create(
OpenAPI_list_t *app_ids OpenAPI_list_t *app_ids
) )
{ {
OpenAPI_af_event_exposure_data_t *af_event_exposure_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_event_exposure_data_t)); OpenAPI_af_event_exposure_data_t *af_event_exposure_data_local_var = ogs_malloc(sizeof(OpenAPI_af_event_exposure_data_t));
if (!af_event_exposure_data_local_var) { ogs_assert(af_event_exposure_data_local_var);
return NULL;
}
af_event_exposure_data_local_var->af_events = af_events; af_event_exposure_data_local_var->af_events = af_events;
af_event_exposure_data_local_var->af_ids = af_ids; af_event_exposure_data_local_var->af_ids = af_ids;
af_event_exposure_data_local_var->app_ids = app_ids; af_event_exposure_data_local_var->app_ids = app_ids;
@ -141,7 +140,7 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c
ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [af_ids]"); ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [af_ids]");
goto end; goto end;
} }
OpenAPI_list_add(af_idsList , ogs_strdup_or_assert(af_ids_local->valuestring)); OpenAPI_list_add(af_idsList , ogs_strdup(af_ids_local->valuestring));
} }
} }
@ -161,7 +160,7 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c
ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [app_ids]"); ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [app_ids]");
goto end; goto end;
} }
OpenAPI_list_add(app_idsList , ogs_strdup_or_assert(app_ids_local->valuestring)); OpenAPI_list_add(app_idsList , ogs_strdup(app_ids_local->valuestring));
} }
} }

7
lib/sbi/openapi/model/af_event_notification.c
View File

@ -9,10 +9,9 @@ OpenAPI_af_event_notification_t *OpenAPI_af_event_notification_create(
OpenAPI_list_t *flows OpenAPI_list_t *flows
) )
{ {
OpenAPI_af_event_notification_t *af_event_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_event_notification_t)); OpenAPI_af_event_notification_t *af_event_notification_local_var = ogs_malloc(sizeof(OpenAPI_af_event_notification_t));
if (!af_event_notification_local_var) { ogs_assert(af_event_notification_local_var);
return NULL;
}
af_event_notification_local_var->event = event; af_event_notification_local_var->event = event;
af_event_notification_local_var->flows = flows; af_event_notification_local_var->flows = flows;

7
lib/sbi/openapi/model/af_event_subscription.c
View File

@ -13,10 +13,9 @@ OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_create(
int wait_time int wait_time
) )
{ {
OpenAPI_af_event_subscription_t *af_event_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_event_subscription_t)); OpenAPI_af_event_subscription_t *af_event_subscription_local_var = ogs_malloc(sizeof(OpenAPI_af_event_subscription_t));
if (!af_event_subscription_local_var) { ogs_assert(af_event_subscription_local_var);
return NULL;
}
af_event_subscription_local_var->event = event; af_event_subscription_local_var->event = event;
af_event_subscription_local_var->notif_method = notif_method; af_event_subscription_local_var->notif_method = notif_method;
af_event_subscription_local_var->is_rep_period = is_rep_period; af_event_subscription_local_var->is_rep_period = is_rep_period;

9
lib/sbi/openapi/model/af_external.c
View File

@ -11,10 +11,9 @@ OpenAPI_af_external_t *OpenAPI_af_external_create(
OpenAPI_valid_time_period_t *valid_time_period OpenAPI_valid_time_period_t *valid_time_period
) )
{ {
OpenAPI_af_external_t *af_external_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_external_t)); OpenAPI_af_external_t *af_external_local_var = ogs_malloc(sizeof(OpenAPI_af_external_t));
if (!af_external_local_var) { ogs_assert(af_external_local_var);
return NULL;
}
af_external_local_var->af_id = af_id; af_external_local_var->af_id = af_id;
af_external_local_var->allowed_geographic_area = allowed_geographic_area; af_external_local_var->allowed_geographic_area = allowed_geographic_area;
af_external_local_var->privacy_check_related_action = privacy_check_related_action; af_external_local_var->privacy_check_related_action = privacy_check_related_action;
@ -153,7 +152,7 @@ OpenAPI_af_external_t *OpenAPI_af_external_parseFromJSON(cJSON *af_externalJSON)
} }
af_external_local_var = OpenAPI_af_external_create ( af_external_local_var = OpenAPI_af_external_create (
af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL, af_id ? ogs_strdup(af_id->valuestring) : NULL,
allowed_geographic_area ? allowed_geographic_areaList : NULL, allowed_geographic_area ? allowed_geographic_areaList : NULL,
privacy_check_related_action ? privacy_check_related_actionVariable : 0, privacy_check_related_action ? privacy_check_related_actionVariable : 0,
valid_time_period ? valid_time_period_local_nonprim : NULL valid_time_period ? valid_time_period_local_nonprim : NULL

7
lib/sbi/openapi/model/af_routing_requirement.c
View File

@ -15,10 +15,9 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
int addr_preser_ind int addr_preser_ind
) )
{ {
OpenAPI_af_routing_requirement_t *af_routing_requirement_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_routing_requirement_t)); OpenAPI_af_routing_requirement_t *af_routing_requirement_local_var = ogs_malloc(sizeof(OpenAPI_af_routing_requirement_t));
if (!af_routing_requirement_local_var) { ogs_assert(af_routing_requirement_local_var);
return NULL;
}
af_routing_requirement_local_var->is_app_reloc = is_app_reloc; af_routing_requirement_local_var->is_app_reloc = is_app_reloc;
af_routing_requirement_local_var->app_reloc = app_reloc; af_routing_requirement_local_var->app_reloc = app_reloc;
af_routing_requirement_local_var->route_to_locs = route_to_locs; af_routing_requirement_local_var->route_to_locs = route_to_locs;

7
lib/sbi/openapi/model/af_routing_requirement_rm.c
View File

@ -15,10 +15,9 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
int addr_preser_ind int addr_preser_ind
) )
{ {
OpenAPI_af_routing_requirement_rm_t *af_routing_requirement_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_routing_requirement_rm_t)); OpenAPI_af_routing_requirement_rm_t *af_routing_requirement_rm_local_var = ogs_malloc(sizeof(OpenAPI_af_routing_requirement_rm_t));
if (!af_routing_requirement_rm_local_var) { ogs_assert(af_routing_requirement_rm_local_var);
return NULL;
}
af_routing_requirement_rm_local_var->is_app_reloc = is_app_reloc; af_routing_requirement_rm_local_var->is_app_reloc = is_app_reloc;
af_routing_requirement_rm_local_var->app_reloc = app_reloc; af_routing_requirement_rm_local_var->app_reloc = app_reloc;
af_routing_requirement_rm_local_var->route_to_locs = route_to_locs; af_routing_requirement_rm_local_var->route_to_locs = route_to_locs;

11
lib/sbi/openapi/model/allowed_mtc_provider_info.c
View File

@ -9,10 +9,9 @@ OpenAPI_allowed_mtc_provider_info_t *OpenAPI_allowed_mtc_provider_info_create(
char *af_id char *af_id
) )
{ {
OpenAPI_allowed_mtc_provider_info_t *allowed_mtc_provider_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_allowed_mtc_provider_info_t)); OpenAPI_allowed_mtc_provider_info_t *allowed_mtc_provider_info_local_var = ogs_malloc(sizeof(OpenAPI_allowed_mtc_provider_info_t));
if (!allowed_mtc_provider_info_local_var) { ogs_assert(allowed_mtc_provider_info_local_var);
return NULL;
}
allowed_mtc_provider_info_local_var->mtc_provider_information = mtc_provider_information; allowed_mtc_provider_info_local_var->mtc_provider_information = mtc_provider_information;
allowed_mtc_provider_info_local_var->af_id = af_id; allowed_mtc_provider_info_local_var->af_id = af_id;
@ -80,8 +79,8 @@ OpenAPI_allowed_mtc_provider_info_t *OpenAPI_allowed_mtc_provider_info_parseFrom
} }
allowed_mtc_provider_info_local_var = OpenAPI_allowed_mtc_provider_info_create ( allowed_mtc_provider_info_local_var = OpenAPI_allowed_mtc_provider_info_create (
mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL, mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL,
af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL af_id ? ogs_strdup(af_id->valuestring) : NULL
); );
return allowed_mtc_provider_info_local_var; return allowed_mtc_provider_info_local_var;

7
lib/sbi/openapi/model/allowed_nssai.c
View File

@ -9,10 +9,9 @@ OpenAPI_allowed_nssai_t *OpenAPI_allowed_nssai_create(
OpenAPI_access_type_e access_type OpenAPI_access_type_e access_type
) )
{ {
OpenAPI_allowed_nssai_t *allowed_nssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_allowed_nssai_t)); OpenAPI_allowed_nssai_t *allowed_nssai_local_var = ogs_malloc(sizeof(OpenAPI_allowed_nssai_t));
if (!allowed_nssai_local_var) { ogs_assert(allowed_nssai_local_var);
return NULL;
}
allowed_nssai_local_var->allowed_snssai_list = allowed_snssai_list; allowed_nssai_local_var->allowed_snssai_list = allowed_snssai_list;
allowed_nssai_local_var->access_type = access_type; allowed_nssai_local_var->access_type = access_type;

7
lib/sbi/openapi/model/allowed_snssai.c
View File

@ -10,10 +10,9 @@ OpenAPI_allowed_snssai_t *OpenAPI_allowed_snssai_create(
OpenAPI_snssai_t *mapped_home_snssai OpenAPI_snssai_t *mapped_home_snssai
) )
{ {
OpenAPI_allowed_snssai_t *allowed_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_allowed_snssai_t)); OpenAPI_allowed_snssai_t *allowed_snssai_local_var = ogs_malloc(sizeof(OpenAPI_allowed_snssai_t));
if (!allowed_snssai_local_var) { ogs_assert(allowed_snssai_local_var);
return NULL;
}
allowed_snssai_local_var->allowed_snssai = allowed_snssai; allowed_snssai_local_var->allowed_snssai = allowed_snssai;
allowed_snssai_local_var->nsi_information_list = nsi_information_list; allowed_snssai_local_var->nsi_information_list = nsi_information_list;
allowed_snssai_local_var->mapped_home_snssai = mapped_home_snssai; allowed_snssai_local_var->mapped_home_snssai = mapped_home_snssai;

13
lib/sbi/openapi/model/alternative_qos_profile.c
View File

@ -13,10 +13,9 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_create(
char *packet_err_rate char *packet_err_rate
) )
{ {
OpenAPI_alternative_qos_profile_t *alternative_qos_profile_local_var = OpenAPI_malloc(sizeof(OpenAPI_alternative_qos_profile_t)); OpenAPI_alternative_qos_profile_t *alternative_qos_profile_local_var = ogs_malloc(sizeof(OpenAPI_alternative_qos_profile_t));
if (!alternative_qos_profile_local_var) { ogs_assert(alternative_qos_profile_local_var);
return NULL;
}
alternative_qos_profile_local_var->index = index; alternative_qos_profile_local_var->index = index;
alternative_qos_profile_local_var->gua_fbr_dl = gua_fbr_dl; alternative_qos_profile_local_var->gua_fbr_dl = gua_fbr_dl;
alternative_qos_profile_local_var->gua_fbr_ul = gua_fbr_ul; alternative_qos_profile_local_var->gua_fbr_ul = gua_fbr_ul;
@ -139,11 +138,11 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_parseFromJSON
alternative_qos_profile_local_var = OpenAPI_alternative_qos_profile_create ( alternative_qos_profile_local_var = OpenAPI_alternative_qos_profile_create (
index->valuedouble, index->valuedouble,
gua_fbr_dl ? ogs_strdup_or_assert(gua_fbr_dl->valuestring) : NULL, gua_fbr_dl ? ogs_strdup(gua_fbr_dl->valuestring) : NULL,
gua_fbr_ul ? ogs_strdup_or_assert(gua_fbr_ul->valuestring) : NULL, gua_fbr_ul ? ogs_strdup(gua_fbr_ul->valuestring) : NULL,
packet_delay_budget ? true : false, packet_delay_budget ? true : false,
packet_delay_budget ? packet_delay_budget->valuedouble : 0, packet_delay_budget ? packet_delay_budget->valuedouble : 0,
packet_err_rate ? ogs_strdup_or_assert(packet_err_rate->valuestring) : NULL packet_err_rate ? ogs_strdup(packet_err_rate->valuestring) : NULL
); );
return alternative_qos_profile_local_var; return alternative_qos_profile_local_var;

14
lib/sbi/openapi/model/am_policy_data.c
View File

@ -9,10 +9,9 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_create(
OpenAPI_list_t *subsc_cats OpenAPI_list_t *subsc_cats
) )
{ {
OpenAPI_am_policy_data_t *am_policy_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_am_policy_data_t)); OpenAPI_am_policy_data_t *am_policy_data_local_var = ogs_malloc(sizeof(OpenAPI_am_policy_data_t));
if (!am_policy_data_local_var) { ogs_assert(am_policy_data_local_var);
return NULL;
}
am_policy_data_local_var->pra_infos = pra_infos; am_policy_data_local_var->pra_infos = pra_infos;
am_policy_data_local_var->subsc_cats = subsc_cats; am_policy_data_local_var->subsc_cats = subsc_cats;
@ -27,6 +26,7 @@ void OpenAPI_am_policy_data_free(OpenAPI_am_policy_data_t *am_policy_data)
OpenAPI_lnode_t *node; OpenAPI_lnode_t *node;
OpenAPI_list_for_each(am_policy_data->pra_infos, node) { OpenAPI_list_for_each(am_policy_data->pra_infos, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_presence_info_free(localKeyValue->value); OpenAPI_presence_info_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -109,9 +109,9 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_parseFromJSON(cJSON *am_policy_
cJSON *localMapObject = pra_infos_local_map; cJSON *localMapObject = pra_infos_local_map;
if (cJSON_IsObject(pra_infos_local_map)) { if (cJSON_IsObject(pra_infos_local_map)) {
localMapKeyPair = OpenAPI_map_create( localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(pra_infos_local_map)) { } else if (cJSON_IsNull(pra_infos_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else { } else {
ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [pra_infos]"); ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [pra_infos]");
goto end; goto end;
@ -136,7 +136,7 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_parseFromJSON(cJSON *am_policy_
ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [subsc_cats]"); ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [subsc_cats]");
goto end; goto end;
} }
OpenAPI_list_add(subsc_catsList , ogs_strdup_or_assert(subsc_cats_local->valuestring)); OpenAPI_list_add(subsc_catsList , ogs_strdup(subsc_cats_local->valuestring));
} }
} }

11
lib/sbi/openapi/model/ambr.c
View File

@ -9,10 +9,9 @@ OpenAPI_ambr_t *OpenAPI_ambr_create(
char *downlink char *downlink
) )
{ {
OpenAPI_ambr_t *ambr_local_var = OpenAPI_malloc(sizeof(OpenAPI_ambr_t)); OpenAPI_ambr_t *ambr_local_var = ogs_malloc(sizeof(OpenAPI_ambr_t));
if (!ambr_local_var) { ogs_assert(ambr_local_var);
return NULL;
}
ambr_local_var->uplink = uplink; ambr_local_var->uplink = uplink;
ambr_local_var->downlink = downlink; ambr_local_var->downlink = downlink;
@ -80,8 +79,8 @@ OpenAPI_ambr_t *OpenAPI_ambr_parseFromJSON(cJSON *ambrJSON)
} }
ambr_local_var = OpenAPI_ambr_create ( ambr_local_var = OpenAPI_ambr_create (
ogs_strdup_or_assert(uplink->valuestring), ogs_strdup(uplink->valuestring),
ogs_strdup_or_assert(downlink->valuestring) ogs_strdup(downlink->valuestring)
); );
return ambr_local_var; return ambr_local_var;

11
lib/sbi/openapi/model/ambr_1.c
View File

@ -9,10 +9,9 @@ OpenAPI_ambr_1_t *OpenAPI_ambr_1_create(
char *downlink char *downlink
) )
{ {
OpenAPI_ambr_1_t *ambr_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ambr_1_t)); OpenAPI_ambr_1_t *ambr_1_local_var = ogs_malloc(sizeof(OpenAPI_ambr_1_t));
if (!ambr_1_local_var) { ogs_assert(ambr_1_local_var);
return NULL;
}
ambr_1_local_var->uplink = uplink; ambr_1_local_var->uplink = uplink;
ambr_1_local_var->downlink = downlink; ambr_1_local_var->downlink = downlink;
@ -80,8 +79,8 @@ OpenAPI_ambr_1_t *OpenAPI_ambr_1_parseFromJSON(cJSON *ambr_1JSON)
} }
ambr_1_local_var = OpenAPI_ambr_1_create ( ambr_1_local_var = OpenAPI_ambr_1_create (
ogs_strdup_or_assert(uplink->valuestring), ogs_strdup(uplink->valuestring),
ogs_strdup_or_assert(downlink->valuestring) ogs_strdup(downlink->valuestring)
); );
return ambr_1_local_var; return ambr_1_local_var;

11
lib/sbi/openapi/model/ambr_rm.c
View File

@ -9,10 +9,9 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_create(
char *downlink char *downlink
) )
{ {
OpenAPI_ambr_rm_t *ambr_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_ambr_rm_t)); OpenAPI_ambr_rm_t *ambr_rm_local_var = ogs_malloc(sizeof(OpenAPI_ambr_rm_t));
if (!ambr_rm_local_var) { ogs_assert(ambr_rm_local_var);
return NULL;
}
ambr_rm_local_var->uplink = uplink; ambr_rm_local_var->uplink = uplink;
ambr_rm_local_var->downlink = downlink; ambr_rm_local_var->downlink = downlink;
@ -80,8 +79,8 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_parseFromJSON(cJSON *ambr_rmJSON)
} }
ambr_rm_local_var = OpenAPI_ambr_rm_create ( ambr_rm_local_var = OpenAPI_ambr_rm_create (
ogs_strdup_or_assert(uplink->valuestring), ogs_strdup(uplink->valuestring),
ogs_strdup_or_assert(downlink->valuestring) ogs_strdup(downlink->valuestring)
); );
return ambr_rm_local_var; return ambr_rm_local_var;

27
lib/sbi/openapi/model/amf3_gpp_access_registration.c
View File

@ -36,10 +36,9 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_cre
char *supi char *supi
) )
{ {
OpenAPI_amf3_gpp_access_registration_t *amf3_gpp_access_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_t)); OpenAPI_amf3_gpp_access_registration_t *amf3_gpp_access_registration_local_var = ogs_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_t));
if (!amf3_gpp_access_registration_local_var) { ogs_assert(amf3_gpp_access_registration_local_var);
return NULL;
}
amf3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id; amf3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id;
amf3_gpp_access_registration_local_var->supported_features = supported_features; amf3_gpp_access_registration_local_var->supported_features = supported_features;
amf3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag; amf3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag;
@ -533,16 +532,16 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
} }
amf3_gpp_access_registration_local_var = OpenAPI_amf3_gpp_access_registration_create ( amf3_gpp_access_registration_local_var = OpenAPI_amf3_gpp_access_registration_create (
ogs_strdup_or_assert(amf_instance_id->valuestring), ogs_strdup(amf_instance_id->valuestring),
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, supported_features ? ogs_strdup(supported_features->valuestring) : NULL,
purge_flag ? true : false, purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0, purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, pei ? ogs_strdup(pei->valuestring) : NULL,
ims_vo_ps ? ims_vo_psVariable : 0, ims_vo_ps ? ims_vo_psVariable : 0,
ogs_strdup_or_assert(dereg_callback_uri->valuestring), ogs_strdup(dereg_callback_uri->valuestring),
amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL, amf_service_name_dereg ? ogs_strdup(amf_service_name_dereg->valuestring) : NULL,
pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL,
amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL, amf_service_name_pcscf_rest ? ogs_strdup(amf_service_name_pcscf_rest->valuestring) : NULL,
initial_registration_ind ? true : false, initial_registration_ind ? true : false,
initial_registration_ind ? initial_registration_ind->valueint : 0, initial_registration_ind ? initial_registration_ind->valueint : 0,
guami_local_nonprim, guami_local_nonprim,
@ -552,16 +551,16 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
rat_typeVariable, rat_typeVariable,
urrp_indicator ? true : false, urrp_indicator ? true : false,
urrp_indicator ? urrp_indicator->valueint : 0, urrp_indicator ? urrp_indicator->valueint : 0,
amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL, amf_ee_subscription_id ? ogs_strdup(amf_ee_subscription_id->valuestring) : NULL,
eps_interworking_info ? eps_interworking_info_local_nonprim : NULL, eps_interworking_info ? eps_interworking_info_local_nonprim : NULL,
ue_srvcc_capability ? true : false, ue_srvcc_capability ? true : false,
ue_srvcc_capability ? ue_srvcc_capability->valueint : 0, ue_srvcc_capability ? ue_srvcc_capability->valueint : 0,
registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, registration_time ? ogs_strdup(registration_time->valuestring) : NULL,
vgmlc_address ? vgmlc_address_local_nonprim : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL,
context_info ? context_info_local_nonprim : NULL, context_info ? context_info_local_nonprim : NULL,
no_ee_subscription_ind ? true : false, no_ee_subscription_ind ? true : false,
no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0, no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL supi ? ogs_strdup(supi->valuestring) : NULL
); );
return amf3_gpp_access_registration_local_var; return amf3_gpp_access_registration_local_var;

9
lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c
View File

@ -16,10 +16,9 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
int ue_srvcc_capability int ue_srvcc_capability
) )
{ {
OpenAPI_amf3_gpp_access_registration_modification_t *amf3_gpp_access_registration_modification_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_modification_t)); OpenAPI_amf3_gpp_access_registration_modification_t *amf3_gpp_access_registration_modification_local_var = ogs_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_modification_t));
if (!amf3_gpp_access_registration_modification_local_var) { ogs_assert(amf3_gpp_access_registration_modification_local_var);
return NULL;
}
amf3_gpp_access_registration_modification_local_var->guami = guami; amf3_gpp_access_registration_modification_local_var->guami = guami;
amf3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag; amf3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag;
amf3_gpp_access_registration_modification_local_var->purge_flag = purge_flag; amf3_gpp_access_registration_modification_local_var->purge_flag = purge_flag;
@ -219,7 +218,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
guami_local_nonprim, guami_local_nonprim,
purge_flag ? true : false, purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0, purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, pei ? ogs_strdup(pei->valuestring) : NULL,
ims_vo_ps ? ims_vo_psVariable : 0, ims_vo_ps ? ims_vo_psVariable : 0,
backup_amf_info ? backup_amf_infoList : NULL, backup_amf_info ? backup_amf_infoList : NULL,
eps_interworking_info ? eps_interworking_info_local_nonprim : NULL, eps_interworking_info ? eps_interworking_info_local_nonprim : NULL,

11
lib/sbi/openapi/model/amf_cond.c
View File

@ -9,10 +9,9 @@ OpenAPI_amf_cond_t *OpenAPI_amf_cond_create(
char *amf_region_id char *amf_region_id
) )
{ {
OpenAPI_amf_cond_t *amf_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_cond_t)); OpenAPI_amf_cond_t *amf_cond_local_var = ogs_malloc(sizeof(OpenAPI_amf_cond_t));
if (!amf_cond_local_var) { ogs_assert(amf_cond_local_var);
return NULL;
}
amf_cond_local_var->amf_set_id = amf_set_id; amf_cond_local_var->amf_set_id = amf_set_id;
amf_cond_local_var->amf_region_id = amf_region_id; amf_cond_local_var->amf_region_id = amf_region_id;
@ -80,8 +79,8 @@ OpenAPI_amf_cond_t *OpenAPI_amf_cond_parseFromJSON(cJSON *amf_condJSON)
} }
amf_cond_local_var = OpenAPI_amf_cond_create ( amf_cond_local_var = OpenAPI_amf_cond_create (
amf_set_id ? ogs_strdup_or_assert(amf_set_id->valuestring) : NULL, amf_set_id ? ogs_strdup(amf_set_id->valuestring) : NULL,
amf_region_id ? ogs_strdup_or_assert(amf_region_id->valuestring) : NULL amf_region_id ? ogs_strdup(amf_region_id->valuestring) : NULL
); );
return amf_cond_local_var; return amf_cond_local_var;

7
lib/sbi/openapi/model/amf_dereg_info.c
View File

@ -8,10 +8,9 @@ OpenAPI_amf_dereg_info_t *OpenAPI_amf_dereg_info_create(
OpenAPI_deregistration_reason_e dereg_reason OpenAPI_deregistration_reason_e dereg_reason
) )
{ {
OpenAPI_amf_dereg_info_t *amf_dereg_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_dereg_info_t)); OpenAPI_amf_dereg_info_t *amf_dereg_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_dereg_info_t));
if (!amf_dereg_info_local_var) { ogs_assert(amf_dereg_info_local_var);
return NULL;
}
amf_dereg_info_local_var->dereg_reason = dereg_reason; amf_dereg_info_local_var->dereg_reason = dereg_reason;
return amf_dereg_info_local_var; return amf_dereg_info_local_var;

7
lib/sbi/openapi/model/amf_event.c
View File

@ -22,10 +22,9 @@ OpenAPI_amf_event_t *OpenAPI_amf_event_create(
int max_response_time int max_response_time
) )
{ {
OpenAPI_amf_event_t *amf_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_t)); OpenAPI_amf_event_t *amf_event_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_t));
if (!amf_event_local_var) { ogs_assert(amf_event_local_var);
return NULL;
}
amf_event_local_var->type = type; amf_event_local_var->type = type;
amf_event_local_var->is_immediate_flag = is_immediate_flag; amf_event_local_var->is_immediate_flag = is_immediate_flag;
amf_event_local_var->immediate_flag = immediate_flag; amf_event_local_var->immediate_flag = immediate_flag;

9
lib/sbi/openapi/model/amf_event_area.c
View File

@ -11,10 +11,9 @@ OpenAPI_amf_event_area_t *OpenAPI_amf_event_area_create(
char *nsi_id char *nsi_id
) )
{ {
OpenAPI_amf_event_area_t *amf_event_area_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_area_t)); OpenAPI_amf_event_area_t *amf_event_area_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_area_t));
if (!amf_event_area_local_var) { ogs_assert(amf_event_area_local_var);
return NULL;
}
amf_event_area_local_var->presence_info = presence_info; amf_event_area_local_var->presence_info = presence_info;
amf_event_area_local_var->ladn_info = ladn_info; amf_event_area_local_var->ladn_info = ladn_info;
amf_event_area_local_var->s_nssai = s_nssai; amf_event_area_local_var->s_nssai = s_nssai;
@ -133,7 +132,7 @@ OpenAPI_amf_event_area_t *OpenAPI_amf_event_area_parseFromJSON(cJSON *amf_event_
presence_info ? presence_info_local_nonprim : NULL, presence_info ? presence_info_local_nonprim : NULL,
ladn_info ? ladn_info_local_nonprim : NULL, ladn_info ? ladn_info_local_nonprim : NULL,
s_nssai ? s_nssai_local_nonprim : NULL, s_nssai ? s_nssai_local_nonprim : NULL,
nsi_id ? ogs_strdup_or_assert(nsi_id->valuestring) : NULL nsi_id ? ogs_strdup(nsi_id->valuestring) : NULL
); );
return amf_event_area_local_var; return amf_event_area_local_var;

9
lib/sbi/openapi/model/amf_event_mode.c
View File

@ -15,10 +15,9 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_create(
int samp_ratio int samp_ratio
) )
{ {
OpenAPI_amf_event_mode_t *amf_event_mode_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_mode_t)); OpenAPI_amf_event_mode_t *amf_event_mode_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_mode_t));
if (!amf_event_mode_local_var) { ogs_assert(amf_event_mode_local_var);
return NULL;
}
amf_event_mode_local_var->trigger = trigger; amf_event_mode_local_var->trigger = trigger;
amf_event_mode_local_var->is_max_reports = is_max_reports; amf_event_mode_local_var->is_max_reports = is_max_reports;
amf_event_mode_local_var->max_reports = max_reports; amf_event_mode_local_var->max_reports = max_reports;
@ -147,7 +146,7 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_parseFromJSON(cJSON *amf_event_
trigger_local_nonprim, trigger_local_nonprim,
max_reports ? true : false, max_reports ? true : false,
max_reports ? max_reports->valuedouble : 0, max_reports ? max_reports->valuedouble : 0,
expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, expiry ? ogs_strdup(expiry->valuestring) : NULL,
rep_period ? true : false, rep_period ? true : false,
rep_period ? rep_period->valuedouble : 0, rep_period ? rep_period->valuedouble : 0,
samp_ratio ? true : false, samp_ratio ? true : false,

25
lib/sbi/openapi/model/amf_event_subscription.c
View File

@ -21,10 +21,9 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_create(
OpenAPI_nf_type_e source_nf_type OpenAPI_nf_type_e source_nf_type
) )
{ {
OpenAPI_amf_event_subscription_t *amf_event_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_subscription_t)); OpenAPI_amf_event_subscription_t *amf_event_subscription_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_subscription_t));
if (!amf_event_subscription_local_var) { ogs_assert(amf_event_subscription_local_var);
return NULL;
}
amf_event_subscription_local_var->event_list = event_list; amf_event_subscription_local_var->event_list = event_list;
amf_event_subscription_local_var->event_notify_uri = event_notify_uri; amf_event_subscription_local_var->event_notify_uri = event_notify_uri;
amf_event_subscription_local_var->notify_correlation_id = notify_correlation_id; amf_event_subscription_local_var->notify_correlation_id = notify_correlation_id;
@ -326,15 +325,15 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c
amf_event_subscription_local_var = OpenAPI_amf_event_subscription_create ( amf_event_subscription_local_var = OpenAPI_amf_event_subscription_create (
event_listList, event_listList,
ogs_strdup_or_assert(event_notify_uri->valuestring), ogs_strdup(event_notify_uri->valuestring),
ogs_strdup_or_assert(notify_correlation_id->valuestring), ogs_strdup(notify_correlation_id->valuestring),
ogs_strdup_or_assert(nf_id->valuestring), ogs_strdup(nf_id->valuestring),
subs_change_notify_uri ? ogs_strdup_or_assert(subs_change_notify_uri->valuestring) : NULL, subs_change_notify_uri ? ogs_strdup(subs_change_notify_uri->valuestring) : NULL,
subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL, subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, supi ? ogs_strdup(supi->valuestring) : NULL,
group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, group_id ? ogs_strdup(group_id->valuestring) : NULL,
gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, gpsi ? ogs_strdup(gpsi->valuestring) : NULL,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, pei ? ogs_strdup(pei->valuestring) : NULL,
any_ue ? true : false, any_ue ? true : false,
any_ue ? any_ue->valueint : 0, any_ue ? any_ue->valueint : 0,
options ? options_local_nonprim : NULL, options ? options_local_nonprim : NULL,

9
lib/sbi/openapi/model/amf_event_subscription_add_info.c
View File

@ -9,10 +9,9 @@ OpenAPI_amf_event_subscription_add_info_t *OpenAPI_amf_event_subscription_add_in
OpenAPI_nf_type_e subscribing_nf_type OpenAPI_nf_type_e subscribing_nf_type
) )
{ {
OpenAPI_amf_event_subscription_add_info_t *amf_event_subscription_add_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_subscription_add_info_t)); OpenAPI_amf_event_subscription_add_info_t *amf_event_subscription_add_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_subscription_add_info_t));
if (!amf_event_subscription_add_info_local_var) { ogs_assert(amf_event_subscription_add_info_local_var);
return NULL;
}
amf_event_subscription_add_info_local_var->binding_info = binding_info; amf_event_subscription_add_info_local_var->binding_info = binding_info;
amf_event_subscription_add_info_local_var->subscribing_nf_type = subscribing_nf_type; amf_event_subscription_add_info_local_var->subscribing_nf_type = subscribing_nf_type;
@ -88,7 +87,7 @@ OpenAPI_amf_event_subscription_add_info_t *OpenAPI_amf_event_subscription_add_in
ogs_error("OpenAPI_amf_event_subscription_add_info_parseFromJSON() failed [binding_info]"); ogs_error("OpenAPI_amf_event_subscription_add_info_parseFromJSON() failed [binding_info]");
goto end; goto end;
} }
OpenAPI_list_add(binding_infoList , ogs_strdup_or_assert(binding_info_local->valuestring)); OpenAPI_list_add(binding_infoList , ogs_strdup(binding_info_local->valuestring));
} }
} }

7
lib/sbi/openapi/model/amf_event_trigger.c
View File

@ -7,10 +7,9 @@
OpenAPI_amf_event_trigger_t *OpenAPI_amf_event_trigger_create( OpenAPI_amf_event_trigger_t *OpenAPI_amf_event_trigger_create(
) )
{ {
OpenAPI_amf_event_trigger_t *amf_event_trigger_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_trigger_t)); OpenAPI_amf_event_trigger_t *amf_event_trigger_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_trigger_t));
if (!amf_event_trigger_local_var) { ogs_assert(amf_event_trigger_local_var);
return NULL;
}
return amf_event_trigger_local_var; return amf_event_trigger_local_var;
} }

7
lib/sbi/openapi/model/amf_event_type.c
View File

@ -7,10 +7,9 @@
OpenAPI_amf_event_type_t *OpenAPI_amf_event_type_create( OpenAPI_amf_event_type_t *OpenAPI_amf_event_type_create(
) )
{ {
OpenAPI_amf_event_type_t *amf_event_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_type_t)); OpenAPI_amf_event_type_t *amf_event_type_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_type_t));
if (!amf_event_type_local_var) { ogs_assert(amf_event_type_local_var);
return NULL;
}
return amf_event_type_local_var; return amf_event_type_local_var;
} }

11
lib/sbi/openapi/model/amf_info.c
View File

@ -15,10 +15,9 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_create(
OpenAPI_n2_interface_amf_info_t *n2_interface_amf_info OpenAPI_n2_interface_amf_info_t *n2_interface_amf_info
) )
{ {
OpenAPI_amf_info_t *amf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_info_t)); OpenAPI_amf_info_t *amf_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_info_t));
if (!amf_info_local_var) { ogs_assert(amf_info_local_var);
return NULL;
}
amf_info_local_var->amf_set_id = amf_set_id; amf_info_local_var->amf_set_id = amf_set_id;
amf_info_local_var->amf_region_id = amf_region_id; amf_info_local_var->amf_region_id = amf_region_id;
amf_info_local_var->guami_list = guami_list; amf_info_local_var->guami_list = guami_list;
@ -348,8 +347,8 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_parseFromJSON(cJSON *amf_infoJSON)
} }
amf_info_local_var = OpenAPI_amf_info_create ( amf_info_local_var = OpenAPI_amf_info_create (
ogs_strdup_or_assert(amf_set_id->valuestring), ogs_strdup(amf_set_id->valuestring),
ogs_strdup_or_assert(amf_region_id->valuestring), ogs_strdup(amf_region_id->valuestring),
guami_listList, guami_listList,
tai_list ? tai_listList : NULL, tai_list ? tai_listList : NULL,
tai_range_list ? tai_range_listList : NULL, tai_range_list ? tai_range_listList : NULL,

27
lib/sbi/openapi/model/amf_non3_gpp_access_registration.c
View File

@ -29,10 +29,9 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
char *supi char *supi
) )
{ {
OpenAPI_amf_non3_gpp_access_registration_t *amf_non3_gpp_access_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_t)); OpenAPI_amf_non3_gpp_access_registration_t *amf_non3_gpp_access_registration_local_var = ogs_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_t));
if (!amf_non3_gpp_access_registration_local_var) { ogs_assert(amf_non3_gpp_access_registration_local_var);
return NULL;
}
amf_non3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id; amf_non3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id;
amf_non3_gpp_access_registration_local_var->supported_features = supported_features; amf_non3_gpp_access_registration_local_var->supported_features = supported_features;
amf_non3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag; amf_non3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag;
@ -450,28 +449,28 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
} }
amf_non3_gpp_access_registration_local_var = OpenAPI_amf_non3_gpp_access_registration_create ( amf_non3_gpp_access_registration_local_var = OpenAPI_amf_non3_gpp_access_registration_create (
ogs_strdup_or_assert(amf_instance_id->valuestring), ogs_strdup(amf_instance_id->valuestring),
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, supported_features ? ogs_strdup(supported_features->valuestring) : NULL,
purge_flag ? true : false, purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0, purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, pei ? ogs_strdup(pei->valuestring) : NULL,
ims_vo_psVariable, ims_vo_psVariable,
ogs_strdup_or_assert(dereg_callback_uri->valuestring), ogs_strdup(dereg_callback_uri->valuestring),
amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL, amf_service_name_dereg ? ogs_strdup(amf_service_name_dereg->valuestring) : NULL,
pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL,
amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL, amf_service_name_pcscf_rest ? ogs_strdup(amf_service_name_pcscf_rest->valuestring) : NULL,
guami_local_nonprim, guami_local_nonprim,
backup_amf_info ? backup_amf_infoList : NULL, backup_amf_info ? backup_amf_infoList : NULL,
rat_typeVariable, rat_typeVariable,
urrp_indicator ? true : false, urrp_indicator ? true : false,
urrp_indicator ? urrp_indicator->valueint : 0, urrp_indicator ? urrp_indicator->valueint : 0,
amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL, amf_ee_subscription_id ? ogs_strdup(amf_ee_subscription_id->valuestring) : NULL,
registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, registration_time ? ogs_strdup(registration_time->valuestring) : NULL,
vgmlc_address ? vgmlc_address_local_nonprim : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL,
context_info ? context_info_local_nonprim : NULL, context_info ? context_info_local_nonprim : NULL,
no_ee_subscription_ind ? true : false, no_ee_subscription_ind ? true : false,
no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0, no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL supi ? ogs_strdup(supi->valuestring) : NULL
); );
return amf_non3_gpp_access_registration_local_var; return amf_non3_gpp_access_registration_local_var;

9
lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c
View File

@ -13,10 +13,9 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac
OpenAPI_list_t *backup_amf_info OpenAPI_list_t *backup_amf_info
) )
{ {
OpenAPI_amf_non3_gpp_access_registration_modification_t *amf_non3_gpp_access_registration_modification_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_modification_t)); OpenAPI_amf_non3_gpp_access_registration_modification_t *amf_non3_gpp_access_registration_modification_local_var = ogs_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_modification_t));
if (!amf_non3_gpp_access_registration_modification_local_var) { ogs_assert(amf_non3_gpp_access_registration_modification_local_var);
return NULL;
}
amf_non3_gpp_access_registration_modification_local_var->guami = guami; amf_non3_gpp_access_registration_modification_local_var->guami = guami;
amf_non3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag; amf_non3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag;
amf_non3_gpp_access_registration_modification_local_var->purge_flag = purge_flag; amf_non3_gpp_access_registration_modification_local_var->purge_flag = purge_flag;
@ -176,7 +175,7 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac
guami_local_nonprim, guami_local_nonprim,
purge_flag ? true : false, purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0, purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, pei ? ogs_strdup(pei->valuestring) : NULL,
ims_vo_ps ? ims_vo_psVariable : 0, ims_vo_ps ? ims_vo_psVariable : 0,
backup_amf_info ? backup_amf_infoList : NULL backup_amf_info ? backup_amf_infoList : NULL
); );

7
lib/sbi/openapi/model/amf_status_change_notification.c
View File

@ -8,10 +8,9 @@ OpenAPI_amf_status_change_notification_t *OpenAPI_amf_status_change_notification
OpenAPI_list_t *amf_status_info_list OpenAPI_list_t *amf_status_info_list
) )
{ {
OpenAPI_amf_status_change_notification_t *amf_status_change_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_status_change_notification_t)); OpenAPI_amf_status_change_notification_t *amf_status_change_notification_local_var = ogs_malloc(sizeof(OpenAPI_amf_status_change_notification_t));
if (!amf_status_change_notification_local_var) { ogs_assert(amf_status_change_notification_local_var);
return NULL;
}
amf_status_change_notification_local_var->amf_status_info_list = amf_status_info_list; amf_status_change_notification_local_var->amf_status_info_list = amf_status_info_list;
return amf_status_change_notification_local_var; return amf_status_change_notification_local_var;

9
lib/sbi/openapi/model/amf_status_change_subscription_data.c
View File

@ -9,10 +9,9 @@ OpenAPI_amf_status_change_subscription_data_t *OpenAPI_amf_status_change_subscri
OpenAPI_list_t *guami_list OpenAPI_list_t *guami_list
) )
{ {
OpenAPI_amf_status_change_subscription_data_t *amf_status_change_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_status_change_subscription_data_t)); OpenAPI_amf_status_change_subscription_data_t *amf_status_change_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_amf_status_change_subscription_data_t));
if (!amf_status_change_subscription_data_local_var) { ogs_assert(amf_status_change_subscription_data_local_var);
return NULL;
}
amf_status_change_subscription_data_local_var->amf_status_uri = amf_status_uri; amf_status_change_subscription_data_local_var->amf_status_uri = amf_status_uri;
amf_status_change_subscription_data_local_var->guami_list = guami_list; amf_status_change_subscription_data_local_var->guami_list = guami_list;
@ -110,7 +109,7 @@ OpenAPI_amf_status_change_subscription_data_t *OpenAPI_amf_status_change_subscri
} }
amf_status_change_subscription_data_local_var = OpenAPI_amf_status_change_subscription_data_create ( amf_status_change_subscription_data_local_var = OpenAPI_amf_status_change_subscription_data_create (
ogs_strdup_or_assert(amf_status_uri->valuestring), ogs_strdup(amf_status_uri->valuestring),
guami_list ? guami_listList : NULL guami_list ? guami_listList : NULL
); );

11
lib/sbi/openapi/model/amf_status_info.c
View File

@ -11,10 +11,9 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_create(
char *target_amf_failure char *target_amf_failure
) )
{ {
OpenAPI_amf_status_info_t *amf_status_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_status_info_t)); OpenAPI_amf_status_info_t *amf_status_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_status_info_t));
if (!amf_status_info_local_var) { ogs_assert(amf_status_info_local_var);
return NULL;
}
amf_status_info_local_var->guami_list = guami_list; amf_status_info_local_var->guami_list = guami_list;
amf_status_info_local_var->status_change = status_change; amf_status_info_local_var->status_change = status_change;
amf_status_info_local_var->target_amf_removal = target_amf_removal; amf_status_info_local_var->target_amf_removal = target_amf_removal;
@ -151,8 +150,8 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_parseFromJSON(cJSON *amf_stat
amf_status_info_local_var = OpenAPI_amf_status_info_create ( amf_status_info_local_var = OpenAPI_amf_status_info_create (
guami_listList, guami_listList,
status_changeVariable, status_changeVariable,
target_amf_removal ? ogs_strdup_or_assert(target_amf_removal->valuestring) : NULL, target_amf_removal ? ogs_strdup(target_amf_removal->valuestring) : NULL,
target_amf_failure ? ogs_strdup_or_assert(target_amf_failure->valuestring) : NULL target_amf_failure ? ogs_strdup(target_amf_failure->valuestring) : NULL
); );
return amf_status_info_local_var; return amf_status_info_local_var;

13
lib/sbi/openapi/model/amf_subscription_info.c
View File

@ -10,10 +10,9 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_create(
char *subs_change_notify_correlation_id char *subs_change_notify_correlation_id
) )
{ {
OpenAPI_amf_subscription_info_t *amf_subscription_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_subscription_info_t)); OpenAPI_amf_subscription_info_t *amf_subscription_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_subscription_info_t));
if (!amf_subscription_info_local_var) { ogs_assert(amf_subscription_info_local_var);
return NULL;
}
amf_subscription_info_local_var->amf_instance_id = amf_instance_id; amf_subscription_info_local_var->amf_instance_id = amf_instance_id;
amf_subscription_info_local_var->subscription_id = subscription_id; amf_subscription_info_local_var->subscription_id = subscription_id;
amf_subscription_info_local_var->subs_change_notify_correlation_id = subs_change_notify_correlation_id; amf_subscription_info_local_var->subs_change_notify_correlation_id = subs_change_notify_correlation_id;
@ -99,9 +98,9 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS
} }
amf_subscription_info_local_var = OpenAPI_amf_subscription_info_create ( amf_subscription_info_local_var = OpenAPI_amf_subscription_info_create (
ogs_strdup_or_assert(amf_instance_id->valuestring), ogs_strdup(amf_instance_id->valuestring),
ogs_strdup_or_assert(subscription_id->valuestring), ogs_strdup(subscription_id->valuestring),
subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL
); );
return amf_subscription_info_local_var; return amf_subscription_info_local_var;

11
lib/sbi/openapi/model/an_gw_address.c
View File

@ -9,10 +9,9 @@ OpenAPI_an_gw_address_t *OpenAPI_an_gw_address_create(
char *an_gw_ipv6_addr char *an_gw_ipv6_addr
) )
{ {
OpenAPI_an_gw_address_t *an_gw_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_an_gw_address_t)); OpenAPI_an_gw_address_t *an_gw_address_local_var = ogs_malloc(sizeof(OpenAPI_an_gw_address_t));
if (!an_gw_address_local_var) { ogs_assert(an_gw_address_local_var);
return NULL;
}
an_gw_address_local_var->an_gw_ipv4_addr = an_gw_ipv4_addr; an_gw_address_local_var->an_gw_ipv4_addr = an_gw_ipv4_addr;
an_gw_address_local_var->an_gw_ipv6_addr = an_gw_ipv6_addr; an_gw_address_local_var->an_gw_ipv6_addr = an_gw_ipv6_addr;
@ -80,8 +79,8 @@ OpenAPI_an_gw_address_t *OpenAPI_an_gw_address_parseFromJSON(cJSON *an_gw_addres
} }
an_gw_address_local_var = OpenAPI_an_gw_address_create ( an_gw_address_local_var = OpenAPI_an_gw_address_create (
an_gw_ipv4_addr ? ogs_strdup_or_assert(an_gw_ipv4_addr->valuestring) : NULL, an_gw_ipv4_addr ? ogs_strdup(an_gw_ipv4_addr->valuestring) : NULL,
an_gw_ipv6_addr ? ogs_strdup_or_assert(an_gw_ipv6_addr->valuestring) : NULL an_gw_ipv6_addr ? ogs_strdup(an_gw_ipv6_addr->valuestring) : NULL
); );
return an_gw_address_local_var; return an_gw_address_local_var;

9
lib/sbi/openapi/model/apn_rate_status.c
View File

@ -16,10 +16,9 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_create(
int remain_ex_reports_dl int remain_ex_reports_dl
) )
{ {
OpenAPI_apn_rate_status_t *apn_rate_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_apn_rate_status_t)); OpenAPI_apn_rate_status_t *apn_rate_status_local_var = ogs_malloc(sizeof(OpenAPI_apn_rate_status_t));
if (!apn_rate_status_local_var) { ogs_assert(apn_rate_status_local_var);
return NULL;
}
apn_rate_status_local_var->is_remain_packets_ul = is_remain_packets_ul; apn_rate_status_local_var->is_remain_packets_ul = is_remain_packets_ul;
apn_rate_status_local_var->remain_packets_ul = remain_packets_ul; apn_rate_status_local_var->remain_packets_ul = remain_packets_ul;
apn_rate_status_local_var->is_remain_packets_dl = is_remain_packets_dl; apn_rate_status_local_var->is_remain_packets_dl = is_remain_packets_dl;
@ -145,7 +144,7 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_parseFromJSON(cJSON *apn_rate
remain_packets_ul ? remain_packets_ul->valuedouble : 0, remain_packets_ul ? remain_packets_ul->valuedouble : 0,
remain_packets_dl ? true : false, remain_packets_dl ? true : false,
remain_packets_dl ? remain_packets_dl->valuedouble : 0, remain_packets_dl ? remain_packets_dl->valuedouble : 0,
validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, validity_time ? ogs_strdup(validity_time->valuestring) : NULL,
remain_ex_reports_ul ? true : false, remain_ex_reports_ul ? true : false,
remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0, remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0,
remain_ex_reports_dl ? true : false, remain_ex_reports_dl ? true : false,

11
lib/sbi/openapi/model/app_descriptor.c
View File

@ -9,10 +9,9 @@ OpenAPI_app_descriptor_t *OpenAPI_app_descriptor_create(
char *app_id char *app_id
) )
{ {
OpenAPI_app_descriptor_t *app_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_descriptor_t)); OpenAPI_app_descriptor_t *app_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_app_descriptor_t));
if (!app_descriptor_local_var) { ogs_assert(app_descriptor_local_var);
return NULL;
}
app_descriptor_local_var->os_id = os_id; app_descriptor_local_var->os_id = os_id;
app_descriptor_local_var->app_id = app_id; app_descriptor_local_var->app_id = app_id;
@ -80,8 +79,8 @@ OpenAPI_app_descriptor_t *OpenAPI_app_descriptor_parseFromJSON(cJSON *app_descri
} }
app_descriptor_local_var = OpenAPI_app_descriptor_create ( app_descriptor_local_var = OpenAPI_app_descriptor_create (
os_id ? ogs_strdup_or_assert(os_id->valuestring) : NULL, os_id ? ogs_strdup(os_id->valuestring) : NULL,
app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL app_id ? ogs_strdup(app_id->valuestring) : NULL
); );
return app_descriptor_local_var; return app_descriptor_local_var;

11
lib/sbi/openapi/model/app_detection_info.c
View File

@ -10,10 +10,9 @@ OpenAPI_app_detection_info_t *OpenAPI_app_detection_info_create(
OpenAPI_list_t *sdf_descriptions OpenAPI_list_t *sdf_descriptions
) )
{ {
OpenAPI_app_detection_info_t *app_detection_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_detection_info_t)); OpenAPI_app_detection_info_t *app_detection_info_local_var = ogs_malloc(sizeof(OpenAPI_app_detection_info_t));
if (!app_detection_info_local_var) { ogs_assert(app_detection_info_local_var);
return NULL;
}
app_detection_info_local_var->app_id = app_id; app_detection_info_local_var->app_id = app_id;
app_detection_info_local_var->instance_id = instance_id; app_detection_info_local_var->instance_id = instance_id;
app_detection_info_local_var->sdf_descriptions = sdf_descriptions; app_detection_info_local_var->sdf_descriptions = sdf_descriptions;
@ -129,8 +128,8 @@ OpenAPI_app_detection_info_t *OpenAPI_app_detection_info_parseFromJSON(cJSON *ap
} }
app_detection_info_local_var = OpenAPI_app_detection_info_create ( app_detection_info_local_var = OpenAPI_app_detection_info_create (
ogs_strdup_or_assert(app_id->valuestring), ogs_strdup(app_id->valuestring),
instance_id ? ogs_strdup_or_assert(instance_id->valuestring) : NULL, instance_id ? ogs_strdup(instance_id->valuestring) : NULL,
sdf_descriptions ? sdf_descriptionsList : NULL sdf_descriptions ? sdf_descriptionsList : NULL
); );

7
lib/sbi/openapi/model/app_port_id.c
View File

@ -11,10 +11,9 @@ OpenAPI_app_port_id_t *OpenAPI_app_port_id_create(
int originator_port int originator_port
) )
{ {
OpenAPI_app_port_id_t *app_port_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_port_id_t)); OpenAPI_app_port_id_t *app_port_id_local_var = ogs_malloc(sizeof(OpenAPI_app_port_id_t));
if (!app_port_id_local_var) { ogs_assert(app_port_id_local_var);
return NULL;
}
app_port_id_local_var->is_destination_port = is_destination_port; app_port_id_local_var->is_destination_port = is_destination_port;
app_port_id_local_var->destination_port = destination_port; app_port_id_local_var->destination_port = destination_port;
app_port_id_local_var->is_originator_port = is_originator_port; app_port_id_local_var->is_originator_port = is_originator_port;

7
lib/sbi/openapi/model/app_session_context.c
View File

@ -10,10 +10,9 @@ OpenAPI_app_session_context_t *OpenAPI_app_session_context_create(
OpenAPI_events_notification_t *evs_notif OpenAPI_events_notification_t *evs_notif
) )
{ {
OpenAPI_app_session_context_t *app_session_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_t)); OpenAPI_app_session_context_t *app_session_context_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_t));
if (!app_session_context_local_var) { ogs_assert(app_session_context_local_var);
return NULL;
}
app_session_context_local_var->asc_req_data = asc_req_data; app_session_context_local_var->asc_req_data = asc_req_data;
app_session_context_local_var->asc_resp_data = asc_resp_data; app_session_context_local_var->asc_resp_data = asc_resp_data;
app_session_context_local_var->evs_notif = evs_notif; app_session_context_local_var->evs_notif = evs_notif;

50
lib/sbi/openapi/model/app_session_context_req_data.c
View File

@ -38,10 +38,9 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_cre
OpenAPI_list_t *tsn_port_man_cont_nwtts OpenAPI_list_t *tsn_port_man_cont_nwtts
) )
{ {
OpenAPI_app_session_context_req_data_t *app_session_context_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_req_data_t)); OpenAPI_app_session_context_req_data_t *app_session_context_req_data_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_req_data_t));
if (!app_session_context_req_data_local_var) { ogs_assert(app_session_context_req_data_local_var);
return NULL;
}
app_session_context_req_data_local_var->af_app_id = af_app_id; app_session_context_req_data_local_var->af_app_id = af_app_id;
app_session_context_req_data_local_var->af_charg_id = af_charg_id; app_session_context_req_data_local_var->af_charg_id = af_charg_id;
app_session_context_req_data_local_var->af_req_data = af_req_data; app_session_context_req_data_local_var->af_req_data = af_req_data;
@ -94,6 +93,7 @@ void OpenAPI_app_session_context_req_data_free(OpenAPI_app_session_context_req_d
ogs_free(app_session_context_req_data->mc_video_id); ogs_free(app_session_context_req_data->mc_video_id);
OpenAPI_list_for_each(app_session_context_req_data->med_components, node) { OpenAPI_list_for_each(app_session_context_req_data->med_components, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_media_component_free(localKeyValue->value); OpenAPI_media_component_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -512,9 +512,9 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par
cJSON *localMapObject = med_components_local_map; cJSON *localMapObject = med_components_local_map;
if (cJSON_IsObject(med_components_local_map)) { if (cJSON_IsObject(med_components_local_map)) {
localMapKeyPair = OpenAPI_map_create( localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_media_component_parseFromJSON(localMapObject)); ogs_strdup(localMapObject->string), OpenAPI_media_component_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(med_components_local_map)) { } else if (cJSON_IsNull(med_components_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else { } else {
ogs_error("OpenAPI_app_session_context_req_data_parseFromJSON() failed [med_components]"); ogs_error("OpenAPI_app_session_context_req_data_parseFromJSON() failed [med_components]");
goto end; goto end;
@ -724,34 +724,34 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par
} }
app_session_context_req_data_local_var = OpenAPI_app_session_context_req_data_create ( app_session_context_req_data_local_var = OpenAPI_app_session_context_req_data_create (
af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL,
af_charg_id ? ogs_strdup_or_assert(af_charg_id->valuestring) : NULL, af_charg_id ? ogs_strdup(af_charg_id->valuestring) : NULL,
af_req_data ? af_req_dataVariable : 0, af_req_data ? af_req_dataVariable : 0,
af_rout_req ? af_rout_req_local_nonprim : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL,
asp_id ? ogs_strdup_or_assert(asp_id->valuestring) : NULL, asp_id ? ogs_strdup(asp_id->valuestring) : NULL,
bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL,
dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, dnn ? ogs_strdup(dnn->valuestring) : NULL,
ev_subsc ? ev_subsc_local_nonprim : NULL, ev_subsc ? ev_subsc_local_nonprim : NULL,
mcptt_id ? ogs_strdup_or_assert(mcptt_id->valuestring) : NULL, mcptt_id ? ogs_strdup(mcptt_id->valuestring) : NULL,
mc_video_id ? ogs_strdup_or_assert(mc_video_id->valuestring) : NULL, mc_video_id ? ogs_strdup(mc_video_id->valuestring) : NULL,
med_components ? med_componentsList : NULL, med_components ? med_componentsList : NULL,
ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL,
mps_id ? ogs_strdup_or_assert(mps_id->valuestring) : NULL, mps_id ? ogs_strdup(mps_id->valuestring) : NULL,
mcs_id ? ogs_strdup_or_assert(mcs_id->valuestring) : NULL, mcs_id ? ogs_strdup(mcs_id->valuestring) : NULL,
preempt_control_info ? preempt_control_infoVariable : 0, preempt_control_info ? preempt_control_infoVariable : 0,
res_prio ? res_prioVariable : 0, res_prio ? res_prioVariable : 0,
serv_inf_status ? serv_inf_statusVariable : 0, serv_inf_status ? serv_inf_statusVariable : 0,
ogs_strdup_or_assert(notif_uri->valuestring), ogs_strdup(notif_uri->valuestring),
serv_urn ? ogs_strdup_or_assert(serv_urn->valuestring) : NULL, serv_urn ? ogs_strdup(serv_urn->valuestring) : NULL,
slice_info ? slice_info_local_nonprim : NULL, slice_info ? slice_info_local_nonprim : NULL,
spon_id ? ogs_strdup_or_assert(spon_id->valuestring) : NULL, spon_id ? ogs_strdup(spon_id->valuestring) : NULL,
spon_status ? spon_statusVariable : 0, spon_status ? spon_statusVariable : 0,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, supi ? ogs_strdup(supi->valuestring) : NULL,
gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, gpsi ? ogs_strdup(gpsi->valuestring) : NULL,
ogs_strdup_or_assert(supp_feat->valuestring), ogs_strdup(supp_feat->valuestring),
ue_ipv4 ? ogs_strdup_or_assert(ue_ipv4->valuestring) : NULL, ue_ipv4 ? ogs_strdup(ue_ipv4->valuestring) : NULL,
ue_ipv6 ? ogs_strdup_or_assert(ue_ipv6->valuestring) : NULL, ue_ipv6 ? ogs_strdup(ue_ipv6->valuestring) : NULL,
ue_mac ? ogs_strdup_or_assert(ue_mac->valuestring) : NULL, ue_mac ? ogs_strdup(ue_mac->valuestring) : NULL,
tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL,
tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL,
tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL

9
lib/sbi/openapi/model/app_session_context_resp_data.c
View File

@ -10,10 +10,9 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_c
char *supp_feat char *supp_feat
) )
{ {
OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_resp_data_t)); OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_resp_data_t));
if (!app_session_context_resp_data_local_var) { ogs_assert(app_session_context_resp_data_local_var);
return NULL;
}
app_session_context_resp_data_local_var->serv_auth_info = serv_auth_info; app_session_context_resp_data_local_var->serv_auth_info = serv_auth_info;
app_session_context_resp_data_local_var->ue_ids = ue_ids; app_session_context_resp_data_local_var->ue_ids = ue_ids;
app_session_context_resp_data_local_var->supp_feat = supp_feat; app_session_context_resp_data_local_var->supp_feat = supp_feat;
@ -132,7 +131,7 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_p
app_session_context_resp_data_local_var = OpenAPI_app_session_context_resp_data_create ( app_session_context_resp_data_local_var = OpenAPI_app_session_context_resp_data_create (
serv_auth_info ? serv_auth_infoVariable : 0, serv_auth_info ? serv_auth_infoVariable : 0,
ue_ids ? ue_idsList : NULL, ue_ids ? ue_idsList : NULL,
supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL
); );
return app_session_context_resp_data_local_var; return app_session_context_resp_data_local_var;

28
lib/sbi/openapi/model/app_session_context_update_data.c
View File

@ -26,10 +26,9 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
OpenAPI_list_t *tsn_port_man_cont_nwtts OpenAPI_list_t *tsn_port_man_cont_nwtts
) )
{ {
OpenAPI_app_session_context_update_data_t *app_session_context_update_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_update_data_t)); OpenAPI_app_session_context_update_data_t *app_session_context_update_data_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_update_data_t));
if (!app_session_context_update_data_local_var) { ogs_assert(app_session_context_update_data_local_var);
return NULL;
}
app_session_context_update_data_local_var->af_app_id = af_app_id; app_session_context_update_data_local_var->af_app_id = af_app_id;
app_session_context_update_data_local_var->af_rout_req = af_rout_req; app_session_context_update_data_local_var->af_rout_req = af_rout_req;
app_session_context_update_data_local_var->asp_id = asp_id; app_session_context_update_data_local_var->asp_id = asp_id;
@ -68,6 +67,7 @@ void OpenAPI_app_session_context_update_data_free(OpenAPI_app_session_context_up
ogs_free(app_session_context_update_data->mc_video_id); ogs_free(app_session_context_update_data->mc_video_id);
OpenAPI_list_for_each(app_session_context_update_data->med_components, node) { OpenAPI_list_for_each(app_session_context_update_data->med_components, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_media_component_rm_free(localKeyValue->value); OpenAPI_media_component_rm_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -368,9 +368,9 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
cJSON *localMapObject = med_components_local_map; cJSON *localMapObject = med_components_local_map;
if (cJSON_IsObject(med_components_local_map)) { if (cJSON_IsObject(med_components_local_map)) {
localMapKeyPair = OpenAPI_map_create( localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_media_component_rm_parseFromJSON(localMapObject)); ogs_strdup(localMapObject->string), OpenAPI_media_component_rm_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(med_components_local_map)) { } else if (cJSON_IsNull(med_components_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else { } else {
ogs_error("OpenAPI_app_session_context_update_data_parseFromJSON() failed [med_components]"); ogs_error("OpenAPI_app_session_context_update_data_parseFromJSON() failed [med_components]");
goto end; goto end;
@ -495,21 +495,21 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
} }
app_session_context_update_data_local_var = OpenAPI_app_session_context_update_data_create ( app_session_context_update_data_local_var = OpenAPI_app_session_context_update_data_create (
af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL,
af_rout_req ? af_rout_req_local_nonprim : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL,
asp_id ? ogs_strdup_or_assert(asp_id->valuestring) : NULL, asp_id ? ogs_strdup(asp_id->valuestring) : NULL,
bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL,
ev_subsc ? ev_subsc_local_nonprim : NULL, ev_subsc ? ev_subsc_local_nonprim : NULL,
mcptt_id ? ogs_strdup_or_assert(mcptt_id->valuestring) : NULL, mcptt_id ? ogs_strdup(mcptt_id->valuestring) : NULL,
mc_video_id ? ogs_strdup_or_assert(mc_video_id->valuestring) : NULL, mc_video_id ? ogs_strdup(mc_video_id->valuestring) : NULL,
med_components ? med_componentsList : NULL, med_components ? med_componentsList : NULL,
mps_id ? ogs_strdup_or_assert(mps_id->valuestring) : NULL, mps_id ? ogs_strdup(mps_id->valuestring) : NULL,
mcs_id ? ogs_strdup_or_assert(mcs_id->valuestring) : NULL, mcs_id ? ogs_strdup(mcs_id->valuestring) : NULL,
preempt_control_info ? preempt_control_info_local_nonprim : NULL, preempt_control_info ? preempt_control_info_local_nonprim : NULL,
res_prio ? res_prioVariable : 0, res_prio ? res_prioVariable : 0,
serv_inf_status ? serv_inf_statusVariable : 0, serv_inf_status ? serv_inf_statusVariable : 0,
sip_fork_ind ? sip_fork_indVariable : 0, sip_fork_ind ? sip_fork_indVariable : 0,
spon_id ? ogs_strdup_or_assert(spon_id->valuestring) : NULL, spon_id ? ogs_strdup(spon_id->valuestring) : NULL,
spon_status ? spon_statusVariable : 0, spon_status ? spon_statusVariable : 0,
tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL,
tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL,

7
lib/sbi/openapi/model/app_session_context_update_data_patch.c
View File

@ -8,10 +8,9 @@ OpenAPI_app_session_context_update_data_patch_t *OpenAPI_app_session_context_upd
OpenAPI_app_session_context_update_data_t *asc_req_data OpenAPI_app_session_context_update_data_t *asc_req_data
) )
{ {
OpenAPI_app_session_context_update_data_patch_t *app_session_context_update_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_update_data_patch_t)); OpenAPI_app_session_context_update_data_patch_t *app_session_context_update_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_update_data_patch_t));
if (!app_session_context_update_data_patch_local_var) { ogs_assert(app_session_context_update_data_patch_local_var);
return NULL;
}
app_session_context_update_data_patch_local_var->asc_req_data = asc_req_data; app_session_context_update_data_patch_local_var->asc_req_data = asc_req_data;
return app_session_context_update_data_patch_local_var; return app_session_context_update_data_patch_local_var;

9
lib/sbi/openapi/model/application_data_change_notif.c
View File

@ -12,10 +12,9 @@ OpenAPI_application_data_change_notif_t *OpenAPI_application_data_change_notif_c
OpenAPI_service_parameter_data_t *ser_param_data OpenAPI_service_parameter_data_t *ser_param_data
) )
{ {
OpenAPI_application_data_change_notif_t *application_data_change_notif_local_var = OpenAPI_malloc(sizeof(OpenAPI_application_data_change_notif_t)); OpenAPI_application_data_change_notif_t *application_data_change_notif_local_var = ogs_malloc(sizeof(OpenAPI_application_data_change_notif_t));
if (!application_data_change_notif_local_var) { ogs_assert(application_data_change_notif_local_var);
return NULL;
}
application_data_change_notif_local_var->iptv_config_data = iptv_config_data; application_data_change_notif_local_var->iptv_config_data = iptv_config_data;
application_data_change_notif_local_var->pfd_data = pfd_data; application_data_change_notif_local_var->pfd_data = pfd_data;
application_data_change_notif_local_var->bdt_policy_data = bdt_policy_data; application_data_change_notif_local_var->bdt_policy_data = bdt_policy_data;
@ -156,7 +155,7 @@ OpenAPI_application_data_change_notif_t *OpenAPI_application_data_change_notif_p
iptv_config_data ? iptv_config_data_local_nonprim : NULL, iptv_config_data ? iptv_config_data_local_nonprim : NULL,
pfd_data ? pfd_data_local_nonprim : NULL, pfd_data ? pfd_data_local_nonprim : NULL,
bdt_policy_data ? bdt_policy_data_local_nonprim : NULL, bdt_policy_data ? bdt_policy_data_local_nonprim : NULL,
ogs_strdup_or_assert(res_uri->valuestring), ogs_strdup(res_uri->valuestring),
ser_param_data ? ser_param_data_local_nonprim : NULL ser_param_data ? ser_param_data_local_nonprim : NULL
); );

13
lib/sbi/openapi/model/application_data_subs.c
View File

@ -11,10 +11,9 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_create(
char *supported_features char *supported_features
) )
{ {
OpenAPI_application_data_subs_t *application_data_subs_local_var = OpenAPI_malloc(sizeof(OpenAPI_application_data_subs_t)); OpenAPI_application_data_subs_t *application_data_subs_local_var = ogs_malloc(sizeof(OpenAPI_application_data_subs_t));
if (!application_data_subs_local_var) { ogs_assert(application_data_subs_local_var);
return NULL;
}
application_data_subs_local_var->notification_uri = notification_uri; application_data_subs_local_var->notification_uri = notification_uri;
application_data_subs_local_var->data_filters = data_filters; application_data_subs_local_var->data_filters = data_filters;
application_data_subs_local_var->expiry = expiry; application_data_subs_local_var->expiry = expiry;
@ -148,10 +147,10 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS
} }
application_data_subs_local_var = OpenAPI_application_data_subs_create ( application_data_subs_local_var = OpenAPI_application_data_subs_create (
ogs_strdup_or_assert(notification_uri->valuestring), ogs_strdup(notification_uri->valuestring),
data_filters ? data_filtersList : NULL, data_filters ? data_filtersList : NULL,
expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, expiry ? ogs_strdup(expiry->valuestring) : NULL,
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL supported_features ? ogs_strdup(supported_features->valuestring) : NULL
); );
return application_data_subs_local_var; return application_data_subs_local_var;

11
lib/sbi/openapi/model/area.c
View File

@ -9,10 +9,9 @@ OpenAPI_area_t *OpenAPI_area_create(
char *area_code char *area_code
) )
{ {
OpenAPI_area_t *area_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_t)); OpenAPI_area_t *area_local_var = ogs_malloc(sizeof(OpenAPI_area_t));
if (!area_local_var) { ogs_assert(area_local_var);
return NULL;
}
area_local_var->tacs = tacs; area_local_var->tacs = tacs;
area_local_var->area_code = area_code; area_local_var->area_code = area_code;
@ -89,7 +88,7 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON)
ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]"); ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]");
goto end; goto end;
} }
OpenAPI_list_add(tacsList , ogs_strdup_or_assert(tacs_local->valuestring)); OpenAPI_list_add(tacsList , ogs_strdup(tacs_local->valuestring));
} }
} }
@ -104,7 +103,7 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON)
area_local_var = OpenAPI_area_create ( area_local_var = OpenAPI_area_create (
tacs ? tacsList : NULL, tacs ? tacsList : NULL,
area_code ? ogs_strdup_or_assert(area_code->valuestring) : NULL area_code ? ogs_strdup(area_code->valuestring) : NULL
); );
return area_local_var; return area_local_var;

11
lib/sbi/openapi/model/area_1.c
View File

@ -9,10 +9,9 @@ OpenAPI_area_1_t *OpenAPI_area_1_create(
char *area_code char *area_code
) )
{ {
OpenAPI_area_1_t *area_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_1_t)); OpenAPI_area_1_t *area_1_local_var = ogs_malloc(sizeof(OpenAPI_area_1_t));
if (!area_1_local_var) { ogs_assert(area_1_local_var);
return NULL;
}
area_1_local_var->tacs = tacs; area_1_local_var->tacs = tacs;
area_1_local_var->area_code = area_code; area_1_local_var->area_code = area_code;
@ -89,7 +88,7 @@ OpenAPI_area_1_t *OpenAPI_area_1_parseFromJSON(cJSON *area_1JSON)
ogs_error("OpenAPI_area_1_parseFromJSON() failed [tacs]"); ogs_error("OpenAPI_area_1_parseFromJSON() failed [tacs]");
goto end; goto end;
} }
OpenAPI_list_add(tacsList , ogs_strdup_or_assert(tacs_local->valuestring)); OpenAPI_list_add(tacsList , ogs_strdup(tacs_local->valuestring));
} }
} }
@ -104,7 +103,7 @@ OpenAPI_area_1_t *OpenAPI_area_1_parseFromJSON(cJSON *area_1JSON)
area_1_local_var = OpenAPI_area_1_create ( area_1_local_var = OpenAPI_area_1_create (
tacs ? tacsList : NULL, tacs ? tacsList : NULL,
area_code ? ogs_strdup_or_assert(area_code->valuestring) : NULL area_code ? ogs_strdup(area_code->valuestring) : NULL
); );
return area_1_local_var; return area_1_local_var;

7
lib/sbi/openapi/model/area_of_validity.c
View File

@ -8,10 +8,9 @@ OpenAPI_area_of_validity_t *OpenAPI_area_of_validity_create(
OpenAPI_list_t *tai_list OpenAPI_list_t *tai_list
) )
{ {
OpenAPI_area_of_validity_t *area_of_validity_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_of_validity_t)); OpenAPI_area_of_validity_t *area_of_validity_local_var = ogs_malloc(sizeof(OpenAPI_area_of_validity_t));
if (!area_of_validity_local_var) { ogs_assert(area_of_validity_local_var);
return NULL;
}
area_of_validity_local_var->tai_list = tai_list; area_of_validity_local_var->tai_list = tai_list;
return area_of_validity_local_var; return area_of_validity_local_var;

18
lib/sbi/openapi/model/area_scope.c
View File

@ -11,10 +11,9 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_create(
OpenAPI_list_t* tac_info_per_plmn OpenAPI_list_t* tac_info_per_plmn
) )
{ {
OpenAPI_area_scope_t *area_scope_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_scope_t)); OpenAPI_area_scope_t *area_scope_local_var = ogs_malloc(sizeof(OpenAPI_area_scope_t));
if (!area_scope_local_var) { ogs_assert(area_scope_local_var);
return NULL;
}
area_scope_local_var->eutra_cell_id_list = eutra_cell_id_list; area_scope_local_var->eutra_cell_id_list = eutra_cell_id_list;
area_scope_local_var->nr_cell_id_list = nr_cell_id_list; area_scope_local_var->nr_cell_id_list = nr_cell_id_list;
area_scope_local_var->tac_list = tac_list; area_scope_local_var->tac_list = tac_list;
@ -43,6 +42,7 @@ void OpenAPI_area_scope_free(OpenAPI_area_scope_t *area_scope)
OpenAPI_list_free(area_scope->tac_list); OpenAPI_list_free(area_scope->tac_list);
OpenAPI_list_for_each(area_scope->tac_info_per_plmn, node) { OpenAPI_list_for_each(area_scope->tac_info_per_plmn, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_tac_info_free(localKeyValue->value); OpenAPI_tac_info_free(localKeyValue->value);
ogs_free(localKeyValue); ogs_free(localKeyValue);
} }
@ -154,7 +154,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON)
ogs_error("OpenAPI_area_scope_parseFromJSON() failed [eutra_cell_id_list]"); ogs_error("OpenAPI_area_scope_parseFromJSON() failed [eutra_cell_id_list]");
goto end; goto end;
} }
OpenAPI_list_add(eutra_cell_id_listList , ogs_strdup_or_assert(eutra_cell_id_list_local->valuestring)); OpenAPI_list_add(eutra_cell_id_listList , ogs_strdup(eutra_cell_id_list_local->valuestring));
} }
} }
@ -174,7 +174,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON)
ogs_error("OpenAPI_area_scope_parseFromJSON() failed [nr_cell_id_list]"); ogs_error("OpenAPI_area_scope_parseFromJSON() failed [nr_cell_id_list]");
goto end; goto end;
} }
OpenAPI_list_add(nr_cell_id_listList , ogs_strdup_or_assert(nr_cell_id_list_local->valuestring)); OpenAPI_list_add(nr_cell_id_listList , ogs_strdup(nr_cell_id_list_local->valuestring));
} }
} }
@ -194,7 +194,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON)
ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_list]"); ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_list]");
goto end; goto end;
} }
OpenAPI_list_add(tac_listList , ogs_strdup_or_assert(tac_list_local->valuestring)); OpenAPI_list_add(tac_listList , ogs_strdup(tac_list_local->valuestring));
} }
} }
@ -213,9 +213,9 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON)
cJSON *localMapObject = tac_info_per_plmn_local_map; cJSON *localMapObject = tac_info_per_plmn_local_map;
if (cJSON_IsObject(tac_info_per_plmn_local_map)) { if (cJSON_IsObject(tac_info_per_plmn_local_map)) {
localMapKeyPair = OpenAPI_map_create( localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_tac_info_parseFromJSON(localMapObject)); ogs_strdup(localMapObject->string), OpenAPI_tac_info_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(tac_info_per_plmn_local_map)) { } else if (cJSON_IsNull(tac_info_per_plmn_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else { } else {
ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_info_per_plmn]"); ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_info_per_plmn]");
goto end; goto end;

7
lib/sbi/openapi/model/arp.c
View File

@ -10,10 +10,9 @@ OpenAPI_arp_t *OpenAPI_arp_create(
OpenAPI_preemption_vulnerability_e preempt_vuln OpenAPI_preemption_vulnerability_e preempt_vuln
) )
{ {
OpenAPI_arp_t *arp_local_var = OpenAPI_malloc(sizeof(OpenAPI_arp_t)); OpenAPI_arp_t *arp_local_var = ogs_malloc(sizeof(OpenAPI_arp_t));
if (!arp_local_var) { ogs_assert(arp_local_var);
return NULL;
}
arp_local_var->priority_level = priority_level; arp_local_var->priority_level = priority_level;
arp_local_var->preempt_cap = preempt_cap; arp_local_var->preempt_cap = preempt_cap;
arp_local_var->preempt_vuln = preempt_vuln; arp_local_var->preempt_vuln = preempt_vuln;

7
lib/sbi/openapi/model/arp_1.c
View File

@ -10,10 +10,9 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_create(
OpenAPI_preemption_vulnerability_e preempt_vuln OpenAPI_preemption_vulnerability_e preempt_vuln
) )
{ {
OpenAPI_arp_1_t *arp_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_arp_1_t)); OpenAPI_arp_1_t *arp_1_local_var = ogs_malloc(sizeof(OpenAPI_arp_1_t));
if (!arp_1_local_var) { ogs_assert(arp_1_local_var);
return NULL;
}
arp_1_local_var->priority_level = priority_level; arp_1_local_var->priority_level = priority_level;
arp_1_local_var->preempt_cap = preempt_cap; arp_1_local_var->preempt_cap = preempt_cap;
arp_1_local_var->preempt_vuln = preempt_vuln; arp_1_local_var->preempt_vuln = preempt_vuln;

7
lib/sbi/openapi/model/assign_ebi_data.c
View File

@ -11,10 +11,9 @@ OpenAPI_assign_ebi_data_t *OpenAPI_assign_ebi_data_create(
OpenAPI_guami_t *old_guami OpenAPI_guami_t *old_guami
) )
{ {
OpenAPI_assign_ebi_data_t *assign_ebi_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_assign_ebi_data_t)); OpenAPI_assign_ebi_data_t *assign_ebi_data_local_var = ogs_malloc(sizeof(OpenAPI_assign_ebi_data_t));
if (!assign_ebi_data_local_var) { ogs_assert(assign_ebi_data_local_var);
return NULL;
}
assign_ebi_data_local_var->pdu_session_id = pdu_session_id; assign_ebi_data_local_var->pdu_session_id = pdu_session_id;
assign_ebi_data_local_var->arp_list = arp_list; assign_ebi_data_local_var->arp_list = arp_list;
assign_ebi_data_local_var->released_ebi_list = released_ebi_list; assign_ebi_data_local_var->released_ebi_list = released_ebi_list;

7
lib/sbi/openapi/model/assign_ebi_error.c
View File

@ -9,10 +9,9 @@ OpenAPI_assign_ebi_error_t *OpenAPI_assign_ebi_error_create(
OpenAPI_assign_ebi_failed_t *failure_details OpenAPI_assign_ebi_failed_t *failure_details
) )
{ {
OpenAPI_assign_ebi_error_t *assign_ebi_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_assign_ebi_error_t)); OpenAPI_assign_ebi_error_t *assign_ebi_error_local_var = ogs_malloc(sizeof(OpenAPI_assign_ebi_error_t));
if (!assign_ebi_error_local_var) { ogs_assert(assign_ebi_error_local_var);
return NULL;
}
assign_ebi_error_local_var->error = error; assign_ebi_error_local_var->error = error;
assign_ebi_error_local_var->failure_details = failure_details; assign_ebi_error_local_var->failure_details = failure_details;

7
lib/sbi/openapi/model/assign_ebi_failed.c
View File

@ -9,10 +9,9 @@ OpenAPI_assign_ebi_failed_t *OpenAPI_assign_ebi_failed_create(
OpenAPI_list_t *failed_arp_list OpenAPI_list_t *failed_arp_list
) )
{ {
OpenAPI_assign_ebi_failed_t *assign_ebi_failed_local_var = OpenAPI_malloc(sizeof(OpenAPI_assign_ebi_failed_t)); OpenAPI_assign_ebi_failed_t *assign_ebi_failed_local_var = ogs_malloc(sizeof(OpenAPI_assign_ebi_failed_t));
if (!assign_ebi_failed_local_var) { ogs_assert(assign_ebi_failed_local_var);
return NULL;
}
assign_ebi_failed_local_var->pdu_session_id = pdu_session_id; assign_ebi_failed_local_var->pdu_session_id = pdu_session_id;
assign_ebi_failed_local_var->failed_arp_list = failed_arp_list; assign_ebi_failed_local_var->failed_arp_list = failed_arp_list;

7
lib/sbi/openapi/model/assigned_ebi_data.c
View File

@ -11,10 +11,9 @@ OpenAPI_assigned_ebi_data_t *OpenAPI_assigned_ebi_data_create(
OpenAPI_list_t *released_ebi_list OpenAPI_list_t *released_ebi_list
) )
{ {
OpenAPI_assigned_ebi_data_t *assigned_ebi_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_assigned_ebi_data_t)); OpenAPI_assigned_ebi_data_t *assigned_ebi_data_local_var = ogs_malloc(sizeof(OpenAPI_assigned_ebi_data_t));
if (!assigned_ebi_data_local_var) { ogs_assert(assigned_ebi_data_local_var);
return NULL;
}
assigned_ebi_data_local_var->pdu_session_id = pdu_session_id; assigned_ebi_data_local_var->pdu_session_id = pdu_session_id;
assigned_ebi_data_local_var->assigned_ebi_list = assigned_ebi_list; assigned_ebi_data_local_var->assigned_ebi_list = assigned_ebi_list;
assigned_ebi_data_local_var->failed_arp_list = failed_arp_list; assigned_ebi_data_local_var->failed_arp_list = failed_arp_list;

7
lib/sbi/openapi/model/association_type.c
View File

@ -7,10 +7,9 @@
OpenAPI_association_type_t *OpenAPI_association_type_create( OpenAPI_association_type_t *OpenAPI_association_type_create(
) )
{ {
OpenAPI_association_type_t *association_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_association_type_t)); OpenAPI_association_type_t *association_type_local_var = ogs_malloc(sizeof(OpenAPI_association_type_t));
if (!association_type_local_var) { ogs_assert(association_type_local_var);
return NULL;
}
return association_type_local_var; return association_type_local_var;
} }

11
lib/sbi/openapi/model/atom.c
View File

@ -11,10 +11,9 @@ OpenAPI_atom_t *OpenAPI_atom_create(
int negative int negative
) )
{ {
OpenAPI_atom_t *atom_local_var = OpenAPI_malloc(sizeof(OpenAPI_atom_t)); OpenAPI_atom_t *atom_local_var = ogs_malloc(sizeof(OpenAPI_atom_t));
if (!atom_local_var) { ogs_assert(atom_local_var);
return NULL;
}
atom_local_var->attr = attr; atom_local_var->attr = attr;
atom_local_var->value = value; atom_local_var->value = value;
atom_local_var->is_negative = is_negative; atom_local_var->is_negative = is_negative;
@ -100,8 +99,8 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON)
} }
atom_local_var = OpenAPI_atom_create ( atom_local_var = OpenAPI_atom_create (
ogs_strdup_or_assert(attr->valuestring), ogs_strdup(attr->valuestring),
ogs_strdup_or_assert(value->valuestring), ogs_strdup(value->valuestring),
negative ? true : false, negative ? true : false,
negative ? negative->valueint : 0 negative ? negative->valueint : 0
); );

7
lib/sbi/openapi/model/atsss_capability.c
View File

@ -13,10 +13,9 @@ OpenAPI_atsss_capability_t *OpenAPI_atsss_capability_create(
int rtt_without_pmf int rtt_without_pmf
) )
{ {
OpenAPI_atsss_capability_t *atsss_capability_local_var = OpenAPI_malloc(sizeof(OpenAPI_atsss_capability_t)); OpenAPI_atsss_capability_t *atsss_capability_local_var = ogs_malloc(sizeof(OpenAPI_atsss_capability_t));
if (!atsss_capability_local_var) { ogs_assert(atsss_capability_local_var);
return NULL;
}
atsss_capability_local_var->is_atsss_ll = is_atsss_ll; atsss_capability_local_var->is_atsss_ll = is_atsss_ll;
atsss_capability_local_var->atsss_ll = atsss_ll; atsss_capability_local_var->atsss_ll = atsss_ll;
atsss_capability_local_var->is_mptcp = is_mptcp; atsss_capability_local_var->is_mptcp = is_mptcp;

11
lib/sbi/openapi/model/ausf_info.c
View File

@ -10,10 +10,9 @@ OpenAPI_ausf_info_t *OpenAPI_ausf_info_create(
OpenAPI_list_t *routing_indicators OpenAPI_list_t *routing_indicators
) )
{ {
OpenAPI_ausf_info_t *ausf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ausf_info_t)); OpenAPI_ausf_info_t *ausf_info_local_var = ogs_malloc(sizeof(OpenAPI_ausf_info_t));
if (!ausf_info_local_var) { ogs_assert(ausf_info_local_var);
return NULL;
}
ausf_info_local_var->group_id = group_id; ausf_info_local_var->group_id = group_id;
ausf_info_local_var->supi_ranges = supi_ranges; ausf_info_local_var->supi_ranges = supi_ranges;
ausf_info_local_var->routing_indicators = routing_indicators; ausf_info_local_var->routing_indicators = routing_indicators;
@ -147,12 +146,12 @@ OpenAPI_ausf_info_t *OpenAPI_ausf_info_parseFromJSON(cJSON *ausf_infoJSON)
ogs_error("OpenAPI_ausf_info_parseFromJSON() failed [routing_indicators]"); ogs_error("OpenAPI_ausf_info_parseFromJSON() failed [routing_indicators]");
goto end; goto end;
} }
OpenAPI_list_add(routing_indicatorsList , ogs_strdup_or_assert(routing_indicators_local->valuestring)); OpenAPI_list_add(routing_indicatorsList , ogs_strdup(routing_indicators_local->valuestring));
} }
} }
ausf_info_local_var = OpenAPI_ausf_info_create ( ausf_info_local_var = OpenAPI_ausf_info_create (
group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, group_id ? ogs_strdup(group_id->valuestring) : NULL,
supi_ranges ? supi_rangesList : NULL, supi_ranges ? supi_rangesList : NULL,
routing_indicators ? routing_indicatorsList : NULL routing_indicators ? routing_indicatorsList : NULL
); );

13
lib/sbi/openapi/model/auth_event.c
View File

@ -14,10 +14,9 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_create(
int auth_removal_ind int auth_removal_ind
) )
{ {
OpenAPI_auth_event_t *auth_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_auth_event_t)); OpenAPI_auth_event_t *auth_event_local_var = ogs_malloc(sizeof(OpenAPI_auth_event_t));
if (!auth_event_local_var) { ogs_assert(auth_event_local_var);
return NULL;
}
auth_event_local_var->nf_instance_id = nf_instance_id; auth_event_local_var->nf_instance_id = nf_instance_id;
auth_event_local_var->success = success; auth_event_local_var->success = success;
auth_event_local_var->time_stamp = time_stamp; auth_event_local_var->time_stamp = time_stamp;
@ -157,12 +156,12 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
} }
auth_event_local_var = OpenAPI_auth_event_create ( auth_event_local_var = OpenAPI_auth_event_create (
ogs_strdup_or_assert(nf_instance_id->valuestring), ogs_strdup(nf_instance_id->valuestring),
success->valueint, success->valueint,
ogs_strdup_or_assert(time_stamp->valuestring), ogs_strdup(time_stamp->valuestring),
auth_typeVariable, auth_typeVariable,
ogs_strdup_or_assert(serving_network_name->valuestring), ogs_strdup(serving_network_name->valuestring),
auth_removal_ind ? true : false, auth_removal_ind ? true : false,
auth_removal_ind ? auth_removal_ind->valueint : 0 auth_removal_ind ? auth_removal_ind->valueint : 0
); );

Some files were not shown because too many files have changed in this diff Show More