sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set ENB-ID to zero in S1AP message. (#156)

This commit is contained in:
Sukchan Lee 2019-03-10 10:32:26 +09:00
parent 8cb620e477
commit 58bcda332b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mme/mme_context.c
View File

@ -1813,8 +1813,7 @@ status_t mme_enb_remove(mme_enb_t *enb)
hash_set(self.enb_sock_hash, &enb->sock, sizeof(enb->sock), NULL);
hash_set(self.enb_addr_hash, enb->addr, sizeof(c_sockaddr_t), NULL);
if (enb->enb_id)
hash_set(self.enb_id_hash, &enb->enb_id, sizeof(enb->enb_id), NULL);
hash_set(self.enb_id_hash, &enb->enb_id, sizeof(enb->enb_id), NULL);
enb_ue_remove_in_enb(enb);
@ -1868,14 +1867,12 @@ mme_enb_t* mme_enb_find_by_addr(c_sockaddr_t *addr)
mme_enb_t* mme_enb_find_by_enb_id(c_uint32_t enb_id)
{
d_assert(enb_id, return NULL,"Invalid param");
return (mme_enb_t *)hash_get(self.enb_id_hash, &enb_id, sizeof(enb_id));
}
status_t mme_enb_set_enb_id(mme_enb_t *enb, c_uint32_t enb_id)
{
d_assert(enb, return CORE_ERROR, "Invalid param");
d_assert(enb_id, return CORE_ERROR, "Invalid param");
enb->enb_id = enb_id;
hash_set(self.enb_id_hash, &enb->enb_id, sizeof(enb->enb_id), enb);

4
test/basic/s1setup_test.c
View File

@ -29,7 +29,7 @@ static void s1setup_test1(abts_case *tc, void *data)
for (i = 0; i < NUM_OF_TEST_DUPLICATED_ENB; i++)
{
rv = tests1ap_build_setup_req(
&sendbuf, S1AP_ENB_ID_PR_macroENB_ID, 0x54f64);
&sendbuf, S1AP_ENB_ID_PR_macroENB_ID, 0);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock[i], sendbuf);
@ -75,7 +75,7 @@ static void s1setup_test2(abts_case *tc, void *data)
for (i = 0; i < NUM_OF_TEST_ENB; i++)
{
rv = tests1ap_build_setup_req(
&sendbuf, S1AP_ENB_ID_PR_macroENB_ID, 0x54f64+i);
&sendbuf, S1AP_ENB_ID_PR_macroENB_ID, i);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock[i], sendbuf);