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

osmux: Check batch_factor overflow in osmux_batch_enqueue 

This commit should fix a bug present if for instance batch_factor < 8
and osmux_batch_enqueue is called from osmux_replay_lost_packets and
enough packets were lost from last received packet.

Change-Id: I5d643810949aeca4762f0cad05eed534d35087f7
This commit is contained in:
Pau Espin 2017-04-12 16:11:50 +02:00
parent a15d00ca57
commit a67c47cab4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/osmux.c
View File

@ -206,12 +206,13 @@ struct osmux_circuit {
int dummy;
};
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)
{
/* Too many messages per batch, discard it. The counter field of the
* osmux header is just 3 bits long, so make sure it doesn't overflow.
*/
if (circuit->nmsgs >= 8) {
if (circuit->nmsgs >= batch_factor || circuit->nmsgs >= 8) {
struct rtp_hdr *rtph;
rtph = osmo_rtp_get_hdr(msg);
@ -454,7 +455,7 @@ static int osmux_rtp_amr_payload_len(struct msgb *msg, struct rtp_hdr *rtph)
}
static void osmux_replay_lost_packets(struct osmux_circuit *circuit,
struct rtp_hdr *cur_rtph)
struct rtp_hdr *cur_rtph, int batch_factor)
{
int16_t diff;
struct msgb *last;
@ -500,7 +501,7 @@ static void osmux_replay_lost_packets(struct osmux_circuit *circuit,
DELTA_RTP_TIMESTAMP);
/* No more room in this batch, skip padding with more clones */
if (osmux_batch_enqueue(clone, circuit) < 0) {
if (osmux_batch_enqueue(clone, circuit, batch_factor) < 0) {
msgb_free(clone);
break;
}
@ -609,10 +610,10 @@ osmux_batch_add(struct osmux_batch *batch, uint32_t batch_factor, struct msgb *m
}
}
/* Handle RTP packet loss scenario */
osmux_replay_lost_packets(circuit, rtph);
osmux_replay_lost_packets(circuit, rtph, batch_factor);
/* This batch is full, force batch delivery */
if (osmux_batch_enqueue(msg, circuit) < 0)
if (osmux_batch_enqueue(msg, circuit, batch_factor) < 0)
return 1;
#ifdef DEBUG_MSG