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

osmux: Unify return codes of osmux_batch_add() and osmux_batch_enqueue() 

This way it's way easier to return the error to the caller, and the code
is easier to read.

Change-Id: Ib78c9b82b85c74be2c5e94dae7c212175244d5fa
This commit is contained in:
Pau Espin 2022-09-27 18:20:56 +02:00
parent 845a386dcd
commit d6e8765faf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osmux.c
View File

@ -311,6 +311,7 @@ struct osmux_circuit {
int dummy; int dummy;
}; };
/* returns: 1 if batch is full, 0 if batch still not full, negative on error. */
static int osmux_batch_enqueue(struct msgb *msg, struct osmux_circuit *circuit, static int osmux_batch_enqueue(struct msgb *msg, struct osmux_circuit *circuit,
uint8_t batch_factor) uint8_t batch_factor)
{ {
@ -325,7 +326,7 @@ static int osmux_batch_enqueue(struct msgb *msg, struct osmux_circuit *circuit,
return -1; return -1;
LOGP(DLMUX, LOGL_DEBUG, "Batch is full for RTP sssrc=%u\n", rtph->ssrc); LOGP(DLMUX, LOGL_DEBUG, "Batch is full for RTP sssrc=%u\n", rtph->ssrc);
return -1; return 1;
} }
llist_add_tail(&msg->list, &circuit->msg_list); llist_add_tail(&msg->list, &circuit->msg_list);
@ -606,7 +607,7 @@ static void osmux_replay_lost_packets(struct osmux_circuit *circuit,
DELTA_RTP_TIMESTAMP); DELTA_RTP_TIMESTAMP);
/* No more room in this batch, skip padding with more clones */ /* No more room in this batch, skip padding with more clones */
if (osmux_batch_enqueue(clone, circuit, batch_factor) < 0) { if (osmux_batch_enqueue(clone, circuit, batch_factor) != 0) {
msgb_free(clone); msgb_free(clone);
break; break;
} }
@ -668,6 +669,7 @@ static void osmux_batch_del_circuit(struct osmux_batch *batch, struct osmux_circ
talloc_free(circuit); talloc_free(circuit);
} }
/* returns: 1 if batch is full, 0 if batch still not full, negative on error. */
static int static int
osmux_batch_add(struct osmux_batch *batch, uint32_t batch_factor, struct msgb *msg, osmux_batch_add(struct osmux_batch *batch, uint32_t batch_factor, struct msgb *msg,
struct rtp_hdr *rtph, int ccid) struct rtp_hdr *rtph, int ccid)
@ -675,6 +677,7 @@ osmux_batch_add(struct osmux_batch *batch, uint32_t batch_factor, struct msgb *m
int bytes = 0, amr_payload_len; int bytes = 0, amr_payload_len;
struct osmux_circuit *circuit; struct osmux_circuit *circuit;
struct msgb *cur; struct msgb *cur;
int rc;
circuit = osmux_batch_find_circuit(batch, ccid); circuit = osmux_batch_find_circuit(batch, ccid);
if (!circuit) if (!circuit)
@ -727,8 +730,9 @@ osmux_batch_add(struct osmux_batch *batch, uint32_t batch_factor, struct msgb *m
osmux_replay_lost_packets(circuit, rtph, batch_factor); osmux_replay_lost_packets(circuit, rtph, batch_factor);
/* This batch is full, force batch delivery */ /* This batch is full, force batch delivery */
if (osmux_batch_enqueue(msg, circuit, batch_factor) < 0) rc = osmux_batch_enqueue(msg, circuit, batch_factor);
return 1; if (rc != 0)
return rc;
#ifdef DEBUG_MSG #ifdef DEBUG_MSG
LOGP(DLMUX, LOGL_DEBUG, "adding msg with ssrc=%u to batch\n", LOGP(DLMUX, LOGL_DEBUG, "adding msg with ssrc=%u to batch\n",