add ZMQ device argument to fail reception when end point disconnects

this allows to gracefully exit the eNB when the UE disconnected.
master
Andre Puschmann 5 years ago
parent ad304207b3
commit 995774c830

@ -429,6 +429,21 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
} }
} }
// fail_on_disconnect
{
const char config_arg[] = "fail_on_disconnect=";
char config_str[PARAM_LEN_SHORT] = {0};
char* config_ptr = strstr(args, config_arg);
if (config_ptr) {
copy_subdev_string(config_str, config_ptr + strlen(config_arg));
if (strncmp(config_str, "true", PARAM_LEN_SHORT) == 0 || strncmp(config_str, "yes", PARAM_LEN_SHORT) == 0) {
rx_opts.fail_on_disconnect = true;
}
remove_substring(args, config_arg);
remove_substring(args, config_str);
}
}
// initialize transmitter // initialize transmitter
if (strlen(handler->tx_port) != 0) { if (strlen(handler->tx_port) != 0) {
if (rf_zmq_tx_open(&handler->transmitter[i], tx_opts, handler->context, handler->tx_port) != SRSLTE_SUCCESS) { if (rf_zmq_tx_open(&handler->transmitter[i], tx_opts, handler->context, handler->tx_port) != SRSLTE_SUCCESS) {
@ -746,7 +761,10 @@ int rf_zmq_recv_with_time_multi(void* h,
// No error // No error
count[i] += n; count[i] += n;
} else if (n == SRSLTE_ERROR_TIMEOUT) { } else if (n == SRSLTE_ERROR_TIMEOUT) {
// Timeout, do nothing, keep going // Other end disconnected, either keep going, or fail
if (handler->receiver[i].fail_on_disconnect) {
goto clean_exit;
}
} else if (n > 0) { } else if (n > 0) {
// Other error, exit // Other error, exit
fprintf(stderr, "Error: receiving data.\n"); fprintf(stderr, "Error: receiving data.\n");

@ -70,6 +70,7 @@ typedef struct {
cf_t* temp_buffer; cf_t* temp_buffer;
void* temp_buffer_convert; void* temp_buffer_convert;
uint32_t frequency_mhz; uint32_t frequency_mhz;
bool fail_on_disconnect;
} rf_zmq_rx_t; } rf_zmq_rx_t;
typedef struct { typedef struct {
@ -77,6 +78,7 @@ typedef struct {
uint32_t socket_type; uint32_t socket_type;
rf_zmq_format_t sample_format; rf_zmq_format_t sample_format;
uint32_t frequency_mhz; uint32_t frequency_mhz;
bool fail_on_disconnect;
} rf_zmq_opts_t; } rf_zmq_opts_t;
/* /*

Loading…
Cancel
Save