Release 4.3.0

Author: gwanglst

CHANGELOG

@@ -1,3 +1,10 @@
+2025-06-17
+    - 4.3.0
+    - Add WebTransport support.
+    - Fix IETF QUIC IP spoofing amplification attack.
+    - Improve preferred address migration implementation, pass interop tests.
+    - Add lsquic_conn_get_info() API to retrieve information about a connection.
+
 2025-02-18
     - 4.2.0
     - Address hash flood attack for lsquic_hash by switching to rapidhash with stronger random seed.

CMakeLists.txt

@@ -11,6 +11,7 @@ OPTION(LSQUIC_BIN "Compile example binaries that use the library" ON)
 OPTION(LSQUIC_TESTS "Compile library unit tests" ON)
 OPTION(LSQUIC_SHARED_LIB "Compile as shared librarry" OFF)
 OPTION(LSQUIC_DEVEL "Compile in development mode" OFF)
+OPTION(LSQUIC_WEBTRANSPORT "Enable WebTransport support" OFF)
 
 INCLUDE(GNUInstallDirs)
 
@@ -80,6 +81,10 @@ IF (LSQUIC_DEVEL)
     SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_DEVEL=1")
 ENDIF()
 
+IF (LSQUIC_WEBTRANSPORT)
+    SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -LSQUIC_WEBTRANSPORT_SERVER_SUPPORT=1")
+ENDIF()
+
 IF(LSQUIC_PROFILE EQUAL 1)
     SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -g -pg")
 ENDIF()

bin/http_client.c

@@ -46,14 +46,13 @@
 #include "../src/liblsquic/lsquic_logger.h"
 #include "../src/liblsquic/lsquic_int_types.h"
 #include "../src/liblsquic/lsquic_util.h"
-/* include directly for reset_stream testing */
-#include "../src/liblsquic/lsquic_varint.h"
-#include "../src/liblsquic/lsquic_hq.h"
-#include "../src/liblsquic/lsquic_sfcw.h"
 #include "../src/liblsquic/lsquic_hash.h"
+#if LSQUIC_QIR
+/* include directly for reset_stream testing */
 #include "../src/liblsquic/lsquic_stream.h"
 /* include directly for retire_cid testing */
 #include "../src/liblsquic/lsquic_conn.h"
+#endif
 #include "lsxpack_header.h"
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -786,6 +785,7 @@ http_client_on_read (lsquic_stream_t *stream, lsquic_stream_ctx_t *st_h)
         {
             st_h->sh_nread += (size_t) nread;
             s_stat_downloaded_bytes += nread;
+#if LSQUIC_QIR
             /* test stream_reset after some number of read bytes */
             if (client_ctx->hcc_reset_after_nbytes &&
                 s_stat_downloaded_bytes > client_ctx->hcc_reset_after_nbytes)
@@ -801,6 +801,7 @@ http_client_on_read (lsquic_stream_t *stream, lsquic_stream_ctx_t *st_h)
                 client_ctx->hcc_retire_cid_after_nbytes = 0;
                 break;
             }
+#endif
             if (!g_header_bypass && !(st_h->sh_flags & PROCESSED_HEADERS))
             {
                 /* First read is assumed to be the first byte */

bin/perf_client.c

@@ -31,7 +31,6 @@
 #include "prog.h"
 
 #include "../src/liblsquic/lsquic_logger.h"
-#include "../src/liblsquic/lsquic_int_types.h"
 #include "../src/liblsquic/lsquic_byteswap.h"
 
 struct scenario

bin/prog.c

@@ -85,15 +85,11 @@ prog_init (struct prog *prog, unsigned flags,
     prog->prog_api.ea_pmi           = &pmi;
     prog->prog_api.ea_pmi_ctx       = &prog->prog_pba;
     prog->prog_api.ea_get_ssl_ctx   = get_ssl_ctx;
-#if LSQUIC_PREFERRED_ADDR
-    if (getenv("LSQUIC_PREFERRED_ADDR4") || getenv("LSQUIC_PREFERRED_ADDR6"))
-        prog->prog_flags |= PROG_SEARCH_ADDRS;
-#endif
 
     /* Non prog-specific initialization: */
     lsquic_global_init(flags & LSENG_SERVER ? LSQUIC_GLOBAL_SERVER :
                                                     LSQUIC_GLOBAL_CLIENT);
-    lsquic_log_to_fstream(stderr, LLTS_HHMMSSMS);
+    lsquic_log_to_fstream(stderr, LLTS_HHMMSSUS);
     lsquic_logger_lopt("=notice");
     return 0;
 }
@@ -767,6 +763,13 @@ prog_prep (struct prog *prog)
         prog->prog_api.ea_lookup_cert = no_cert;
     }
 
+    if (prog->prog_engine_flags & LSENG_SERVER)
+    {
+        if (memcmp(prog->prog_settings.es_preferred_address,
+                "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 24) != 0)
+            prog->prog_flags |= PROG_SEARCH_ADDRS;
+    }
+
     prog->prog_eb = event_base_new();
     prog->prog_engine = lsquic_engine_new(prog->prog_engine_flags,
                                                             &prog->prog_api);

bin/prog.h

@@ -47,9 +47,7 @@ struct prog
     int                             prog_ipver;     /* 0, 4, or 6 */
     enum {
         PROG_FLAG_COOLDOWN  = 1 << 0,
-#if LSQUIC_PREFERRED_ADDR
         PROG_SEARCH_ADDRS   = 1 << 1,
-#endif
     }                               prog_flags;
 };
 

bin/test_common.c

@@ -228,6 +228,39 @@ sport_destroy (struct service_port *sport)
 }
 
 
+static char *
+sockaddr2str (const struct sockaddr *addr, char *buf, size_t sz)
+{
+    unsigned short port;
+    int len;
+
+    switch (addr->sa_family)
+    {
+    case AF_INET:
+        port = ntohs(((struct sockaddr_in *) addr)->sin_port);
+        if (!inet_ntop(AF_INET, &((struct sockaddr_in *) addr)->sin_addr,
+                                                                    buf, sz))
+            buf[0] = '\0';
+        break;
+    case AF_INET6:
+        port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
+        if (!inet_ntop(AF_INET6, &((struct sockaddr_in6 *) addr)->sin6_addr,
+                                                                    buf, sz))
+            buf[0] = '\0';
+        break;
+    default:
+        port = 0;
+        (void) snprintf(buf, sz, "<invalid family %d>", addr->sa_family);
+        break;
+    }
+
+    len = strlen(buf);
+    if (len < (int) sz)
+        snprintf(buf + len, sz - (size_t) len, ":%hu", port);
+    return buf;
+}
+
+
 struct service_port *
 sport_new (const char *optarg, struct prog *prog)
 {
@@ -600,6 +633,14 @@ read_one_packet (struct read_iter *iter)
         sport->drop_init = 1;
     sport->n_dropped = n_dropped;
 #endif
+    char localaddr_str[80];
+    char remoteaddr_str[80];
+    LSQ_DEBUG("[%s] RX packet %zd bytes from: %s",
+            sockaddr2str((struct sockaddr *)local_addr, localaddr_str,
+                         sizeof(localaddr_str)),
+            nread, sockaddr2str(
+                (struct sockaddr *)&packs_in->peer_addresses[iter->ri_idx],
+                remoteaddr_str, sizeof(remoteaddr_str)));
 
 #ifndef WIN32
     packs_in->vecs[iter->ri_idx].iov_len = nread;
@@ -1557,7 +1598,6 @@ send_packets_using_sendmmsg (const struct lsquic_out_spec *specs,
 #endif
 
 
-#if LSQUIC_PREFERRED_ADDR
 static const struct service_port *
 find_sport (struct prog *prog, const struct sockaddr *local_sa)
 {
@@ -1574,6 +1614,17 @@ find_sport (struct prog *prog, const struct sockaddr *local_sa)
                                              : sizeof(struct sockaddr_in6);
             if (0 == memcmp(addr, local_sa, len))
                 return sport;
+            if (((struct sockaddr_in *)addr)->sin_port ==
+                ((struct sockaddr_in *)local_sa)->sin_port)
+            {
+                if ((addr->sa_family == AF_INET
+                        && ((struct sockaddr_in *)addr)->sin_addr.s_addr
+                            == INADDR_ANY)
+                    ||(addr->sa_family == AF_INET6
+                        && (IN6_IS_ADDR_UNSPECIFIED(
+                            &((struct sockaddr_in6 *)addr)->sin6_addr))))
+                    return sport;
+            }
         }
     }
 
@@ -1582,9 +1633,6 @@ find_sport (struct prog *prog, const struct sockaddr *local_sa)
 }
 
 
-#endif
-
-
 static int
 send_packets_one_by_one (const struct lsquic_out_spec *specs, unsigned count)
 {
@@ -1655,10 +1703,8 @@ send_packets_one_by_one (const struct lsquic_out_spec *specs, unsigned count)
     do
     {
         sport = specs[n].peer_ctx;
-#if LSQUIC_PREFERRED_ADDR
         if (sport->sp_prog->prog_flags & PROG_SEARCH_ADDRS)
             sport = find_sport(sport->sp_prog, specs[n].local_sa);
-#endif
 #ifndef WIN32
         msg.msg_name       = (void *) specs[n].dest_sa;
         msg.msg_namelen    = (AF_INET == specs[n].dest_sa->sa_family ?
@@ -1734,6 +1780,14 @@ send_packets_one_by_one (const struct lsquic_out_spec *specs, unsigned count)
 #endif
             break;
         }
+        char localaddr_str[80];
+        char remoteaddr_str[80];
+        LSQ_DEBUG("[%s] TX packet %d bytes to: %s",
+                sockaddr2str((struct sockaddr *)&sport->sp_local_addr,
+                             localaddr_str, sizeof(localaddr_str)),
+                s, sockaddr2str(specs[n].dest_sa,
+                    remoteaddr_str, sizeof(remoteaddr_str)));
+
         ++n;
     }
     while (n < count);
@@ -1779,6 +1833,47 @@ sport_packets_out (void *ctx, const struct lsquic_out_spec *specs,
 }
 
 
+int
+set_perferred_address(uint8_t *addr, uint16_t *port, const char *s, int family)
+{
+    char addr_buf[1024];
+    const char *colon;
+    if (s && strlen(s) < sizeof(addr_buf) && (colon = strrchr(s, ':')))
+    {
+        strncpy(addr_buf, s, colon - s);
+        addr_buf[colon - s] = '\0';
+        if (inet_pton(family, addr_buf, addr))
+        {
+            *port = atoi(colon + 1);
+            //params.tp_set |= 1 << TPI_PREFERRED_ADDRESS;
+            return 1;
+        }
+        else
+        {
+            struct addrinfo hints, *res = NULL;
+            int ret;
+            memset(&hints, 0, sizeof(hints));
+            hints.ai_flags = AI_NUMERICSERV;
+            hints.ai_family = family;
+            ret = getaddrinfo(addr_buf, colon + 1, &hints, &res);
+            if (ret != 0)
+            {
+                LSQ_ERROR("could not resolve %s:%s: %s", addr_buf, colon + 1,
+                                                       gai_strerror(ret));
+                return 0;
+            }
+            if (family == AF_INET)
+                memcpy(addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr, 4);
+            else
+                memcpy(addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 16);
+            *port = atoi(colon + 1);
+            return 1;
+        }
+    }
+    return 0;
+}
+
+
 int
 set_engine_option (struct lsquic_engine_settings *settings,
                    int *version_cleared, const char *name)
@@ -1981,6 +2076,20 @@ set_engine_option (struct lsquic_engine_settings *settings,
             settings->es_delayed_acks = atoi(val);
             return 0;
         }
+        if (0 == strncmp(name, "preferred_v4", 12))
+        {
+            set_perferred_address(settings->es_preferred_address,
+                (uint16_t *)&settings->es_preferred_address[4], val, AF_INET);
+            return 0;
+        }
+        if (0 == strncmp(name, "preferred_v6", 12))
+        {
+            set_perferred_address(&settings->es_preferred_address[6],
+                (uint16_t *)&settings->es_preferred_address[22],
+                                  val, AF_INET6);
+            return 0;
+        }
+
         break;
     case 13:
         if (0 == strncmp(name, "support_tcid0", 13))

bin/test_common.h

@@ -138,10 +138,7 @@ create_lsquic_reader_ctx (const char *filename);
 void
 destroy_lsquic_reader_ctx (struct reader_ctx *ctx);
 
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-#define LITESPEED_ID "lsquic" "/" TOSTRING(LSQUIC_MAJOR_VERSION) "." \
-            TOSTRING(LSQUIC_MINOR_VERSION) "." TOSTRING(LSQUIC_PATCH_VERSION)
+#define LITESPEED_ID "lsquic/" LSQUIC_VERSION_STR
 
 struct header_buf
 {

docs/conf.py

@@ -24,9 +24,9 @@
 author = u'LiteSpeed Technologies'
 
 # The short X.Y version
-version = u'4.2'
+version = u'4.3'
 # The full version, including alpha/beta/rc tags
-release = u'4.2.0'
+release = u'4.3.0'
 
 
 # -- General configuration ---------------------------------------------------

include/lsquic.h

@@ -11,7 +11,7 @@
  */
 
 #include <stdarg.h>
-#include <lsquic_types.h>
+#include "lsquic_types.h"
 #ifndef WIN32
 #include <sys/uio.h>
 #include <time.h>
@@ -26,9 +26,14 @@ extern "C" {
 #endif
 
 #define LSQUIC_MAJOR_VERSION 4
-#define LSQUIC_MINOR_VERSION 2
+#define LSQUIC_MINOR_VERSION 3
 #define LSQUIC_PATCH_VERSION 0
 
+#define LSQUIC_QUOTE(x)     #x
+#define LSQUIC_SVAL(v)      LSQUIC_QUOTE(v)
+#define LSQUIC_VERSION_STR  LSQUIC_SVAL(LSQUIC_MAJOR_VERSION) "." \
+    LSQUIC_SVAL(LSQUIC_MINOR_VERSION) "." LSQUIC_SVAL(LSQUIC_PATCH_VERSION)
+
 /**
  * Engine flags:
  */
@@ -1123,6 +1128,17 @@ struct lsquic_engine_settings {
      */
     int             es_send_verneg;
 
+    /**
+     * This is the preferred_address used in server's transport parameter
+     * It contains an address and port for both IPv4 and IPv6. It is copied directly
+     * as the addresses part of preferred_address value. Includes:
+     * Four-byte IPv4 Address, two-byte IPv4 Port,
+     * a 16-byte IPv6 Address, two-byte IPv6 Port.
+     *
+     * The default is all zero, which indicates perferred_address is not set
+     */
+    uint8_t         es_preferred_address[24];
+
 #if LSQUIC_WEBTRANSPORT_SERVER_SUPPORT
     /**
      * Enable datagram extension for http3 server.  Allowed values are 0 and 1.
@@ -2102,6 +2118,25 @@ lsquic_conn_get_sni (lsquic_conn_t *);
 void
 lsquic_conn_abort (lsquic_conn_t *);
 
+struct lsquic_conn_info
+{
+    uint32_t lci_cwnd;
+    uint32_t lci_pmtu;
+    uint32_t lci_rtt;
+    uint32_t lci_rttvar;
+    uint32_t lci_rtt_min;
+    uint64_t lci_bytes_rcvd;
+    uint64_t lci_bytes_sent;
+    uint64_t lci_pkts_rcvd;
+    uint64_t lci_pkts_sent;
+    uint64_t lci_pkts_lost;
+    uint64_t lci_pkts_retx;
+    uint64_t lci_bw_estimate;
+};
+
+int
+lsquic_conn_get_info (lsquic_conn_t *conn, struct lsquic_conn_info *info);
+
 /**
  * Helper function: convert list of versions as specified in the argument
  * bitmask to string that can be included as argument to "v=" part of the