From 447b989aad64bd22bfdfcda877e250261c7bda64 Mon Sep 17 00:00:00 2001
From: Fabian Eckermann <30895211+FabianEckermann@users.noreply.github.com>
Date: Tue, 5 May 2020 12:41:41 +0200
Subject: [PATCH] fix parsing of zmq arguments

Use the return value of parse_string function to determine whether a parameter was found.
I experienced issues when the rx_type was set, but the rx_format was not. This led to "Unsupported sample format pub" as the tmp variable is still set to the value of the rx_type.
---
 lib/src/phy/rf/rf_zmq_imp.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/src/phy/rf/rf_zmq_imp.c b/lib/src/phy/rf/rf_zmq_imp.c
index 8603abeba..0b7cb7d21 100644
--- a/lib/src/phy/rf/rf_zmq_imp.c
+++ b/lib/src/phy/rf/rf_zmq_imp.c
@@ -240,8 +240,7 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
 
       // rx_type
       char tmp[RF_PARAM_LEN] = {0};
-      parse_string(args, "rx_type", -1, tmp);
-      if (strlen(tmp) > 0) {
+      if (parse_string(args, "rx_type", -1, tmp) == SRSLTE_SUCCESS) {
         if (!strcmp(tmp, "sub")) {
           rx_opts.socket_type = ZMQ_SUB;
         } else {
@@ -251,9 +250,8 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
       }
 
       // rx_format
-      parse_string(args, "rx_format", -1, tmp);
       rx_opts.sample_format = ZMQ_TYPE_FC32;
-      if (strlen(tmp) > 0) {
+      if (parse_string(args, "rx_format", -1, tmp) == SRSLTE_SUCCESS) {
         if (!strcmp(tmp, "sc16")) {
           rx_opts.sample_format = ZMQ_TYPE_SC16;
         } else {
@@ -263,8 +261,7 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
       }
 
       // tx_type
-      parse_string(args, "tx_type", -1, tmp);
-      if (strlen(tmp) > 0) {
+      if (parse_string(args, "tx_type", -1, tmp) == SRSLTE_SUCCESS) {
         if (!strcmp(tmp, "pub")) {
           tx_opts.socket_type = ZMQ_PUB;
         } else {
@@ -274,9 +271,8 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
       }
 
       // tx_format
-      parse_string(args, "tx_format", -1, tmp);
       tx_opts.sample_format = ZMQ_TYPE_FC32;
-      if (strlen(tmp) > 0) {
+      if (parse_string(args, "tx_format", -1, tmp) == SRSLTE_SUCCESS) {
         if (!strcmp(tmp, "sc16")) {
           tx_opts.sample_format = ZMQ_TYPE_SC16;
         } else {