Commit d97830b8 authored Dec 05, 2018 by Andreas Schmidt

merge develop

parent 08b1d0e6

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,4 @@ tests/__pycache__/
		MANIFEST
		prrt.cpython*.so
		prrt.so
		.ipynb_checkpoints/

.gitlab-ci.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ build:prrt:
		- which cmake
		- which gcc
		- which g++
		- pip3 list \| grep Cython
		- pip3 list \| grep numpy
		- pip3 list --format=legacy \| grep Cython
		- pip3 list --format=legacy \| grep numpy
		- CC=gcc-5 CXX=g++-5 cmake . -DPRRT_TESTS=1
		- make

README.md

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,12 +5,13 @@
		## Features

		* Hybrid error control (FEC + ARQ) using systematic Vandermonde codes
		* Congestion control using a variant of [BBR](https://groups.google.com/forum/#!forum/bbr-dev)
		* 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

docker/Dockerfile

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,6 @@ ENV DEBIAN_FRONTEND noninteractive
		RUN apt-get update && apt-get install --yes --force-yes \
		bc \
		cmake \
		iperf3 \
		psmisc \
		traceroute \
		tshark

docker/Dockerfile_tcp

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,6 @@ ENV DEBIAN_FRONTEND noninteractive
		RUN apt-get update && apt-get install --yes --force-yes \
		bc \
		cmake \
		iperf3 \
		psmisc \
		traceroute \
		tshark