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

update it

This commit is contained in:
Sukchan Lee 2017-03-05 00:57:52 +09:00
parent d0dc9e95c9
commit a56e171e04
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mme/enb_s1_sm.c
View File

@ -53,7 +53,7 @@ void enb_s1_state_operational(enb_s1_sm_t *s, event_t *e)
{ {
break; break;
} }
case EVT_S1_ENB_INF: case EVT_ENB_S1AP_INF:
{ {
s1ap_message message; s1ap_message message;
status_t rv; status_t rv;
@ -62,7 +62,7 @@ void enb_s1_state_operational(enb_s1_sm_t *s, event_t *e)
rv = s1ap_decode_pdu(&message, recvbuf); rv = s1ap_decode_pdu(&message, recvbuf);
if (rv != CORE_OK) if (rv != CORE_OK)
{ {
d_error("Can't parse S1AP_PDU in EVT_S1_ENB_INF"); d_error("Can't parse S1AP_PDU in EVT_ENB_S1APAP_INF");
break; break;
} }

14
src/mme/event.c
View File

@ -122,10 +122,10 @@ static char FSM_NAME_INIT_SIG[] = "INIT";
static char FSM_NAME_ENTRY_SIG[] = "ENTRY"; static char FSM_NAME_ENTRY_SIG[] = "ENTRY";
static char FSM_NAME_EXIT_SIG[] = "EXIT"; static char FSM_NAME_EXIT_SIG[] = "EXIT";
static char EVT_NAME_LO_ENB_S1_ACCEPT[] = "LO_ENB_S1_ACCEPT"; static char EVT_NAME_LO_ENB_S1AP_ACCEPT[] = "LO_ENB_S1AP_ACCEPT";
static char EVT_NAME_LO_ENB_S1_CONNREFUSED[] = "LO_ENB_S1_CONNREFUSED"; static char EVT_NAME_LO_ENB_S1AP_CONNREFUSED[] = "LO_ENB_S1AP_CONNREFUSED";
static char EVT_NAME_S1_ENB_INF[] = "S1_ENB_INF"; static char EVT_NAME_ENB_S1AP_INF[] = "ENB_S1AP_INF";
static char EVT_NAME_UNKNOWN[] = "UNKNOWN"; static char EVT_NAME_UNKNOWN[] = "UNKNOWN";
@ -141,9 +141,9 @@ char* event_get_name(event_t *e)
case FSM_ENTRY_SIG: return FSM_NAME_ENTRY_SIG; case FSM_ENTRY_SIG: return FSM_NAME_ENTRY_SIG;
case FSM_EXIT_SIG: return FSM_NAME_EXIT_SIG; case FSM_EXIT_SIG: return FSM_NAME_EXIT_SIG;
case EVT_LO_ENB_S1_ACCEPT: return EVT_NAME_LO_ENB_S1_ACCEPT; case EVT_LO_ENB_S1AP_ACCEPT: return EVT_NAME_LO_ENB_S1AP_ACCEPT;
case EVT_LO_ENB_S1_CONNREFUSED: case EVT_LO_ENB_S1AP_CONNREFUSED:
return EVT_NAME_LO_ENB_S1_CONNREFUSED; return EVT_NAME_LO_ENB_S1AP_CONNREFUSED;
default: return EVT_NAME_UNKNOWN; default: return EVT_NAME_UNKNOWN;
} }
@ -152,7 +152,7 @@ char* event_get_name(event_t *e)
{ {
switch (event_get(e)) switch (event_get(e))
{ {
case EVT_S1_ENB_INF: return EVT_NAME_S1_ENB_INF; case EVT_ENB_S1AP_INF: return EVT_NAME_ENB_S1AP_INF;
default: return EVT_NAME_UNKNOWN; default: return EVT_NAME_UNKNOWN;
} }
} }

10
src/mme/event.h
View File

@ -1,10 +1,6 @@
#ifndef __EVENT_H__ #ifndef __EVENT_H__
#define __EVENT_H__ #define __EVENT_H__
/**
* @file event.h
* @brief Event header
*/
#include "core_msgq.h" #include "core_msgq.h"
#include "core_time.h" #include "core_time.h"
#include "core_timer.h" #include "core_timer.h"
@ -20,15 +16,15 @@ typedef enum {
EVT_BASE = FSM_USER_SIG, EVT_BASE = FSM_USER_SIG,
EVT_LO_BASE, EVT_LO_BASE,
EVT_LO_ENB_S1_ACCEPT, EVT_LO_ENB_S1AP_ACCEPT,
EVT_LO_ENB_S1_CONNREFUSED, EVT_LO_ENB_S1AP_CONNREFUSED,
EVT_LO_TOP, EVT_LO_TOP,
EVT_TM_BASE, EVT_TM_BASE,
EVT_TM_TOP, EVT_TM_TOP,
EVT_MSG_BASE, EVT_MSG_BASE,
EVT_S1_ENB_INF, EVT_ENB_S1AP_INF,
EVT_MSG_TOP, EVT_MSG_TOP,
EVT_GTP_BASE, EVT_GTP_BASE,

6
src/mme/mme_sm.c
View File

@ -54,7 +54,7 @@ void mme_state_operational(mme_sm_t *s, event_t *e)
} }
break; break;
} }
case EVT_LO_ENB_S1_ACCEPT: case EVT_LO_ENB_S1AP_ACCEPT:
{ {
int rc; int rc;
@ -91,7 +91,7 @@ void mme_state_operational(mme_sm_t *s, event_t *e)
break; break;
} }
case EVT_S1_ENB_INF: case EVT_ENB_S1AP_INF:
{ {
net_sock_t *sock = (net_sock_t *)event_get_param1(e); net_sock_t *sock = (net_sock_t *)event_get_param1(e);
d_assert(sock, break, "Null param"); d_assert(sock, break, "Null param");
@ -108,7 +108,7 @@ void mme_state_operational(mme_sm_t *s, event_t *e)
} }
break; break;
} }
case EVT_LO_ENB_S1_CONNREFUSED: case EVT_LO_ENB_S1AP_CONNREFUSED:
{ {
net_sock_t *sock = (net_sock_t *)event_get_param1(e); net_sock_t *sock = (net_sock_t *)event_get_param1(e);
d_assert(sock, break, "Null param"); d_assert(sock, break, "Null param");

6
src/mme/s1ap_path.c
View File

@ -73,7 +73,7 @@ static int _s1ap_accept_cb(net_sock_t *net_sock, void *data)
INET_NTOP(&remote_sock->remote.sin_addr.s_addr, buf)); INET_NTOP(&remote_sock->remote.sin_addr.s_addr, buf));
event_t e; event_t e;
event_set(&e, EVT_LO_ENB_S1_ACCEPT, (c_uintptr_t)remote_sock); event_set(&e, EVT_LO_ENB_S1AP_ACCEPT, (c_uintptr_t)remote_sock);
event_send(queue_id, &e); event_send(queue_id, &e);
} }
else else
@ -95,7 +95,7 @@ static status_t s1ap_recv(net_sock_t *net_sock, pkbuf_t *pkb, msgq_id queue_id)
d_trace(1, "S1AP_PDU is received from eNB-Inf\n"); d_trace(1, "S1AP_PDU is received from eNB-Inf\n");
d_trace_hex(1, pkb->payload, pkb->len); d_trace_hex(1, pkb->payload, pkb->len);
event_set(&e, EVT_S1_ENB_INF, (c_uintptr_t)net_sock); event_set(&e, EVT_ENB_S1AP_INF, (c_uintptr_t)net_sock);
event_set_msg(&e, pkb); event_set_msg(&e, pkb);
return event_send(queue_id, &e); return event_send(queue_id, &e);
@ -142,7 +142,7 @@ int _s1ap_recv_cb(net_sock_t *net_sock, void *data)
event_t e; event_t e;
event_set(&e, EVT_LO_ENB_S1_CONNREFUSED, (c_uintptr_t)net_sock); event_set(&e, EVT_LO_ENB_S1AP_CONNREFUSED, (c_uintptr_t)net_sock);
event_send(queue_id, &e); event_send(queue_id, &e);
return -1; return -1;