aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmux.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@soleta.eu>2015-07-17 19:55:18 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-07-21 09:59:49 +0200
commitb3fc27423a76ab4178a3734423800bebd2e9f639 (patch)
tree5cbce02d704179b536ec6baf3e813260b208fc5d /src/osmux.c
parentab898deea3903202ae98a2e258b861ec38f4ceed (diff)
osmux: introduce osmux_xfrm_input_close_circuit()
Add this new function to explicitly remove an existing circuit. Thus, the client application (openbsc) is in full control to release circuits. Before this patch, the circuit object was added when the first RTP messages was seen, and it was removed when transforming the list of pending RTP messages to the Osmux message (once the timer expired). Moreover, check circuit->nmsgs to account bytes that are consumed by the osmux header, given that !circuit doesn't mean "this is the first packet" anymore.
Diffstat (limited to 'src/osmux.c')
-rw-r--r--src/osmux.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/src/osmux.c b/src/osmux.c
index 82ec56e..4451b5a 100644
--- a/src/osmux.c
+++ b/src/osmux.c
@@ -289,7 +289,7 @@ static struct msgb *osmux_build_batch(struct osmux_batch *batch,
uint32_t batch_size)
{
struct msgb *batch_msg;
- struct osmux_circuit *circuit, *next;
+ struct osmux_circuit *circuit;
#ifdef DEBUG_MSG
LOGP(DLMIB, LOGL_DEBUG, "Now building batch\n");
@@ -301,7 +301,7 @@ static struct msgb *osmux_build_batch(struct osmux_batch *batch,
return NULL;
}
- llist_for_each_entry_safe(circuit, next, &batch->circuit_list, head) {
+ llist_for_each_entry(circuit, &batch->circuit_list, head) {
struct msgb *cur, *tmp;
int ctr = 0;
@@ -336,8 +336,6 @@ static struct msgb *osmux_build_batch(struct osmux_batch *batch,
ctr++;
batch->nmsgs--;
}
- llist_del(&circuit->head);
- talloc_free(circuit);
}
return batch_msg;
}
@@ -487,6 +485,18 @@ osmux_batch_add_circuit(struct osmux_batch *batch, int ccid)
return circuit;
}
+static void osmux_batch_del_circuit(struct osmux_batch *batch, int ccid)
+{
+ struct osmux_circuit *circuit;
+
+ circuit = osmux_batch_find_circuit(batch, ccid);
+ if (circuit == NULL)
+ return;
+
+ llist_del(&circuit->head);
+ talloc_free(circuit);
+}
+
static int
osmux_batch_add(struct osmux_batch *batch, int batch_factor, struct msgb *msg,
struct rtp_hdr *rtph, int ccid)
@@ -502,7 +512,7 @@ osmux_batch_add(struct osmux_batch *batch, int batch_factor, struct msgb *msg,
/* First check if there is room for this message in the batch */
bytes += amr_payload_len;
- if (!circuit)
+ if (!circuit || circuit->nmsgs == 0)
bytes += sizeof(struct osmux_hdr);
/* No room, sorry. You'll have to retry */
@@ -645,6 +655,13 @@ void osmux_xfrm_input_init(struct osmux_in_handle *h)
LOGP(DLMIB, LOGL_DEBUG, "initialized osmux input converter\n");
}
+void osmux_xfrm_input_close_circuit(struct osmux_in_handle *h, int ccid)
+{
+ struct osmux_batch *batch = (struct osmux_batch *)h->internal_data;
+
+ osmux_batch_del_circuit(batch, ccid);
+}
+
void osmux_xfrm_input_fini(struct osmux_in_handle *h)
{
struct osmux_batch *batch = (struct osmux_batch *)h->internal_data;