sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#57550 Unconfirm monologue medias using subs

Browse Source 
In the `dialogue_unconfirm()` (previously `dialogue_unkernelize()`)
use media subscriptions to find subscribers/subscriptions
and correlated to them medias to unconfirm them.

This change is bound to the switch from monologue
subscriptions to media subscriptions.

Additionally: Refactor unkernelize/unconfirm in `call.c`

To provide a sense of the functions clearer,
the namings of the following function singatures
have been changed:
- `dialogue_unkernelize()` -> `dialogue_unconfirm()`
- `__monologue_unkernelize()` -> `__monologue_unconfirm()`

Change-Id: If8cc2515eb26dcc4ffed02a420514f98d43cc5c6
pull/1752/head
Donat Zenichev 2 years ago
parent 8640112ff8
commit b923e5e039
4 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File

85
daemon/call.c
Unescape View File

@ -3564,7 +3564,7 @@ int monologue_subscribe_answer(struct call_monologue *dst_ml, struct sdp_ng_flag
}
__update_init_subscribers(dst_ml, streams, flags, flags->opmode);
dialogue_unkernelize(dst_ml, "subscribe answer event");
dialogue_unconfirm(dst_ml, "subscribe answer event");
AUTO_CLEANUP(GQueue mls, g_queue_clear) = G_QUEUE_INIT; /* to avoid duplications */
for (int i = 0; i < dst_ml->medias->len; i++)
@ -3579,7 +3579,7 @@ int monologue_subscribe_answer(struct call_monologue *dst_ml, struct sdp_ng_flag
if (!g_queue_find(&mls, ms->monologue)) {
set_monologue_flags_per_subscribers(ms->monologue);
__update_init_subscribers(ms->monologue, NULL, NULL, flags->opmode);
dialogue_unkernelize(ms->monologue, "subscribe answer event");
dialogue_unconfirm(ms->monologue, "subscribe answer event");
g_queue_push_tail(&mls, ms->monologue);
}
}
@ -3601,8 +3601,8 @@ int monologue_unsubscribe(struct call_monologue *dst_ml, struct sdp_ng_flags *fl
__update_init_subscribers(dst_ml, NULL, NULL, flags->opmode);
__update_init_subscribers(src_ml, NULL, NULL, flags->opmode);
dialogue_unkernelize(src_ml, "monologue unsubscribe");
dialogue_unkernelize(dst_ml, "monologue unsubscribe");
dialogue_unconfirm(src_ml, "monologue unsubscribe");
dialogue_unconfirm(dst_ml, "monologue unsubscribe");
l = next;
}
@ -4270,8 +4270,11 @@ static void __unconfirm_sinks(GQueue *q, const char *reason) {
__stream_unconfirm(sh->sink, reason);
}
}
/* must be called with call->master_lock held in W */
void __monologue_unkernelize(struct call_monologue *monologue, const char *reason) {
/**
* Unconfirms sinks and streams of all monologue medias.
* must be called with call->master_lock held in W
*/
void __monologue_unconfirm(struct call_monologue *monologue, const char *reason) {
if (!monologue)
return;
@ -4279,16 +4282,13 @@ void __monologue_unkernelize(struct call_monologue *monologue, const char *reaso
struct call_media *media = monologue->medias->pdata[i];
if (!media)
continue;
for (GList *m = media->streams.head; m; m = m->next) {
struct packet_stream *stream = m->data;
__stream_unconfirm(stream, reason);
__unconfirm_sinks(&stream->rtp_sinks, reason);
__unconfirm_sinks(&stream->rtcp_sinks, reason);
}
__media_unconfirm(media, reason);
}
}
/* must be called with call->master_lock held in W */
/**
* Unconfirms sinks and streams of given media.
* must be called with call->master_lock held in W
*/
void __media_unconfirm(struct call_media *media, const char *reason) {
if (!media)
return;
@ -4300,16 +4300,36 @@ void __media_unconfirm(struct call_media *media, const char *reason) {
__unconfirm_sinks(&stream->rtcp_sinks, reason);
}
}
void dialogue_unkernelize(struct call_monologue *ml, const char *reason) {
__monologue_unkernelize(ml, reason);
/**
* Unconfirms all monologue medias and its subscribers/subscriptions.
*/
void dialogue_unconfirm(struct call_monologue *ml, const char *reason) {
__monologue_unconfirm(ml, reason);
for (GList *sub = ml->subscriptions.head; sub; sub = sub->next) {
struct call_subscription *cs = sub->data;
__monologue_unkernelize(cs->monologue, reason);
}
for (GList *sub = ml->subscribers.head; sub; sub = sub->next) {
struct call_subscription *cs = sub->data;
__monologue_unkernelize(cs->monologue, reason);
/* TODO: this seems to be doing similar work as `__monologue_unconfirm()`
* but works instead on subscriptions additionally. For the future
* this should probably be deprecated and `__monologue_unconfirm()`
* has to take the work on subscribers/subscriptions as well.
*/
for (unsigned int i = 0; i < ml->medias->len; i++)
{
struct call_media *media = ml->medias->pdata[i];
if (!media)
continue;
for (GList *l = media->media_subscriptions.head; l; l = l->next)
{
struct media_subscription * ms = l->data;
if (!ms->media)
continue;
__media_unconfirm(ms->media, reason);
}
for (GList *l = media->media_subscribers.head; l; l = l->next)
{
struct media_subscription * ms = l->data;
if (!ms->media)
continue;
__media_unconfirm(ms->media, reason);
}
}
}
@ -4319,7 +4339,10 @@ static void __unkernelize_sinks(GQueue *q, const char *reason) {
unkernelize(sh->sink, reason);
}
}
/* call locked in R */
/**
* Unkernelizes sinks and streams of given media.
* call locked in R
*/
void call_media_unkernelize(struct call_media *media, const char *reason) {
if (!media)
return;
@ -4350,7 +4373,7 @@ void monologue_destroy(struct call_monologue *monologue) {
STR_FMT(&monologue->tag),
STR_FMT0(&monologue->viabranch));
__monologue_unkernelize(monologue, "destroying monologue");
__monologue_unconfirm(monologue, "destroying monologue");
__tags_unassociate_all(monologue);
g_hash_table_remove(call->tags, &monologue->tag);
@ -4583,7 +4606,7 @@ static int call_get_monologue_new(struct call_monologue *monologues[2], struct c
__C_DBG("found existing monologue");
/* unkernelize existing monologue medias, which are subscribed to something */
__monologue_unkernelize(ret, "signalling on existing monologue");
__monologue_unconfirm(ret, "signalling on existing monologue");
for (int i = 0; i < ret->medias->len; i++)
{
struct call_media * media = ret->medias->pdata[i];
@ -4626,7 +4649,7 @@ static int call_get_monologue_new(struct call_monologue *monologues[2], struct c
os = g_hash_table_lookup(call->viabranches, viabranch);
if (os) {
/* previously seen branch. use it */
__monologue_unkernelize(os, "dialogue/branch association changed");
__monologue_unconfirm(os, "dialogue/branch association changed");
__subscribe_offer_answer_both_ways(ret, os); /* TODO: deprecate */
/* susbcribe medias to medias */
@ -4744,16 +4767,16 @@ tag_setup:
if (!ft->tag.s || str_cmp_str(&ft->tag, fromtag))
__monologue_tag(ft, fromtag);
dialogue_unkernelize(ft, "dialogue signalling event");
dialogue_unkernelize(tt, "dialogue signalling event");
dialogue_unconfirm(ft, "dialogue signalling event");
dialogue_unconfirm(tt, "dialogue signalling event");
__subscribe_offer_answer_both_ways(ft, tt);
/* susbcribe medias to medias */
__subscribe_matched_medias(ft, tt);
done:
__monologue_unkernelize(ft, "dialogue signalling event");
dialogue_unkernelize(ft, "dialogue signalling event");
__monologue_unconfirm(ft, "dialogue signalling event");
dialogue_unconfirm(ft, "dialogue signalling event");
__tags_associate(ft, tt);
/* just provide gotten dialogs,

6
daemon/call_interfaces.c
Unescape View File

@ -2715,7 +2715,7 @@ found:
return "From-tag given, but no such tag exists";
}
if (*monologue)
__monologue_unkernelize(*monologue, "media blocking signalling event");
__monologue_unconfirm(*monologue, "media blocking signalling event");
return NULL;
}
static const char *media_block_match(struct call **call, struct call_monologue **monologue,
@ -3126,7 +3126,7 @@ static const char *call_block_silence_media(bencode_item_t *input, bool on_off,
STR_FMT_M(&monologue->tag));
bf_set_clear(&monologue->ml_flags, ml_flag, on_off);
}
__monologue_unkernelize(monologue, "media silencing signalling event");
__monologue_unconfirm(monologue, "media silencing signalling event");
}
else {
bf_set_clear(&call->call_flags, call_flag, on_off);
@ -3345,7 +3345,7 @@ const char *call_play_dtmf_ng(bencode_item_t *input, bencode_item_t *output) {
found:
ML_SET(monologue, DTMF_INJECTION_ACTIVE);
dialogue_unkernelize(monologue, "DTMF playback");
dialogue_unconfirm(monologue, "DTMF playback");
for (GList *k = monologue->subscribers.head; k; k = k->next) {
struct call_subscription *cs = k->data;

4
daemon/codec.c
Unescape View File

@ -4201,7 +4201,7 @@ void codec_update_all_handlers(struct call_monologue *ml) {
}
}
dialogue_unkernelize(ml, "updating codec handlers");
dialogue_unconfirm(ml, "updating codec handlers");
}
void codec_update_all_source_handlers(struct call_monologue *ml, const struct sdp_ng_flags *flags) {
@ -4223,7 +4223,7 @@ void codec_update_all_source_handlers(struct call_monologue *ml, const struct sd
}
}
dialogue_unkernelize(ml, "updating codec source handlers");
dialogue_unconfirm(ml, "updating codec source handlers");
}

8
include/call.h
Unescape View File

@ -783,9 +783,9 @@ struct call_media *call_media_new(struct call *call);
void call_media_free(struct call_media **mdp);
enum call_stream_state call_stream_state_machine(struct packet_stream *);
void call_media_state_machine(struct call_media *m);
void call_media_unkernelize(struct call_media *media, const char *);
void dialogue_unkernelize(struct call_monologue *ml, const char *);
void __monologue_unkernelize(struct call_monologue *monologue, const char *);
void call_media_unkernelize(struct call_media *media, const char *reason);
void dialogue_unconfirm(struct call_monologue *ml, const char *);
void __monologue_unconfirm(struct call_monologue *monologue, const char *);
void __media_unconfirm(struct call_media *media, const char *);
void update_init_subscribers(struct call_monologue *ml, enum call_opmode opmode);
@ -856,7 +856,7 @@ INLINE str *call_str_init_dup(struct call *c, char *s) {
INLINE void __call_unkernelize(struct call *call, const char *reason) {
for (GList *l = call->monologues.head; l; l = l->next) {
struct call_monologue *ml = l->data;
__monologue_unkernelize(ml, reason);
__monologue_unconfirm(ml, reason);
}
}
INLINE endpoint_t *packet_stream_local_addr(struct packet_stream *ps) {

Write Preview
Loading…
Cancel
Save