osmocom
/
libosmo-netif
mirror of https://gerrit.osmocom.org/libosmo-netif
11
0
Fork 0
Code Issues Releases Wiki Activity

osmux: Drop long time deprecated APIs 

Those APIs where deprecated 4 years ago (end of Aug 2018), and they have
not been used since around that time. Hence it can be considered safe to
drop them, since they only make the whole code more complex to
understand.

API osmux_xfrm_output_init() is left since openbsc.git is still using
it.

Related: OS#5987
Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853
This commit is contained in:
Pau Espin 2022-08-31 16:16:06 +02:00
parent bc45a8f599
commit 51fa5ad16e
2 changed files with 0 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocom/netif/osmux.h
View File

@ -110,13 +110,9 @@ void osmux_xfrm_input_deliver(struct osmux_in_handle *h);
void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) OSMO_DEPRECATED("Use osmux_xfrm_output_init2() instead");
void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type);
void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, void (*tx_cb)(struct msgb *msg, void *data), void *data);
int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h, struct llist_head *list) OSMO_DEPRECATED("Use osmux_xfrm_output_sched() instead");
int osmux_xfrm_output_sched(struct osmux_out_handle *h, struct osmux_hdr *osmuxh);
void osmux_xfrm_output_flush(struct osmux_out_handle *h);
struct osmux_hdr *osmux_xfrm_output_pull(struct msgb *msg);
void osmux_tx_sched(struct llist_head *list, void (*tx_cb)(struct msgb *msg, void *data), void *data) OSMO_DEPRECATED("Use osmux_xfrm_output_set_tx_cb() instead");
/*! @} */
#endif

118
src/osmux.c
View File

@ -44,12 +44,6 @@
* \brief Osmocom multiplex protocol helpers
*/
/* This allows you to debug timing reconstruction in the output path */
#if 0
#define DEBUG_TIMING 0
#endif
/* This allows you to debug osmux message transformations (spamming) */
#if 0
#define DEBUG_MSG 0
@ -191,46 +185,6 @@ osmux_rebuild_rtp(struct osmux_out_handle *h, struct osmux_hdr *osmuxh,
return out_msg;
}
int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h,
struct llist_head *list)
{
struct msgb *msg;
int i;
INIT_LLIST_HEAD(list);
for (i=0; i<osmuxh->ctr+1; i++) {
struct rtp_hdr *rtph;
msg = osmux_rebuild_rtp(h, osmuxh,
osmux_get_payload(osmuxh) +
i * osmo_amr_bytes(osmuxh->amr_ft),
osmo_amr_bytes(osmuxh->amr_ft), !i);
if (msg == NULL)
continue;
rtph = osmo_rtp_get_hdr(msg);
if (rtph == NULL)
continue;
#ifdef DEBUG_MSG
{
char buf[4096];
osmo_rtp_snprintf(buf, sizeof(buf), msg);
buf[sizeof(buf)-1] = '\0';
LOGP(DLMUX, LOGL_DEBUG, "to BTS: %s\n", buf);
}
#endif
llist_add_tail(&msg->list, list);
}
/* Update last seen seq number: */
h->osmux_seq_ack = osmuxh->seq;
return i;
}
static void osmux_xfrm_output_trigger(void *data)
{
struct osmux_out_handle *h = data;
@ -924,80 +878,8 @@ struct osmux_tx_handle {
struct msgb *msg;
void (*tx_cb)(struct msgb *msg, void *data);
void *data;
#ifdef DEBUG_TIMING
struct timeval start;
struct timeval when;
#endif
};
static void osmux_tx_cb(void *data)
{
struct osmux_tx_handle *h = data;
#ifdef DEBUG_TIMING
struct timeval now, diff;
osmo_gettimeofday(&now, NULL);
timersub(&now, &h->start, &diff);
timersub(&diff,&h->when, &diff);
LOGP(DLMUX, LOGL_DEBUG, "we are lagging %lu.%.6lu in scheduled "
"transmissions\n", diff.tv_sec, diff.tv_usec);
#endif
h->tx_cb(h->msg, h->data);
talloc_free(h);
}
static void
osmux_tx(struct msgb *msg, struct timeval *when,
void (*tx_cb)(struct msgb *msg, void *data), void *data)
{
struct osmux_tx_handle *h;
h = talloc_zero(osmux_ctx, struct osmux_tx_handle);
if (h == NULL)
return;
h->msg = msg;
h->tx_cb = tx_cb;
h->data = data;
osmo_timer_setup(&h->timer, osmux_tx_cb, h);
#ifdef DEBUG_TIMING
osmo_gettimeofday(&h->start, NULL);
h->when.tv_sec = when->tv_sec;
h->when.tv_usec = when->tv_usec;
#endif
/* send it now */
if (when->tv_sec == 0 && when->tv_usec == 0) {
osmux_tx_cb(h);
return;
}
osmo_timer_schedule(&h->timer, when->tv_sec, when->tv_usec);
}
void
osmux_tx_sched(struct llist_head *list,
void (*tx_cb)(struct msgb *msg, void *data), void *data)
{
struct msgb *cur, *tmp;
struct timeval delta = { .tv_sec = 0, .tv_usec = DELTA_RTP_MSG };
struct timeval when;
timerclear(&when);
llist_for_each_entry_safe(cur, tmp, list, list) {
#ifdef DEBUG_MSG
LOGP(DLMUX, LOGL_DEBUG, "scheduled transmision in %lu.%6lu "
"seconds, msg=%p\n", when.tv_sec, when.tv_usec, cur);
#endif
llist_del(&cur->list);
osmux_tx(cur, &when, tx_cb, data);
timeradd(&when, &delta, &when);
}
}
void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type)
{
memset(h, 0, sizeof(*h));