Allocate struct osmux_in_handle through new libosmo-netif APIs
Change-Id: I013c99d1f915279684ce278648e9c69e39b94266
Depends: libosmo-netif.git I752ab031f935f04731bb1a354333f1682a1aa5bd
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index a4ce024..5c3ddbf 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -144,7 +144,7 @@
in->stats.output_osmux_msgs,
in->stats.output_osmux_bytes);
llist_del(&h->head);
- osmux_xfrm_input_fini(h->in);
+ TALLOC_FREE(h->in);
talloc_free(h);
}
return;
@@ -167,22 +167,17 @@
h->rem_addr = *rem_addr;
h->refcnt++;
- h->in = talloc_zero(h, struct osmux_in_handle);
+ h->in = osmux_xfrm_input_alloc(h);
if (!h->in) {
talloc_free(h);
return NULL;
}
-
/* sequence number to start OSMUX message from */
- h->in->osmux_seq = 0;
-
- h->in->batch_factor = cfg->osmux_batch;
-
- /* If batch size is zero, the library defaults to 1470 bytes. */
- h->in->batch_size = cfg->osmux_batch_size;
- h->in->deliver = osmux_deliver_cb;
- osmux_xfrm_input_init(h->in);
- h->in->data = h;
+ osmux_xfrm_input_set_initial_seqnum(h->in, 0);
+ osmux_xfrm_input_set_batch_factor(h->in, cfg->osmux_batch);
+ /* If batch size is zero, the library defaults to 1472 bytes. */
+ osmux_xfrm_input_set_batch_size(h->in, cfg->osmux_batch_size);
+ osmux_xfrm_input_set_deliver_cb(h->in, osmux_deliver_cb, h);
llist_add(&h->head, &osmux_handle_list);