next/1018/20250929/v1

.github/workflows/builds.yml

@@ -35,7 +35,7 @@ env:
   # A recent version of stable Rust that is known to pass build, test and other
   # verification steps in this workflow. This was added because using "stable"
   # could cause some steps to fail.
-  RUST_VERSION_KNOWN: "1.80.0"
+  RUST_VERSION_KNOWN: "1.90.0"
 
 jobs:
 

.github/workflows/rust.yml

@@ -61,7 +61,7 @@ jobs:
                 sudo \
                 which \
                 zlib-devel
-      - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.88.0 -y
+      - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.90.0 -y
       - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - run: cargo install bindgen-cli --version 0.66.0
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8

plugins/napatech/runmode-napatech.c

@@ -190,7 +190,7 @@ static void *NapatechConfigParser(const char *device)
     return (void *)conf;
 }
 
-static int NapatechGetThreadsCount(void *conf __attribute__((unused)))
+static uint16_t NapatechGetThreadsCount(void *conf __attribute__((unused)))
 {
     /* No matter which live device it is there is no reason to ever use more than 1 thread
        2 or more thread would cause packet duplication */

plugins/pfring/runmode-pfring.c

@@ -115,7 +115,7 @@ static void *OldParsePfringConfig(const char *iface)
         pfconf->threads = 1;
     } else {
         if (threadsstr != NULL) {
-            if (StringParseInt32(&pfconf->threads, 10, 0, threadsstr) < 0) {
+            if (StringParseUnt16(&pfconf->threads, 10, 0, threadsstr) < 0) {
                 SCLogWarning("Invalid value for "
                              "pfring.threads: '%s'. Resetting to 1.",
                         threadsstr);
@@ -396,7 +396,7 @@ static void *ParsePfringConfig(const char *iface)
     return pfconf;
 }
 
-static int PfringConfigGetThreadsCount(void *conf)
+static uint16_t PfringConfigGetThreadsCount(void *conf)
 {
     PfringIfaceConfig *pfp = (PfringIfaceConfig *)conf;
     return pfp->threads;

plugins/pfring/source-pfring.h

@@ -41,7 +41,7 @@ typedef struct PfringIfaceConfig_ {
 
     char iface[PFRING_IFACE_NAME_LENGTH];
     /* number of threads */
-    int threads;
+    uint16_t threads;
 
     const char *bpf_filter;