#include <subscription_delete_request.hpp>
#include <subscription_delete_response.hpp>
+#define SUBSCR_SUCCESS 0
+#define SUBSCR_ERR_TX 1
+#define SUBSCR_ERR_TIMEOUT 2
+#define SUBSCR_ERR_FAIL 3
+#define SUBSCR_ERR_UNKNOWN 4
+#define SUBSCR_ERR_DUPLICATE 5
+#define SUBSCR_ERR_ENCODE 6
+#define SUBSCR_ERR_MISSING 7
+
using namespace std;
typedef enum {
*/
-class SubscriptionHandler {
+class subscription_handler {
public:
- SubscriptionHandler(void);
- SubscriptionHandler(unsigned int, unsigned int);
+ subscription_handler(void);
+ subscription_handler(unsigned int, unsigned int);
void init(void);
template <typename Transmitter>
- bool RequestSubscription(subscription_helper &, subscription_response_helper &, int , Transmitter &&);
+ int RequestSubscription(subscription_helper &, subscription_response_helper &, int , Transmitter &&);
template<typename Transmitter>
- bool RequestSubscriptionDelete(subscription_helper &, subscription_response_helper &, int , Transmitter &&);
+ int RequestSubscriptionDelete(subscription_helper &, subscription_response_helper &, int , Transmitter &&);
void Response(int, unsigned char *, int);
unsigned int get_next_id(void);
void set_timeout(unsigned int);
- void set_timeout_flag(bool);
void set_num_retries(unsigned int);
bool is_subscription_entry(int);
private:
- void ProcessSubscriptionResponse(unsigned char *, int len);
- void ProcessSubscriptionFailure(unsigned char *, int len);
-
- void ProcessDeleteResponse(unsigned char *, int len);
- void ProcessSubscriptionDeleteFailure(unsigned char *, int len);
-
bool add_request_entry(int, int);
bool set_request_status(int, int);
bool delete_request_entry(int);
std::chrono::seconds _time_out;
unsigned int _num_retries = 2;
- bool _time_out_flag = true;
unsigned int unique_request_id = 0;
};
template <typename Transmitter>
-bool SubscriptionHandler::RequestSubscription(subscription_helper &he, subscription_response_helper &response, int TxCode, Transmitter && tx){
+int subscription_handler::RequestSubscription(subscription_helper &he, subscription_response_helper &response, int TxCode, Transmitter && tx){
- bool res;
+ int res;
unsigned char buffer[512];
size_t buf_len = 512;
mdclog_write(MDCLOG_INFO, "%s, %d:: Generated new request id %d\n", __FILE__, __LINE__, new_req_id);
he.set_request(new_req_id, he.get_req_seq());
- E2AP_PDU_t *e2ap_pdu = 0;
+
subscription_request e2ap_sub_req;
// generate the request pdu
- res = e2ap_sub_req.encode_e2ap_subscription(&buffer[0], &buf_len, e2ap_pdu, he);
+ res = e2ap_sub_req.encode_e2ap_subscription(&buffer[0], &buf_len, he);
if(! res){
mdclog_write(MDCLOG_ERR, "%s, %d: Error encoding subscription pdu. Reason = ", __FILE__, __LINE__);
- return false;
+ return SUBSCR_ERR_ENCODE;
}
// put entry in request table
std::lock_guard<std::mutex> lock(*(_data_lock.get()));
res = add_request_entry(he.get_request_id(), request_pending);
if(! res){
- mdclog_write(MDCLOG_ERR, "Error adding new subscription request %d to queue", he.get_request_id());
- return false;
+ mdclog_write(MDCLOG_ERR, "%s, %d : Error adding new subscription request %d to queue", __FILE__, __LINE__, he.get_request_id());
+ return SUBSCR_ERR_UNKNOWN;
}
}
if (!res){
// clear state
delete_request_entry(he.get_request_id());
- mdclog_write(MDCLOG_ERR, "Error transmitting subscription request %d", he.get_request_id());
- return false;
+ mdclog_write(MDCLOG_ERR, "%s, %d :: Error transmitting subscription request %d", __FILE__, __LINE__, he.get_request_id());
+ return SUBSCR_ERR_TX;
};
// record time stamp ..
auto start = std::chrono::system_clock::now();
+ res = SUBSCR_ERR_UNKNOWN;
while(1){
int status = get_request_status(he.get_request_id());
if (status == request_success){
- // retreive the subscription response and clear queue
- response = subscription_responses[he.get_request_id()];
- // clear state
- delete_request_entry(he.get_request_id());
-
- // release data lock
- _local_lock.unlock();
+ // retreive & store the subscription response
+ response = subscription_responses[he.get_request_id()];
mdclog_write(MDCLOG_INFO, "Successfully subscribed for request %d", he.get_request_id());
-
+ res = SUBSCR_SUCCESS;
break;
}
auto end = std::chrono::system_clock::now();
std::chrono::duration<double> f = end - start;
- if (_time_out_flag && f > _num_retries * _time_out){
- delete_request_entry(he.get_request_id());
+ if ( f > _num_retries * _time_out){
mdclog_write(MDCLOG_ERR, "%s, %d:: Subscription request %d timed out waiting for response ", __FILE__, __LINE__, he.get_request_id());
-
- // Release data lock
- _local_lock.unlock();
- return false;
+ res = SUBSCR_ERR_TIMEOUT;
+ std::cout <<"Set res = " << res << " for " << he.get_request_id() << std::endl;
+ break;
}
else{
mdclog_write(MDCLOG_INFO, "Subscription request %d Waiting for response ....", he.get_request_id());
}
}
+ if(status == request_failed){
+ mdclog_write(MDCLOG_ERR, "Error :: %s, %d : Subscription Request %d got failure response .. \n", __FILE__, __LINE__, he.get_request_id());
+ res = SUBSCR_ERR_FAIL;
+ break;
+ }
+
// if we are here, some spurious
// status obtained or request failed . we return false
mdclog_write(MDCLOG_ERR, "Error :: %s, %d : Spurious time out caused by invalid state of request %d -- state = %d. Deleting request entry and failing .. \n", __FILE__, __LINE__, he.get_request_id(), status);
- delete_request_entry(he.get_request_id());
-
- // release data lock
- _local_lock.unlock();
-
- return false;
-
+ res = SUBSCR_ERR_UNKNOWN;
+ break;
};
-
+
+ delete_request_entry(he.get_request_id());
- return true;
+ // release data lock
+ _local_lock.unlock();
+ std::cout <<"Returning res = " << res << " for " << he.get_request_id() << std::endl;
+ return res;
};
template <typename Transmitter>
-bool SubscriptionHandler::RequestSubscriptionDelete(subscription_helper &he, subscription_response_helper &response, int TxCode, Transmitter && tx){
+int subscription_handler::RequestSubscriptionDelete(subscription_helper &he, subscription_response_helper &response, int TxCode, Transmitter && tx){
- bool res;
+ int res;
// First check if we have this subscription
if(! is_subscription_entry(he.get_request_id())){
mdclog_write(MDCLOG_ERR, "subscription with id %d does not exist. Cannot be deleted", he.get_request_id());
- return false;
+ return SUBSCR_ERR_MISSING;
}
// Also check if such a request is queued
if (is_request_entry(he.get_request_id())){
mdclog_write(MDCLOG_ERR, "Subscription delete request with id %d already in queue", he.get_request_id());
- return false;
+ return SUBSCR_ERR_UNKNOWN;
}
subscription_delete e2ap_sub_req_del;
res = e2ap_sub_req_del.encode_e2ap_subscription(&buffer[0], &buf_len, he);
if(! res){
mdclog_write(MDCLOG_ERR, "%s, %d: Error encoding subscription delete request pdu. Reason = %s", __FILE__, __LINE__, e2ap_sub_req_del.get_error().c_str());
- return false;
+ return SUBSCR_ERR_ENCODE;
}
// put entry in request table
res = add_request_entry(he.get_request_id(), delete_request_pending);
if(! res){
mdclog_write(MDCLOG_ERR, "Error adding new subscription request %d to queue", he.get_request_id());
- return false;
+ return SUBSCR_ERR_UNKNOWN;
}
std::unique_lock<std::mutex> _local_lock(*(_data_lock.get()));
if (!res){
delete_request_entry(he.get_request_id());
mdclog_write(MDCLOG_ERR, "Error transmitting delete subscription request %d", he.get_request_id());
- return false;
+ return SUBSCR_ERR_TX;
};
// record time stamp ..
auto start = std::chrono::system_clock::now();
+ res = SUBSCR_ERR_UNKNOWN;
while(1){
// wait to be woken up
// check status and return appropriate object
int status = get_request_status(he.get_request_id());
if (status == delete_request_success){
- delete_request_entry(he.get_request_id());
mdclog_write(MDCLOG_INFO, "Successfully deleted subscription id %d", he.get_request_id());
- _local_lock.unlock();
+ res = SUBSCR_SUCCESS;
break;
}
auto end = std::chrono::system_clock::now();
std::chrono::duration<double> f = end - start;
- if (_time_out_flag && f > _num_retries * _time_out){
- delete_request_entry(he.get_request_id());
- mdclog_write(MDCLOG_ERR, "Subscription delete request %d timed out waiting for response ", he.get_request_id());
- _local_lock.unlock();
- return false;
+ if (f > _num_retries * _time_out){
+ mdclog_write(MDCLOG_ERR, "Subscription delete request %d timed out waiting for response ", he.get_request_id());
+ res = SUBSCR_ERR_TIMEOUT;
+ break;
}
else{
mdclog_write(MDCLOG_INFO, "Subscription delete request %d Waiting for response ....", he.get_request_id());
continue;
}
- // if we are hear, some spurious
+ if(status == delete_request_failed){
+ mdclog_write(MDCLOG_ERR, "Error :: %s, %d : Subscription Delete Request %d got failure response .. \n", __FILE__, __LINE__, he.get_request_id());
+ res = SUBSCR_ERR_FAIL;
+ break;
+ }
+ // if we are here, some spurious
// status obtained. we return false
- delete_request_entry(he.get_request_id());
- _local_lock.unlock();
- return false;
+ mdclog_write(MDCLOG_ERR, "Error :: %s, %d : Spurious time out caused by invalid state of delete request %d -- state = %d. Deleting request entry and failing .. \n", __FILE__, __LINE__, he.get_request_id(), status);
+ res = SUBSCR_ERR_UNKNOWN;
+ break;
};
- return true;
+ delete_request_entry(he.get_request_id());
+
+ // release data lock
+ _local_lock.unlock();
+ std::cout <<"Returning res = " << res << " for " << he.get_request_id() << std::endl;
+ return res;
};
#endif
Code Review / ric-app / admin.git / blobdiff