fixed small issue that was causing compilation errors

master
Francisco Paisana 5 years ago
parent 2de0eee9c7
commit 546ee98879

@ -117,6 +117,11 @@ int tcp_send(int remotefd, const void* buf, size_t nbytes, srslte::log* log_);
* Rx multisocket handler * Rx multisocket handler
***************************/ ***************************/
/**
* Description - Instantiates a thread that will block waiting for IO from multiple sockets, via a select
* The user can register their own (socket fd, data handler) in this class via the
* add_socket_handler(fd, task) API or its other variants
*/
class rx_multisocket_handler final : public thread class rx_multisocket_handler final : public thread
{ {
public: public:

@ -485,10 +485,10 @@ bool rx_multisocket_handler::add_socket_pdu_handler(int fd, recv_callback_t pdu_
/** /**
* Convenience method for reading PDUs from SCTP socket * Convenience method for reading PDUs from SCTP socket
*/ */
bool rx_multisocket_handler::add_socket_sctp_pdu_handler(int fd, sctp_recv_callback_t task) bool rx_multisocket_handler::add_socket_sctp_pdu_handler(int fd, sctp_recv_callback_t pdu_task)
{ {
srslte::rx_multisocket_handler::task_callback_t task; srslte::rx_multisocket_handler::task_callback_t task;
task.reset(new srslte::sctp_recvmsg_pdu_task(pool, log_h, std::move(task))); task.reset(new srslte::sctp_recvmsg_pdu_task(pool, log_h, std::move(pdu_task)));
return add_socket_handler(fd, std::move(task)); return add_socket_handler(fd, std::move(task));
} }

@ -141,10 +141,6 @@ srslte::proc_outcome_t s1ap::s1_setup_proc_t::react(const srsenb::s1ap::s1_setup
void s1ap::s1_setup_proc_t::then(const srslte::proc_state_t& result) const void s1ap::s1_setup_proc_t::then(const srslte::proc_state_t& result) const
{ {
if (result.is_error()) { if (result.is_error()) {
// If a connection to the MME was created, it has to be erased again
// if (s1ap_ptr->s1ap_socket.is_init()) {
// s1ap_ptr->stack->remove_mme_socket(s1ap_ptr->s1ap_socket.fd());
// }
s1ap_ptr->s1ap_socket.reset(); s1ap_ptr->s1ap_socket.reset();
procInfo("S1AP socket closed.\n"); procInfo("S1AP socket closed.\n");
} }

Loading…
Cancel
Save