update code for GUI + quic attacker + ivy compiler

ElNiak · Jun 23, 2023 · 551456f · 551456f
2 parents 22767b0 + 4d24a65
commit 551456f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -229,6 +229,12 @@ change-permissions:
 	sudo chown -R $(USER):$(USER) $(PWD)/QUIC-Ivy/doc/examples/quic/test/temp
 	sudo chown -R $(USER):$(USER) $(PWD)/QUIC-Ivy/doc/examples/quic/build
 
+test-local-server-rfc9000:
+	python3 run_experiments.py --mode server --categories global_tests --update_include_tls \
+			   --timeout 180 --iter $(ITER) --compile  --initial_version 1 --alpn hq-interop
+test-local-client-rfc9000:
+	python3 run_experiments.py --mode client --categories global_tests --update_include_tls \
+			   --timeout 180 --iter $(ITER) --compile  --initial_version 1 --alpn hq-interop
 
 test-vnet:
 	docker run --privileged -it picoquic-ivy ./setup_namespace.sh

diff --git a/scripts/installers/implementation-installer/install_aioquic.sh b/scripts/installers/implementation-installer/install_aioquic.sh
@@ -4,7 +4,7 @@ git stash
 git fetch
 git checkout d272be10b93b09b75325b139090007dae16b9f16
 git pull
-export PYTHONPATH=$PWD
+export PYTHONPATH=${PYTHONPATH}:$PWD
 source $HOME/.cargo/env
 
 sudo apt install --yes software-properties-common

diff --git a/scripts/installers/implementation-installer/install_mvfst.sh b/scripts/installers/implementation-installer/install_mvfst.sh
@@ -1,5 +1,15 @@
 # Possible error: c++: internal compiler error: Killed (program cc1plus)
 
+cd $PROOTPATH/quic-implementations/
+sudo apt remove --fix-missing -y cmake
+wget https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.sh  &> /dev/null
+chmod +x cmake-3.12.4-Linux-x86_64.sh
+mkdir /opt/cmake
+bash cmake-3.12.4-Linux-x86_64.sh --skip-license --prefix=/opt/cmake
+ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+cmake --version
+
+
 cd $PROOTPATH/quic-implementations/mvfst/
 git stash 
 git fetch
@@ -11,10 +21,11 @@ bash build_helper.sh
 echo "----> Cloning mvfst apply"
 cd $PROOTPATH/quic-implementations/mvfst/quic/samples
 
-rm -r $PROOTPATH/quic-implementations/mvfst/quic/samples/echo 
-cp -r $PROOTPATH/ressources/mvfst/rfc9000/echo/ $PROOTPATH/quic-implementations/mvfst/quic/samples/
-cp $PROOTPATH/ressources/mvfst/rfc9000/QuicClientTransport.h $PROOTPATH/quic-implementations/mvfst/quic/client/QuicClientTransport.h
-cp $PROOTPATH/ressources/mvfst/rfc9000/QuicConstants.h $PROOTPATH/quic-implementations/mvfst/quic/QuicConstants.h
+# rm -r $PROOTPATH/quic-implementations/mvfst/quic/samples/echo 
+# cp -r $PROOTPATH/ressources/mvfst/rfc9000/echo/ $PROOTPATH/quic-implementations/mvfst/quic/samples/
+# cp $PROOTPATH/ressources/mvfst/rfc9000/QuicClientTransport.h $PROOTPATH/quic-implementations/mvfst/quic/client/QuicClientTransport.h
+# cp $PROOTPATH/ressources/mvfst/rfc9000/QuicConstants.h $PROOTPATH/quic-implementations/mvfst/quic/QuicConstants.h
+
 cmake .
 make
 cd $PROOTPATH/quic-implementations/mvfst/_build/build/quic/samples

diff --git a/utils/constants.py b/utils/constants.py
@@ -7,7 +7,8 @@
 IVY_DIR    =   SOURCE_DIR + '/QUIC-Ivy'
 ENV_VAR = {
     "PROOTPATH": SOURCE_DIR,
-    #"PYTHONPATH": IMPLEM_DIR + "/aioquic",
+    "PYTHONPATH": "${PYTHONPATH}:" + IMPLEM_DIR + "/aioquic",
+    "PATH": os.getenv('PATH') + ":/go/bin", # "/go/bin:${"+ os.getenv('PATH') +"}", #
     "ZRTT_SSLKEYLOGFILE": SOURCE_DIR + "/QUIC-Ivy/doc/examples/quic/last_tls_key.txt",
     "RETRY_TOKEN_FILE": SOURCE_DIR + "/QUIC-Ivy/doc/examples/quic/last_retry_token.txt",
     "NEW_TOKEN_FILE": SOURCE_DIR + "/QUIC-Ivy/doc/examples/quic/last_new_token.txt",