Erik/colosseum-near-rt-ric
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix delivery of indication message - merge pull request #11 from JaykobJ/ns-o-ran

Browse Source 
xapp-sm-connector now sends entire indication message to the connected xApp. Previously only first Byte of the message was sent.

Thanks @JaykobJ
This commit is contained in:
Andrea Lacava 2023-12-01 11:32:54 -05:00 committed by GitHub
commit e3161c1f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/xapp-sm-connector/src/agent_connector.cc
View File

@ -104,7 +104,7 @@ std::string find_agent_ip_from_gnb(unsigned char* gnb_id_trans) {
// send through socket // send through socket
int send_socket(char* buf, std::string dest_ip) { int send_socket(char* buf, size_t payload_size, std::string dest_ip) {
int control_sckfd = -1; int control_sckfd = -1;
@ -126,8 +126,7 @@ int send_socket(char* buf, std::string dest_ip) {
// const size_t max_size = 512; // const size_t max_size = 512;
// char buf[max_size] = "Hello, Server!"; // store the data in a buffer // char buf[max_size] = "Hello, Server!"; // store the data in a buffer
size_t data_size = strlen(buf); int sent_size = send(control_sckfd, buf, payload_size, 0);
int sent_size = send(control_sckfd ,buf, data_size, 0);
if(sent_size < 0) { // the send returns a size of -1 in case of errors if(sent_size < 0) { // the send returns a size of -1 in case of errors
std::cout << "ERROR: SEND to agent " << dest_ip << std::endl; std::cout << "ERROR: SEND to agent " << dest_ip << std::endl;

2
setup/xapp-sm-connector/src/agent_connector.hpp
View File

@ -27,6 +27,6 @@ extern std::map<std::string, std::string> agentIp_gnbId;
int open_control_socket_agent(const char* dest_ip, const int dest_port); int open_control_socket_agent(const char* dest_ip, const int dest_port);
void close_control_socket_agent(void); void close_control_socket_agent(void);
std::string find_agent_ip_from_gnb(unsigned char* gnb_id); std::string find_agent_ip_from_gnb(unsigned char* gnb_id);
int send_socket(char* buf, std::string dest_ip); int send_socket(char* buf, size_t payload_size, std::string dest_ip);
#endif #endif

4
setup/xapp-sm-connector/src/xapp-mgmt/msgs_proc.cc
View File

@ -271,7 +271,7 @@ uint8_t procRicIndication(E2AP_PDU_t *e2apMsg, transaction_identifier gnb_id)
} }
case 26: // RIC indication message case 26: // RIC indication message
{ {
int payload_size = ricIndication->protocolIEs.list.array[idx]-> \ size_t payload_size = ricIndication->protocolIEs.list.array[idx]-> \
value.choice.RICindicationMessage.size; value.choice.RICindicationMessage.size;
@ -283,7 +283,7 @@ uint8_t procRicIndication(E2AP_PDU_t *e2apMsg, transaction_identifier gnb_id)
// send payload to agent // send payload to agent
std::string agent_ip = find_agent_ip_from_gnb(gnb_id); std::string agent_ip = find_agent_ip_from_gnb(gnb_id);
send_socket(payload, agent_ip); send_socket(payload, payload_size, agent_ip);
break; break;
} }