Untangle L subcommand processing a bit.

Author: sobomax

modules/acct_csv/rtpp_acct_csv.c

@@ -26,6 +26,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>

src/commands/rpcpv1_ul.c

@@ -124,7 +124,7 @@ static int rtpp_command_ul_pre_parse(const struct rtpp_command *,
 }
 
 void
-ul_reply_port(struct rtpp_command *cmd, struct ul_reply *ulr)
+ul_reply_port(const struct rtpp_command *cmd, struct ul_reply *ulr)
 {
     int rport, r;
     const char subc_err[] = " && -1";
@@ -535,19 +535,20 @@ handle_nomem(struct rtpp_command *cmd, int ecode, struct rtpp_session *spa)
     CALL_SMETHOD(cmd->reply, deliver_error, ecode);
 }
 
-static int
-format_ul_reply_result(const struct ul_reply *ulr, struct rtpp_subc_resp *rsp)
+int
+format_ul_reply_result(const struct ul_opts *ulop, char *buf_t, size_t blen)
 {
     const rtpp_str_const_t *sap;
     rtpp_str_const_t sad;
     char saddr[MAX_ADDR_STRLEN];
     const char *at;
     int plen;
+    const struct ul_reply *ulr = &ulop->reply;
 
     if (ulr == NULL || ulr->ia == NULL || ishostnull(ulr->ia->addr)) {
-        plen = snprintf(rsp->buf_t, sizeof(rsp->buf_t), "%d",
+        plen = snprintf(buf_t, blen, "%d",
           (ulr != NULL) ? ulr->port : 0);
-        return (plen > -1 && plen < sizeof(rsp->buf_t)) ? 0 : -1;
+        return (plen > -1 && plen < blen) ? 0 : -1;
     }
     sap = &ulr->ia->params.advaddr;
     if (sap->s == NULL) {
@@ -557,15 +558,14 @@ format_ul_reply_result(const struct ul_reply *ulr, struct rtpp_subc_resp *rsp)
         sap = &sad;
     }
     at = (ulr->ia->addr->sa_family == AF_INET) ? "" : " 6";
-    plen = snprintf(rsp->buf_t, sizeof(rsp->buf_t), "%d %.*s%s",
+    plen = snprintf(buf_t, blen, "%d %.*s%s",
       ulr->port, FMTSTR(sap), at);
-    return (plen > -1 && plen < sizeof(rsp->buf_t)) ? 0 : -1;
+    return (plen > -1 && plen < blen) ? 0 : -1;
 }
 
 int
 rtpp_command_ul_handle_impl(const struct rtpp_cfg *cfsp,
-  struct rtpp_command *cmd, int sidx, struct rtpp_subc_resp *rsp,
-  struct rtpp_command_stats *csp, const struct rtpp_sockaddr *raddrp)
+  struct rtpp_command *cmd, int sidx)
 {
     int pidx, lport, sessions_active;
     struct rtpp_socket *fds[2];
@@ -582,7 +582,7 @@ rtpp_command_ul_handle_impl(const struct rtpp_cfg *cfsp,
     ulop = cmd->cca.opts.ul;
 
 #define UL_FAIL(_ecode) do { \
-    if (rsp == NULL) \
+    if (cmd->reply != NULL) \
         CALL_SMETHOD(cmd->reply, deliver_error, (_ecode)); \
     goto err_undo_0; \
 } while (0)
@@ -626,8 +626,8 @@ rtpp_command_ul_handle_impl(const struct rtpp_cfg *cfsp,
             spa->rtp->stream[sidx]->port = lport;
             spa->rtcp->stream[sidx]->port = lport + 1;
             if (spa->complete == 0) {
-                if (csp != NULL)
-                    csp->nsess_complete.cnt++;
+                if (cmd->csp != NULL)
+                    cmd->csp->nsess_complete.cnt++;
                 CALL_SMETHOD(spa->rtp->stream[0]->ttl, reset_with,
                   spa->rtp->stream[0]->stream_ttl);
                 CALL_SMETHOD(spa->rtp->stream[1]->ttl, reset_with,
@@ -693,8 +693,8 @@ rtpp_command_ul_handle_impl(const struct rtpp_cfg *cfsp,
             UL_FAIL(ECODE_LSTFAIL_2);
         }
 
-        if (csp != NULL)
-            csp->nsess_created.cnt++;
+        if (cmd->csp != NULL)
+            cmd->csp->nsess_created.cnt++;
 
         hte = CALL_SMETHOD(cfsp->sessions_ht, append_str_refcnt, spa->call_id,
           spa->rcnt, NULL);
@@ -744,11 +744,11 @@ rtpp_command_ul_handle_impl(const struct rtpp_cfg *cfsp,
         }
         if (ulop->notify_socket != NULL) {
             struct rtpp_tnotify_target *rttp;
-            struct rtpp_sockaddr raddr = (raddrp != NULL) ? *raddrp :
-              (struct rtpp_sockaddr){.l = 0};
+            RTPP_DBG_ASSERT(cmd->raddr != NULL);
 
             rttp = CALL_METHOD(cfsp->rtpp_tnset_cf, lookup, ulop->notify_socket->s,
-              (raddr.l > 0) ? sstosa(raddr.a) : NULL, (raddr.l > 0) ? cmd->laddr : NULL);
+              (cmd->raddr->l > 0) ? sstosa(cmd->raddr->a) : NULL,
+              (cmd->raddr->l > 0) ? cmd->laddr : NULL);
             if (rttp == NULL) {
                 RTPP_LOG(spa->log, RTPP_LOG_ERR, "invalid socket name %.*s",
                   FMTSTR(ulop->notify_socket));
@@ -833,26 +833,18 @@ rtpp_command_ul_handle_impl(const struct rtpp_cfg *cfsp,
         if (rsc.resp->result != 0)
             break;
     }
-    if (rsp == NULL) {
+    if (cmd->reply != NULL) {
         ul_reply_port(cmd, &ulop->reply);
-    } else if (format_ul_reply_result(&ulop->reply, rsp) != 0) {
-        goto err_undo_0;
     }
-#undef UL_FAIL
     return (0);
 
 err_undo_0:
-#undef UL_FAIL
     return (-1);
 }
 
 int
 rtpp_command_ul_handle(const struct rtpp_cfg *cfsp, struct rtpp_command *cmd, int sidx)
 {
-    struct rtpp_command_stats *csp;
-    struct rtpp_sockaddr raddr;
 
-    csp = rtpp_command_get_stats(cmd);
-    raddr = rtpp_command_get_raddr(cmd);
-    return (rtpp_command_ul_handle_impl(cfsp, cmd, sidx, NULL, csp, &raddr));
+    return (rtpp_command_ul_handle_impl(cfsp, cmd, sidx));
 }

src/commands/rpcpv1_ul.h

@@ -35,8 +35,6 @@ struct ul_opts;
 struct ul_reply;
 struct rtpp_command;
 struct rtpp_session;
-struct rtpp_subc_ctx;
-struct rtpp_subc_resp;
 struct rtpp_command_args;
 struct after_success_h;
 struct rtpp_command_stats;
@@ -62,10 +60,9 @@ struct ul_opts *rtpp_command_ul_opts_parse_inner(const struct rtpp_cfg *,
 void rtpp_command_ul_opts_free(struct ul_opts *ulop);
 int rtpp_command_ul_handle(const struct rtpp_cfg *, struct rtpp_command *,
   int);
+int format_ul_reply_result(const struct ul_opts *, char *, size_t);
 int rtpp_command_ul_handle_impl(const struct rtpp_cfg *,
-  struct rtpp_command *, int, struct rtpp_subc_resp *,
-  struct rtpp_command_stats *, const struct rtpp_sockaddr *);
-void ul_reply_port(struct rtpp_command *cmd,
-  struct ul_reply *ulr);
+  struct rtpp_command *, int);
+void ul_reply_port(const struct rtpp_command *cmd, struct ul_reply *ulr);
 
 #endif

src/commands/rpcpv1_ul_subc.c

@@ -59,14 +59,7 @@
 
 struct rtpp_subcommand_ul_lstate {
     struct rtpp_refcnt *rcnt;
-    int op;
-    struct ul_opts *ulop;
-    struct rtpp_log *glog;
-    struct sockaddr *laddr;
-    const struct rtpp_timestamp *dtime;
-    const rtpp_str_t *to_tag;
-    struct rtpp_command_stats *csp;
-    struct rtpp_sockaddr raddr;
+    struct rtpp_command scmd;
 };
 
 static int
@@ -77,7 +70,7 @@ rtpp_command_ul_subc_pre_parse(const rtpp_str_t *call_id,
 
     if (call_id == NULL || from_tag == NULL || to_tag == NULL)
         return (-1);
-    if (subc_args->c != 3 && subc_args->c != 5)
+    if (subc_args->c != 3)
         return (-1);
     if (subc_args->v[0].len < 1)
         return (-1);
@@ -86,17 +79,12 @@ rtpp_command_ul_subc_pre_parse(const rtpp_str_t *call_id,
 
     memset(pcmd, '\0', sizeof(*pcmd));
     pcmd->cmods = subc_args->v[0].s + 1;
-    pcmd->op = (subc_args->c == 5) ? UPDATE : LOOKUP;
+    pcmd->op = LOOKUP;
     pcmd->call_id = call_id;
     pcmd->from_tag = from_tag;
     pcmd->to_tag = to_tag;
     pcmd->addr = rtpp_str_fix(&subc_args->v[1]);
     pcmd->port = rtpp_str_fix(&subc_args->v[2]);
-    if (subc_args->c == 5) {
-        pcmd->has_notify = 1;
-        pcmd->notify_socket = rtpp_str_fix(&subc_args->v[3]);
-        pcmd->notify_tag = subc_args->v[4];
-    }
     return (0);
 }
 
@@ -105,37 +93,26 @@ rtpp_command_ul_as_subc(const struct after_success_h_args *ap,
   const struct rtpp_subc_ctx *scp)
 {
     const struct rtpp_cfg *cfsp;
-    const struct rtpp_subcommand_ul_lstate *lsp;
-    struct rtpp_command scmd;
+    struct rtpp_subcommand_ul_lstate *lsp;
     int sidx, rval;
 
-    lsp = (const struct rtpp_subcommand_ul_lstate *)ap->dyn;
+    lsp = (struct rtpp_subcommand_ul_lstate *)ap->dyn;
     RTPP_DBG_ASSERT(scp->env->sessp != NULL);
     RTPP_DBG_ASSERT(lsp != NULL);
-    RTPP_DBG_ASSERT(lsp->ulop != NULL);
-    RTPP_DBG_ASSERT(lsp->to_tag != NULL);
     cfsp = (const struct rtpp_cfg *)ap->stat;
-    memset(&scmd, '\0', sizeof(scmd));
-    scmd.glog = lsp->glog;
-    scmd.reply = NULL;
-    scmd.dtime = lsp->dtime;
-    scmd.laddr = lsp->laddr;
-    scmd.cca.op = lsp->op;
-    scmd.cca.call_id = scp->env->sessp->call_id;
-    scmd.cca.from_tag = scp->env->sessp->from_tag;
-    scmd.cca.to_tag = lsp->to_tag;
-    scmd.cca.opts.ul = lsp->ulop;
     if (scp->env->sessp->rtp->stream[0] == scp->env->strmp_in) {
         sidx = 0;
     } else if (scp->env->sessp->rtp->stream[1] == scp->env->strmp_in) {
         sidx = 1;
     } else {
         return (-1);
     }
-    scmd.sp = scp->env->sessp;
-    rval = rtpp_command_ul_handle_impl(cfsp, &scmd, sidx, scp->resp, lsp->csp,
-      &lsp->raddr);
+    lsp->scmd.sp = scp->env->sessp;
+    rval = rtpp_command_ul_handle_impl(cfsp, &lsp->scmd, sidx);
     if (rval == 0) {
+        if (format_ul_reply_result(lsp->scmd.cca.opts.ul,
+          scp->resp->buf_t, sizeof(scp->resp->buf_t)) != 0)
+            return -1;
         struct rtpp_stream *t = scp->env->strmp_in;
         scp->env->strmp_in = scp->env->strmp_out;
         scp->env->strmp_out = t;
@@ -150,33 +127,32 @@ rtpp_command_ul_look_subc_parse(const struct rtpp_cfg *cfsp,
 {
     struct rtpp_subcommand_ul_lstate *lsp;
     struct rtpp_command_ul_pcmd pcmd;
-    struct rtpp_command scmd = {.glog = cmd->glog, .reply = cmd->reply};
     struct ul_opts *ulop;
     int ecode = 0;
 
     if (cmd->cca.op != UPDATE)
-        return (-1);
+        goto e0;
     if (rtpp_command_ul_subc_pre_parse(cmd->cca.call_id, cmd->cca.from_tag,
-      cmd->cca.to_tag, subc_args, &pcmd) != 0) {
-        return (-1);
-    }
-    ulop = rtpp_command_ul_opts_parse_inner(cfsp, &scmd, &pcmd, &ecode);
-    if (ulop == NULL)
-        return (-1);
+      cmd->cca.to_tag, subc_args, &pcmd) != 0)
+        goto e0;
     lsp = rtpp_rzmalloc(sizeof(struct rtpp_subcommand_ul_lstate),
       offsetof(struct rtpp_subcommand_ul_lstate, rcnt));
-    if (lsp == NULL) {
-        rtpp_command_ul_opts_free(ulop);
-        return (-1);
-    }
-    lsp->op = pcmd.op;
-    lsp->ulop = ulop;
-    lsp->glog = cmd->glog;
-    lsp->laddr = cmd->laddr;
-    lsp->dtime = cmd->dtime;
-    lsp->to_tag = cmd->cca.to_tag;
-    lsp->csp = rtpp_command_get_stats(cmd);
-    lsp->raddr = rtpp_command_get_raddr(cmd);
+    if (lsp == NULL)
+        goto e0;
+    lsp->scmd = (struct rtpp_command){.glog = cmd->glog, .reply = cmd->reply};
+    ulop = rtpp_command_ul_opts_parse_inner(cfsp, &lsp->scmd, &pcmd, &ecode);
+    if (ulop == NULL)
+        goto e1;
+    lsp->scmd.reply = NULL;
+    lsp->scmd.laddr = cmd->laddr;
+    lsp->scmd.dtime = cmd->dtime;
+    lsp->scmd.cca.op = pcmd.op;
+    lsp->scmd.cca.opts.ul = ulop;
+    lsp->scmd.cca.call_id = cmd->cca.call_id;
+    lsp->scmd.cca.from_tag = cmd->cca.from_tag;
+    lsp->scmd.cca.to_tag = cmd->cca.to_tag;
+    lsp->scmd.raddr = cmd->raddr;
+    lsp->scmd.csp = cmd->csp;
     RTPP_OBJ_DTOR_ATTACH_s(lsp, (rtpp_refcnt_dtor_t)&rtpp_command_ul_opts_free,
       ulop);
     asp->args.stat = (void *)cfsp;
@@ -187,6 +163,10 @@ rtpp_command_ul_look_subc_parse(const struct rtpp_cfg *cfsp,
         return -1;
     }
     return (0);
+e1:
+    free(lsp);
+e0:
+    return (-1);
 }
 
 #if ENABLE_MODULE_IF

src/rtpp_command.c

@@ -217,10 +217,12 @@ rtpp_command_ctor(const struct rtpp_cfg *cfsp, int controlfd,
     pvt->ctx.dtime.wall = dtime->wall;
     pvt->ctx.dtime.mono = dtime->mono;
     cmd->dtime = &pvt->ctx.dtime;
-    pvt->ctx.csp = csp;
+    cmd->csp = pvt->ctx.csp = csp;
     cmd->glog = cfsp->glog;
     pvt->ctx.umode = umode;
     cmd->reply = rtpc_reply_ctor(&pvt->ctx);
+    pvt->ctx.raddr.a = &pvt->ctx._raddr;
+    cmd->raddr = &pvt->ctx.raddr;
     if (cmd->reply == NULL) {
         RTPP_OBJ_DECREF(cmd);
         return (NULL);
@@ -235,29 +237,24 @@ rtpp_command_set_raddr(struct rtpp_command *cmd, const struct sockaddr *raddr, s
     struct rtpp_command_priv *pvt;
 
     PUB2PVT(cmd, pvt);
-    memcpy(&pvt->ctx.raddr, raddr, rlen);
-    pvt->ctx.rlen = rlen;
+    memcpy(&pvt->ctx._raddr, raddr, rlen);
+    pvt->ctx.raddr.l = rlen;
 }
 
 struct rtpp_sockaddr
 rtpp_command_get_raddr(const struct rtpp_command *cmd)
 {
-    struct rtpp_sockaddr raddr;
     const struct rtpp_command_priv *pvt;
 
     PUB2PVT(cmd, pvt);
-    raddr.a = &pvt->ctx.raddr;
-    raddr.l = pvt->ctx.rlen;
-    return (raddr);
+    return (pvt->ctx.raddr);
 }
 
 struct rtpp_command_stats *
 rtpp_command_get_stats(const struct rtpp_command *cmd)
 {
-    const struct rtpp_command_priv *pvt;
 
-    PUB2PVT(cmd, pvt);
-    return (pvt->ctx.csp);
+    return (cmd->csp);
 }
 
 struct rtpp_command *
@@ -303,9 +300,9 @@ get_command(const struct rtpp_cfg *cfsp, struct rtpp_ctrl_sock *rcsp, int contro
             lp = &asize;
             raddr = sstosa(&rcsp->emrg.addr);
         } else {
-            pvt->ctx.rlen = sizeof(pvt->ctx.raddr);
-            lp = &pvt->ctx.rlen;
-            raddr = sstosa(&pvt->ctx.raddr);
+            pvt->ctx.raddr.l = sizeof(pvt->ctx._raddr);
+            lp = &pvt->ctx.raddr.l;
+            raddr = sstosa(pvt->ctx.raddr.a);
         }
         len = recvfrom(controlfd, bp, bsize - 1, 0, raddr, lp);
     }
@@ -354,11 +351,11 @@ rtpp_command_guard_retrans(struct rtpp_command *cmd,
     }
     len = cres->reply->len;
     int r = rtpp_anetio_sendto_na(pvt->ctx.cfs->rtpp_proc_cf->netio, pvt->ctx.controlfd,
-      cres->reply->s, len, 0, sstosa(&pvt->ctx.raddr), pvt->ctx.rlen, cres->rcnt);
+      cres->reply->s, len, 0, sstosa(pvt->ctx.raddr.a), pvt->ctx.raddr.l, cres->rcnt);
     if (r != 0)
         RTPP_OBJ_DECREF(cres);
-    pvt->ctx.csp->ncmds_rcvd.cnt--;
-    pvt->ctx.csp->ncmds_rcvd_ndups.cnt++;
+    cmd->csp->ncmds_rcvd.cnt--;
+    cmd->csp->ncmds_rcvd_ndups.cnt++;
     return (1);
 }
 
@@ -379,7 +376,7 @@ rtpp_command_split(struct rtpp_command *cmd, int len, int *rval,
         RTPP_LOG(pvt->ctx.cfs->glog, RTPP_LOG_DBUG, "received command \"%s\"",
           cmd->buf);
     }
-    pvt->ctx.csp->ncmds_rcvd.cnt++;
+    cmd->csp->ncmds_rcvd.cnt++;
 
     cap = &cmd->args;
     rtpp_strsplit(cmd->buf, mbuf, len, sizeof(mbuf));