update

ElNiak · Jul 24, 2024 · 78d4b7d · 78d4b7d
1 parent fd48ac4
commit 78d4b7d
Show file tree

Hide file tree

Showing 32 changed files with 1,294 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@ panther_worker/app/implementations/other/get-pip.py
 panther_worker/app/implementations/quic-implementations/quic-go/quic-go/go1.16.linux-amd64.tar.gz
 *.qlog
 panther/outputs/qlogs/*/*.qlog
-panther/outputs/qlogs/*/*.log
+panther/outputs/qlogs/*/*.log
+panther/outputs/qlogs/*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
-- repo: https://github.com/psf/black
- rev: 22.10.0
- hooks:
- - id: black
- language_version: python3
+# - repo: https://github.com/psf/black
+#  rev: 22.10.0
+#  hooks:
+#  - id: black
+#  language_version: python3
 - repo: https://github.com/pre-commit/pre-commit-hooks
  rev: v3.2.0
  hooks: # TOD make less annoying

diff --git a/panther/docker-compose.yml b/panther/docker-compose.yml
@@ -82,9 +82,58 @@ services:
  image: picoquic-panther:latest
  networks:
  net:
- ipv4_address: 172.27.1.13
+ ipv4_address: 172.27.1.14
  ports:
- - 49162:80
+ - 49163:80
+ privileged: true
+ restart: always
+ security_opt:
+ - seccomp:unconfined
+ stdin_open: true
+ sysctls:
+ - net.ipv6.conf.all.disable_ipv6=1
+ tty: true
+ volumes:
+ - /tmp/.X11-unix:/tmp/.X11-unix
+ - ${PWD}/panther_worker/app/:/app/
+ - /app/panther-ivy/
+ - /app/implementations/
+ - ${PWD}/panther_worker/app/panther-ivy/protocol-testing/:/app/panther-ivy/protocol-testing/
+ - ${PWD}/panther_worker/app/panther-ivy/ivy/include/:/app/panther-ivy/ivy/include/
+ - ${PWD}/panther_worker/app/panther-ivy/ivy/ivy_to_cpp.py:/app/panther-ivy/ivy/ivy_to_cpp.py
+ - ${PWD}/outputs/tls-keys:/app/tls-keys
+ - ${PWD}/outputs/tickets:/app/tickets
+ - ${PWD}/outputs/qlogs:/app/qlogs
+ ping-pong-panther:
+ command: bash -c "stty cols 100 rows 100 && python3 panther_client.py"
+ container_name: ping-pong-panther
+ depends_on:
+ - panther-webapp
+ deploy:
+ resources:
+ limits:
+ cpus: '8'
+ memory: 2548M
+ reservations:
+ cpus: '4.0'
+ memory: 1274.0M
+ environment:
+ - DISPLAY=${DISPLAY}
+ - XAUTHORITY=~/.Xauthority
+ - ROOT_PATH=${PWD}
+ - MPLBACKEND="Agg"
+ - COLUMNS=100
+ - LINES=100
+ - LOG_LEVEL=10
+ - PYTHONUNBUFFERED=1
+ - PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
+ hostname: ping-pong-panther
+ image: ping-pong-panther:latest
+ networks:
+ net:
+ ipv4_address: 172.27.1.12
+ ports:
+ - 49161:80
  privileged: true
  restart: always
  security_opt:
@@ -131,9 +180,9 @@ services:
  image: ping-pong-random-panther:latest
  networks:
  net:
- ipv4_address: 172.27.1.12
+ ipv4_address: 172.27.1.13
  ports:
- - 49161:80
+ - 49162:80
  privileged: true
  restart: always
  security_opt:

diff --git a/panther/docker-compose.yml.bak b/panther/docker-compose.yml.bak
@@ -82,9 +82,58 @@ services:
  image: picoquic-panther:latest
  networks:
  net:
- ipv4_address: 172.27.1.13
+ ipv4_address: 172.27.1.14
  ports:
- - 49162:80
+ - 49163:80
+ privileged: true
+ restart: always
+ security_opt:
+ - seccomp:unconfined
+ stdin_open: true
+ sysctls:
+ - net.ipv6.conf.all.disable_ipv6=1
+ tty: true
+ volumes:
+ - /tmp/.X11-unix:/tmp/.X11-unix
+ - ${PWD}/panther_worker/app/:/app/
+ - /app/panther-ivy/
+ - /app/implementations/
+ - ${PWD}/panther_worker/app/panther-ivy/protocol-testing/:/app/panther-ivy/protocol-testing/
+ - ${PWD}/panther_worker/app/panther-ivy/ivy/include/:/app/panther-ivy/ivy/include/
+ - ${PWD}/panther_worker/app/panther-ivy/ivy/ivy_to_cpp.py:/app/panther-ivy/ivy/ivy_to_cpp.py
+ - ${PWD}/outputs/tls-keys:/app/tls-keys
+ - ${PWD}/outputs/tickets:/app/tickets
+ - ${PWD}/outputs/qlogs:/app/qlogs
+ ping-pong-panther:
+ command: bash -c "stty cols 100 rows 100 && python3 panther_client.py"
+ container_name: ping-pong-panther
+ depends_on:
+ - panther-webapp
+ deploy:
+ resources:
+ limits:
+ cpus: '8'
+ memory: 2548M
+ reservations:
+ cpus: '4.0'
+ memory: 1274.0M
+ environment:
+ - DISPLAY=${DISPLAY}
+ - XAUTHORITY=~/.Xauthority
+ - ROOT_PATH=${PWD}
+ - MPLBACKEND="Agg"
+ - COLUMNS=100
+ - LINES=100
+ - LOG_LEVEL=10
+ - PYTHONUNBUFFERED=1
+ - PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
+ hostname: ping-pong-panther
+ image: ping-pong-panther:latest
+ networks:
+ net:
+ ipv4_address: 172.27.1.12
+ ports:
+ - 49161:80
  privileged: true
  restart: always
  security_opt:
@@ -131,9 +180,9 @@ services:
  image: ping-pong-random-panther:latest
  networks:
  net:
- ipv4_address: 172.27.1.12
+ ipv4_address: 172.27.1.13
  ports:
- - 49161:80
+ - 49162:80
  privileged: true
  restart: always
  security_opt:

diff --git a/panther/install_config.ini b/panther/install_config.ini
@@ -23,7 +23,7 @@ bgp_gobgp = False
 ; COAP
 coap_libcoap = False
 ; MINIP
-minip_ping_pong = False
+minip_ping_pong = True
 minip_ping_pong_fail = False
 minip_ping_pong_flaky = False
 minip_ping_pong_random = True

diff --git a/panther/outputs/tickets/ticket.bin b/panther/outputs/tickets/ticket.bin