Port number is configurable.

Author: jianjunz

source/agent/addons/quic/QuicTransportServer.cc

@@ -21,8 +21,12 @@ Nan::Persistent<v8::Function> QuicTransportServer::s_constructor;
 
 DEFINE_LOGGER(QuicTransportServer, "QuicTransportServer");
 
-QuicTransportServer::QuicTransportServer(int port)
-    : m_quicServer(QuicFactory::getQuicTransportFactory()->CreateQuicTransportServer(port, "", "", ""))
+// TODO: Certificate and key path is hard coded here. Read them from toml file later.
+const std::string certPath = "/tmp/certs/leaf_cert.pem";
+const std::string keyPath = "/tmp/certs/leaf_cert.pkcs8";
+
+QuicTransportServer::QuicTransportServer(int port, const std::string& certPath, const std::string& keyPath)
+    : m_quicServer(QuicFactory::getQuicTransportFactory()->CreateQuicTransportServer(port, certPath.c_str(), keyPath.c_str()))
 {
     m_quicServer->SetVisitor(this);
     ELOG_DEBUG("QuicTransportServer::QuicTransportServer");
@@ -52,7 +56,8 @@ NAN_METHOD(QuicTransportServer::newInstance)
         return Nan::ThrowTypeError("Port is required.");
     }
     // Default port number is not specified in https://tools.ietf.org/html/draft-vvv-webtransport-quic-01.
-    QuicTransportServer* obj = new QuicTransportServer(7700);
+    int minPort = info[0]->IntegerValue();
+    QuicTransportServer* obj = new QuicTransportServer(minPort, certPath, keyPath);
     obj->Wrap(info.This());
     uv_async_init(uv_default_loop(), &obj->m_asyncOnConnection, &QuicTransportServer::onConnectionCallback);
     info.GetReturnValue().Set(info.This());

source/agent/addons/quic/QuicTransportServer.h

@@ -33,7 +33,7 @@ class QuicTransportServer : public Nan::ObjectWrap, owt::quic::QuicTransportServ
     void onClose() override;
 
     QuicTransportServer() = delete;
-    explicit QuicTransportServer(int port);
+    explicit QuicTransportServer(int port, const std::string& certPath, const std::string& keyPath);
 
 private:
     static NAN_METHOD(newInstance);

source/agent/quic/agent.toml

@@ -48,10 +48,9 @@ minport = 0 #default: 0
 
 #########################################################################################
 [quic]
-#The network inferface all peer-connections will be established through. All network interfaces in the system will be adopted if this item is not specified or specified with an empty array.
-##Valid value is an array of objects that has two properties: name and replaced_ip_address. name is the name of network interface that will be used, replaced_ip_address is the IP address used for replacing the internal IP address in locally generated SDP's and ICE candidates during establishing the peer-connection(useful when behind NATs). replaced_ip_address is optional, if it is not specified, IP address from corresponding network interface will not be replaced.
-#Example of valid value: [{name = "eth1"}, {name = "eth2", replaced_ip_address = "192.0.2.2"}].
-network_interfaces = []  # default: []
-
+# Key store path doesn't work right now.
 keystorePath = "./cert/certificate.pfx"
-#note, this won't work with all versions of libnice. With 0 all the available ports are used
+
+# Port of QUIC agent is going to listen on. Default port for WebTransport is not defined in WebTransport spec. We will update it when it's defined.
+minport = 7700 #default: 7700
+# maxport = 7799 #default: 7799

source/agent/quic/index.js

@@ -27,22 +27,23 @@ const addon = require('./build/Release/quic');
 log.info('QUIC transport node.')
 
 module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
-    var that = {
+    const that = {
       agentID: parentRpcId,
       clusterIP: clusterWorkerIP
     };
-    var connections = new Connections;
-    var internalConnFactory = new InternalConnectionFactory;
+    const connections = new Connections;
+    const internalConnFactory = new InternalConnectionFactory;
     const incomingStreamPipelines =
         new Map();  // Key is publication ID, value is stream pipeline.
     const outgoingStreamPipelines =
         new Map();  // Key is subscription ID, value is stream pipeline.
 
-    var notifyStatus = (controller, sessionId, direction, status) => {
+    const notifyStatus = (controller, sessionId, direction, status) => {
         rpcClient.remoteCast(controller, 'onSessionProgress', [sessionId, direction, status]);
     };
 
-    const quicTransportServer = new QuicTransportServer(addon);
+    const quicTransportServer =
+        new QuicTransportServer(addon, global.config.quic.minport);
     quicTransportServer.start();
     quicTransportServer.on('streamadded', (stream) => {
         const conn = connections.getConnection(stream.contentSessionId);