[PATCH] openbsc[master]: mgcp: switch to new osmux output APIs

[Pau Espin Pedrol]

Review at  https://gerrit.osmocom.org/7886

mgcp: switch to new osmux output APIs

Older ones are being deprecated as they may generate interleaved
packets.

Depends on libosmo-netif.git Change-Id 
I4e05ff141eb4041128ae77812bbcfe84ed4c02de.

Change-Id: I189564fc63139c15314db8975afd423c7153ea32
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/86/7886/1

diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index c52984b..69124d2 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -267,7 +267,6 @@
 {
        struct msgb *msg;
        struct osmux_hdr *osmuxh;
-       struct llist_head list;
        struct sockaddr_in addr;
        struct mgcp_config *cfg = ofd->data;
        uint32_t rem;
@@ -297,8 +296,7 @@
                endp->osmux.stats.chunks++;
                rem = msg->len;
 
-               osmux_xfrm_output(osmuxh, &endp->osmux.out, &list);
-               osmux_tx_sched(&list, scheduled_tx_bts_cb, endp);
+               osmux_xfrm_output_sched(&endp->osmux.out, osmuxh);
        }
 out:
        msgb_free(msg);
@@ -359,7 +357,6 @@
 {
        struct msgb *msg;
        struct osmux_hdr *osmuxh;
-       struct llist_head list;
        struct sockaddr_in addr;
        struct mgcp_config *cfg = ofd->data;
        uint32_t rem;
@@ -389,8 +386,7 @@
                endp->osmux.stats.chunks++;
                rem = msg->len;
 
-               osmux_xfrm_output(osmuxh, &endp->osmux.out, &list);
-               osmux_tx_sched(&list, scheduled_tx_net_cb, endp);
+               osmux_xfrm_output_sched(&endp->osmux.out, osmuxh);
        }
 out:
        msgb_free(msg);
@@ -470,9 +466,13 @@
        switch (endp->cfg->role) {
                case MGCP_BSC_NAT:
                        endp->type = MGCP_OSMUX_BSC_NAT;
+                       osmux_xfrm_output_set_tx_cb(&endp->osmux.out,
+                                                       scheduled_tx_net_cb, 
endp);
                        break;
                case MGCP_BSC:
                        endp->type = MGCP_OSMUX_BSC;
+                       osmux_xfrm_output_set_tx_cb(&endp->osmux.out,
+                                                       scheduled_tx_bts_cb, 
endp);
                        break;
        }
        endp->osmux.state = OSMUX_STATE_ENABLED;
@@ -484,6 +484,11 @@
 {
        LOGP(DMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n",
             ENDPOINT_NUMBER(endp), endp->osmux.cid);
+
+       /* We are closing, we don't need pending RTP packets to be transmitted 
*/
+       osmux_xfrm_output_set_tx_cb(&endp->osmux.out, NULL, NULL);
+       osmux_xfrm_output_flush(&endp->osmux.out);
+
        osmux_xfrm_input_close_circuit(endp->osmux.in, endp->osmux.cid);
        endp->osmux.state = OSMUX_STATE_DISABLED;
        endp->osmux.cid = -1;

-- 
To view, visit https://gerrit.osmocom.org/7886
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I189564fc63139c15314db8975afd423c7153ea32
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de>