Extend after_success API to take two pointers - one for static

structs and one for a dynamic. Use dynamic for the TTL subcommand
and static for the module-specific command.

Author: sobomax

src/commands/rpcpv1_ul.c

@@ -172,6 +172,8 @@ rtpp_command_ul_opts_free(struct ul_opts *ulop)
     FREE_IF_NULL(ulop->codecs);
     FREE_IF_NULL(ulop->ia[0]);
     FREE_IF_NULL(ulop->ia[1]);
+    for (int i = 0; i < MAX_SUBC_NUM; i++)
+        FREE_IF_NULL(ulop->after_success[i].args.dyn);
     free(ulop);
 }
 
@@ -689,7 +691,7 @@ rtpp_command_ul_handle(const struct rtpp_cfg *cfsp, struct rtpp_command *cmd, in
             .resp = &(ulop->reply.subc_res[i])
         };
         rsc.resp->result = ulop->after_success[i].handler(
-          ulop->after_success[i].arg, &rsc);
+          &ulop->after_success[i].args, &rsc);
     }
     ul_reply_port(cmd, &ulop->reply);
     rtpp_command_ul_opts_free(ulop);

src/commands/rpcpv1_ul.h

@@ -28,17 +28,26 @@
 #ifndef _RTPP_COMMAND_UL_H_
 #define _RTPP_COMMAND_UL_H_
 
+struct rtpp_cfg;
 struct ul_opts;
 struct ul_reply;
 struct rtpp_command;
 struct rtpp_session;
 struct rtpp_subc_ctx;
+struct after_success_h_args;
 
-DEFINE_RAW_METHOD(after_success, int, void *, const struct rtpp_subc_ctx *);
+DEFINE_RAW_METHOD(after_success, int, const struct after_success_h_args *,
+  const struct rtpp_subc_ctx *);
+
+struct after_success_h_args {
+    void *stat;
+    void *dyn;
+
+};
 
 struct after_success_h {
     after_success_t handler;
-    void *arg;
+    struct after_success_h_args args;
 };
 
 struct ul_opts *rtpp_command_ul_opts_parse(const struct rtpp_cfg *,

src/rtpp_modman.c

@@ -164,7 +164,7 @@ rtpp_modman_get_ul_subc_h(struct rtpp_modman *self, unsigned int mod_id,
         if (tmp->has.ul_subc_h == 0)
             break;
         ashp->handler = (after_success_t)tmp->ul_subc_handle;
-        ashp->arg = tmp;
+        ashp->args.stat = tmp;
         return (0);
     }
     return (-1);

src/rtpp_module_if.c

@@ -74,6 +74,7 @@
 #include "rtpp_wi_sgnl.h"
 #include "rtpp_weakref.h"
 #include "rtpp_command_sub.h"
+#include "commands/rpcpv1_ul.h"
 #ifdef RTPP_CHECK_LEAKS
 #include "rtpp_memdeb_internal.h"
 #endif
@@ -100,7 +101,7 @@ static int rtpp_mif_start(struct rtpp_module_if *, const struct rtpp_cfg *);
 static void rtpp_mif_do_acct(struct rtpp_module_if *, struct rtpp_acct *);
 static void rtpp_mif_do_acct_rtcp(struct rtpp_module_if *, struct rtpp_acct_rtcp *);
 static int rtpp_mif_get_mconf(struct rtpp_module_if *, struct rtpp_module_conf **);
-static int rtpp_mif_ul_subc_handle(struct rtpp_module_if *,
+static int rtpp_mif_ul_subc_handle(const struct after_success_h_args *,
   const struct rtpp_subc_ctx *);
 static int rtpp_mif_construct(struct rtpp_module_if *self, const struct rtpp_cfg *);
 static void rtpp_mif_kaput(struct rtpp_module_if *self);
@@ -512,11 +513,13 @@ rtpp_mif_get_mconf(struct rtpp_module_if *self, struct rtpp_module_conf **mcpp)
 }
 
 static int
-rtpp_mif_ul_subc_handle(struct rtpp_module_if *self,
+rtpp_mif_ul_subc_handle(const struct after_success_h_args *ashap,
   const struct rtpp_subc_ctx *ctxp)
 {
     struct rtpp_module_if_priv *pvt;
+    struct rtpp_module_if *self;
 
+    self = ashap->stat;
     PUB2PVT(self, pvt);
     return (pvt->mip->capi->ul_subc_handle(pvt->mpvt, ctxp));
 }

src/rtpp_module_if.h

@@ -34,6 +34,7 @@ struct rtpp_cfg;
 struct rtpp_module_conf;
 struct rtpp_mdescr;
 struct rtpp_subc_ctx;
+struct after_success_h_args;
 
 DEFINE_METHOD(rtpp_module_if, rtpp_module_if_load, int, const struct rtpp_cfg *,
   struct rtpp_log *);
@@ -46,7 +47,7 @@ DEFINE_METHOD(rtpp_module_if, rtpp_module_if_do_acct_rtcp, void,
   struct rtpp_acct_rtcp *);
 DEFINE_METHOD(rtpp_module_if, rtpp_module_if_get_mconf, int,
   struct rtpp_module_conf **);
-DEFINE_METHOD(rtpp_module_if, rtpp_module_if_ul_subc_handle, int,
+DEFINE_RAW_METHOD(rtpp_module_if_ul_subc_handle, int, const struct after_success_h_args *,
   const struct rtpp_subc_ctx *);
 DEFINE_METHOD(rtpp_module_if, rtpp_module_if_kaput, void);