Attach pointer to the rtpp_session_ctor_args to the

r_pipe_ctor_args, so that we don't have to copy bunch of
pointers and parameters.

Author: sobomax

src/rtpp_pipe.c

@@ -32,6 +32,7 @@
 
 #include "config.h"
 
+#include "rtpp_cfg.h"
 #include "rtpp_debug.h"
 #include "rtpp_log.h"
 #include "rtpp_types.h"
@@ -53,6 +54,7 @@
 #include "rtpp_pcnts_strm.h"
 #include "rtpp_stats.h"
 #include "rtpp_refcnt.h"
+#include "rtpp_session.h"
 #include "advanced/pproc_manager.h"
 
 struct rtpp_pipe_priv
@@ -85,6 +87,7 @@ struct rtpp_pipe *
 rtpp_pipe_ctor(const struct r_pipe_ctor_args *ap)
 {
     struct rtpp_pipe_priv *pvt;
+    const struct rtpp_cfg *cfs = ap->session_cap->cfs;
     int i;
 
     pvt = rtpp_rzmalloc(sizeof(struct rtpp_pipe_priv), PVT_RCOFFS(pvt));
@@ -93,9 +96,13 @@ rtpp_pipe_ctor(const struct r_pipe_ctor_args *ap)
     }
 
     RTPP_OBJ_BORROW(&pvt->pub, ap->log);
-    pvt->streams_wrt = ap->streams_wrt;
+    if (ap->pipe_type == PIPE_RTP) {
+        pvt->streams_wrt = cfs->rtp_streams_wrt;
+    } else {
+        pvt->streams_wrt = cfs->rtcp_streams_wrt;
+    }
 
-    pvt->pub.ppuid = CALL_SMETHOD(ap->guid, gen);
+    pvt->pub.ppuid = CALL_SMETHOD(cfs->guid, gen);
     struct r_stream_ctor_args rsca = {
         .pipe_cap = ap,
     };
@@ -127,7 +134,7 @@ rtpp_pipe_ctor(const struct r_pipe_ctor_args *ap)
     pvt->pub.stream[1]->pproc_manager->reverse = pvt->pub.stream[0]->pproc_manager;
     RTPP_OBJ_BORROW(&pvt->pub, pvt->pub.stream[0]->pproc_manager);
     pvt->pipe_type = ap->pipe_type;
-    pvt->pub.rtpp_stats = ap->rtpp_stats;
+    pvt->pub.rtpp_stats = cfs->rtpp_stats;
     pvt->pub.log = ap->log;
     PUBINST_FININIT(&pvt->pub, pvt, rtpp_pipe_dtor);
 #if defined(RTPP_DEBUG)

src/rtpp_pipe.h

@@ -30,6 +30,7 @@
 struct rtpp_stats;
 struct rtpp_acct_pipe;
 struct rtpp_proc_servers;
+struct rtpp_session_ctor_args;
 
 #define PIPE_RTP        1
 #define PIPE_RTCP       2
@@ -38,14 +39,9 @@ struct rtpp_proc_servers;
 
 struct r_pipe_ctor_args {
     uint64_t seuid;
-    struct rtpp_weakref *streams_wrt;
-    struct rtpp_proc_servers *proc_servers;
     struct rtpp_log *log;
-    struct rtpp_stats *rtpp_stats;
     int pipe_type;
-    unsigned int nmodules;
-    struct pproc_manager *pproc_manager;
-    struct rtpp_genuid *guid;
+    const struct rtpp_session_ctor_args *session_cap;
 };
 
 DECLARE_CLASS(rtpp_pipe, const struct r_pipe_ctor_args *);

src/rtpp_session.c

@@ -112,20 +112,13 @@ rtpp_session_ctor(const struct rtpp_session_ctor_args *ap)
     CALL_METHOD(log, start, cfs);
     CALL_METHOD(log, setlevel, cfs->log_level);
     pipe_cfg = (struct r_pipe_ctor_args){.seuid = pub->seuid,
-      .streams_wrt = cfs->rtp_streams_wrt, .proc_servers = cfs->proc_servers,
-      .log = log, .rtpp_stats = cfs->rtpp_stats, .pipe_type = PIPE_RTP,
-#if ENABLE_MODULE_IF
-      .nmodules  = cfs->modules_cf->count.total,
-#endif
-      .pproc_manager = cfs->pproc_manager,
-      .guid = cfs->guid,
+      .log = log, .pipe_type = PIPE_RTP, .session_cap = ap,
     };
     pub->rtp = rtpp_pipe_ctor(&pipe_cfg);
     if (pub->rtp == NULL) {
         goto e3;
     }
     /* spb is RTCP twin session for this one. */
-    pipe_cfg.streams_wrt = cfs->rtcp_streams_wrt;
     pipe_cfg.pipe_type = PIPE_RTCP;
     pub->rtcp = rtpp_pipe_ctor(&pipe_cfg);
     if (pub->rtcp == NULL) {
@@ -155,10 +148,6 @@ rtpp_session_ctor(const struct rtpp_session_ctor_args *ap)
         goto e8;
     }
     pub->from_tag_nmn = &pvt->from_tag_nmn.fx;
-    for (i = 0; i < 2; i++) {
-        pub->rtp->stream[i]->laddr = ap->lia[i];
-        pub->rtcp->stream[i]->laddr = ap->lia[i];
-    }
     if (ap->weak) {
         pub->rtp->stream[0]->weak = 1;
     } else {

src/rtpp_stream.c

@@ -82,6 +82,8 @@
 #include "advanced/pproc_manager.h"
 #include "advanced/packet_processor.h"
 #include "rtpp_command_stats.h"
+#include "rtpp_modman.h"
+#include "rtpp_session.h"
 
 #define  SEQ_SYNC_IVAL   1.0    /* in seconds */
 
@@ -245,9 +247,16 @@ rtpp_stream_ctor(const struct r_stream_ctor_args *ap)
     struct rtpp_stream_priv *pvt;
     size_t alen;
     const struct r_pipe_ctor_args *pap = ap->pipe_cap;
+    const struct rtpp_session_ctor_args *sap = pap->session_cap;
+    const struct rtpp_cfg *cfs = sap->cfs;
+    int nmodules = 0;
+
+#if ENABLE_MODULE_IF
+    nmodules  = cfs->modules_cf->count.total;
+#endif
 
     alen = offsetof(struct rtpp_stream_priv, pmod_data.adp) + 
-      (pap->nmodules * sizeof(pvt->pmod_data.adp[0]));
+      (nmodules * sizeof(pvt->pmod_data.adp[0]));
     pvt = rtpp_rzmalloc(alen, PVT_RCOFFS(pvt));
     if (pvt == NULL) {
         goto e0;
@@ -258,7 +267,7 @@ rtpp_stream_ctor(const struct r_stream_ctor_args *ap)
     pvt->pub.log = pap->log;
     RTPP_OBJ_BORROW(&pvt->pub, pap->log);
     RTPP_OBJ_DTOR_ATTACH(&pvt->pub, pthread_mutex_destroy, &pvt->lock);
-    pvt->pub.pproc_manager = CALL_SMETHOD(pap->pproc_manager, clone);
+    pvt->pub.pproc_manager = CALL_SMETHOD(cfs->pproc_manager, clone);
     if (pvt->pub.pproc_manager == NULL) {
         goto e1;
     }
@@ -278,7 +287,7 @@ rtpp_stream_ctor(const struct r_stream_ctor_args *ap)
         };
         if (CALL_SMETHOD(pvt->pub.pproc_manager, reg, PPROC_ORD_RESIZE, &resize_packet_poi) < 0)
             goto e1;
-        pvt->npkts_resizer_in_idx = CALL_SMETHOD(pap->rtpp_stats, getidxbyname,
+        pvt->npkts_resizer_in_idx = CALL_SMETHOD(cfs->rtpp_stats, getidxbyname,
           "npkts_resizer_in");
         if (pvt->npkts_resizer_in_idx == -1)
             goto e2;
@@ -308,19 +317,20 @@ rtpp_stream_ctor(const struct r_stream_ctor_args *ap)
         goto e3;
     }
     RTPP_OBJ_DTOR_ATTACH_OBJ(&pvt->pub, pvt->rem_addr);
-    pvt->proc_servers = pap->proc_servers;
-    RTPP_OBJ_BORROW(&pvt->pub, pap->proc_servers);
-    pvt->rtpp_stats = pap->rtpp_stats;
+    pvt->proc_servers = cfs->proc_servers;
+    RTPP_OBJ_BORROW(&pvt->pub, cfs->proc_servers);
+    pvt->rtpp_stats = cfs->rtpp_stats;
     pvt->pub.side = ap->side;
     pvt->pub.pipe_type = pap->pipe_type;
 
-    pvt->pub.stuid = CALL_SMETHOD(pap->guid, gen);
+    pvt->pub.stuid = CALL_SMETHOD(cfs->guid, gen);
     pvt->pub.seuid = pap->seuid;
-    for (unsigned int i = 0; i < pap->nmodules; i++) {
+    for (unsigned int i = 0; i < nmodules; i++) {
         atomic_init(&(pvt->pmod_data.adp[i]), NULL);
     }
-    pvt->pmod_data.nmodules = pap->nmodules;
+    pvt->pmod_data.nmodules = nmodules;
     pvt->pub.pmod_datap = &(pvt->pmod_data);
+    pvt->pub.laddr = sap->lia[ap->side];
     PUBINST_FININIT(&pvt->pub, pvt, rtpp_stream_dtor);
     return (&pvt->pub);