remove pool related configuration (#1431)
This commit is contained in:
parent
224d1caca1
commit
2cb06b3085
|
@ -324,30 +324,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# usrsctp:
|
||||
# udp_port : 9899
|
||||
|
|
|
@ -162,30 +162,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -164,30 +164,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -52,27 +52,3 @@ parameter:
|
|||
# gnb: 64
|
||||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
|
|
@ -398,30 +398,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# usrsctp:
|
||||
# udp_port : 9899
|
||||
|
|
|
@ -111,30 +111,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -204,30 +204,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -164,30 +164,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -51,27 +51,3 @@ parameter:
|
|||
# gnb: 64
|
||||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
|
|
@ -152,30 +152,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -141,30 +141,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -522,30 +522,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -162,30 +162,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -164,30 +164,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -212,30 +212,6 @@ parameter:
|
|||
#
|
||||
max:
|
||||
|
||||
#
|
||||
# pool:
|
||||
#
|
||||
# o The default memory pool size was set assuming 1024 UEs.
|
||||
# To connect more UEs, you need to increase the size further.
|
||||
#
|
||||
# - Pool-size 128 => 65536 Number
|
||||
# - Pool-size 256 => 16384 Number
|
||||
# - Pool-size 512 => 4096 Number
|
||||
# - Pool-size 1024 => 1024 Number
|
||||
# - Pool-size 2048 => 512 Number
|
||||
# - Pool-size 8192 => 128 Number
|
||||
# - Pool-size 1024*1024 => 8 Number
|
||||
#
|
||||
# 128: 65536
|
||||
# 256: 16384
|
||||
# 512: 4096
|
||||
# 1024: 1024
|
||||
# 2048: 512
|
||||
# 8192: 128
|
||||
# big: 8
|
||||
#
|
||||
pool:
|
||||
|
||||
#
|
||||
# time:
|
||||
#
|
||||
|
|
|
@ -439,43 +439,6 @@ int ogs_app_context_parse_config(void)
|
|||
}
|
||||
|
||||
recalculate_pool_size();
|
||||
} else if (!strcmp(root_key, "pool")) {
|
||||
ogs_yaml_iter_t pool_iter;
|
||||
ogs_yaml_iter_recurse(&root_iter, &pool_iter);
|
||||
while (ogs_yaml_iter_next(&pool_iter)) {
|
||||
const char *pool_key = ogs_yaml_iter_key(&pool_iter);
|
||||
ogs_assert(pool_key);
|
||||
if (!strcmp(pool_key, "128")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_128_pool = atoi(v);
|
||||
} else if (!strcmp(pool_key, "256")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_256_pool = atoi(v);
|
||||
} else if (!strcmp(pool_key, "512")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_512_pool = atoi(v);
|
||||
} else if (!strcmp(pool_key, "1024")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_1024_pool = atoi(v);
|
||||
} else if (!strcmp(pool_key, "2048")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_2048_pool = atoi(v);
|
||||
} else if (!strcmp(pool_key, "8192")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_8192_pool = atoi(v);
|
||||
} else if (!strcmp(pool_key, "big")) {
|
||||
const char *v = ogs_yaml_iter_value(&pool_iter);
|
||||
if (v)
|
||||
self.pool.defconfig.cluster_big_pool = atoi(v);
|
||||
} else
|
||||
ogs_warn("unknown key `%s`", pool_key);
|
||||
}
|
||||
} else if (!strcmp(root_key, "time")) {
|
||||
ogs_yaml_iter_t time_iter;
|
||||
ogs_yaml_iter_recurse(&root_iter, &time_iter);
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#undef OGS_LOG_DOMAIN
|
||||
#define OGS_LOG_DOMAIN __ogs_mem_domain
|
||||
|
||||
#if OGS_USE_TALLOC == 0
|
||||
#define OGS_CLUSTER_128_SIZE 128
|
||||
#define OGS_CLUSTER_256_SIZE 256
|
||||
#define OGS_CLUSTER_512_SIZE 512
|
||||
|
@ -64,7 +65,6 @@ typedef struct ogs_pkbuf_pool_s {
|
|||
static OGS_POOL(pkbuf_pool, ogs_pkbuf_pool_t);
|
||||
static ogs_pkbuf_pool_t *default_pool = NULL;
|
||||
|
||||
#if OGS_USE_TALLOC == 0
|
||||
static ogs_cluster_t *cluster_alloc(
|
||||
ogs_pkbuf_pool_t *pool, unsigned int size);
|
||||
static void cluster_free(ogs_pkbuf_pool_t *pool, ogs_cluster_t *cluster);
|
||||
|
@ -81,16 +81,21 @@ void *ogs_pkbuf_put_data(
|
|||
|
||||
void ogs_pkbuf_init(void)
|
||||
{
|
||||
#if OGS_USE_TALLOC == 0
|
||||
ogs_pool_init(&pkbuf_pool, ogs_core()->pkbuf.pool);
|
||||
#endif
|
||||
}
|
||||
|
||||
void ogs_pkbuf_final(void)
|
||||
{
|
||||
#if OGS_USE_TALLOC == 0
|
||||
ogs_pool_final(&pkbuf_pool);
|
||||
#endif
|
||||
}
|
||||
|
||||
void ogs_pkbuf_default_init(ogs_pkbuf_config_t *config)
|
||||
{
|
||||
#if OGS_USE_TALLOC == 0
|
||||
ogs_assert(config);
|
||||
memset(config, 0, sizeof *config);
|
||||
|
||||
|
@ -101,21 +106,27 @@ void ogs_pkbuf_default_init(ogs_pkbuf_config_t *config)
|
|||
config->cluster_2048_pool = 1024;
|
||||
config->cluster_8192_pool = 512;
|
||||
config->cluster_big_pool = 8;
|
||||
#endif
|
||||
}
|
||||
|
||||
void ogs_pkbuf_default_create(ogs_pkbuf_config_t *config)
|
||||
{
|
||||
#if OGS_USE_TALLOC == 0
|
||||
default_pool = ogs_pkbuf_pool_create(config);
|
||||
#endif
|
||||
}
|
||||
|
||||
void ogs_pkbuf_default_destroy(void)
|
||||
{
|
||||
#if OGS_USE_TALLOC == 0
|
||||
ogs_pkbuf_pool_destroy(default_pool);
|
||||
#endif
|
||||
}
|
||||
|
||||
ogs_pkbuf_pool_t *ogs_pkbuf_pool_create(ogs_pkbuf_config_t *config)
|
||||
{
|
||||
ogs_pkbuf_pool_t *pool = NULL;
|
||||
#if OGS_USE_TALLOC == 0
|
||||
int tmp = 0;
|
||||
|
||||
ogs_assert(config);
|
||||
|
@ -141,6 +152,7 @@ ogs_pkbuf_pool_t *ogs_pkbuf_pool_create(ogs_pkbuf_config_t *config)
|
|||
ogs_pool_init(&pool->cluster_2048, config->cluster_2048_pool);
|
||||
ogs_pool_init(&pool->cluster_8192, config->cluster_8192_pool);
|
||||
ogs_pool_init(&pool->cluster_big, config->cluster_big_pool);
|
||||
#endif
|
||||
|
||||
return pool;
|
||||
}
|
||||
|
@ -165,6 +177,7 @@ ogs_pkbuf_pool_t *ogs_pkbuf_pool_create(ogs_pkbuf_config_t *config)
|
|||
|
||||
void ogs_pkbuf_pool_destroy(ogs_pkbuf_pool_t *pool)
|
||||
{
|
||||
#if OGS_USE_TALLOC == 0
|
||||
ogs_assert(pool);
|
||||
|
||||
ogs_pkbuf_pool_final(&pool->pkbuf);
|
||||
|
@ -181,6 +194,7 @@ void ogs_pkbuf_pool_destroy(ogs_pkbuf_pool_t *pool)
|
|||
ogs_thread_mutex_destroy(&pool->mutex);
|
||||
|
||||
ogs_pool_free(&pkbuf_pool, pool);
|
||||
#endif
|
||||
}
|
||||
|
||||
ogs_pkbuf_t *ogs_pkbuf_alloc_debug(
|
||||
|
@ -189,7 +203,7 @@ ogs_pkbuf_t *ogs_pkbuf_alloc_debug(
|
|||
#if OGS_USE_TALLOC
|
||||
ogs_pkbuf_t *pkbuf = NULL;
|
||||
|
||||
pkbuf = ogs_talloc_zero_size(NULL, sizeof(*pkbuf) + size, file_line);
|
||||
pkbuf = ogs_talloc_zero_size(pool, sizeof(*pkbuf) + size, file_line);
|
||||
if (!pkbuf) {
|
||||
ogs_error("ogs_pkbuf_alloc() failed [size=%d]", size);
|
||||
return NULL;
|
||||
|
|
|
@ -35,7 +35,11 @@ typedef struct ogs_cluster_s {
|
|||
unsigned int ref;
|
||||
} ogs_cluster_t;
|
||||
|
||||
#if OGS_USE_TALLOC
|
||||
typedef void ogs_pkbuf_pool_t;
|
||||
#else
|
||||
typedef struct ogs_pkbuf_pool_s ogs_pkbuf_pool_t;
|
||||
#endif
|
||||
typedef struct ogs_pkbuf_s {
|
||||
ogs_lnode_t lnode;
|
||||
|
||||
|
@ -158,15 +162,8 @@ static ogs_inline void *ogs_pkbuf_pull_inline(
|
|||
|
||||
static ogs_inline void *ogs_pkbuf_pull(ogs_pkbuf_t *pkbuf, unsigned int len)
|
||||
{
|
||||
#if 0
|
||||
if (ogs_unlikely(len > pkbuf->len))
|
||||
ogs_assert_if_reached();
|
||||
|
||||
return ogs_pkbuf_pull_inline(pkbuf, len);
|
||||
#else
|
||||
return ogs_unlikely(len > pkbuf->len) ?
|
||||
NULL : ogs_pkbuf_pull_inline(pkbuf, len);
|
||||
#endif
|
||||
}
|
||||
|
||||
static ogs_inline int ogs_pkbuf_trim(ogs_pkbuf_t *pkbuf, int len)
|
||||
|
|
|
@ -330,29 +330,6 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message)
|
|||
ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_SNSSAI, v);
|
||||
ogs_free(v);
|
||||
}
|
||||
if (message->param.plmn_id_presence) {
|
||||
OpenAPI_plmn_id_t plmn_id;
|
||||
|
||||
plmn_id.mnc = ogs_plmn_id_mnc_string(&message->param.plmn_id);
|
||||
plmn_id.mcc = ogs_plmn_id_mcc_string(&message->param.plmn_id);
|
||||
|
||||
if (plmn_id.mnc && plmn_id.mcc) {
|
||||
char *v = NULL;
|
||||
cJSON *item = NULL;
|
||||
|
||||
item = OpenAPI_plmn_id_convertToJSON(&plmn_id);
|
||||
ogs_expect_or_return_val(item, NULL);
|
||||
if (plmn_id.mnc) ogs_free(plmn_id.mnc);
|
||||
if (plmn_id.mcc) ogs_free(plmn_id.mcc);
|
||||
|
||||
v = cJSON_Print(item);
|
||||
ogs_expect_or_return_val(v, NULL);
|
||||
cJSON_Delete(item);
|
||||
|
||||
ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_PLMN_ID, v);
|
||||
ogs_free(v);
|
||||
}
|
||||
}
|
||||
if (message->param.slice_info_request_for_pdu_session_presence) {
|
||||
OpenAPI_slice_info_for_pdu_session_t SliceInfoForPDUSession;
|
||||
OpenAPI_snssai_t sNSSAI;
|
||||
|
|
|
@ -28,7 +28,6 @@ ogs_pkbuf_t *ogs_tun_read(ogs_socket_t fd, ogs_pkbuf_pool_t *packet_pool)
|
|||
int n;
|
||||
|
||||
ogs_assert(fd != INVALID_SOCKET);
|
||||
ogs_assert(packet_pool);
|
||||
|
||||
recvbuf = ogs_pkbuf_alloc(packet_pool, OGS_MAX_PKT_LEN);
|
||||
ogs_assert(recvbuf);
|
||||
|
|
Loading…
Reference in New Issue