+ 9ef48c0

Author: sobomax

scripts/fuzz/fuzz_standalone.h

@@ -9,6 +9,7 @@
 #endif /* FUZZ_STANDALONE */
 
 const int rtpp_is_lib = 0;
+const int rtpp_use_smodules = 1;
 
 #if defined(FUZZ_STANDALONE)
 extern int LLVMFuzzerInitialize(int *argc, char ***argv) __attribute__((__weak__));

src/main.c

@@ -124,13 +124,14 @@
 #include "rtpp_memdeb_internal.h"
 #endif
 #include "rtpp_stacktrace.h"
+#include "rtpp_module_if_static.h"
 #if defined(LIBRTPPROXY)
 #include "librtpproxy.h"
 #include "librtpp_main.h"
-#include "rtpp_module_if_static.h"
 const int rtpp_is_lib __attribute__((weak)) = 1;
 #else
 const int rtpp_is_lib = 0;
+const int rtpp_use_smodules = 0;
 #endif
 
 #define PRIO_UNSET (PRIO_MIN - 1)
@@ -359,7 +360,6 @@ init_config(struct rtpp_cfg *cfsp, int argc, const char * const *argv)
     cfsp->rrtcp = 1;
     cfsp->runcreds->sock_mode = 0;
     cfsp->ttl_mode = TTL_UNIFIED;
-    cfsp->is_lib = rtpp_is_lib;
     cfsp->log_level = -1;
     cfsp->log_facility = -1;
     cfsp->sched_hz = rtpp_get_sched_hz();
@@ -408,13 +408,13 @@ init_config(struct rtpp_cfg *cfsp, int argc, const char * const *argv)
 #if ENABLE_MODULE_IF
         case LOPT_DSO:
             cp = NULL;
-#if defined(LIBRTPPROXY)
-            if (rtpp_static_modules_lookup(optarg) != NULL) {
-                cp = optarg;
-            } else {
-                IC_ERRX(1, "%s: static module is not compiled in", optarg);
+            if (rtpp_use_smodules) {
+                if (rtpp_static_modules_lookup(optarg) != NULL) {
+                    cp = optarg;
+                } else {
+                    IC_ERRX(1, "%s: static module is not compiled in", optarg);
+                }
             }
-#endif
             if (cp == NULL)
                 cp = realpath(optarg, mpath);
             if (cp == NULL) {

src/rtpp_cfg.h

@@ -156,7 +156,6 @@ struct rtpp_cfg {
     struct rtpp_proc_servers *proc_servers;
     struct rtpp_genuid *guid;
 
-    int is_lib;
 #if ENABLE_MODULE_IF
     struct rtpp_modman *modules_cf;
 #else

src/rtpp_module_if.c

@@ -199,45 +199,57 @@ acct_rtcp_enqueue(const struct pkt_proc_ctx *pktx)
     return (PPROC_ACT_TEE);
 }
 
+static const struct rtpp_minfo *
+rtpp_modules_lookup(struct rtpp_module_if *self, const char *mpath, struct rtpp_log *log)
+{
+    const struct rtpp_minfo *mip = NULL;
+
+    const char *derr;
+    int dlflags = RTLD_NOW | (is_gcov_on() ? RTLD_NODELETE : 0);
+    void *dmp = dlopen(mpath, dlflags);
+    if (dmp == NULL) {
+        derr = dlerror();
+        if (strstr(derr, mpath) == NULL) {
+            RTPP_LOG(log, RTPP_LOG_ERR, "can't dlopen(%s): %s", mpath, derr);
+        } else {
+            RTPP_LOG(log, RTPP_LOG_ERR, "can't dlopen() module: %s", derr);
+        }
+        goto e1;
+    }
+    RTPP_OBJ_DTOR_ATTACH_s(self, dlclose, dmp);
+    mip = dlsym(dmp, "rtpp_module");
+    if (mip == NULL) {
+        derr = dlerror();
+        if (strstr(derr, mpath) == NULL) {
+            RTPP_LOG(log, RTPP_LOG_ERR, "can't find 'rtpp_module' symbol in the %s"
+              ": %s", mpath, derr);
+        } else {
+            RTPP_LOG(log, RTPP_LOG_ERR, "can't find 'rtpp_module' symbol: %s",
+              derr);
+        }
+        goto e1;
+    }
+    return (mip);
+e1:
+    return (NULL);
+}
+
+
 static int
 rtpp_mif_load(struct rtpp_module_if *self, const struct rtpp_cfg *cfsp, struct rtpp_log *log)
 {
     struct rtpp_module_if_priv *pvt;
-    const char *derr;
     const struct rtpp_minfo *mip = NULL;
 
     PUB2PVT(self, pvt);
-    if (rtpp_is_lib) {
+
+    if (rtpp_use_smodules) {
         mip = rtpp_static_modules_lookup(pvt->mpath);
-        if (mip == NULL)
-            goto e1;
-    }
-    if (mip == NULL) {
-        int dlflags = RTLD_NOW | (is_gcov_on() ? RTLD_NODELETE : 0);
-        void *dmp = dlopen(pvt->mpath, dlflags);
-        if (dmp == NULL) {
-            derr = dlerror();
-            if (strstr(derr, pvt->mpath) == NULL) {
-                RTPP_LOG(log, RTPP_LOG_ERR, "can't dlopen(%s): %s", pvt->mpath, derr);
-            } else {
-                RTPP_LOG(log, RTPP_LOG_ERR, "can't dlopen() module: %s", derr);
-            }
-            goto e1;
-        }
-        RTPP_OBJ_DTOR_ATTACH_s(&(pvt->pub), dlclose, dmp);
-        mip = dlsym(dmp, "rtpp_module");
-        if (mip == NULL) {
-            derr = dlerror();
-            if (strstr(derr, pvt->mpath) == NULL) {
-                RTPP_LOG(log, RTPP_LOG_ERR, "can't find 'rtpp_module' symbol in the %s"
-                  ": %s", pvt->mpath, derr);
-            } else {
-                RTPP_LOG(log, RTPP_LOG_ERR, "can't find 'rtpp_module' symbol: %s",
-                  derr);
-            }
-            goto e1;
-        }
+    } else {
+        mip = rtpp_modules_lookup(self, pvt->mpath, log);
     }
+    if (mip == NULL)
+        goto e1;
 
     if (!MI_VER_CHCK(mip) || mip->fn == NULL) {
         RTPP_LOG(log, RTPP_LOG_ERR, "incompatible API version in the %s, "

src/rtpp_module_if_static.c

@@ -30,6 +30,8 @@
 #include "rtpp_linker_set.h"
 #include "rtpp_module_if_static.h"
 
+const int rtpp_use_smodules __attribute__((weak)) = 1;
+
 SET_DECLARE(rtpp_modules, const struct rtpp_minfo);
 
 const struct rtpp_minfo *

src/rtpp_module_if_static.h

@@ -26,4 +26,6 @@
 
 #pragma once
 
+extern const int rtpp_use_smodules;
+
 const struct rtpp_minfo *rtpp_static_modules_lookup(const char *);