From 35421860f9b330e15ca5e233733ae6752c5b3ead Mon Sep 17 00:00:00 2001 From: Javier Morgade Date: Thu, 11 Apr 2019 22:01:24 +0200 Subject: [PATCH] Bugfix RLC/PDCP MBMS Bearer settings --- openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 3 ++- openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c | 2 +- openair2/LAYER2/RLC/rlc.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c index b21a5c2422..1a55251090 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c @@ -773,7 +773,8 @@ pdcp_data_ind( dest_addr.sin_addr.s_addr = ip_header->daddr; sendto(mbms_socket, &sdu_buffer_pP->data[payload_offset], sdu_buffer_sizeP - payload_offset, MSG_DONTWAIT, (struct sockaddr*)&dest_addr, sizeof(dest_addr)); - packet_forwarded = TRUE; + //packet_forwarded = TRUE; + } #endif diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c index 6cb849091a..b7bc34db54 100644 --- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c +++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c @@ -137,7 +137,7 @@ void config_req_rlc_um_asn1 ( } rlc_p = &rlc_union_p->rlc.um; - } + }else if ((sourceL2Id >0 ) && (destinationL2Id >0)){ key = RLC_COLL_KEY_SOURCE_DEST_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, rb_idP, sourceL2Id, destinationL2Id, srb_flagP); } else diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c index e5d9977de7..c15adb0d0e 100644 --- a/openair2/LAYER2/RLC/rlc.c +++ b/openair2/LAYER2/RLC/rlc.c @@ -395,7 +395,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP, } key = RLC_COLL_KEY_MBMS_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, mbms_id_p->service_id, mbms_id_p->session_id); - } + }else if (sourceL2Id && destinationL2Id) { LOG_D (RLC, "RLC_COLL_KEY_VALUE: ctxt_pP->module_id: %d, ctxt_pP->rnti: %d, ctxt_pP->enb_flag: %d, rb_idP:%d, srb_flagP: %d \n \n", ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, rb_idP,