Merge pull request #1677 from private-octopus/clean-up-multipath

Clean up multipath

Author: huitema

UnitTest1/unittest1.cpp

@@ -2417,12 +2417,6 @@ namespace UnitTest1
             Assert::AreEqual(ret, 0);
         }
 
-        TEST_METHOD(monopath_unique) {
-            int ret = monopath_unique_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
         TEST_METHOD(monopath_0rtt) {
             int ret = monopath_0rtt_test();
 
@@ -2434,7 +2428,6 @@ namespace UnitTest1
 
             Assert::AreEqual(ret, 0);
         }
-
         TEST_METHOD(multipath_aead) {
             int ret = multipath_aead_test();
 
@@ -2561,68 +2554,8 @@ namespace UnitTest1
             Assert::AreEqual(ret, 0);
         }
 
-        TEST_METHOD(m_unip_basic) {
-            int ret = m_unip_basic_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_drop_first) {
-            int ret = m_unip_drop_first_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_drop_second) {
-            int ret = m_unip_drop_second_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_sat_plus) {
-            int ret = m_unip_sat_plus_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_renew) {
-            int ret = m_unip_renew_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_rotation) {
-            int ret = m_unip_rotation_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_nat) {
-            int ret = m_unip_nat_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_standby) {
-            int ret = m_unip_standby_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_standup) {
-            int ret = m_unip_standup_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_tunnel) {
-            int ret = m_unip_tunnel_test();
-
-            Assert::AreEqual(ret, 0);
-        }
-
-        TEST_METHOD(m_unip_abandon) {
-            int ret = m_unip_abandon_test();
+        TEST_METHOD(multipath_tunnel) {
+            int ret = multipath_tunnel_test();
 
             Assert::AreEqual(ret, 0);
         }

picoquic/bbr.c

@@ -2005,15 +2005,7 @@ static picoquic_packet_context_t* BBRAccessEcnPacketContext(picoquic_path_t* pat
     picoquic_packet_context_t* pkt_ctx = &path_x->cnx->pkt_ctx[picoquic_packet_context_application];
 
     if (path_x->cnx->is_multipath_enabled) {
-        /* TODO: if the RCID index has changed, reset the counters. */
-        picoquic_remote_cnxid_t* r_cid = path_x->p_remote_cnxid;
-
-        if (r_cid != NULL) {
-            pkt_ctx = &r_cid->pkt_ctx;
-        }
-        else {
-            pkt_ctx = NULL;
-        }
+        pkt_ctx = &path_x->pkt_ctx;
     }
     else if (path_x != path_x->cnx->path[0]) {
         /* When doing simple multipath, or when preparing transitions,

picoquic/config.c

@@ -67,7 +67,7 @@ static option_table_line_t option_table[] = {
     "Use the specified congestion control algorithm: reno, cubic, bbr or fast. Defaults to bbr." },
     { picoquic_option_SPINBIT, 'P', "spinbit", 1, "number", "Set the default spinbit policy" },
     { picoquic_option_LOSSBIT, 'O', "lossbit", 1, "number", "Set the default lossbit policy" },
-    { picoquic_option_MULTIPATH, 'M', "multipath", 1, "number", "Multipath option: none(0), full(1), simple(2), both(3), unique(4), all (7)" },
+    { picoquic_option_MULTIPATH, 'M', "multipath", 1, "number", "Multipath option: none(0), full(1), simple(2), both(3)" },
     { picoquic_option_DEST_IF, 'e', "dest_if", 1, "if", "Send on interface (default: -1)" },
     { picoquic_option_CIPHER_SUITE, 'C', "cipher_suite", 1, "cipher_suite_id", "specify cipher suite (e.g. -C 20 = chacha20)" },
     { picoquic_option_INIT_CNXID, 'i', "cnxid_params", 1, "per-text-lb-spec", "See documentation for LB compatible CID configuration" },
@@ -375,7 +375,7 @@ static int config_set_option(option_table_line_t* option_desc, option_param_t* p
     }
     case picoquic_option_MULTIPATH: {
         int v = config_atoi(params, nb_params, 0, &ret);
-        if (ret != 0 || v < 0 || v > 7) {
+        if (ret != 0 || v < 0 || v > 3) {
             fprintf(stderr, "Invalid multipath option: %s\n", config_optval_param_string(opval_buffer, 256, params, nb_params, 0));
             ret = (ret == 0) ? -1 : ret;
         }