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

core_free -> CORE_FREE. We need to know which function raise this 

exception
This commit is contained in:
Sukchan Lee 2018-01-13 22:03:30 +09:00
parent 63562dd63a
commit 8c3d4ca0de
33 changed files with 88 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/include/core_pkbuf.h
View File

@ -7,7 +7,7 @@
*/
#include "core.h"
#include "core_errno.h"
#include "core_debug.h"
#ifdef __cplusplus
extern "C" {
@ -187,7 +187,8 @@ CORE_DECLARE(status_t) pkbuf_tobuf_partial(pkbuf_t *pkbuf,
/* memory handling library like OS-function(malloc,free) */
CORE_DECLARE(void *) core_malloc(size_t size);
CORE_DECLARE(void) core_free(void *ptr);
#define CORE_FREE(__pTR) d_assert(core_free(__pTR) == CORE_OK,,);
CORE_DECLARE(status_t) core_free(void *ptr);
CORE_DECLARE(void *) core_calloc(size_t nmemb, size_t size);
CORE_DECLARE(void *) core_realloc(void *ptr, size_t size);

2
lib/core/include/core_tlv_msg.h
View File

@ -105,7 +105,7 @@ typedef struct _tlv_int32_t {
d_assert((__dATA), , "Null param"); \
if ((__dATA)->data) \
{ \
core_free((__dATA)->data); \
CORE_FREE((__dATA)->data); \
(__dATA)->data = NULL; \
(__dATA)->len = 0; \
(__dATA)->presence = 0; \

8
lib/core/src/hash.c
View File

@ -101,12 +101,12 @@ CORE_DECLARE(void) hash_destroy(hash_t *ht)
{
next_he = he->next;
core_free(he);
CORE_FREE(he);
he = next_he;
}
core_free(ht->array);
core_free(ht);
CORE_FREE(ht->array);
CORE_FREE(ht);
}
/*
@ -188,7 +188,7 @@ static void expand_array(hash_t *ht)
hi->this->next = new_array[i];
new_array[i] = hi->this;
}
core_free(ht->array);
CORE_FREE(ht->array);
ht->array = new_array;
ht->max = new_max;
}

4
lib/core/src/msgq.c
View File

@ -77,7 +77,7 @@ msgq_id msgq_create(int qdepth, int msgsize, int opt)
return (msgq_id)md;
error_final:
if (md->pool) core_free(md->pool);
if (md->pool) CORE_FREE(md->pool);
if (md->mut_c) mutex_delete(md->mut_c);
if (md->mut_r) mutex_delete(md->mut_r);
if (md->mut_w) mutex_delete(md->mut_w);
@ -94,7 +94,7 @@ status_t msgq_delete(msgq_id id)
d_assert(md != NULL, return CORE_ERROR, "param 'id' is null");
if (md->pool) core_free(md->pool);
if (md->pool) CORE_FREE(md->pool);
if (md->mut_c) mutex_delete(md->mut_c);
if (md->mut_r) mutex_delete(md->mut_r);
if (md->mut_w) mutex_delete(md->mut_w);

8
lib/core/src/unix/pkbuf.c
View File

@ -548,18 +548,20 @@ void *core_malloc(size_t size)
return p->payload;
}
void core_free(void *ptr)
status_t core_free(void *ptr)
{
c_uint16_t headroom = sizeof(pkbuf_t *);
pkbuf_t *p = NULL;
if (!ptr)
return;
return CORE_OK;
memcpy(&p, ptr - headroom, headroom);
d_assert(p, return, "Null param");
d_assert(p, return CORE_ERROR, "Null param");
pkbuf_free(p);
return CORE_OK;
}
void *core_calloc(size_t nmemb, size_t size)

4
lib/core/src/unix/sockaddr.c
View File

@ -21,7 +21,7 @@ status_t core_freeaddrinfo(c_sockaddr_t *sa_list)
while(addr)
{
next = addr->next;
core_free(addr);
CORE_FREE(addr);
addr = next;
}
@ -109,7 +109,7 @@ status_t core_filteraddrinfo(c_sockaddr_t **sa_list, int family)
prev->next = addr->next;
else
*sa_list = addr->next;
core_free(addr);
CORE_FREE(addr);
}
else

8
lib/core/test/abts.c
View File

@ -217,12 +217,12 @@ static void abts_free(abts_suite *suite)
while (ptr != NULL) {
next_ptr = ptr->next;
core_free((void*)ptr->name);
core_free(ptr);
CORE_FREE((void*)ptr->name);
CORE_FREE(ptr);
ptr = next_ptr;
}
core_free(suite);
CORE_FREE(suite);
}
void abts_log_message(const char *fmt, ...)
@ -473,7 +473,7 @@ int main(int argc, const char *const argv[]) {
abts_free(suite);
core_free(testlist);
CORE_FREE(testlist);
return rv;
}

4
lib/core/test/testaes.c
View File

@ -126,8 +126,8 @@ static void aes_test2(abts_case *tc, void *data)
rc = memcmp(tmp, test_vector[i].decipher_output, 16);
ABTS_INT_EQUAL(tc, 0, rc);
core_free(test_vector[i].key);
core_free(test_vector[i].rk);
CORE_FREE(test_vector[i].key);
CORE_FREE(test_vector[i].rk);
}
}

8
lib/core/test/testfile.c
View File

@ -109,7 +109,7 @@ static void test_read(abts_case *tc, void *data)
ABTS_SIZE_EQUAL(tc, strlen(TESTSTR), nbytes);
ABTS_STR_EQUAL(tc, TESTSTR, str);
core_free(str);
CORE_FREE(str);
file_close(filetest);
}
@ -289,7 +289,7 @@ static void test_seek(abts_case *tc, void *data)
ABTS_SIZE_EQUAL(tc, 5, nbytes);
ABTS_STR_EQUAL(tc, TESTSTR + strlen(TESTSTR) - 5, str);
core_free(str);
CORE_FREE(str);
file_close(filetest);
}
@ -329,7 +329,7 @@ static void test_gets(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, CORE_EOF, rv);
ABTS_STR_EQUAL(tc, "", str);
core_free(str);
CORE_FREE(str);
file_close(f);
}
@ -476,7 +476,7 @@ static void file_contents_equal(abts_case *tc,
CORE_ASSERT_OK(tc, "close file", file_close(f));
core_free(actual);
CORE_FREE(actual);
}
#define LINE1 "this is a line of text\n"

8
lib/core/test/testpkbuf.c
View File

@ -5,7 +5,7 @@ static void pkbuf_test1(abts_case *tc, void *data)
{
char *ptr = core_malloc(256);
ABTS_PTR_NOTNULL(tc, ptr);
core_free(ptr);
CORE_FREE(ptr);
}
static void pkbuf_test2(abts_case *tc, void *data)
@ -17,14 +17,14 @@ static void pkbuf_test2(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, 0, ptr[i]);
}
ABTS_PTR_NOTNULL(tc, ptr);
core_free(ptr);
CORE_FREE(ptr);
}
static void pkbuf_test3(abts_case *tc, void *data)
{
char *ptr = core_realloc(0, 10);
ABTS_PTR_NOTNULL(tc, ptr);
core_free(ptr);
CORE_FREE(ptr);
ptr = core_malloc(20);
ABTS_PTR_NOTNULL(tc, ptr);
@ -49,7 +49,7 @@ static void pkbuf_test4(abts_case *tc, void *data)
SIZEOF_VOIDP);
ABTS_TRUE(tc, p != q);
ABTS_TRUE(tc, memcmp(p, q, 10) == 0);
core_free(p);
CORE_FREE(p);
}

4
lib/fd/gx/gx_message.c
View File

@ -20,7 +20,9 @@ void gx_message_free(gx_message_t *gx_message)
flow_t *flow = &pcc_rule->flow[j];
if (flow->description)
core_free(flow->description);
{
CORE_FREE(flow->description);
}
else
d_assert(0,, "Null param");
}

4
lib/fd/rx/rx_message.c
View File

@ -21,7 +21,9 @@ void rx_message_free(rx_message_t *rx_message)
flow_t *flow = &media_component->flow[j];
if (flow->description)
core_free(flow->description);
{
CORE_FREE(flow->description);
}
else
d_assert(0,, "Null param");
}

8
lib/gtp/gtp_conv.c
View File

@ -72,21 +72,21 @@ status_t gtp_f_teid_to_sockaddr(
else if (f_teid->ipv4)
{
addr->sin.sin_addr.s_addr = f_teid->addr;
core_free(addr6);
CORE_FREE(addr6);
*list = addr;
}
else if (f_teid->ipv6)
{
memcpy(addr6->sin6.sin6_addr.s6_addr, f_teid->addr6, IPV6_LEN);
core_free(addr);
CORE_FREE(addr);
*list = addr6;
}
else
{
core_free(addr);
core_free(addr6);
CORE_FREE(addr);
CORE_FREE(addr6);
d_assert(0, return CORE_ERROR,);
}

2
lib/nas/nas_types.h
View File

@ -12,7 +12,7 @@ extern "C" {
d_assert((__dATA), , "Null param"); \
if ((__dATA)->buffer) \
{ \
core_free((__dATA)->buffer); \
CORE_FREE((__dATA)->buffer); \
(__dATA)->buffer = NULL; \
(__dATA)->length = 0; \
} \

2
lib/s1ap/asn1c/asn_internal.h
View File

@ -33,7 +33,7 @@ int get_asn1c_environment_version(void); /* Run-time version */
#define CALLOC(nmemb, size) core_calloc(nmemb, size)
#define MALLOC(size) core_malloc(size)
#define REALLOC(oldptr, size) core_realloc(oldptr, size)
#define FREEMEM(ptr) core_free(ptr)
#define FREEMEM(ptr) CORE_FREE(ptr)
#endif
#define asn_debug_indent 0

2
lib/s1ap/s1ap_decoder.c
View File

@ -314,7 +314,7 @@ static void s1ap_decode_xer_print_message(
func(cb, message_string, message_p);
printf("%s\n", message_string);
core_free(message_string);
CORE_FREE(message_string);
}
}

2
lib/s1ap/s1ap_encoder.c
View File

@ -1046,7 +1046,7 @@ static void s1ap_encode_xer_print_message(
printf("%s\n", message_string);
core_free(message_string);
CORE_FREE(message_string);
}
}

2
lib/s1ap/s1ap_message.h
View File

@ -14,7 +14,7 @@ extern "C" {
d_assert((__dATA), , "Null param"); \
if ((__dATA)->buf) \
{ \
core_free((__dATA)->buf); \
CORE_FREE((__dATA)->buf); \
(__dATA)->buf = NULL; \
(__dATA)->size = 0; \
} \

4
src/app/context.c
View File

@ -35,7 +35,7 @@ status_t context_final()
if (self.config.document)
{
yaml_document_delete(self.config.document);
core_free(self.config.document);
CORE_FREE(self.config.document);
}
context_initialized = 0;
@ -67,7 +67,7 @@ status_t context_read_file()
if (!yaml_parser_load(&parser, document))
{
d_fatal("Failed to parse configuration file '%s'", config->path);
core_free(document);
CORE_FREE(document);
return CORE_ERROR;
}

6
src/mme/mme_context.c
View File

@ -1587,7 +1587,7 @@ status_t mme_enb_remove(mme_enb_t *enb)
if (enb->sock_type == SOCK_STREAM)
s1ap_delete(enb->sock);
#endif
core_free(enb->addr);
CORE_FREE(enb->addr);
index_free(&mme_enb_pool, enb);
@ -1871,8 +1871,8 @@ status_t mme_ue_remove(mme_ue_t *mme_ue)
(S1ap_UERadioCapability_t *)mme_ue->radio_capa;
if (radio_capa->buf)
core_free(radio_capa->buf);
core_free(mme_ue->radio_capa);
CORE_FREE(radio_capa->buf);
CORE_FREE(mme_ue->radio_capa);
}
/* Clear Transparent Container */

4
src/mme/mme_sm.c
View File

@ -137,7 +137,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
else
enb = mme_enb_find_by_addr(addr);
#endif
core_free(addr);
CORE_FREE(addr);
if (enb)
{
@ -170,7 +170,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
d_assert(pkbuf, break, "Null param");
enb = mme_enb_find_by_addr(addr);
core_free(addr);
CORE_FREE(addr);
d_assert(enb, pkbuf_free(pkbuf); break, "No eNB context");
d_assert(FSM_STATE(&enb->sm), pkbuf_free(pkbuf); break,

4
src/mme/s1ap_handler.c
View File

@ -227,8 +227,8 @@ void s1ap_handle_ue_capability_info_indication(
radio_capa = (S1ap_UERadioCapability_t *)mme_ue->radio_capa;
if (radio_capa->buf)
core_free(radio_capa->buf);
core_free(mme_ue->radio_capa);
CORE_FREE(radio_capa->buf);
CORE_FREE(mme_ue->radio_capa);
}
/* Save UE radio capability */
mme_ue->radio_capa = core_calloc(1, sizeof(S1ap_UERadioCapability_t));

6
src/mme/s1ap_sctp.c
View File

@ -106,7 +106,7 @@ static int s1ap_accept_handler(sock_id id, void *data)
event_set_param2(&e, (c_uintptr_t)addr);
if (mme_event_send(&e) != CORE_OK)
{
core_free(addr);
CORE_FREE(addr);
}
return 0;
@ -169,7 +169,7 @@ int s1ap_recv_handler(sock_id sock, void *data)
if (mme_event_send(&e) != CORE_OK)
{
d_error("Event MME_EVT_S1AP_LO_CONNREFUSED failed");
core_free(addr);
CORE_FREE(addr);
}
return 0;
@ -201,7 +201,7 @@ int s1ap_recv_handler(sock_id sock, void *data)
if (rv != CORE_OK)
{
pkbuf_free(pkbuf);
core_free(addr);
CORE_FREE(addr);
}
return 0;

8
src/mme/s1ap_usrsctp.c
View File

@ -374,7 +374,7 @@ static int s1ap_usrsctp_recv_handler(struct socket *sock,
event_set_param2(&e, (c_uintptr_t)addr);
if (mme_event_send(&e) != CORE_OK)
{
core_free(addr);
CORE_FREE(addr);
}
}
else if (not->sn_assoc_change.sac_state == SCTP_COMM_UP)
@ -388,7 +388,7 @@ static int s1ap_usrsctp_recv_handler(struct socket *sock,
event_set_param2(&e, (c_uintptr_t)addr);
if (mme_event_send(&e) != CORE_OK)
{
core_free(addr);
CORE_FREE(addr);
}
}
@ -412,7 +412,7 @@ static int s1ap_usrsctp_recv_handler(struct socket *sock,
event_set_param2(&e, (c_uintptr_t)addr);
if (mme_event_send(&e) != CORE_OK)
{
core_free(addr);
CORE_FREE(addr);
}
break;
}
@ -444,7 +444,7 @@ static int s1ap_usrsctp_recv_handler(struct socket *sock,
if (mme_event_send(&e) != CORE_OK)
{
pkbuf_free(pkbuf);
core_free(addr);
CORE_FREE(addr);
}
}
else

2
src/mme/snow_3g.c
View File

@ -413,7 +413,7 @@ void snow_3g_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, u32 length)
data[4*i+3] ^= (u8) (KS[i] ) & 0xff;
}
core_free(KS);
CORE_FREE(KS);
/* zero last bits of data in case its length is not byte-aligned
this is an addition to the C reference code, which did not handle it */

4
src/mme/zuc.c
View File

@ -323,7 +323,7 @@ void zuc_eea3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION,
i--;
C[i] &= 0x100 - (1<<lastbits);
core_free(z);
CORE_FREE(z);
}
/* end of EEA3.c */
@ -389,6 +389,6 @@ void zuc_eia3(u8* IK, u32 COUNT, u32 BEARER, u32 DIRECTION,
T ^= GET_WORD(z,LENGTH);
*MAC = T ^ z[L-1];
core_free(z);
CORE_FREE(z);
}
/* end of EIA3.c */

10
src/pcrf/pcrf_gx_path.c
View File

@ -60,11 +60,11 @@ static void state_cleanup(
pcrf_sess_set_ipv6(sess_data->addr6, NULL);
if (sess_data->gx_sid)
core_free(sess_data->gx_sid);
CORE_FREE(sess_data->gx_sid);
if (sess_data->rx_sid)
core_free(sess_data->rx_sid);
CORE_FREE(sess_data->rx_sid);
if (sess_data->peer_host)
core_free(sess_data->peer_host);
CORE_FREE(sess_data->peer_host);
pool_free_node(&pcrf_gx_sess_pool, sess_data);
}
@ -133,7 +133,7 @@ static int pcrf_gx_ccr_cb( struct msg **msg, struct avp *avp,
d_assert(ret == 0, return EINVAL,);
if (sess_data->peer_host)
core_free(sess_data->peer_host);
CORE_FREE(sess_data->peer_host);
sess_data->peer_host =
(os0_t)core_strdup((char *)hdr->avp_value->os.data);
d_assert(sess_data->peer_host, return CORE_ERROR,);
@ -988,7 +988,7 @@ status_t pcrf_sess_gx_associate_rx(c_uint8_t *gx_sid, c_uint8_t *rx_sid)
d_assert(sess_data, return CORE_ERROR,);
if (sess_data->rx_sid)
core_free(sess_data->rx_sid);
CORE_FREE(sess_data->rx_sid);
sess_data->rx_sid = (os0_t)core_strdup((char *)rx_sid);
d_assert(sess_data->rx_sid, return CORE_ERROR,);

6
src/pcrf/pcrf_rx_path.c
View File

@ -43,9 +43,9 @@ static void state_cleanup(
d_assert(sess_data, return,);
if (sess_data->rx_sid)
core_free((char *)sess_data->rx_sid);
CORE_FREE((char *)sess_data->rx_sid);
if (sess_data->gx_sid)
core_free((char *)sess_data->gx_sid);
CORE_FREE((char *)sess_data->gx_sid);
pool_free_node(&pcrf_rx_sess_pool, sess_data);
}
@ -294,7 +294,7 @@ static int pcrf_rx_aar_cb( struct msg **msg, struct avp *avp,
/* Store Gx Session-Id in this session */
if (sess_data->gx_sid)
core_free(sess_data->gx_sid);
CORE_FREE(sess_data->gx_sid);
sess_data->gx_sid = (os0_t)core_strdup((char *)gx_sid);
d_assert(sess_data->gx_sid, goto out,);

8
test/abts.c
View File

@ -220,12 +220,12 @@ static void abts_free(abts_suite *suite)
while (ptr != NULL) {
next_ptr = ptr->next;
core_free((void*)ptr->name);
core_free(ptr);
CORE_FREE((void*)ptr->name);
CORE_FREE(ptr);
ptr = next_ptr;
}
core_free(suite);
CORE_FREE(suite);
}
void abts_log_message(const char *fmt, ...)
@ -495,7 +495,7 @@ int main(int argc, const char *const argv[]) {
abts_free(suite);
core_free(testlist);
CORE_FREE(testlist);
return rv;
}

8
test/rx/abts.c
View File

@ -222,12 +222,12 @@ static void abts_free(abts_suite *suite)
while (ptr != NULL) {
next_ptr = ptr->next;
core_free((void*)ptr->name);
core_free(ptr);
CORE_FREE((void*)ptr->name);
CORE_FREE(ptr);
ptr = next_ptr;
}
core_free(suite);
CORE_FREE(suite);
}
void abts_log_message(const char *fmt, ...)
@ -511,7 +511,7 @@ int main(int argc, const char *const argv[]) {
abts_free(suite);
core_free(testlist);
CORE_FREE(testlist);
return rv;
}

8
test/rx/testpacket.c
View File

@ -960,12 +960,12 @@ status_t tests1ap_build_pdn_connectivity_request(
{
char *payload[TESTS1AP_MAX_MESSAGE] = {
"000d40680000"
"0500000005c08000 0107000800030001 00001a003b3a277c 81dab50a0205d011"
"0500000005c00000 0001000800030001 00001a003b3a277c 81dab50a0205d011"
"281208696e746572 6e6574036e673204 6d6e6574271a8080 2110010000108106"
"0000000083060000 0000000d00000a00 006440080055f501 0019d01000434006"
"0055f5011022",
"000d40680000"
"0500000005c08000 0107000800030001 00001a003b3a2710 3fdafa0a0209d011"
"0500000005c00000 0001000800030001 00001a003b3a2710 3fdafa0a0209d011"
"281208706e746572 6e6574036e673204 6d6e6574271a8080 2110010000108106"
"0000000083060000 0000000d00000a00 006440080055f501 0019d01000434006"
"0055f5011022",
@ -1010,7 +1010,7 @@ status_t tests1ap_build_pdn_disconnectivity_request(
{
char *payload[TESTS1AP_MAX_MESSAGE] = {
"000d40380000"
"0500000005c00000 0001000800030001 00001a000b0a2732 423c53040206d206"
"0500000005c08000 0108000800030001 00001a000b0a2732 423c53040206d206"
"006440080055f501 0019d01000434006 0055f5011022",
"",
"",
@ -1151,7 +1151,7 @@ status_t tests1ap_build_activate_default_bearer_accept(
{
char *payload[TESTS1AP_MAX_MESSAGE] = {
"000d40370000"
"0500000005c00000 0001000800030001 00001a000a0927e7 f5bb400b6200c200"
"0500000005c08000 0107000800030001 00001a000a0927e7 f5bb400b6200c200"
"6440080055f50100 19d0100043400600 55f5011022",
"",
"",

5
test/rx/volte_test.c
View File

@ -187,8 +187,7 @@ static void volte_test1(abts_case *tc, void *data)
core_sleep(time_from_msec(300));
/* Send Initial Context Setup Response */
rv = tests1ap_build_initial_context_setup_response(&sendbuf,
16777373, 1, 5, 1);
rv = tests1ap_build_initial_context_setup_response(&sendbuf, 1, 1, 5, 1);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock, sendbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
@ -221,7 +220,7 @@ static void volte_test1(abts_case *tc, void *data)
pkbuf_free(recvbuf);
/* Send E-RAB Setup Response */
rv = tests1ap_build_e_rab_setup_response(&sendbuf, 33554492, 1, 6, 2);
rv = tests1ap_build_e_rab_setup_response(&sendbuf, 1, 1, 6, 2);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock, sendbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);

2
test/security_test.c
View File

@ -214,7 +214,7 @@ static void security_test6(abts_case *tc, void *data)
aes_cmac_calculate(mact, CORE_HEX(_ik, strlen(_ik), ik), m, m_len);
core_free(m);
CORE_FREE(m);
ABTS_TRUE(tc, memcmp(mact, CORE_HEX(_mact, strlen(_mact), tmp), 4) == 0);