From b89779a30121e2064161c24285ffb417dd83cb82 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Fri, 1 Sep 2017 09:36:55 +0900 Subject: [PATCH] update it --- lib/gtp/gtp_xact.c | 7 ++- lib/gtp/gtp_xact.h | 3 +- src/mme/mme_gtp_path.c | 25 ----------- src/mme/mme_gtp_path.h | 3 -- src/mme/mme_s11_handler.c | 22 ++++++--- src/mme/s1ap_handler.c | 23 +++++++--- src/pgw/pgw_gtp_path.c | 18 -------- src/pgw/pgw_gtp_path.h | 3 -- src/pgw/pgw_gx_handler.c | 12 ++++- src/sgw/sgw_gtp_path.c | 38 ---------------- src/sgw/sgw_gtp_path.h | 5 --- src/sgw/sgw_handler.c | 93 +++++++++++++++++++++++++-------------- src/sgw/sgw_handler.h | 19 ++++---- src/sgw/sgw_sm.c | 26 +++++------ 14 files changed, 132 insertions(+), 165 deletions(-) diff --git a/lib/gtp/gtp_xact.c b/lib/gtp/gtp_xact.c index e9520c2f1..2bf7a43dc 100644 --- a/lib/gtp/gtp_xact.c +++ b/lib/gtp/gtp_xact.c @@ -73,8 +73,10 @@ status_t gtp_xact_final(void) return CORE_OK; } -gtp_xact_t *gtp_xact_local_create(net_sock_t *sock, gtp_node_t *gnode) +gtp_xact_t *gtp_xact_local_create(net_sock_t *sock, gtp_node_t *gnode, + c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf) { + status_t rv; char buf[INET_ADDRSTRLEN]; gtp_xact_t *xact = NULL; @@ -108,6 +110,9 @@ gtp_xact_t *gtp_xact_local_create(net_sock_t *sock, gtp_node_t *gnode) list_append(xact->org == GTP_LOCAL_ORIGINATOR ? &xact->gnode->local_list : &xact->gnode->remote_list, xact); + rv = gtp_xact_update_tx(xact, type, teid, pkbuf); + d_assert(rv == CORE_OK, return NULL, "Update Tx failed"); + d_trace(3, "[%d] %s Create peer %s:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", diff --git a/lib/gtp/gtp_xact.h b/lib/gtp/gtp_xact.h index 639d98aa1..3e6d43c3f 100644 --- a/lib/gtp/gtp_xact.h +++ b/lib/gtp/gtp_xact.h @@ -53,7 +53,8 @@ CORE_DECLARE(status_t) gtp_xact_init(tm_service_t *tm_service, CORE_DECLARE(status_t) gtp_xact_final(void); CORE_DECLARE(gtp_xact_t *) gtp_xact_local_create( - net_sock_t *sock, gtp_node_t *gnode); + net_sock_t *sock, gtp_node_t *gnode, + c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf); CORE_DECLARE(gtp_xact_t *) gtp_xact_remote_create( net_sock_t *sock, gtp_node_t *gnode, c_uint32_t sqn); CORE_DECLARE(void) gtp_xact_delete_all(gtp_node_t *gnode); diff --git a/src/mme/mme_gtp_path.c b/src/mme/mme_gtp_path.c index 451d4b70e..88ee8ffd3 100644 --- a/src/mme/mme_gtp_path.c +++ b/src/mme/mme_gtp_path.c @@ -80,28 +80,3 @@ status_t mme_gtp_close() return CORE_OK; } - -status_t mme_s11_send_to_sgw(mme_sess_t *sess, c_uint8_t type, pkbuf_t *pkbuf) -{ - status_t rv; - gtp_xact_t *xact = NULL; - void *sgw = NULL; - c_uint32_t teid; - d_assert(sess, return CORE_ERROR, "Null param"); - d_assert(pkbuf, return CORE_ERROR, "Null param"); - - sgw = sess->sgw; - d_assert(sgw, return CORE_ERROR, "Null param"); - teid = sess->sgw_s11_teid; - - xact = gtp_xact_local_create(mme_self()->s11_sock, sgw); - d_assert(xact, return CORE_ERROR, "Null param"); - - rv = gtp_xact_update_tx(xact, type, teid, pkbuf); - d_assert(rv == CORE_OK, return CORE_ERROR, "xact_update_tx error"); - - rv = gtp_xact_commit(xact); - d_assert(rv == CORE_OK, return CORE_ERROR, "xact_commit error"); - - return CORE_OK; -} diff --git a/src/mme/mme_gtp_path.h b/src/mme/mme_gtp_path.h index b34544e9b..b31293347 100644 --- a/src/mme/mme_gtp_path.h +++ b/src/mme/mme_gtp_path.h @@ -10,9 +10,6 @@ extern "C" { CORE_DECLARE(status_t) mme_gtp_open(); CORE_DECLARE(status_t) mme_gtp_close(); -CORE_DECLARE(status_t) mme_s11_send_to_sgw( - mme_sess_t *sess, c_uint8_t type, pkbuf_t *pkbuf); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/mme/mme_s11_handler.c b/src/mme/mme_s11_handler.c index 816f2276a..29397e964 100644 --- a/src/mme/mme_s11_handler.c +++ b/src/mme/mme_s11_handler.c @@ -17,19 +17,24 @@ void mme_s11_handle_create_session_request(mme_sess_t *sess) { status_t rv; pkbuf_t *pkbuf = NULL; + gtp_xact_t *xact = NULL; /* Use round-robin for selecting SGW */ d_assert(sess, return, "Null param"); - d_assert(sess->sgw, return, "Null param"); sess->sgw = mme_sgw_next(sess->sgw); if (!sess->sgw) sess->sgw = mme_sgw_first(); + d_assert(sess->sgw, return, "Null param"); rv = mme_s11_build_create_session_request(&pkbuf, sess); d_assert(rv == CORE_OK, return, "S11 build error"); - rv = mme_s11_send_to_sgw(sess, GTP_CREATE_SESSION_REQUEST_TYPE, pkbuf); - d_assert(rv == CORE_OK, return, "S11 send error"); + xact = gtp_xact_local_create(mme_self()->s11_sock, (gtp_node_t *)sess->sgw, + GTP_CREATE_SESSION_REQUEST_TYPE, sess->sgw_s11_teid, pkbuf); + d_assert(xact, return, "Null param"); + + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); } void mme_s11_handle_create_session_response( @@ -113,11 +118,18 @@ void mme_s11_handle_delete_all_sessions_request_in_ue(mme_ue_t *mme_ue) sess = mme_sess_first(mme_ue); while (sess != NULL) { + gtp_xact_t *xact = NULL; + rv = mme_s11_build_delete_session_request(&s11buf, sess); d_assert(rv == CORE_OK, return, "S11 build error"); - rv = mme_s11_send_to_sgw(sess, GTP_DELETE_SESSION_REQUEST_TYPE, s11buf); - d_assert(rv == CORE_OK, return, "S11 send error"); + xact = gtp_xact_local_create( + mme_self()->s11_sock, (gtp_node_t *)sess->sgw, + GTP_DELETE_SESSION_REQUEST_TYPE, sess->sgw_s11_teid, s11buf); + d_assert(xact, return, "Null param"); + + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); sess = mme_sess_next(sess); } diff --git a/src/mme/s1ap_handler.c b/src/mme/s1ap_handler.c index 6ecb0aa39..42b491737 100644 --- a/src/mme/s1ap_handler.c +++ b/src/mme/s1ap_handler.c @@ -394,6 +394,7 @@ void s1ap_handle_initial_context_setup_response( i++) { status_t rv; + gtp_xact_t *xact = NULL; mme_sess_t *sess = NULL; pkbuf_t *pkbuf = NULL; @@ -418,8 +419,13 @@ void s1ap_handle_initial_context_setup_response( rv = mme_s11_build_modify_bearer_request(&pkbuf, bearer); d_assert(rv == CORE_OK, return, "S11 build error"); - rv = mme_s11_send_to_sgw(sess, GTP_MODIFY_BEARER_REQUEST_TYPE, pkbuf); - d_assert(rv == CORE_OK, return, "S11 send error"); + xact = gtp_xact_local_create( + mme_self()->s11_sock, (gtp_node_t *)sess->sgw, + GTP_MODIFY_BEARER_REQUEST_TYPE, sess->sgw_s11_teid, pkbuf); + d_assert(xact, return, "Null param"); + + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); } } @@ -459,13 +465,20 @@ void s1ap_handle_ue_context_release_request( mme_sess_t *sess = mme_sess_first(mme_ue); while (sess != NULL) { + gtp_xact_t *xact = NULL; + rv = mme_s11_build_release_access_bearers_request( &pkbuf); d_assert(rv == CORE_OK, return, "S11 build error"); - rv = mme_s11_send_to_sgw(sess, - GTP_RELEASE_ACCESS_BEARERS_REQUEST_TYPE, pkbuf); - d_assert(rv == CORE_OK, return, "S11 send error"); + xact = gtp_xact_local_create( + mme_self()->s11_sock, (gtp_node_t *)sess->sgw, + GTP_RELEASE_ACCESS_BEARERS_REQUEST_TYPE, + sess->sgw_s11_teid, pkbuf); + d_assert(xact, return, "Null param"); + + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); sess = mme_sess_next(sess); } diff --git a/src/pgw/pgw_gtp_path.c b/src/pgw/pgw_gtp_path.c index 20e9ac425..7720fec74 100644 --- a/src/pgw/pgw_gtp_path.c +++ b/src/pgw/pgw_gtp_path.c @@ -233,21 +233,3 @@ status_t pgw_gtp_close() return CORE_OK; } - -status_t pgw_s5c_send_to_sgw( - gtp_xact_t *xact, c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf) -{ - status_t rv; - - d_assert(pkbuf, return CORE_ERROR, "Null param"); - d_assert(xact, return CORE_ERROR, "Null param"); - - rv = gtp_xact_update_tx(xact, type, teid, pkbuf); - d_assert(rv == CORE_OK, return CORE_ERROR, "gtp_xact_update_tx error"); - - rv = gtp_xact_commit(xact); - d_assert(rv == CORE_OK, return CORE_ERROR, "xact_commit error"); - - return CORE_OK; -} - diff --git a/src/pgw/pgw_gtp_path.h b/src/pgw/pgw_gtp_path.h index fca6873c5..1f13797b3 100644 --- a/src/pgw/pgw_gtp_path.h +++ b/src/pgw/pgw_gtp_path.h @@ -10,9 +10,6 @@ extern "C" { CORE_DECLARE(status_t) pgw_gtp_open(); CORE_DECLARE(status_t) pgw_gtp_close(); -CORE_DECLARE(status_t) pgw_s5c_send_to_sgw( - gtp_xact_t *xact, c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/pgw/pgw_gx_handler.c b/src/pgw/pgw_gx_handler.c index 45c430799..61c43679c 100644 --- a/src/pgw/pgw_gx_handler.c +++ b/src/pgw/pgw_gx_handler.c @@ -100,7 +100,11 @@ void pgw_gx_handle_cca_initial_request( rv = gtp_build_msg(&pkbuf, >p_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - pgw_s5c_send_to_sgw(xact, gtp_message.h.type, sess->sgw_s5c_teid, pkbuf); + rv = gtp_xact_update_tx(xact, gtp_message.h.type, sess->sgw_s5c_teid, pkbuf); + d_assert(rv == CORE_OK, return, "gtp_xact_update_tx error"); + + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); } void pgw_gx_handle_cca_termination_request( gtp_xact_t *xact, pgw_sess_t *sess, @@ -161,7 +165,11 @@ void pgw_gx_handle_cca_termination_request( d_assert(rv == CORE_OK, return, "gtp build failed"); /* send */ - pgw_s5c_send_to_sgw(xact, gtp_message.h.type, sgw_s5c_teid, pkbuf); + rv = gtp_xact_update_tx(xact, gtp_message.h.type, sgw_s5c_teid, pkbuf); + d_assert(rv == CORE_OK, return, "gtp_xact_update_tx error"); + + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); } static c_int16_t pgw_pco_build(c_uint8_t *pco_buf, tlv_pco_t *tlv_pco) diff --git a/src/sgw/sgw_gtp_path.c b/src/sgw/sgw_gtp_path.c index cc950dad2..253916e55 100644 --- a/src/sgw/sgw_gtp_path.c +++ b/src/sgw/sgw_gtp_path.c @@ -302,41 +302,3 @@ status_t sgw_gtp_close() return CORE_OK; } - -status_t sgw_s11_send_to_mme( - gtp_xact_t *xact, c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf) -{ - status_t rv; - d_assert(pkbuf, return CORE_ERROR, "Null param"); - d_assert(xact, return CORE_ERROR, "Null param"); - - rv = gtp_xact_update_tx(xact, type, teid, pkbuf); - d_assert(rv == CORE_OK, return CORE_ERROR, "gtp_xact_update_tx error"); - - rv = gtp_xact_commit(xact); - d_assert(rv == CORE_OK, return CORE_ERROR, "xact_commit error"); - - return CORE_OK; -} - -status_t sgw_s5c_send_to_pgw( - gtp_xact_t *assoc_xact, c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf) -{ - status_t rv; - gtp_xact_t *xact = NULL; - d_assert(assoc_xact, return CORE_ERROR, "Null param"); - d_assert(pkbuf, return CORE_ERROR, "Null param"); - - xact = gtp_xact_local_create(sgw_self()->s5c_sock, &sgw_self()->s5c_node); - d_assert(xact, return CORE_ERROR, "Null param"); - - rv = gtp_xact_update_tx(xact, type, teid, pkbuf); - d_assert(rv == CORE_OK, return CORE_ERROR, "xact_update_tx error"); - - gtp_xact_associate(xact, assoc_xact); - - rv = gtp_xact_commit(xact); - d_assert(rv == CORE_OK, return CORE_ERROR, "xact_commit error"); - - return CORE_OK; -} diff --git a/src/sgw/sgw_gtp_path.h b/src/sgw/sgw_gtp_path.h index a3b0f2110..9a7aba696 100644 --- a/src/sgw/sgw_gtp_path.h +++ b/src/sgw/sgw_gtp_path.h @@ -10,11 +10,6 @@ extern "C" { CORE_DECLARE(status_t) sgw_gtp_open(); CORE_DECLARE(status_t) sgw_gtp_close(); -CORE_DECLARE(status_t) sgw_s11_send_to_mme( - gtp_xact_t *xact, c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf); -CORE_DECLARE(status_t) sgw_s5c_send_to_pgw( - gtp_xact_t *assoc_xact, c_uint8_t type, c_uint32_t teid, pkbuf_t *pkbuf); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/sgw/sgw_handler.c b/src/sgw/sgw_handler.c index 3fc8dea02..a8b665619 100644 --- a/src/sgw/sgw_handler.c +++ b/src/sgw/sgw_handler.c @@ -10,7 +10,7 @@ #include "sgw_gtp_path.h" #include "sgw_handler.h" -void sgw_handle_create_session_request(gtp_xact_t *xact, +void sgw_handle_create_session_request(gtp_xact_t *s11_xact, sgw_sess_t *sess, gtp_message_t *gtp_message) { status_t rv; @@ -19,9 +19,10 @@ void sgw_handle_create_session_request(gtp_xact_t *xact, gtp_f_teid_t *mme_s11_teid = NULL; gtp_f_teid_t sgw_s5c_teid, sgw_s5u_teid; + gtp_xact_t *s5c_xact = NULL; sgw_bearer_t *bearer = NULL; - d_assert(xact, return, "Null param"); + d_assert(s11_xact, return, "Null param"); d_assert(sess, return, "Null param"); d_assert(gtp_message, return, "Null param"); bearer = sgw_default_bearer_in_sess(sess); @@ -76,8 +77,14 @@ void sgw_handle_create_session_request(gtp_xact_t *xact, rv = gtp_build_msg(&pkbuf, gtp_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - d_assert(sgw_s5c_send_to_pgw(xact, GTP_CREATE_SESSION_REQUEST_TYPE, 0, - pkbuf) == CORE_OK, return, "failed to send message"); + s5c_xact = gtp_xact_local_create(sgw_self()->s5c_sock, + &sgw_self()->s5c_node, gtp_message->h.type, 0, pkbuf); + d_assert(s5c_xact, return, "Null param"); + + gtp_xact_associate(s11_xact, s5c_xact); + + rv = gtp_xact_commit(s5c_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); d_trace(3, "[GTP] Create Session Reqeust : " "SGW[%d] --> PGW\n", sess->sgw_s5c_teid); @@ -165,21 +172,25 @@ void sgw_handle_create_session_response(gtp_xact_t *s5c_xact, rsp->bearer_contexts_created.s1_u_enodeb_f_teid.data = &sgw_s1u_teid; rsp->bearer_contexts_created.s1_u_enodeb_f_teid.len = GTP_F_TEID_IPV4_LEN; + rv = gtp_xact_commit(s5c_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); + gtp_message->h.type = GTP_CREATE_SESSION_RESPONSE_TYPE; rv = gtp_build_msg(&pkbuf, gtp_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - rv = gtp_xact_commit(s5c_xact); + rv = gtp_xact_update_tx(s11_xact, + gtp_message->h.type, sess->mme_s11_teid, pkbuf); + d_assert(rv == CORE_OK, return, "gtp_xact_update_tx error"); + + rv = gtp_xact_commit(s11_xact); d_assert(rv == CORE_OK, return, "xact_commit error"); - d_assert(sgw_s11_send_to_mme(s11_xact, gtp_message->h.type, - sess->mme_s11_teid, pkbuf) == CORE_OK, return, - "failed to send message"); d_trace(3, "[GTP] Create Session Response : " "SGW[%d] <-- PGW[%d]\n", sess->sgw_s5c_teid, sess->pgw_s5c_teid); } -CORE_DECLARE(void) sgw_handle_modify_bearer_request(gtp_xact_t *xact, +CORE_DECLARE(void) sgw_handle_modify_bearer_request(gtp_xact_t *s11_xact, sgw_sess_t *sess, gtp_modify_bearer_request_t *req) { status_t rv; @@ -192,7 +203,7 @@ CORE_DECLARE(void) sgw_handle_modify_bearer_request(gtp_xact_t *xact, gtp_f_teid_t *enb_s1u_teid = NULL; d_assert(sess, return, "Null param"); - d_assert(xact, return, "Null param"); + d_assert(s11_xact, return, "Null param"); if (req->bearer_contexts_to_be_modified.presence == 0) { @@ -233,21 +244,25 @@ CORE_DECLARE(void) sgw_handle_modify_bearer_request(gtp_xact_t *xact, rv = gtp_build_msg(&pkbuf, >p_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - d_assert(sgw_s11_send_to_mme(xact, GTP_MODIFY_BEARER_RESPONSE_TYPE, - sess->mme_s11_teid, pkbuf) == CORE_OK, return, - "failed to send message"); + rv = gtp_xact_update_tx(s11_xact, + gtp_message.h.type, sess->mme_s11_teid, pkbuf); + d_assert(rv == CORE_OK, return, "gtp_xact_update_tx error"); + + rv = gtp_xact_commit(s11_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); d_trace(3, "[GTP] Modify Bearer Reqeust : " "MME[%d] --> SGW[%d]\n", sess->mme_s11_teid, sess->sgw_s11_teid); } -void sgw_handle_delete_session_request(gtp_xact_t *xact, +void sgw_handle_delete_session_request(gtp_xact_t *s11_xact, sgw_sess_t *sess, gtp_message_t *gtp_message) { status_t rv; pkbuf_t *pkbuf = NULL; + gtp_xact_t *s5c_xact = NULL; - d_assert(xact, return, "Null param"); + d_assert(s11_xact, return, "Null param"); d_assert(sess, return, "Null param"); d_assert(gtp_message, return, "Null param"); @@ -255,9 +270,15 @@ void sgw_handle_delete_session_request(gtp_xact_t *xact, rv = gtp_build_msg(&pkbuf, gtp_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - d_assert(sgw_s5c_send_to_pgw(xact, GTP_DELETE_SESSION_REQUEST_TYPE, - sess->pgw_s5c_teid, pkbuf) == CORE_OK, - return, "failed to send message"); + s5c_xact = gtp_xact_local_create( + sgw_self()->s5c_sock, &sgw_self()->s5c_node, + gtp_message->h.type, sess->pgw_s5c_teid, pkbuf); + d_assert(s5c_xact, return, "Null param"); + + gtp_xact_associate(s11_xact, s5c_xact); + + rv = gtp_xact_commit(s5c_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); d_trace(3, "[GTP] Delete Session Reqeust : " "SGW[%d] --> PGW[%d]\n", sess->sgw_s5c_teid, sess->pgw_s5c_teid); @@ -310,19 +331,22 @@ void sgw_handle_delete_session_response(gtp_xact_t *s5c_xact, cause->value = GTP_CAUSE_INVALID_PEER; } + rv = gtp_xact_commit(s5c_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); + gtp_message->h.type = GTP_DELETE_SESSION_RESPONSE_TYPE; rv = gtp_build_msg(&pkbuf, gtp_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - rv = gtp_xact_commit(s5c_xact); - d_assert(rv == CORE_OK, return, "xact_commit error"); + rv = gtp_xact_update_tx(s11_xact, + gtp_message->h.type, mme_s11_teid, pkbuf); + d_assert(rv == CORE_OK, return, "gtp_xact_update_tx error"); - d_assert(sgw_s11_send_to_mme(s11_xact, gtp_message->h.type, - mme_s11_teid, pkbuf) == CORE_OK, return, - "failed to send message"); + rv = gtp_xact_commit(s11_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); } -void sgw_handle_release_access_bearers_request(gtp_xact_t *xact, +void sgw_handle_release_access_bearers_request(gtp_xact_t *s11_xact, sgw_sess_t *sess, gtp_release_access_bearers_request_t *req) { status_t rv; @@ -334,7 +358,7 @@ void sgw_handle_release_access_bearers_request(gtp_xact_t *xact, gtp_cause_t cause; d_assert(sess, return, "Null param"); - d_assert(xact, return, "Null param"); + d_assert(s11_xact, return, "Null param"); /* Release S1U(DL) path */ bearer = list_first(&sess->bearer_list); @@ -364,10 +388,12 @@ void sgw_handle_release_access_bearers_request(gtp_xact_t *xact, rv = gtp_build_msg(&pkbuf, >p_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - d_assert(sgw_s11_send_to_mme(xact, - GTP_RELEASE_ACCESS_BEARERS_RESPONSE_TYPE, - sess->mme_s11_teid, pkbuf) == CORE_OK, return, - "failed to send message"); + rv = gtp_xact_update_tx(s11_xact, + gtp_message.h.type, sess->mme_s11_teid, pkbuf); + d_assert(rv == CORE_OK, return, "gtp_xact_update_tx error"); + + rv = gtp_xact_commit(s11_xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); d_trace(3, "[GTP] Release Access Bearers Reqeust : " "MME[%d] --> SGW[%d]\n", sess->mme_s11_teid, sess->sgw_s11_teid); @@ -406,13 +432,12 @@ void sgw_handle_lo_dldata_notification(sgw_bearer_t *bearer) rv = gtp_build_msg(&pkbuf, >p_message); d_assert(rv == CORE_OK, return, "gtp build failed"); - xact = gtp_xact_local_create(sgw_self()->s11_sock, &sgw_self()->s11_node); + xact = gtp_xact_local_create(sgw_self()->s11_sock, &sgw_self()->s11_node, + GTP_DOWNLINK_DATA_NOTIFICATION_TYPE, sess->mme_s11_teid, pkbuf); d_assert(xact, return, "Null param"); - d_assert(sgw_s11_send_to_mme(xact, - GTP_DOWNLINK_DATA_NOTIFICATION_TYPE, - sess->mme_s11_teid, pkbuf) == CORE_OK, return, - "failed to send message"); + rv = gtp_xact_commit(xact); + d_assert(rv == CORE_OK, return, "xact_commit error"); d_trace(3, "[GTP] Downlink Data Notification : " "SGW[%d] --> MME[%d]\n", sess->sgw_s11_teid, sess->mme_s11_teid); diff --git a/src/sgw/sgw_handler.h b/src/sgw/sgw_handler.h index 3e15f4a57..ccfbf0ad3 100644 --- a/src/sgw/sgw_handler.h +++ b/src/sgw/sgw_handler.h @@ -9,22 +9,23 @@ extern "C" { #endif /* __cplusplus */ -CORE_DECLARE(void) sgw_handle_create_session_request(gtp_xact_t *xact, +CORE_DECLARE(void) sgw_handle_create_session_request(gtp_xact_t *s11_xact, sgw_sess_t *sess, gtp_message_t *gtp_message); -CORE_DECLARE(void) sgw_handle_create_session_response(gtp_xact_t *xact, - sgw_sess_t *s5c_xact, gtp_message_t *gtp_message); +CORE_DECLARE(void) sgw_handle_create_session_response(gtp_xact_t *s5c_xact, + sgw_sess_t *sess, gtp_message_t *gtp_message); -CORE_DECLARE(void) sgw_handle_modify_bearer_request(gtp_xact_t *xact, +CORE_DECLARE(void) sgw_handle_modify_bearer_request(gtp_xact_t *s11_xact, sgw_sess_t *sess, gtp_modify_bearer_request_t *req); -CORE_DECLARE(void) sgw_handle_delete_session_request(gtp_xact_t *xact, +CORE_DECLARE(void) sgw_handle_delete_session_request(gtp_xact_t *s11_xact, + sgw_sess_t *sess, gtp_message_t *gtp_message); +CORE_DECLARE(void) sgw_handle_delete_session_response(gtp_xact_t *s5c_xact, sgw_sess_t *sess, gtp_message_t *gtp_message); -CORE_DECLARE(void) sgw_handle_delete_session_response(gtp_xact_t *xact, - sgw_sess_t *s5c_xact, gtp_message_t *gtp_message); -CORE_DECLARE(void) sgw_handle_release_access_bearers_request(gtp_xact_t *xact, - sgw_sess_t *sess, gtp_release_access_bearers_request_t *req); +CORE_DECLARE(void) sgw_handle_release_access_bearers_request( + gtp_xact_t *s11_xact, sgw_sess_t *sess, + gtp_release_access_bearers_request_t *req); CORE_DECLARE(void) sgw_handle_lo_dldata_notification(sgw_bearer_t *bearer); diff --git a/src/sgw/sgw_sm.c b/src/sgw/sgw_sm.c index 4e5d9403a..fd3370bd9 100644 --- a/src/sgw/sgw_sm.c +++ b/src/sgw/sgw_sm.c @@ -80,34 +80,28 @@ void sgw_state_operational(fsm_t *s, event_t *e) switch(message.h.type) { case GTP_CREATE_SESSION_REQUEST_TYPE: - sgw_handle_create_session_request( - xact, sess, &message); + sgw_handle_create_session_request(xact, sess, &message); break; case GTP_CREATE_SESSION_RESPONSE_TYPE: - sgw_handle_create_session_response( - xact, sess, &message); + sgw_handle_create_session_response(xact, sess, &message); break; case GTP_MODIFY_BEARER_REQUEST_TYPE: - sgw_handle_modify_bearer_request( - xact, sess, &message.modify_bearer_request); + sgw_handle_modify_bearer_request(xact, sess, + &message.modify_bearer_request); break; case GTP_DELETE_SESSION_REQUEST_TYPE: - sgw_handle_delete_session_request( - xact, sess, &message); + sgw_handle_delete_session_request(xact, sess, &message); break; case GTP_DELETE_SESSION_RESPONSE_TYPE: - sgw_handle_delete_session_response( - xact, sess, &message); + sgw_handle_delete_session_response(xact, sess, &message); break; case GTP_RELEASE_ACCESS_BEARERS_REQUEST_TYPE: - sgw_handle_release_access_bearers_request( - xact, sess, - &message.release_access_bearers_request); + sgw_handle_release_access_bearers_request(xact, sess, + &message.release_access_bearers_request); break; case GTP_DOWNLINK_DATA_NOTIFICATION_ACKNOWLEDGE_TYPE: - sgw_handle_downlink_data_notification_ack( - sess, - &message.downlink_data_notification_acknowledge); + sgw_handle_downlink_data_notification_ack(sess, + &message.downlink_data_notification_acknowledge); break; default: d_warn("Not implmeneted(type:%d)", message.h.type);