Merge pull request #62 from n-hop/update_binary_0828

chore: update binary and add quic

src/config/predefined.protocols.yaml

@@ -44,3 +44,17 @@ protocols:
         path: bin/kcp/server_linux_amd64
         args:
           - "-l :4000 -t 127.0.0.1:10100" # by default, it forwards the traffic to localhost:10100
+  - name: quic
+    type: none_distributed
+    args: {} # global args for quic
+    port: 8006
+    protocols: # iterative
+      - name: quic_client
+        path: /go/bin/gost
+        args:
+          - "-L tcp://:8006/%s:8006"
+          - "-F http+quic://%s:8443"
+      - name: quic_server
+        path: /go/bin/gost
+        args:
+          - "-L http+quic://:8443"

src/config/protocol-docker-azure/Dockerfile

@@ -15,8 +15,9 @@ RUN apt-get install --yes \
         iperf3 \
         iputils-ping \
         python3-pip \
-        iptables
-
+        iptables \
+        curl \
+        wget
 
 RUN pip3 install \
         PyYAML==6.0.1 \
@@ -29,6 +30,15 @@ RUN apt-get install --yes \
         linux-tools-azure \
         linux-cloud-tools-azure
 
+
+# Install go
+RUN curl -L https://go.dev/dl/go1.23.0.linux-amd64.tar.gz | tar -C /usr/local -xz
+ENV GOPATH=/go
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+
+# Install go-gost
+RUN go install github.com/go-gost/gost/cmd/gost@latest
+
 # Cleanup
 RUN rm -rf /var/lib/apt/lists/*
 

src/config/protocol-first-rtt-test.yaml

@@ -10,7 +10,7 @@ tests:
     topology:
       config_name: linear_network_1
       config_file: config/predefined.topology.yaml
-    target_protocols: [btp, brtp, brtp_proxy, kcp, tcp-bbr]
+    target_protocols: [btp, brtp, brtp_proxy, kcp, tcp-bbr, quic]
     route: static_route
     test_tools:
       rtt:

src/config/protocol-single-hop-test.yaml

@@ -10,7 +10,7 @@ tests:
     topology:
       config_name: linear_network_1
       config_file: config/predefined.topology.yaml
-    target_protocols: [btp, brtp, brtp_proxy, kcp, tcp-bbr]
+    target_protocols: [btp, brtp, brtp_proxy, kcp, tcp-bbr, quic]
     route: static_route
     test_tools:
       iperf:

src/protosuites/proto.py

@@ -31,7 +31,7 @@ class ProtoConfig:
         default=None)  # type: ignore
 
 
-SupportedProto = ['btp', 'brtp', 'brtp_proxy', 'tcp', 'kcp']
+SupportedProto = ['btp', 'brtp', 'brtp_proxy', 'tcp', 'kcp', 'quic']
 SupportedBATSProto = ['btp', 'brtp', 'brtp_proxy']
 
 

src/protosuites/std_protocol.py

@@ -78,9 +78,12 @@ def get_protocol_version(self) -> str:
         return self.config.version or ""
 
     def get_protocol_args(self, hosts) -> str:
-        if "%s" in self.protocol_args and 'kcp' in self.config.name:
+        if "%s" in self.protocol_args:
             receiver_ip = hosts[-1].IP()  # ?fixme
-            return self.protocol_args % receiver_ip
+            if 'kcp' in self.config.name:
+                return self.protocol_args % receiver_ip
+            if 'quic_' in self.config.name:
+                return self.protocol_args % (receiver_ip, receiver_ip)
         return self.protocol_args
 
     def __set_protocol_version(self, network: INetwork, version: str):

src/testsuites/test_iperf.py

@@ -43,7 +43,7 @@ def _run_test(self, network: INetwork, proto_info: IProtoInfo):
         client = hosts[self.config.client_host]
         server = hosts[self.config.server_host]
         receiver_ip = None
-        if proto_info.get_protocol_name().upper() == "KCP":
+        if (proto_info.get_protocol_name().upper() == "KCP") or (proto_info.get_protocol_name().upper() == "QUIC"):
             # kcp tun like a proxy, all traffic will be forwarded to the proxy server
             tun_ip = proto_info.get_tun_ip(network, self.config.client_host)
             if tun_ip == "":

src/testsuites/test_rtt.py

@@ -58,7 +58,7 @@ def _run_test(self, network: INetwork, proto_info: IProtoInfo):
         client = hosts[self.config.client_host]
         server = hosts[self.config.server_host]
         receiver_ip = None
-        if proto_info.get_protocol_name().upper() == "KCP":
+        if (proto_info.get_protocol_name().upper() == "KCP") or (proto_info.get_protocol_name().upper() == "QUIC"):
             # kcp tun like a proxy, all traffic will be forwarded to the proxy server
             tun_ip = proto_info.get_tun_ip(network, self.config.client_host)
             if tun_ip == "":