5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move ue pdcp interfaces to separate interfaces header file

Browse Source
master
Francisco 4 years ago committed by Francisco Paisana
parent ea04104e8e
commit a988351f46
23 changed files with 108 additions and 53 deletions
Show Stats Download Patch File Download Diff File

47
lib/include/srslte/interfaces/ue_interfaces.h
Unescape Escape View File

@ -172,24 +172,6 @@ public:
virtual bool connection_request_completed(bool outcome) = 0;
};
// PDCP interface for RRC
class pdcp_interface_rrc
{
public:
virtual void reestablish() = 0;
virtual void reestablish(uint32_t lcid) = 0;
virtual void reset() = 0;
virtual void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, int sn = -1) = 0;
virtual void add_bearer(uint32_t lcid, srslte::pdcp_config_t cnfg) = 0;
virtual void change_lcid(uint32_t old_lcid, uint32_t new_lcid) = 0;
virtual void config_security(uint32_t lcid, srslte::as_security_config_t sec_cfg) = 0;
virtual void config_security_all(srslte::as_security_config_t sec_cfg) = 0;
virtual void enable_integrity(uint32_t lcid, srslte::srslte_direction_t direction) = 0;
virtual void enable_encryption(uint32_t lcid,
srslte::srslte_direction_t direction = srslte::srslte_direction_t::DIRECTION_TXRX) = 0;
virtual void send_status_report() = 0;
virtual void send_status_report(uint32_t lcid) = 0;
};
// RRC NR interface for RRC (LTE)
class rrc_nr_interface_rrc
{
@ -208,27 +190,6 @@ public:
virtual bool is_config_pending() = 0;
};
// PDCP interface for RLC
class pdcp_interface_rlc
{
public:
/* RLC calls PDCP to push a PDCP PDU. */
virtual void write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_bcch_bch(srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_bcch_dlsch(srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_pcch(srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
virtual void notify_delivery(uint32_t lcid, const std::vector<uint32_t>& pdcp_sn) = 0;
virtual void notify_failure(uint32_t lcid, const std::vector<uint32_t>& pdcp_sn) = 0;
};
class pdcp_interface_gw
{
public:
virtual void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
virtual bool is_lcid_enabled(uint32_t lcid) = 0;
};
// RLC interface for RRC
class rlc_interface_rrc
{
@ -573,14 +534,6 @@ public:
virtual void enable_pregen_signals(bool enable) = 0;
};
// STACK interface for GW
class stack_interface_gw : public pdcp_interface_gw
{
public:
virtual bool is_registered() = 0;
virtual bool start_service_request() = 0;
};
// STACK interface for RRC
class stack_interface_rrc
{

68
lib/include/srslte/interfaces/ue_pdcp_interfaces.h
Unescape Escape View File

@ -0,0 +1,68 @@
/**
*
* \section COPYRIGHT
*
* Copyright 2013-2020 Software Radio Systems Limited
*
* By using this file, you agree to the terms and conditions set
* forth in the LICENSE file which can be found at the top level of
* the distribution.
*
*/
#ifndef SRSLTE_UE_PDCP_INTERFACES_H
#define SRSLTE_UE_PDCP_INTERFACES_H
#include "pdcp_interface_types.h"
namespace srsue {
class pdcp_interface_rrc
{
public:
virtual void reestablish() = 0;
virtual void reestablish(uint32_t lcid) = 0;
virtual void reset() = 0;
virtual void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, int sn = -1) = 0;
virtual void add_bearer(uint32_t lcid, srslte::pdcp_config_t cnfg) = 0;
virtual void change_lcid(uint32_t old_lcid, uint32_t new_lcid) = 0;
virtual void config_security(uint32_t lcid, srslte::as_security_config_t sec_cfg) = 0;
virtual void config_security_all(srslte::as_security_config_t sec_cfg) = 0;
virtual void enable_integrity(uint32_t lcid, srslte::srslte_direction_t direction) = 0;
virtual void enable_encryption(uint32_t lcid,
srslte::srslte_direction_t direction = srslte::srslte_direction_t::DIRECTION_TXRX) = 0;
virtual void send_status_report() = 0;
virtual void send_status_report(uint32_t lcid) = 0;
};
class pdcp_interface_rlc
{
public:
/* RLC calls PDCP to push a PDCP PDU. */
virtual void write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_bcch_bch(srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_bcch_dlsch(srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_pcch(srslte::unique_byte_buffer_t sdu) = 0;
virtual void write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
virtual void notify_delivery(uint32_t lcid, const std::vector<uint32_t>& pdcp_sn) = 0;
virtual void notify_failure(uint32_t lcid, const std::vector<uint32_t>& pdcp_sn) = 0;
};
class pdcp_interface_gw
{
public:
virtual void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
virtual bool is_lcid_enabled(uint32_t lcid) = 0;
};
// STACK interface for GW
class stack_interface_gw : public pdcp_interface_gw
{
public:
virtual bool is_registered() = 0;
virtual bool start_service_request() = 0;
};
} // namespace srsue
#endif // SRSLTE_UE_PDCP_INTERFACES_H

2
lib/include/srslte/upper/pdcp.h
Unescape Escape View File

@ -16,7 +16,7 @@
#include "srslte/common/common.h"
#include "srslte/common/log.h"
#include "srslte/common/task_scheduler.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/upper/pdcp_entity_lte.h"
namespace srslte {

1
lib/include/srslte/upper/rlc.h
Unescape Escape View File

@ -17,6 +17,7 @@
#include "srslte/common/common.h"
#include "srslte/common/log.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/upper/rlc_common.h"
#include "srslte/upper/rlc_metrics.h"

6
lib/include/srslte/upper/rlc_am_lte.h
Unescape Escape View File

@ -27,6 +27,12 @@
#include <list>
#include <map>
namespace srsue {
class pdcp_interface_rlc;
}
namespace srslte {
#undef RLC_AM_BUFFER_DEBUG

6
lib/include/srslte/upper/rlc_tm.h
Unescape Escape View File

@ -20,6 +20,12 @@
#include "srslte/upper/byte_buffer_queue.h"
#include "srslte/upper/rlc_common.h"
namespace srsue {
class pdcp_interface_rlc;
}
namespace srslte {
class rlc_tm final : public rlc_common

6
lib/include/srslte/upper/rlc_um_base.h
Unescape Escape View File

@ -25,6 +25,12 @@
#include <pthread.h>
#include <queue>
namespace srsue {
class pdcp_interface_rlc;
}
namespace srslte {
class rlc_um_base : public rlc_common

1
lib/src/upper/rlc_am_lte.cc
Unescape Escape View File

@ -11,6 +11,7 @@
*/
#include "srslte/upper/rlc_am_lte.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include <iostream>

1
lib/src/upper/rlc_tm.cc
Unescape Escape View File

@ -11,6 +11,7 @@
*/
#include "srslte/upper/rlc_tm.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
namespace srslte {

1
lib/src/upper/rlc_um_lte.cc
Unescape Escape View File

@ -11,6 +11,7 @@
*/
#include "srslte/upper/rlc_um_lte.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include <sstream>
#define RX_MOD_BASE(x) (((x)-vr_uh - cfg.um.rx_window_size) % cfg.um.rx_mod)

1
lib/src/upper/rlc_um_nr.cc
Unescape Escape View File

@ -11,6 +11,7 @@
*/
#include "srslte/upper/rlc_um_nr.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include <sstream>
#define RX_MOD_NR_BASE(x) (((x)-RX_Next_Highest - cfg.um_nr.UM_Window_Size) % cfg.um_nr.mod)

2
lib/test/upper/rlc_am_test.cc
Unescape Escape View File

@ -14,8 +14,8 @@
#include "srslte/common/rlc_pcap.h"
#include "srslte/common/test_common.h"
#include "srslte/common/threads.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/upper/rlc_am_lte.h"
#include <iostream>
#define NBUFS 5
#define HAVE_PCAP 0
#define SDU_SIZE 500

1
lib/test/upper/rlc_test_common.h
Unescape Escape View File

@ -14,6 +14,7 @@
#define SRSLTE_RLC_TEST_COMMON_H
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include <vector>
namespace srslte {

2
lib/test/upper/rlc_um_nr_test.cc
Unescape Escape View File

@ -13,12 +13,12 @@
#include "rlc_test_common.h"
#include "srslte/common/log_filter.h"
#include "srslte/config.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/upper/rlc.h"
#include "srslte/upper/rlc_um_nr.h"
#include <array>
#include <iostream>
#include <memory>
#include <vector>
#define TESTASSERT(cond) \

1
srsenb/hdr/stack/rrc/rrc_nr.h
Unescape Escape View File

@ -21,6 +21,7 @@
#include "srslte/common/buffer_pool.h"
#include "srslte/common/common.h"
#include "srslte/common/logmap.h"
#include "srslte/common/task_scheduler.h"
#include "srslte/common/threads.h"
#include "srslte/common/timeout.h"
#include "srslte/interfaces/gnb_interfaces.h"

1
srsue/hdr/stack/rrc/rrc.h
Unescape Escape View File

@ -60,6 +60,7 @@ namespace srsue {
class phy_controller;
class usim_interface_rrc;
class gw_interface_rrc;
class pdcp_interface_rrc;
class rrc : public rrc_interface_nas,
public rrc_interface_phy_lte,

1
srsue/hdr/stack/rrc/rrc_nr.h
Unescape Escape View File

@ -25,6 +25,7 @@
namespace srsue {
class usim_interface_rrc_nr;
class pdcp_interface_rrc;
// Expert arguments to create GW without proper RRC
struct core_less_args_t {

4
srsue/hdr/stack/upper/gw.h
Unescape Escape View File

@ -21,13 +21,15 @@
#include "srslte/common/log_filter.h"
#include "srslte/common/threads.h"
#include "srslte/interfaces/ue_gw_interfaces.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/srslog/srslog.h"
#include "tft_packet_filter.h"
#include <net/if.h>
#include <netinet/in.h>
namespace srsue {
class stack_interface_gw;
struct gw_args_t {
struct log_args_t {
std::string gw_level;

1
srsue/src/stack/rrc/rrc.cc
Unescape Escape View File

@ -15,6 +15,7 @@
#include "srslte/common/bcd_helpers.h"
#include "srslte/common/security.h"
#include "srslte/interfaces/ue_gw_interfaces.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/interfaces/ue_usim_interfaces.h"
#include "srsue/hdr/stack/rrc/phy_controller.h"
#include "srsue/hdr/stack/rrc/rrc_meas.h"

1
srsue/src/stack/rrc/rrc_nr.cc
Unescape Escape View File

@ -12,6 +12,7 @@
#include "srsue/hdr/stack/rrc/rrc_nr.h"
#include "srslte/common/security.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srsue/hdr/stack/upper/usim.h"
#define Error(fmt, ...) rrc_ptr->log_h->error("Proc \"%s\" - " fmt, name(), ##__VA_ARGS__)

1
srsue/src/stack/rrc/rrc_procedures.cc
Unescape Escape View File

@ -14,6 +14,7 @@
#include "srslte/common/security.h"
#include "srslte/common/standard_streams.h"
#include "srslte/common/tti_point.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/interfaces/ue_usim_interfaces.h"
#include "srsue/hdr/stack/rrc/rrc_meas.h"
#include <inttypes.h> // for printing uint64_t

3
srsue/src/stack/upper/gw.cc
Unescape Escape View File

@ -11,14 +11,17 @@
*/
#include "srsue/hdr/stack/upper/gw.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/upper/ipv6.h"
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/if_tun.h>
#include <linux/ip.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <netinet/in.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <unistd.h>

3
srsue/test/upper/gw_test.cc
Unescape Escape View File

@ -10,11 +10,10 @@
*
*/
#include "srslte/common/common.h"
#include "srslte/common/log.h"
#include "srslte/common/logger_srslog_wrapper.h"
#include "srslte/common/test_common.h"
#include "srslte/interfaces/ue_interfaces.h"
#include "srslte/interfaces/ue_pdcp_interfaces.h"
#include "srslte/srslog/srslog.h"
#include "srslte/srslte.h"
#include "srsue/hdr/stack/upper/gw.h"

Write Preview
Loading…
Cancel
Save