Further script clean-ups.

Author: NorNet Praesum Presum

src/flowtest-dccp

@@ -54,15 +54,15 @@ rm -f vgcore.* core.* core
 
 # ====== Run NetPerfMeter ===================================================
 ./netperfmeter "${SERVER}:${PORT}" \
-   -vector=dccp.vec -scalar=dccp.sca \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
-   -dccp const80:const10000:const80:const10000 \
+   -config=dccp.config -vector=dccp.vec -scalar=dccp.sca \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
+   -dccp const80:const1000:const80:const1000 \
    -runtime="${RUNTIME}"

src/flowtest-many

@@ -71,9 +71,10 @@ i=0 ; while [ $i -lt $UDP_FLOWS ] ; do
    options="${options} -udp ${UDP_PARAMS}"
    i=$((i+1))
 done
-
 echo "OPTIONS=${options}"
+
 # shellcheck disable=SC2086
 ./netperfmeter "${SERVER}:${PORT}" \
+   -config=many.config -vector=many.vec -scalar=many.sca \
    ${options} \
    -runtime="${RUNTIME}"

src/flowtest-misc

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+đ#!/usr/bin/env bash
 # ==========================================================================
 #         _   _      _   ____            __ __  __      _
 #        | \ | | ___| |_|  _ \ ___ _ __ / _|  \/  | ___| |_ ___ _ __
@@ -47,13 +47,13 @@ rm -f vgcore.* core.* core
 # ====== Run NetPerfMeter ===================================================
 ./netperfmeter "${SERVER}:${PORT}" \
    -control-over-tcp \
-   -scalar=x.sca.bz2 -vector=x.vec.bz2 \
+   -config=multi1.config -scalar=multi1.sca.bz2 -vector=multi1.vec.bz2 \
    -tcp const30:const68000:const30:const68000:maxmsgsize=1300 \
    -runtime=5
 
 ./netperfmeter "${SERVER}:${PORT}" \
    -control-over-tcp \
-   -scalar=y.sca.bz2 -vector=y.vec.bz2 \
+   -config=multi1.config -scalar=multi1.sca.bz2 -vector=multi1.vec.bz2 \
    -udp const30:const68000:const30:const68000:maxmsgsize=1300 \
    -tcp const30:const68000:const30:const68000:maxmsgsize=1300 \
    -sctp const30:const68000:const30:const68000:maxmsgsize=1300 \
@@ -62,6 +62,6 @@ rm -f vgcore.* core.* core
 
 ./netperfmeter "${SERVER}:${PORT}" \
    -control-over-tcp \
-   -scalar=y.sca.bz2 -vector=y.vec.bz2 \
+   -config=multi3.config -scalar=multi3.sca.bz2 -vector=multi3.vec.bz2 \
    -sctp const30:const6800:const30:const6800:maxmsgsize=1300 const30:const6800:const30:const6800:maxmsgsize=1300 const30:const6800:const30:const6800:maxmsgsize=1300 \
    -runtime=5

src/flowtest-multi

@@ -54,7 +54,7 @@ rm -f vgcore.* core.* core
 
 # ====== Run NetPerfMeter ===================================================
 ./netperfmeter "${SERVER}:${PORT}" \
-   -vector=multi.vec -scalar=multi.sca \
+   -config=multi.config -vector=multi.vec -scalar=multi.sca \
    -tcp  const10:const1000:const10:const1000 \
    -udp  const10:const1000:const10:const1000 \
    -dccp const10:const1000:const10:const1000 \

src/flowtest-sctp

@@ -54,7 +54,7 @@ rm -f vgcore.* core.* core
 
 # ====== Run NetPerfMeter ===================================================
 ./netperfmeter "${SERVER}:${PORT}" \
-   -vector=sctp.vec -scalar=sctp.sca \
+   -config=sctp.config -vector=sctp.vec -scalar=sctp.sca \
    -sctp \
      const8:const10000:const8:const10000 \
      const8:const10000:const8:const10000 \

src/flowtest-wireshark

@@ -67,7 +67,7 @@ rm -f vgcore.* core.* core
 # ====== Run NetPerfMeter ===================================================
 # make && valgrind --tool=helgrind \
 ./netperfmeter "${SERVER}:${PORT}" \
-   -vector=f.vec.bz2 -scalar=f.sca.bz2 \
+   -config=wireshark.config -vector=wireshark.vec.bz2 -scalar=wireshark.sca.bz2 \
    -tcp  const4:const1024:const3:const1024 \
    -tcp  const2:const512:const3:const512 \
    -udp  const4:const1024:const3:const1024 \

src/netperfmeter.1

@@ -229,7 +229,7 @@ Some netperfmeter usage examples:
 .Bl -tag -width indent
 .It netperfmeter 9000
 Start in passive mode, i.e. accepting connections, on port 9000.
-.It netperfmeter 172.16.255.254:\%9000 -vector=\%output.vec.bz2 -scalar=\%output.sca.bz2 -sctp const5:\%exp1000:\%const3:\%exp500:\%description=\%"Alpha":\%onoff=\%+10 const5:\%exp1000:\%const3:\%exp500:\%description=\%"Beta":\%onoff=\%+30 -tcp const5:\%exp1000:\%const3:\%exp500:\%description=\%"Gamma":\%onoff=\%+60 -runtime=\%300
+.It netperfmeter 172.16.255.254:\%9000 -config=output.config -vector=\%output.vec.bz2 -scalar=\%output.sca.bz2 -sctp const5:\%exp1000:\%const3:\%exp500:\%description=\%"Alpha":\%onoff=\%+10 const5:\%exp1000:\%const3:\%exp500:\%description=\%"Beta":\%onoff=\%+30 -tcp const5:\%exp1000:\%const3:\%exp500:\%description=\%"Gamma":\%onoff=\%+60 -runtime=\%300
 Start in active mode, i.e. establish connection to 172.16.255.254, port 9000.
 Frames will be segmented into messages of up to 4096 bytes.
 Write vectors to output.vec.bz2 (BZip2-compressed).