Commit ab2b00fd authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Merge branch 'develop'

parents 8293e674 d8ad1570

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ test:prrt_functional: 
  tags:

    - bash

  script:

    - exec ./bin/prrtTests

    - exec ./prrtTests



test:prrt_python_bindings:

  stage: test

.gitmodules

+1 −1
Original line number Diff line number Diff line 
[submodule "prrt/xlap"]

	path = prrt/xlap

	url = ../../as/X-Lap.git
 
	url = ../X-Lap.git

CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ project (PRRT) 


option(PRRT_TESTS "Build tests" OFF)



set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

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" )

set(CMAKE_C_FLAGS "-O2 -Wall -std=gnu11 -D_GNU_SOURCE -fPIC" )

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_RELEASE "-Os -Wall" )

README.md

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
* 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)

* [Hardware timestamping support](https://git.nt.uni-saarland.de/LARN/PRRT/wikis/hardware-timestamping)
@@ -25,7 +26,7 @@ import prrt 


port = int(sys.argv[1])



s = prrt.PrrtSocket(port=port, isSender=False)

s = prrt.PrrtSocket(port=port)



while True:

    d = s.recv()
@@ -44,7 +45,7 @@ import prrt 
host = sys.argv[1]

port = int(sys.argv[2])



s = prrt.PrrtSocket(port=port, isSender=True)

s = prrt.PrrtSocket(port=port)

s.connect(host, port)



for i in range(10):

dissect/README.md

0 → 100644
+15 −0
Original line number Diff line number Diff line 
PRRT Dissector for Wireshark

============================



Installation

------------



* Download Wireshark Source Code: https://www.wireshark.org/



    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`.