Small fixes to run scripts

tst-race · Jun 3, 2024 · 786034a · 786034a
1 parent 1ef3211
commit 786034a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -187,4 +187,15 @@ docker run --rm -it --name=rbserver --network=rib-overlay-network --ip=10.11.1.2
        -v $(pwd)/scripts/:/scripts/ \
        raceboat:latest bash
 
-race-cli --dir /client-kits --send-recv --send-channel=twoSixDirectCpp --send-address="{\"hostname\":\"10.11.1.2\",\"port\":26262}" --recv-channel=twoSixDirectCpp --param hostname="10.11.1.3" --param PluginCommsTwoSixStub.startPort=26262 --param PluginCommsTwoSixStub.endPort=26265 --param localPort=9999 --debug | tee srlog
+race-cli --dir /client-kits --send-recv --send-channel=twoSixDirectCpp --send-address="{\"hostname\":\"10.11.1.2\",\"port\":26262}" --recv-channel=twoSixDirectCpp --param hostname="10.11.1.3" --param PluginCommsTwoSixStub.startPort=26262 --param PluginCommsTwoSixStub.endPort=26265 --param localPort=9999 --debug | tee srlog
+
+
+race-cli --dir /etc/race/plugins --send-recv --send-channel=twoSixDirectCpp --send-address="{\"hostname\":\"10.11.1.2\",\"port\":26262}" --recv-channel=twoSixDirectCpp --final-send-channel=twoSixDirectCpp --final-recv-channel=twoSixDirectCpp --param hostname="10.11.1.3" --param PluginCommsTwoSixStub.startPort=26262 --param PluginCommsTwoSixStub.endPort=26265 --param localPort=9999 --debug | tee srlog | grep ERROR
+
+race-cli --dir /etc/race/plugins --recv-reply --send-channel=twoSixDirectCpp --recv-channel=twoSixDirectCpp --final-send-channel=twoSixDirectCpp --final-recv-channel=twoSixDirectCpp --param hostname="10.11.1.2" --param PluginCommsTwoSixStub.startPort=26262 --param PluginCommsTwoSixStub.endPort=26265 --param localPort=9999 --debug | tee rrlog | grep ERROR
+
+
+race-cli --dir /etc/race/plugins --client-connect --send-channel=twoSixDirectCpp --send-address="{\"hostname\":\"10.11.1.2\",\"port\":26262}" --recv-channel=twoSixDirectCpp --final-send-channel=twoSixDirectCpp --final-recv-channel=twoSixDirectCpp --param hostname="10.11.1.3" --param PluginCommsTwoSixStub.startPort=26262 --param PluginCommsTwoSixStub.endPort=26265 --param localPort=9999 --debug | tee srlog | grep ERROR
+
+race-cli --dir /etc/race/plugins --server-connect --send-channel=twoSixDirectCpp --recv-channel=twoSixDirectCpp --final-send-channel=twoSixDirectCpp --final-recv-channel=twoSixDirectCpp --param hostname="10.11.1.2" --param PluginCommsTwoSixStub.startPort=26262 --param PluginCommsTwoSixStub.endPort=26265 --param localPort=9999 --debug | tee rrlog | grep ERROR
+
diff --git a/pluggable-transport/pt-client-image/run.sh b/pluggable-transport/pt-client-image/run.sh
@@ -27,6 +27,6 @@ docker run --rm --name=pt-client -it \
        -v $RACEBOAT_HOME:/code \
        -v $RACEBOAT_HOME/pluggable-transport/log/client/:/log \
        -v $RACEBOAT_HOME/racesdk/package/LINUX_x86_64/:/usr/local/bin/race/ \
-       -v $PLUGIN_PATH:/etc/race/plugins/unix/x86_64/ \
-       -e DISPLAY=:0 \
-       pt-client bash #tor-browser/Browser/start-tor-browser
+       -v $PLUGIN_PATH:/etc/race/plugins/ \
+       -e DISPLAY=192.168.64.1:0 \
+       pt-client bash tor-browser/Browser/start-tor-browser
diff --git a/pluggable-transport/pt-server-image/run.sh b/pluggable-transport/pt-server-image/run.sh
@@ -28,6 +28,6 @@ docker run --rm --name=pt-server -it \
        -v $RACEBOAT_HOME/pluggable-transport/log/bridge/:/log \
        -v $RACEBOAT_HOME/pluggable-transport/pt-server-image/etc-race/:/etc/race/ \
        -v $RACEBOAT_HOME/racesdk/package/LINUX_x86_64/:/usr/local/bin/race/ \
-       -v $PLUGIN_PATH/:/etc/race/plugins/unix/x86_64/ \
+       -v $PLUGIN_PATH/:/etc/race/plugins \
        -u root pt-server bash -c "/bridge-mount/start-tor.sh"
 
diff --git a/pluggable-transport/source/cmd/race-dispatcher/Dispatcher.go b/pluggable-transport/source/cmd/race-dispatcher/Dispatcher.go
@@ -222,25 +222,25 @@ func copyLoop(socks, race io.ReadWriter) {
 	copyWg.Add(2)
 
 	go func() {
-		golog.Println("Copy1")
+		golog.Println("Copy Socks to Conduit")
 		written, err := io.Copy(race, socks)
 		if err != nil {
 			golog.Println("io.Copy error " + err.Error())
 		} else {
-			golog.Println("copied " + strconv.FormatInt(written, 10) + " bytes")
+			golog.Println("copied " + strconv.FormatInt(written, 10) + " bytes from Socks to Conduit")
 		}
-		golog.Println("Copy1.1")
+		golog.Println("Done with Socks to Conduit Loop")
 		copyWg.Done()
 	}()
 	go func() {
-		golog.Println("Copy2")
+		golog.Println("Copy Conduit to Socks")
 		written, err := io.Copy(socks, race)
 		if err != nil {
 			golog.Println("io.Copy error " + err.Error())
 		} else {
-			golog.Println("copied " + strconv.FormatInt(written, 10) + " bytes")
+			golog.Println("copied " + strconv.FormatInt(written, 10) + " bytes from Conduit to Socks")
 		}
-		golog.Println("Copy2.1")
+		golog.Println("Done with Conduit to Socks Loop")
 		copyWg.Done()
 	}()
 

diff --git a/pluggable-transport/source/pkg/race_pt3/race_pt3.go b/pluggable-transport/source/pkg/race_pt3/race_pt3.go
@@ -74,7 +74,7 @@ func NewRaceClient(
 	core.RaceLogSetLogLevelStdout(core.RaceLogLL_NONE)  // PT API uses stdout
 
 	if len(pluginPath) == 0 {
-		pluginPath = "/etc/race"
+		pluginPath = "/etc/race/plugins"
 		golog.Println("using default plugin path " + pluginPath)
 	}
 
@@ -246,7 +246,7 @@ func NewRaceServer(
 	core.RaceLogSetLogLevelStdout(core.RaceLogLL_NONE)   // PT API uses stdout
 
 	if len(pluginPath) == 0 {
-		pluginPath = "/etc/race"
+		pluginPath = "/etc/race/plugins"
 		golog.Println("using default plugin path " + pluginPath)
 	}
 

diff --git a/scripts/example-responses.txt b/scripts/example-responses.txt
@@ -1,3 +1,4 @@
-obfs4 11.212.224.110:45176 645E3927 cert=t9Rpv0CX iat-mode=0
-obfs4 22.212.224.110:45176 645E3927 cert=t9Rpv0CX iat-mode=0
-obfs4 33.212.224.110:45176 645E3927 cert=t9Rpv0CX iat-mode=0
+obfs4 173.212.224.110:45178 649E3927673087997034C37D2F595A82B91EB718 cert=t9Rpv0CXD514THtrCTJt1+opv9HmSHL8FitPpcRV+slt5omH/vE8Luc3foLFAMvUcfYVMQ iat-mode=0
+obfs4 5.252.226.123:1992 6580023D474DD3C06920027530C3B5E39B89DC03 cert=pSt9XZ3p/3oxi9knlK4jQY8LFSWZn4hl/PplgnMY5Lra3VaZMbP7F4tuorDV2vXhm8qEAQ iat-mode=0
+obfs4 5.188.188.210:443 6138019DF8B380F48C8E9BC4551C7EE333322F97 cert=qIlWunO6cMi8vicOeppnkiCPKWm+lgUQ6UO7LatF2cK8o4WEfPvgPVY8vD1nqtsf6+f6VA iat-mode=0
+obfs4 74.48.100.172:41969 B47B24FCDF810FB5DE12DBB17B77C3D5D384B3D2 cert=TBuxHS/IM6WszQIzkUQXDYI//eeZjVymSF7mg2alBNpmtigLCS7RgLmbVipzQTXo4W/3Pg iat-mode=0
diff --git a/source/api-managers/ApiManager.cpp b/source/api-managers/ApiManager.cpp
@@ -1203,6 +1203,7 @@ void ApiManagerInternal::removeContext(ApiContext &context) {
        pairIt != packageIdContextMap.end();) {
     pairIt->second.erase(&context);
     if (pairIt->second.size() == 0) {
+      helper::logDebug("removeContext: Removing packageId=" + json(pairIt->first).dump());
       pairIt = packageIdContextMap.erase(pairIt);
     } else {
       ++pairIt;