Skip to content

IE Enterprise Specific (optional) support #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orion-belt wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

IE Enterprise Specific (optional) support #23

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea60461
IE Enterprise Specific - decoding function added
orion-belt Jun 15, 2021
d536888
IE Enterprise Specific - decoding in pfcp asscociation req
orion-belt Jun 15, 2021
d7d2830
clang formating
orion-belt Jun 15, 2021
4da6400
serialization of proprietary_data
orion-belt Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/common/3gpp_29.244.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@

namespace pfcp {

typedef struct enterprise_specific_s {
uint16_t enterprise_id;
std::string proprietary_data;
} enterprise_specific_t;

struct pfcp_exception : public std::exception {
pfcp_exception() throw() {
cause = 0;
Expand Down Expand Up @@ -334,6 +339,7 @@ struct pfcp_ie_value_exception : public pfcp_ie_exception {
#define PFCP_SESSION_DELETION_RESPONSE (55)
#define PFCP_SESSION_REPORT_REQUEST (56)
#define PFCP_SESSION_REPORT_RESPONSE (57)
#define PFCP_IE_ENTERPRISE_SPECIFIC (32770)
} // namespace pfcp

namespace pfcp {
Expand Down
3 changes: 2 additions & 1 deletion src/oai_spgwc/PfcpUpNodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ void pgwc::PfcpUpNodes::AssociationSetupRequest(
pfcp::node_id_t& node_id, pfcp::recovery_time_stamp_t& recovery_time_stamp,
std::pair<bool, pfcp::up_function_features_s>& up_function_features,
std::pair<bool, pfcp::user_plane_ip_resource_information_t>&
user_plane_ip_resource_information) {
user_plane_ip_resource_information,
std::pair<bool, pfcp::enterprise_specific_s>& enterprise_specific) {
Logger::pgwc_app().info(
"RX AssociationSetupRequest FQDN %s", node_id.fqdn.c_str());
std::unique_lock<std::mutex> l(m_pending_nodes);
Expand Down
3 changes: 2 additions & 1 deletion src/oai_spgwc/PfcpUpNodes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ class PfcpUpNodes {
pfcp::recovery_time_stamp_t& recovery_time_stamp,
std::pair<bool, pfcp::up_function_features_s>& up_function_features,
std::pair<bool, pfcp::user_plane_ip_resource_information_t>&
user_plane_ip_resource_information);
user_plane_ip_resource_information,
std::pair<bool, pfcp::enterprise_specific_s>& enterprise_specific);

bool AddUpNode(const std::string t_up_ip, const std::string t_apn);
bool GetUpNode(
Expand Down
22 changes: 13 additions & 9 deletions src/oai_spgwc/pgwc_sxab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,15 @@ void pgwc_sxab::handle_receive_association_setup_request(
"IE!, ignore message");
return;
}
if (msg_ies_container.enterprise_specific.first) {
// Do nothing for now
}
PfcpUpNodes::Instance().AssociationSetupRequest(
trxn_id, remote_endpoint, msg_ies_container.node_id.second,
msg_ies_container.recovery_time_stamp.second,
msg_ies_container.up_function_features,
msg_ies_container.user_plane_ip_resource_information);
msg_ies_container.user_plane_ip_resource_information,
msg_ies_container.enterprise_specific);
}
}

Expand Down Expand Up @@ -468,15 +472,15 @@ void pgwc_sxab::handle_receive_session_report_request(

//------------------------------------------------------------------------------
void pgwc_sxab::send_sx_msg(itti_sxab_association_setup_request& i) {
pfcp::recovery_time_stamp_t r = {.recovery_time_stamp =
(uint32_t) recovery_time_stamp};
pfcp::recovery_time_stamp_t r = {
.recovery_time_stamp = (uint32_t) recovery_time_stamp};
i.pfcp_ies.set(r);
send_request(i.r_endpoint, i.pfcp_ies, TASK_PGWC_SX, i.trxn_id);
}
//------------------------------------------------------------------------------
void pgwc_sxab::send_sx_msg(itti_sxab_association_setup_response& i) {
pfcp::recovery_time_stamp_t r = {.recovery_time_stamp =
(uint32_t) recovery_time_stamp};
pfcp::recovery_time_stamp_t r = {
.recovery_time_stamp = (uint32_t) recovery_time_stamp};
i.pfcp_ies.set(r);
if (cp_function_features.has_features()) {
i.pfcp_ies.set(cp_function_features);
Expand All @@ -490,8 +494,8 @@ void pgwc_sxab::send_sx_msg(itti_sxab_session_report_response& i) {
//------------------------------------------------------------------------------
void pgwc_sxab::send_heartbeat_request(std::shared_ptr<pfcp_association>& a) {
pfcp::pfcp_heartbeat_request h = {};
pfcp::recovery_time_stamp_t r = {.recovery_time_stamp =
(uint32_t) recovery_time_stamp};
pfcp::recovery_time_stamp_t r = {
.recovery_time_stamp = (uint32_t) recovery_time_stamp};
h.set(r);

a->timer_heartbeat = itti_inst->timer_setup(
Expand All @@ -507,8 +511,8 @@ void pgwc_sxab::send_heartbeat_request(std::shared_ptr<pfcp_association>& a) {
void pgwc_sxab::send_heartbeat_response(
const endpoint& r_endpoint, const uint64_t trxn_id) {
pfcp::pfcp_heartbeat_response h = {};
pfcp::recovery_time_stamp_t r = {.recovery_time_stamp =
(uint32_t) recovery_time_stamp};
pfcp::recovery_time_stamp_t r = {
.recovery_time_stamp = (uint32_t) recovery_time_stamp};
h.set(r);
send_response(r_endpoint, h, trxn_id);
}
Expand Down
5 changes: 5 additions & 0 deletions src/pfcp/3gpp_29.244.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ pfcp_ie* pfcp_ie::new_pfcp_ie_from_stream(std::istream& is) {
tlv.load_from(is);
if (tlv.length) {
switch (tlv.type) {
case PFCP_IE_ENTERPRISE_SPECIFIC: {
pfcp_enterprise_specific_ie* ie = new pfcp_enterprise_specific_ie(tlv);
ie->load_from(is);
return ie;
} break;
case PFCP_IE_CREATE_PDR: {
pfcp_create_pdr_ie* ie = new pfcp_create_pdr_ie(tlv);
ie->load_from(is);
Expand Down
63 changes: 62 additions & 1 deletion src/pfcp/3gpp_29.244.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class pfcp_ie : public stream_serializable {

pfcp_ie() : tlv() {}
explicit pfcp_ie(const pfcp_tlv& t) : tlv(t) {}
explicit pfcp_ie(const uint8_t tlv_type) : tlv() { tlv.type = tlv_type; }
explicit pfcp_ie(const uint16_t tlv_type) : tlv() { tlv.type = tlv_type; }

virtual ~pfcp_ie(){};

Expand Down Expand Up @@ -602,6 +602,67 @@ class pfcp_cause_ie : public pfcp_ie {
}
};
//-------------------------------------
// IE ENTERPRISE SPECIFIC
class pfcp_enterprise_specific_ie : public pfcp_ie {
public:
uint16_t enterprise_id;
std::string proprietary_data;

//--------
explicit pfcp_enterprise_specific_ie(const pfcp::enterprise_specific_t& b)
: pfcp_ie(PFCP_IE_ENTERPRISE_SPECIFIC) {
enterprise_id = b.enterprise_id;
proprietary_data = b.proprietary_data;
tlv.set_length(2 + proprietary_data.size());
}
//--------
pfcp_enterprise_specific_ie() : pfcp_ie(PFCP_IE_ENTERPRISE_SPECIFIC) {
enterprise_id = 0;
proprietary_data = {};
tlv.set_length(2);
}
// --------
explicit pfcp_enterprise_specific_ie(const pfcp_tlv& t)
: pfcp_ie(t), enterprise_id(0), proprietary_data(){};

//--------
void to_core_type(pfcp::enterprise_specific_t& b) {
b.enterprise_id = enterprise_id;
b.proprietary_data = proprietary_data;
}
//--------
void dump_to(std::ostream& os) {
tlv.dump_to(os);
os.write(
reinterpret_cast<const char*>(&enterprise_id), sizeof(enterprise_id));
os << enterprise_id;
}

@lionelgo lionelgo Aug 23, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no serialization of proprietary_data ?

@orion-belt orion-belt Aug 27, 2021

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lionelgo
addressed in latest commit

@lionelgo lionelgo Sep 2, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do write twice enterprise_id and proprietary_data ?
seems to me suspicious reinterpret_cast<const char*>(&proprietary_data) ...

//--------
void load_from(std::istream& is) {
// tlv.load_from(is);
if (tlv.get_length() < 2) {
throw pfcp_tlv_bad_length_exception(
tlv.type, tlv.get_length(), __FILE__, __LINE__);
}
is.read(reinterpret_cast<char*>(&enterprise_id), sizeof(enterprise_id));

char e[tlv.get_length() - 2];
is.read(e, tlv.get_length() - 2);
proprietary_data.assign(e, tlv.get_length() - 2);

if (tlv.get_length() != (2 + proprietary_data.size())) {
throw pfcp_tlv_bad_length_exception(
tlv.type, tlv.get_length(), __FILE__, __LINE__);
}
}
//--------
void to_core_type(pfcp_ies_container& s) {
pfcp::enterprise_specific_t enterprise_specific = {};
to_core_type(enterprise_specific);
s.set(enterprise_specific);
}
};
//-------------------------------------
// IE SOURCE_INTERFACE
class pfcp_source_interface_ie : public pfcp_ie {
public:
Expand Down
42 changes: 40 additions & 2 deletions src/pfcp/msg_pfcp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,16 @@ class pfcp_ies_container {
public:
static const uint8_t msg_id = 0;

// PFCP_IE_ENTERPRISE_SPECIFIC
virtual bool get(pfcp::enterprise_specific_t& v) const {
throw pfcp_msg_illegal_ie_exception(
0, PFCP_IE_ENTERPRISE_SPECIFIC, __FILE__, __LINE__);
}
virtual void set(const pfcp::enterprise_specific_t& v) {
throw pfcp_msg_illegal_ie_exception(
0, PFCP_IE_ENTERPRISE_SPECIFIC, __FILE__, __LINE__);
}

// PFCP_IE_CREATE_PDR
virtual bool get(pfcp::create_pdr& v) const {
throw pfcp_msg_illegal_ie_exception(
Expand Down Expand Up @@ -5568,20 +5578,23 @@ class pfcp_association_setup_request : public pfcp_ies_container {
std::pair<bool, pfcp::cp_function_features_t> cp_function_features;
std::pair<bool, pfcp::user_plane_ip_resource_information_t>
user_plane_ip_resource_information;
std::pair<bool, pfcp::enterprise_specific_t> enterprise_specific;

pfcp_association_setup_request()
: node_id(),
recovery_time_stamp(),
up_function_features(),
cp_function_features(),
user_plane_ip_resource_information() {}
user_plane_ip_resource_information(),
enterprise_specific() {}

pfcp_association_setup_request(const pfcp_association_setup_request& i) {
node_id = i.node_id;
recovery_time_stamp = i.recovery_time_stamp;
up_function_features = i.up_function_features;
cp_function_features = i.cp_function_features;
user_plane_ip_resource_information = i.user_plane_ip_resource_information;
enterprise_specific = i.enterprise_specific;
}
const char* get_msg_name() const { return "PFCP_ASSOCIATION_SETUP_REQUEST"; };

Expand Down Expand Up @@ -5620,6 +5633,13 @@ class pfcp_association_setup_request : public pfcp_ies_container {
}
return false;
}
bool get(pfcp::enterprise_specific_t& v) const {
if (enterprise_specific.first) {
v = enterprise_specific.second;
return true;
}
return false;
}

void set(const pfcp::node_id_t& v) {
node_id.first = true;
Expand All @@ -5641,6 +5661,10 @@ class pfcp_association_setup_request : public pfcp_ies_container {
user_plane_ip_resource_information.first = true;
user_plane_ip_resource_information.second = v;
}
void set(const pfcp::enterprise_specific_t& v) {
enterprise_specific.first = true;
enterprise_specific.second = v;
}
};

//------------------------------------------------------------------------------
Expand All @@ -5655,14 +5679,16 @@ class pfcp_association_setup_response : public pfcp_ies_container {
std::pair<bool, pfcp::cp_function_features_t> cp_function_features;
std::pair<bool, pfcp::user_plane_ip_resource_information_t>
user_plane_ip_resource_information;
std::pair<bool, pfcp::enterprise_specific_t> enterprise_specific;

pfcp_association_setup_response()
: node_id(),
cause(),
recovery_time_stamp(),
up_function_features(),
cp_function_features(),
user_plane_ip_resource_information() {}
user_plane_ip_resource_information(),
enterprise_specific() {}

pfcp_association_setup_response(const pfcp_association_setup_response& i) {
node_id = i.node_id;
Expand All @@ -5671,6 +5697,7 @@ class pfcp_association_setup_response : public pfcp_ies_container {
up_function_features = i.up_function_features;
cp_function_features = i.cp_function_features;
user_plane_ip_resource_information = i.user_plane_ip_resource_information;
enterprise_specific = i.enterprise_specific;
}
const char* get_msg_name() const {
return "PFCP_ASSOCIATION_SETUP_RESPONSE";
Expand Down Expand Up @@ -5718,6 +5745,13 @@ class pfcp_association_setup_response : public pfcp_ies_container {
}
return false;
}
bool get(pfcp::enterprise_specific_t& v) const {
if (enterprise_specific.first) {
v = enterprise_specific.second;
return true;
}
return false;
}

void set(const pfcp::node_id_t& v) {
node_id.first = true;
Expand All @@ -5743,6 +5777,10 @@ class pfcp_association_setup_response : public pfcp_ies_container {
user_plane_ip_resource_information.first = true;
user_plane_ip_resource_information.second = v;
}
void set(const pfcp::enterprise_specific_t& v) {
enterprise_specific.first = true;
enterprise_specific.second = v;
}
};

//------------------------------------------------------------------------------
Expand Down