ipfixprobed - consistency of DPDK_OPTS parameter with examples and dpdk-ring

Author: TheSableCZ

init/ipfixprobed

@@ -17,6 +17,10 @@ if [ -e "$CONFFILE" ]; then
          DPDK_LCORES="--lcores $DPDK_LCORES"
       fi
 
+      if [ -n "$DPDK_OPTS" -a "${DPDK_OPTS:0:1}" != ";" ]; then
+         DPDK_OPTS=";$DPDK_OPTS"
+      fi
+
       # create array with input workers affinities
       if [ ! -z "$DPDK_INPUT_WORKER_CPUS" ]; then
          if `declare -p DPDK_INPUT_WORKER_CPUS > /dev/null 2>/dev/null`; then
@@ -47,18 +51,15 @@ if [ -e "$CONFFILE" ]; then
          fi
 
          # mring interfaces
-         dpdkinput=("-i" "dpdk-ring${affinities[0]};r=$(printf "$DPDK_RING_PATTERN" "$DPDK_RING_STARTIDX");e=$DPDK_LCORES $DPDK_EXTRA_EAL")
+         dpdkinput=("-i" "dpdk-ring${affinities[0]};r=$(printf "$DPDK_RING_PATTERN" "$DPDK_RING_STARTIDX")${DPDK_OPTS};e=$DPDK_LCORES $DPDK_EXTRA_EAL")
          plugin_idx=1
          for ((ifc=($DPDK_RING_STARTIDX+1); ifc<($DPDK_RING_STARTIDX + $DPDK_QUEUES_COUNT);ifc++)); do
             dpdkinput+=("-i" "dpdk-ring${affinities[$plugin_idx]};r=$(printf "$DPDK_RING_PATTERN" "$ifc")")
             ((plugin_idx++))
          done
       else
          # DPDK port interface
-         if [ -n "$DPDK_PORTOPTS" -a "${DPDK_PORTOPTS:0:1}" != ";" ]; then
-            DPDK_PORTOPTS=";$DPDK_PORTOPTS"
-         fi
-         dpdkinput=("-i" "dpdk${affinities[0]};p=${DPDK_PORT}${DPDK_PORTOPTS};q=$DPDK_QUEUES_COUNT;e=$DPDK_LCORES $DPDK_EXTRA_EAL -a $DPDK_DEVICE")
+         dpdkinput=("-i" "dpdk${affinities[0]};p=${DPDK_PORT}${DPDK_OPTS};q=$DPDK_QUEUES_COUNT;e=$DPDK_LCORES $DPDK_EXTRA_EAL -a $DPDK_DEVICE")
          for ((ifc=1; ifc<$DPDK_QUEUES_COUNT;ifc++)); do
             dpdkinput+=("-i" "dpdk${affinities[$ifc]}")
          done