.gitignore

@@ -9,3 +9,8 @@ tests/__pycache__/
 MANIFEST
 prrt.cpython*.so
 prrt.so
+.ipynb_checkpoints/
+.idea/
+.venv/
+Pipfile.lock
+.vscode/

.gitlab-ci.yml

+image: docker.nt.uni-saarland.de/docker/prrt-builder:20.04
+
 variables:
   PYPI_USER: SECURE
   PYPI_PASSWORD: SECURE
@@ -12,7 +14,7 @@ stages:
 build:prrt:
   stage: build
   tags:
-    - cmake
+    - docker
   artifacts:
     name: "$CI_BUILD_REF_NAME$"
     untracked: true
@@ -24,26 +26,15 @@ build:prrt:
     - which g++
     - pip3 list | grep Cython
     - pip3 list | grep numpy
-    - CC=gcc-5 CXX=g++-5 cmake . -DPRRT_TESTS=1
+    - cmake .
     - make
 
-build:container:
-    stage: build
-    tags:
-        - docker
-    script:
-        - export DOCKER_TAG=$(echo "$CI_BUILD_REF_NAME" | sed 's#/#_#' | sed 's#^master$#latest#')
-        - docker build -t $CI_REGISTRY_IMAGE:$DOCKER_TAG --build-arg http_proxy=http://www-proxy.uni-saarland.de:3128 -f docker/Dockerfile .
-        - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-        - docker push $CI_REGISTRY_IMAGE:$DOCKER_TAG
-        - docker rmi $CI_REGISTRY_IMAGE:$DOCKER_TAG
-
 test:prrt_mem:
   stage: test
   dependencies:
     - build:prrt
   tags:
-    - valgrind
+    - docker
   script:
     - bash tests/memtest.sh
 
@@ -52,22 +43,24 @@ test:prrt_functional:
   dependencies:
     - build:prrt
   tags:
-    - bash
+    - docker
   script:
+    - rm CMakeCache.txt
+    - cmake . -DPRRT_TESTS=1
+    - make
     - exec ./prrtTests
 
 test:prrt_python_bindings:
   stage: test
   tags:
-    - bash
-    - python3
+    - docker
   script:
     - sh tests/build.sh
 
 deploy:pypi:
   stage: deploy
   tags:
-    - python3
+    - docker
   script:
     - echo "[distutils]" >> ~/.pypirc
     - echo "index-servers =" >> ~/.pypirc
@@ -79,3 +72,19 @@ deploy:pypi:
     - echo "password=$PYPI_PASSWORD" >> ~/.pypirc
     - python3 setup.py check sdist bdist upload -r on
     - rm -vf ~/.pypirc
+
+deploy:profile:
+  stage: deploy
+  tags:
+    - docker
+  script:
+    - ls -lahv
+    - rm CMakeCache.txt
+    - cmake . -DGPROF=1
+    - make
+    - bash profiling/profile.sh
+  artifacts:
+    paths:
+    - gprof-send.txt
+    - gprof-recv.txt
+    expire_in: 30 days

.gitmodules

 [submodule "prrt/xlap"]
 	path = prrt/xlap
-	url = ../../as/X-Lap.git
+	url = https://git.nt.uni-saarland.de/LARN/X-Lap.git

CMakeLists.txt

@@ -2,16 +2,22 @@ cmake_minimum_required (VERSION 2.8.11)
 project (PRRT)
 
 option(PRRT_TESTS "Build tests" OFF)
+option(GPROF "Compile with profiler" OFF)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 set(CMAKE_C_FLAGS "-O2 -Wall -std=gnu11 -D_GNU_SOURCE -fPIC" )
+set(CMAKE_C_FLAGS_DEBUG "-O0 -fsanitize=undefined -fsanitize=address -g3" )
 set(CMAKE_CXX_FLAGS "-fstack-protector -fstack-protector-all -Wall -std=gnu++11 -D_GNU_SOURCE" )
-set(CMAKE_CXX_FLAGS_DEBUG "-O2 -Wall -ggdb" )
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -Wall -ggdb -fsanitize=undefined -fsanitize=address -g3" )
 set(CMAKE_CXX_FLAGS_RELEASE "-Os -Wall" )
 
+if(GPROF)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
+endif()
 
 find_package (Threads)
 find_library(M_LIB m)

MANIFEST.in

-include requirements.txt
-recursive-include src *
 recursive-include prrt *
 include versioneer.py
-include prrt/_version.py
 include _version.py

Pipfile

+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+cython       = "==0.29.13"
+jupyter      = "==1.0.0"
+numpy        = "==1.17.0"
+pandas       = "==0.25.1"
+matplotlib   = "==3.1.1"
+ruamel-yaml  = "==0.16.5"
+scikit-learn = "==0.21.3"
+graphviz     = "==0.12"
+prrt         = {editable = true, path = "./"}

README.md

@@ -4,12 +4,14 @@
 
 ## Features
 
-* Forward Error Correction (FEC) using systematic Vandermonde codes
+* Hybrid error control (FEC + ARQ) using systematic Vandermonde codes
+* Congestion control and pacing using a variant of [BBR](https://groups.google.com/forum/#!forum/bbr-dev)
 * Clock synchronization between sending stack and receiving stack
 * Applications can specify packet-level expiration times
 * Different receive modes for ASAP and time-synchronized operation
 * Passive measurement of propagation delay, bottleneck data rate and packet loss rate
 * Packet-level timing analysis using [X-Lap](http://xlap.larn.systems)
+* Wireshark dissector written in Lua
 * [Hardware timestamping support](https://git.nt.uni-saarland.de/LARN/PRRT/wikis/hardware-timestamping)
 
 ## Installation
@@ -29,9 +31,9 @@ port = int(sys.argv[1])
 s = prrt.PrrtSocket(port=port)
 
 while True:
-    d = s.recv()
+    d = s.recv().decode("utf8")
     if d != "Close":
-        print d
+        print(d)
     else:
         break
 ```
@@ -44,25 +46,27 @@ import prrt
 
 host = sys.argv[1]
 port = int(sys.argv[2])
+localport = int(sys.argv[3])
 
-s = prrt.PrrtSocket(port=port)
+s = prrt.PrrtSocket(port=localport)
 s.connect(host, port)
 
+
 for i in range(10):
-    s.send("Packet {}".format(i))
-s.send("Close")
+    s.send("Packet {}".format(i).encode("utf8"))
+s.send("Close".encode("utf8"))
 ```
 
 Start the receiver by:
 
 ```bash
-python receiver.py 5000
+python3 receiver.py 5000
 ```
 
 In a separate terminal, run:
 
 ```bash
-python sender.py 127.0.0.1 5000
+python3 sender.py 127.0.0.1 5000 6000
 ```
 
 This should generate the following output in the receiver console:
@@ -79,6 +83,20 @@ Packet 9
 * [PRRT Wiki](https://git.nt.uni-saarland.de/LARN/PRRT/wikis)
 * [LARN Project Website](http://larn.systems)
 
+## Citing Us
+
+If you find PRRT useful and incorporate it in your works, we are very happy to hear about it. Please also consider to cite us like this:
+
+```bibtex
+@misc{sic2019prrt,
+      author = {Telecommunications Lab at Saarland Informatics Campus},
+      title = {PRRT: Predictably Reliable Real-time Transport},
+      howpublished={Web page},
+      url = {http://prrt.larn.systems},
+      year = {2019}
+}
+```
+
 ## License
 
 [MIT Licence](LICENSE)

dissect/README.md

@@ -5,11 +5,11 @@ Installation
 ------------
 
 * Download Wireshark Source Code: https://www.wireshark.org/
-
+```console
     apt-get install qt-sdk libgtk-3-dev libpcap-dev
     tar xvjf wireshark-1.10.2.tar.bz2
     ./configure
-
+```
 * Copy `packet-prrt.c` to `epan/dissectors`.
 * Add a line `packet-prrt.c \` in `DISSECTOR_SRC` of `epan/dissectors/Makefile.common`.
 * Call make in the root folder. You can now start wireshark using `./wireshark`.

dissect/prrt.lua

@@ -21,20 +21,23 @@ local pf_idx = ProtoField.uint8("prrt.index", "Index")
 local pf_seqN = ProtoField.uint16("prrt.sequenceNumber", "Sequence Number")
 
 local pf_data = ProtoField.new("Data", "prrt.data", ftypes.BYTES, base.NONE)
-local pf_data_length = ProtoField.uint32("prrt.data.length", "Length")
 local pf_data_timestamp = ProtoField.uint32("prrt.data.timestamp", "Timestamp")
-local pf_data_groupRTprop = ProtoField.uint32("prrt.data.grouprtprop", "Group RTprop")
+local pf_data_btl_pace = ProtoField.uint32("prrt.data.btl_pace", "Bottleneck Pace")
+local pf_data_length = ProtoField.uint32("prrt.data.length", "Length")
+local pf_data_RTprop = ProtoField.uint32("prrt.data.RTprop", "RTprop")
 local pf_data_packettimeout = ProtoField.uint32("prrt.data.packettimeout", "Packet Timeout")
+local pf_data_btlDatarate = ProtoField.uint32("prrt.data.btl_datarate", "Bottleneck Datarate")
 
 local pf_red = ProtoField.new("Redundancy", "prrt.redundancy", ftypes.BYTES, base.NONE)
-local pf_red_baseSeqN = ProtoField.uint16("prrt.redundancy.baseSequenceNumber", "Base Sequence Number", base.DEC)
 local pf_red_timestamp = ProtoField.uint32("prrt.redundancy.timestamp", "Timestamp")
+local pf_red_btl_pace = ProtoField.uint32("prrt.redundancy.btl_pace", "Bottleneck Pace")
+local pf_red_baseSeqN = ProtoField.uint16("prrt.redundancy.baseSequenceNumber", "Base Sequence Number", base.DEC)
 local pf_red_n = ProtoField.uint8("prrt.redundancy.n", "n")
 local pf_red_k = ProtoField.uint8("prrt.redundancy.k", "k")
 
 local pf_fb = ProtoField.new("Feedback", "prrt.feedback", ftypes.BYTES, base.NONE)
-local pf_fb_groupRTT = ProtoField.uint32("prrt.feedback.groupRTT", "Group RTT")
 local pf_fb_ftt = ProtoField.uint32("prrt.feedback.FTT", "FTT")
+local pf_fb_btlPace = ProtoField.uint32("prrt.feedback.btlPace", "Bottleneck pace")
 local pf_fb_erasurecount = ProtoField.uint16("prrt.feedback.erasureCount", "Erasure count")
 local pf_fb_packetcount = ProtoField.uint16("prrt.feedback.packetCount", "Packet count")
 local pf_fb_gaplength = ProtoField.uint16("prrt.feedback.gapLength", "Gap length")
@@ -52,20 +55,23 @@ prrt_proto.fields = {
     pf_seqN,
 
     pf_data,
-    pf_data_length,
     pf_data_timestamp,
-    pf_data_groupRTprop,
+    pf_data_btl_pace,
+    pf_data_length,
+    pf_data_RTprop,
     pf_data_packettimeout,
+    pf_data_btlDatarate,
 
     pf_red,
-    pf_red_baseSeqN,
     pf_red_timestamp,
+    pf_red_btl_pace,
+    pf_red_baseSeqN,
     pf_red_n,
     pf_red_k,
 
     pf_fb,
-    pf_fb_groupRTT,
     pf_fb_ftt,
+    pf_fb_btlPace,
     pf_fb_erasurecount,
     pf_fb_packetcount,
     pf_fb_gaplength,
@@ -89,9 +95,16 @@ local ex_type = Field.new("prrt.type")
 local function getType() return ex_type()() end
 local function getTypeName() return prrtPacketTypeNames[getType()] end
 
+local ex_index = Field.new("prrt.index")
+local function getIndex() return ex_index()() end
+
 local ex_data_length = Field.new("prrt.data.length")
 local function getDataLength() return ex_data_length()() end
 
+local ex_red_baseseqno = Field.new("prrt.redundancy.baseSequenceNumber")
+local function getRedBaseSeqNo() return ex_red_baseseqno()() end
+
+
 local ex_red_n = Field.new("prrt.redundancy.n")
 local function getRedN() return ex_red_n()() end
 
@@ -104,32 +117,35 @@ local PRRT_MIN_SIZE = 8
 -- create sub-dissectors for different types
 local function dissect_data(buffer, pinfo, root)
     local tree = root:add(pf_data, buffer:range(0))
-    tree:add(pf_data_length, buffer:range(0,4))
-    tree:add(pf_data_timestamp, buffer:range(4,4))
-    tree:add(pf_data_groupRTprop, buffer:range(8,4))
-    tree:add(pf_data_packettimeout, buffer:range(12,4))
-
-    local label = "DATA Len=" .. getDataLength()
+    tree:add(pf_data_timestamp, buffer:range(0,4))
+    tree:add(pf_data_btl_pace, buffer:range(4,4))
+    tree:add(pf_data_length, buffer:range(8,4))
+    tree:add(pf_data_RTprop, buffer:range(12,4))
+    tree:add(pf_data_packettimeout, buffer:range(16,4))
+    tree:add(pf_data_btlDatarate, buffer:range(20,4))
+
+    local label = "[D] Idx=" .. getIndex() .. " Len=" .. getDataLength()
     tree:set_text(label)
     pinfo.cols.info:set(label)
 end
 
 local function dissect_redundancy(buffer, pinfo, root)
     local tree = root:add(pf_red, buffer:range(0))
-    tree:add(pf_red_baseSeqN, buffer:range(0,2))
-    tree:add(pf_red_timestamp, buffer:range(2,4))
-    tree:add(pf_red_n, buffer:range(6,1))
-    tree:add(pf_red_k, buffer:range(7,1))
+    tree:add(pf_red_timestamp, buffer:range(0,4))
+    tree:add(pf_red_btl_pace, buffer:range(4,4))
+    tree:add(pf_red_baseSeqN, buffer:range(8,2))
+    tree:add(pf_red_n, buffer:range(10,1))
+    tree:add(pf_red_k, buffer:range(11,1))
 
-    local label = "REDUNDANCY n=" .. getRedN() .. " k=" .. getRedK()
+    local label = "[R] Idx=" .. getIndex() .. " b=" .. getRedBaseSeqNo() .. " n=" .. getRedN() .. " k=" .. getRedK()
     tree:set_text(label)
     pinfo.cols.info:set(label)
 end
 
 local function dissect_feedback(buffer, pinfo, root)
     local tree = root:add(pf_fb, buffer:range(0))
-    tree:add(pf_fb_groupRTT, buffer:range(0,4))
-    tree:add(pf_fb_ftt, buffer:range(4,4))
+    tree:add(pf_fb_ftt, buffer:range(0,4))
+    tree:add(pf_fb_btlPace, buffer:range(4,4))
     tree:add(pf_fb_erasurecount, buffer:range(8,2))
     tree:add(pf_fb_packetcount, buffer:range(10,2))
     tree:add(pf_fb_gaplength, buffer:range(12,2))
@@ -139,7 +155,7 @@ local function dissect_feedback(buffer, pinfo, root)
     tree:add(pf_fb_acktype, buffer:range(20,1))
     tree:add(pf_fb_ackSeqN, buffer:range(21, 2))
 
-    local label = "FEEDBACK"
+    local label = "[F]"
     tree:set_text(label)
     pinfo.cols.info:set(label)
 end
@@ -198,4 +214,3 @@ function prrt_proto.prefs_changed()
         end
     end
 end
-

dissect/wireshark-1.4.6/packet-prrt.c

@@ -87,7 +87,7 @@ static int hf_prrt_payload = -1;        /* payload with arbitrary length, depend
 static int hf_prrt_receiver_addr = -1;  /* 32 bits IP address of the receiver */
 static int hf_prrt_rtt_probe = -1;      /* 32 bits timestamp of most recent data packet plus delay since reception of this packet. */
 static int hf_prrt_plr = -1;            /* 32 bits packet loss rate measured at the receiver. */
-static int hf_prrt_bw_est = -1;         /* 32 bits bandwidth estimated at the receiver. */
+static int hf_prrt_datarate_est = -1;         /* 32 bits datarate estimated at the receiver. */
 /* The following two fields are the payload of PRRT feedback packet (packet type: 3). */
 static int hf_prrt_packet_no = -1;      /* 16 bits packet no of the first lost packet. */
 static int hf_prrt_retr_round = -1;     /* 16 bits retransmission round of the first lost. (first transmission is 0.) */
@@ -323,7 +323,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 24) {
@@ -364,7 +364,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 28) {
@@ -484,10 +484,10 @@ proto_register_prrt(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "The packet loss rate measured at the receiver, stored in general PRRT feedback header", HFILL }
     },
-    { &hf_prrt_bw_est,
-      { "Estimated Bandwidth", "prrt.feedback.bw",
+    { &hf_prrt_datarate_est,
+      { "Estimated Datarate", "prrt.feedback.datarate",
       FT_UINT32, BASE_DEC, NULL, 0x0,
-      "The bandwidth estimated at the receiver, stored in general PRRT feedback header", HFILL }
+      "The datarate estimated at the receiver, stored in general PRRT feedback header", HFILL }
     },
     { &hf_prrt_packet_no,
       { "Packet No", "prrt.feedback.packetno",

dissect/wireshark-1.6.1/packet-prrt.c

@@ -92,7 +92,7 @@ static int hf_prrt_payload = -1;        /* payload with arbitrary length, depend
 static int hf_prrt_receiver_addr = -1;  /* 32 bits IP address of the receiver */
 static int hf_prrt_rtt_probe = -1;      /* 32 bits timestamp of most recent data packet plus delay since reception of this packet. */
 static int hf_prrt_plr = -1;            /* 32 bits packet loss rate measured at the receiver. */
-static int hf_prrt_bw_est = -1;         /* 32 bits bandwidth estimated at the receiver. */
+static int hf_prrt_datarate_est = -1;         /* 32 bits datarate estimated at the receiver. */
 /* The following two fields are the payload of PRRT feedback packet (packet type: 3). */
 static int hf_prrt_packet_no = -1;      /* 16 bits packet no of the first lost packet. */
 static int hf_prrt_retr_round = -1;     /* 16 bits retransmission round of the first lost. (first transmission is 0.) */
@@ -361,7 +361,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 24) {
@@ -402,7 +402,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 28) {
@@ -524,10 +524,10 @@ proto_register_prrt(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "The packet loss rate measured at the receiver, stored in general PRRT feedback header", HFILL }
     },
-    { &hf_prrt_bw_est,
-      { "Estimated Bandwidth", "prrt.feedback.bw",
+    { &hf_prrt_datarate_est,
+      { "Estimated Datarate", "prrt.feedback.datarate",
       FT_UINT32, BASE_DEC, NULL, 0x0,
-      "The bandwidth estimated at the receiver, stored in general PRRT feedback header", HFILL }
+      "The datarate estimated at the receiver, stored in general PRRT feedback header", HFILL }
     },
     { &hf_prrt_packet_no,
       { "Packet No", "prrt.feedback.packetno",

dissect/wireshark-2.0.0/packet-prrt.c

@@ -74,7 +74,7 @@ static int hf_prrt_gap = -1;
 static int hf_prrt_ngap = -1;
 static int hf_prrt_burst = -1;
 static int hf_prrt_nburst = -1;
-static int hf_prrt_bw_est = -1;
+static int hf_prrt_datarate_est = -1;
 static int hf_prrt_buf_fb = -1;
 
 /* Payload */
@@ -206,7 +206,7 @@ static void dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                         offset += 2;
                         proto_tree_add_item(prrt_tree, hf_prrt_nburst, tvb, offset, 2, FALSE);
                         offset += 2;
-                        proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+                        proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
                         offset += 4;
                         proto_tree_add_item(prrt_tree, hf_prrt_buf_fb, tvb, offset, 4, FALSE);
                 } else if(packet_type == 4) {
@@ -236,7 +236,7 @@ static void dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                         offset += 2;
                         proto_tree_add_item(prrt_tree, hf_prrt_nburst, tvb, offset, 2, FALSE);
                         offset += 2;
-                        proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+                        proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
                         offset += 4;
                         proto_tree_add_item(prrt_tree, hf_prrt_buf_fb, tvb, offset, 4, FALSE);
                 } else {
@@ -292,8 +292,8 @@ void proto_register_prrt(void)
                   { "Aggregated Burst Length", "prrt.feedback.burst", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
                 { &hf_prrt_nburst,
                   { "Burst Count", "prrt.feedback.nburst", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
-                { &hf_prrt_bw_est,
-                  { "Estimated Bandwidth", "prrt.feedback.bw", FT_UINT32, BASE_DEC, NULL, 0x0, "The bandwidth estimated at the receiver, stored in general PRRT feedback header", HFILL }},
+                { &hf_prrt_datarate_est,
+                  { "Estimated Datarate", "prrt.feedback.datarate", FT_UINT32, BASE_DEC, NULL, 0x0, "The datarate estimated at the receiver, stored in general PRRT feedback header", HFILL }},
                 { &hf_prrt_buf_fb,
                   { "Buffer Feedback", "prrt.feedback.buf_fb", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
                 { &hf_prrt_payload,

docker/Dockerfile

-FROM gcc:5
+FROM gcc:8
 
 MAINTAINER Andreas Schmidt <schmidt@nt.uni-saarland.de>
 
-RUN apt-get update \
-    && apt-get upgrade -y \
-    && apt-get install -y cmake
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get install --yes --force-yes \
+    bc \
+    cmake \
+    iperf3 \
+    psmisc \
+    traceroute \
+    tshark
 
 COPY CMakeLists.txt /prrt/
 COPY prrt /prrt/prrt
 COPY tests /prrt/tests
 COPY docker/entrypoint.sh /
+COPY docker/sysctl.conf /etc/sysctl.d/01-disable-ipv6.conf
 
 WORKDIR /prrt
 
-RUN cmake . \
+RUN cmake . -DCMAKE_BUILD_TYPE=DEBUG \
     && make
-ENV PATH /prrt/bin:$PATH
-WORKDIR /prrt/bin
+ENV PATH /prrt:$PATH
 
 VOLUME /output
 

docker/Dockerfile_tcp

+FROM gcc:8
+
+MAINTAINER Andreas Schmidt <schmidt@nt.uni-saarland.de>
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get install --yes --force-yes \
+    bc \
+    cmake \
+    iperf3 \
+    psmisc \
+    traceroute \
+    tshark
+
+COPY CMakeLists.txt /prrt/
+COPY prrt /prrt/prrt
+COPY tests /prrt/tests
+COPY docker/entrypoint.sh /
+
+WORKDIR /prrt
+
+RUN cmake -DTCP=1 -DCMAKE_BUILD_TYPE=DEBUG . \
+    && make
+ENV PATH /prrt:$PATH
+
+VOLUME /output
+
+ENTRYPOINT ["/entrypoint.sh"]

docker/entrypoint.sh

-#!/bin/bash
+#!/bin/sh
 
 dev=eth0
 
 command=$1
 shift
 
-if [[ "$command" == "sender" || "$command" == "receiver" ]]; then
+if [[ "$command" == "sender" || "$command" == "receiver" || "$command" == "time-sender" || "$command" == "time-receiver" ]]; then
     :
 else
     echo "Command should be either sender or receiver."
     exit 0;
 fi
 
+TARGET="127.0.0.1"
+OUTPUT="/dev/null"
 NETEM=()
 PRRT=()
 while [[ $# -gt 0 ]]
@@ -19,7 +21,24 @@ do
 key="$1"
 
 case $key in
-    -t|--target|-p|--port|-r|--rounds)
+    -t|--target)
+    if [[  "$command" == "sender" || "$command" == "time-sender" ]]; then
+    PRRT+=("$1 $2")
+    fi
+    TARGET=("$2")
+    shift
+    shift
+    ;;
+    -w|--wireshark)
+    OUTPUT=("$2")
+    shift
+    shift
+    ;;
+    -T|--threadpinning|-U)
+    PRRT+=("$1")
+    shift
+    ;;
+    -p|--port|-r|--rounds|-s|--size|-R|--rcvbuf|-S|--sndbuf|-o|--output|-a|--appdelay|-j|--appjitter)
     PRRT+=("$1 $2")
     shift
     shift
@@ -34,8 +53,30 @@ done
 PRRT_PARAMS="${PRRT[@]}"
 NETEM_PARAMS="${NETEM[@]}"
 
-echo "Running PRRT with command: \"$command $PRRT_PARAMS\" and link parameters: \"$NETEM_PARAMS\""
+echo "Starting Wireshark."
+tshark -i eth0 -w $OUTPUT.pcap &
+TSHARK_PID=$!
+sleep 2
+
+start=$(date +%s.%N);
+echo "Checking reachability of $TARGET."
+until ping -c1 $TARGET &>/dev/null; do sleep 1; done
+dur=$(echo "$(date +%s.%N) - $start" | bc);
+
+printf "Reachable after %.6f seconds\n" $dur
 
-tc qdisc add dev $dev root netem $NETEM_PARAMS
-/prrt/$command $PRRT_PARAMS -o /output/log.csv
-tc qdisc del dev $dev root
+if [[ "$command" == "sender" || "$command" == "time-sender" ]]; then
+    echo "Delaying sender start."
+else
+    echo "Delaying receiver start."
+fi
+
+start=$(date +%s.%N);
+echo "Running PRRT with command: \"$command $PRRT_PARAMS\" and link parameters: \"$NETEM_PARAMS\""
+trap 'echo "Caught SIGINT."; echo "$(ps -a)"; killall -SIGINT $command' INT
+LOG=$(/prrt/$command $PRRT_PARAMS 2>&1)
+echo "Exit status: $?"
+printf "$LOG\n"
+dur=$(echo "$(date +%s.%N) - $start" | bc);
+printf "Done after %.6f seconds\n" $dur
+kill $TSHARK_PID

docker/sysctl.conf

+net.ipv6.conf.all.disable_ipv6 = 1
+net.ipv6.conf.default.disable_ipv6 = 1
+net.ipv6.conf.lo.disable_ipv6 = 1

eval.ipynb

+%% Cell type:code id: tags:
+
+``` python
+import pandas as pd
+```
+
+%% Cell type:code id: tags:
+
+``` python
+pd.read_csv("eval.csv")
+```
+
+%% Cell type:code id: tags:
+
+``` python
+```

eval.py

+import sys
+sys.path.insert(0, "./build")
+
+import tests.perf as perf
+
+def run_setup_and_report(setup):
+    results = setup.run()
+    print("Setup:\n   ", setup)
+    print("Results:\n    " + str(results).replace("\n","\n    "))
+    results.export()
+
+if __name__ == "__main__":
+    # Packet Count Works: 2^15; Segfault at: 2^16
+
+    # TODO: support multiple tests via proper socket termination
+    setups = [
+        perf.TestSetup(packets=2**17,delay=1,loss=0,reorder=0,duplicate=0)
+    ]
+
+    for setup in setups:
+        run_setup_and_report(setup)

examples/receiver.py

@@ -3,7 +3,7 @@ import prrt
 
 port = int(sys.argv[1])
 
-s = prrt.PrrtSocket(("127.0.0.1", port))
+s = prrt.PrrtSocket(("0.0.0.0", port))
 
 while True:
     d, addr = s.recv()

examples/sender.py

@@ -5,9 +5,9 @@ host = sys.argv[1]
 port = int(sys.argv[2])
 localport = int(sys.argv[3])
 
-s = prrt.PrrtSocket(("127.0.1.1", localport), maximum_payload_size=150)
+s = prrt.PrrtSocket(("0.0.0.0", localport), maximum_payload_size=150)
 s.connect((host, port))
 
 for i in range(10):
-    s.send("Packet {}".format(i).encode("utf8"))
-s.send("Close".encode("utf8"))
+    s.send_sync("Packet {}".format(i).encode("utf8"))
+s.send_sync("Close".encode("utf8"))