Browse Source

TT#91151 switch SDP parsed vars to auto cleanup

Change-Id: Iee3a76c6224c4524fce7da15be8ad65d6f020aa7
pull/1295/head
Richard Fuchs 5 years ago
parent
commit
72bb874cc5
1 changed files with 5 additions and 10 deletions
  1. +5
    -10
      daemon/call_interfaces.c

+ 5
- 10
daemon/call_interfaces.c View File

@ -307,7 +307,7 @@ static void streams_parse(const char *s, GQueue *q) {
static str *call_request_lookup_tcp(char **out, enum call_opmode opmode) { static str *call_request_lookup_tcp(char **out, enum call_opmode opmode) {
struct call *c; struct call *c;
struct call_monologue *dialogue[2]; struct call_monologue *dialogue[2];
GQueue s = G_QUEUE_INIT;
AUTO_CLEANUP(GQueue s, sdp_streams_free) = G_QUEUE_INIT;
str *ret = NULL, callid, fromtag, totag = STR_NULL; str *ret = NULL, callid, fromtag, totag = STR_NULL;
GHashTable *infohash; GHashTable *infohash;
@ -346,7 +346,6 @@ static str *call_request_lookup_tcp(char **out, enum call_opmode opmode) {
out2: out2:
rwlock_unlock_w(&c->master_lock); rwlock_unlock_w(&c->master_lock);
sdp_streams_free(&s);
redis_update_onekey(c, rtpe_redis_write); redis_update_onekey(c, rtpe_redis_write);
@ -1326,12 +1325,12 @@ static const char *call_offer_answer_ng(struct ng_buffer *ngbuf, bencode_item_t
const endpoint_t *sin) const endpoint_t *sin)
{ {
const char *errstr; const char *errstr;
GQueue parsed = G_QUEUE_INIT;
GQueue streams = G_QUEUE_INIT;
AUTO_CLEANUP(GQueue parsed, sdp_free) = G_QUEUE_INIT;
AUTO_CLEANUP(GQueue streams, sdp_streams_free) = G_QUEUE_INIT;
struct call *call; struct call *call;
struct call_monologue *dialogue[2]; struct call_monologue *dialogue[2];
int ret; int ret;
struct sdp_ng_flags flags;
AUTO_CLEANUP(struct sdp_ng_flags flags, call_ng_free_flags);
struct sdp_chopper *chopper; struct sdp_chopper *chopper;
call_ng_process_flags(&flags, input, opmode); call_ng_process_flags(&flags, input, opmode);
@ -1493,10 +1492,6 @@ static const char *call_offer_answer_ng(struct ng_buffer *ngbuf, bencode_item_t
errstr = NULL; errstr = NULL;
out: out:
sdp_free(&parsed);
sdp_streams_free(&streams);
call_ng_free_flags(&flags);
return errstr; return errstr;
} }
@ -1824,7 +1819,7 @@ stats:
} }
} }
else { else {
ml = g_hash_table_lookup(call->tags, match_tag);
ml = call_get_monologue(call, match_tag);
if (ml) { if (ml) {
ng_stats_monologue(tags, ml, totals); ng_stats_monologue(tags, ml, totals);
for (GList *l = ml->subscriptions.head; l; l = l->next) { for (GList *l = ml->subscriptions.head; l; l = l->next) {


Loading…
Cancel
Save