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

MT#55283 use more g_auto

Browse Source 
... for GString and typed queues

Change-Id: I77647f81bc7979b9cfbf770cd8a620356da5363f
pull/1786/head
Richard Fuchs 2 years ago
parent b7b4890ecd
commit fe99735a5d
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File

31
daemon/sdp.c
Unescape View File

@ -2109,7 +2109,7 @@ static void insert_codec_parameters(GString *s, struct call_media *cm,
if (!pt->encoding_with_params.len) if (!pt->encoding_with_params.len)
continue; continue;
GString * s_dst = g_string_new(""); g_autoptr(GString) s_dst = g_string_new("");
/* rtpmap */ /* rtpmap */
{ {
@ -2157,8 +2157,6 @@ static void insert_codec_parameters(GString *s, struct call_media *cm,
append_attr_to_gstring(s, s_dst->str, NULL, flags, cm->type_id); append_attr_to_gstring(s, s_dst->str, NULL, flags, cm->type_id);
} }
} }
g_string_free(s_dst, TRUE);
} }
} }
@ -2615,7 +2613,7 @@ static void insert_candidate(GString *s, stream_fd *sfd,
unsigned long priority; unsigned long priority;
struct packet_stream *ps = sfd->stream; struct packet_stream *ps = sfd->stream;
const struct local_intf *ifa = sfd->local_intf; const struct local_intf *ifa = sfd->local_intf;
GString * s_dst = g_string_new(""); g_autoptr(GString) s_dst = g_string_new("");
if (local_pref == -1) if (local_pref == -1)
local_pref = ifa->unique_id; local_pref = ifa->unique_id;
@ -2634,7 +2632,6 @@ static void insert_candidate(GString *s, stream_fd *sfd,
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, s_dst->str, NULL, flags, append_attr_to_gstring(s, s_dst->str, NULL, flags,
(sdp_media ? sdp_media->media_type_id : MT_UNKNOWN)); (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
g_string_free(s_dst, TRUE);
} }
static void insert_sfd_candidates(GString *s, struct packet_stream *ps, static void insert_sfd_candidates(GString *s, struct packet_stream *ps,
@ -2659,7 +2656,6 @@ static void insert_candidates(GString *s, struct packet_stream *rtp, struct pack
unsigned int type_pref, local_pref; unsigned int type_pref, local_pref;
enum ice_candidate_type cand_type; enum ice_candidate_type cand_type;
struct ice_candidate *cand; struct ice_candidate *cand;
GString * s_dst;
media = rtp->media; media = rtp->media;
@ -2682,8 +2678,8 @@ static void insert_candidates(GString *s, struct packet_stream *rtp, struct pack
insert_candidate(s, rtcp->selected_sfd, type_pref, ifa->unique_id, cand_type, flags, sdp_media); insert_candidate(s, rtcp->selected_sfd, type_pref, ifa->unique_id, cand_type, flags, sdp_media);
if (flags->opmode == OP_OFFER && AGENT_ISSET(ag, CONTROLLING)) { if (flags->opmode == OP_OFFER && AGENT_ISSET(ag, CONTROLLING)) {
candidate_q rc; g_auto(candidate_q) rc = TYPED_GQUEUE_INIT;
s_dst = g_string_new(""); g_autoptr(GString) s_dst = g_string_new("");
/* prepare remote-candidates */ /* prepare remote-candidates */
g_string_append(s_dst, "remote-candidates:"); g_string_append(s_dst, "remote-candidates:");
@ -2697,9 +2693,6 @@ static void insert_candidates(GString *s, struct packet_stream *rtp, struct pack
} }
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, s_dst->str, NULL, flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN)); append_attr_to_gstring(s, s_dst->str, NULL, flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
g_string_free(s_dst, TRUE);
t_queue_clear(&rc);
} }
return; return;
} }
@ -2717,15 +2710,12 @@ static void insert_dtls(GString *s, struct call_media *media, struct dtls_connec
const struct dtls_hash_func *hf; const struct dtls_hash_func *hf;
str actpass_str = STR_NULL; str actpass_str = STR_NULL;
call_t *call = media->call; call_t *call = media->call;
GString * s_dst;
if (!media->protocol || !media->protocol->srtp) if (!media->protocol || !media->protocol->srtp)
return; return;
if (!call->dtls_cert || !MEDIA_ISSET(media, DTLS) || MEDIA_ISSET(media, PASSTHRU)) if (!call->dtls_cert || !MEDIA_ISSET(media, DTLS) || MEDIA_ISSET(media, PASSTHRU))
return; return;
s_dst = g_string_new("");
hf = media->fp_hash_func; hf = media->fp_hash_func;
if (!hf) if (!hf)
hf = media->fingerprint.hash_func; hf = media->fingerprint.hash_func;
@ -2759,7 +2749,7 @@ static void insert_dtls(GString *s, struct call_media *media, struct dtls_connec
append_attr_to_gstring(s, "setup:", &actpass_str, flags, media->type_id); append_attr_to_gstring(s, "setup:", &actpass_str, flags, media->type_id);
/* prepare fingerprint */ /* prepare fingerprint */
g_string_append(s_dst, "fingerprint:"); g_autoptr(GString) s_dst = g_string_new("fingerprint:");
g_string_append(s_dst, hf->name); g_string_append(s_dst, hf->name);
g_string_append(s_dst, " "); g_string_append(s_dst, " ");
@ -2770,11 +2760,10 @@ static void insert_dtls(GString *s, struct call_media *media, struct dtls_connec
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, s_dst->str, NULL, flags, media->type_id); append_attr_to_gstring(s, s_dst->str, NULL, flags, media->type_id);
g_string_free(s_dst, TRUE);
if (dtls) { if (dtls) {
/* prepare tls-id */ /* prepare tls-id */
s_dst = g_string_new(""); g_string_truncate(s_dst, 0);
g_string_append(s_dst, "tls-id:"); g_string_append(s_dst, "tls-id:");
p = dtls->tls_id; p = dtls->tls_id;
@ -2783,7 +2772,6 @@ static void insert_dtls(GString *s, struct call_media *media, struct dtls_connec
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, s_dst->str, NULL, flags, media->type_id); append_attr_to_gstring(s, s_dst->str, NULL, flags, media->type_id);
g_string_free(s_dst, TRUE);
} }
} }
@ -2794,12 +2782,11 @@ static void insert_crypto1(GString *s, struct call_media *media, struct crypto_p
char *p; char *p;
int state = 0, save = 0, i; int state = 0, save = 0, i;
unsigned long long ull; unsigned long long ull;
GString * s_dst;
if (!cps->params.crypto_suite || !MEDIA_ISSET(media, SDES) || MEDIA_ISSET(media, PASSTHRU)) if (!cps->params.crypto_suite || !MEDIA_ISSET(media, SDES) || MEDIA_ISSET(media, PASSTHRU))
return; return;
s_dst = g_string_new(""); g_autoptr(GString) s_dst = g_string_new("");
p = b64_buf; p = b64_buf;
p += g_base64_encode_step((unsigned char *) cps->params.master_key, p += g_base64_encode_step((unsigned char *) cps->params.master_key,
@ -2839,7 +2826,6 @@ static void insert_crypto1(GString *s, struct call_media *media, struct crypto_p
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, s_dst->str, NULL, flags, media->type_id); append_attr_to_gstring(s, s_dst->str, NULL, flags, media->type_id);
g_string_free(s_dst, TRUE);
} }
static void insert_crypto(GString *s, struct call_media *media, sdp_ng_flags *flags) { static void insert_crypto(GString *s, struct call_media *media, sdp_ng_flags *flags) {
@ -2852,7 +2838,7 @@ static void insert_rtcp_attr(GString *s, struct packet_stream *ps, sdp_ng_flags
struct sdp_media *sdp_media) { struct sdp_media *sdp_media) {
if (flags->no_rtcp_attr) if (flags->no_rtcp_attr)
return; return;
GString * s_dst = g_string_new(""); g_autoptr(GString) s_dst = g_string_new("");
g_string_append_printf(s_dst, "rtcp:%u", ps->selected_sfd->socket.local.port); g_string_append_printf(s_dst, "rtcp:%u", ps->selected_sfd->socket.local.port);
if (flags->full_rtcp_attr) { if (flags->full_rtcp_attr) {
@ -2868,7 +2854,6 @@ static void insert_rtcp_attr(GString *s, struct packet_stream *ps, sdp_ng_flags
} }
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, s_dst->str, NULL, flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN)); append_attr_to_gstring(s, s_dst->str, NULL, flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
g_string_free(s_dst, TRUE);
} }

1
include/types.h
Unescape View File

@ -20,6 +20,7 @@ TYPED_GQUEUE(sdp_streams, struct stream_params)
struct ice_candidate; struct ice_candidate;
TYPED_GQUEUE(candidate, struct ice_candidate) TYPED_GQUEUE(candidate, struct ice_candidate)
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(candidate_q, candidate_q_clear)
struct ice_candidate_pair; struct ice_candidate_pair;
TYPED_GQUEUE(candidate_pair, struct ice_candidate_pair) TYPED_GQUEUE(candidate_pair, struct ice_candidate_pair)

Write Preview
Loading…
Cancel
Save