RuhNetConsulting
/
rtpengine
mirror of https://github.com/sipwise/rtpengine
1
1
Fork 0
Code Issues 0 Projects 0 Releases 822 Wiki Activity
Browse Source

MT#55283 rename STR_INIT_GS to STR_GS 

no-op

Change-Id: Ib7754b785b7c07f1793021d5e51aa4044729ac5d
rfuchs/gh1842
Richard Fuchs 1 year ago
parent
a2ee38ac44
commit
3f5b1ad8db
4 changed files with 13 additions and 13 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      daemon/rtcp.c
  2. +10
    -10
      daemon/sdp.c
  3. +1
    -1
      daemon/t38.c
  4. +1
    -1
      lib/str.h

+ 1
- 1
daemon/rtcp.c View File

@ -1596,7 +1596,7 @@ void rtcp_send_report(struct call_media *media, struct ssrc_ctx *ssrc_out) {
// handle crypto // handle crypto
str rtcp_packet = STR_INIT_GS(sr);
str rtcp_packet = STR_GS(sr);
const struct streamhandler *crypt_handler = determine_handler(&transport_protocols[PROTO_RTP_AVP], const struct streamhandler *crypt_handler = determine_handler(&transport_protocols[PROTO_RTP_AVP],
media, true); media, true);


+ 10
- 10
daemon/sdp.c View File

@ -427,7 +427,7 @@ void sdp_append_str_attr(GString *s, const sdp_ng_flags *flags, enum media_type
g_autoptr(GString) gs = g_string_new(""); g_autoptr(GString) gs = g_string_new("");
g_string_vprintf(gs, fmt, ap); g_string_vprintf(gs, fmt, ap);
va_end(ap); va_end(ap);
append_str_attr_to_gstring(s, name, &STR_INIT_GS(gs), flags, media_type);
append_str_attr_to_gstring(s, name, &STR_GS(gs), flags, media_type);
} }
INLINE void append_attr_to_gstring(GString *s, const char * name, const str * value, INLINE void append_attr_to_gstring(GString *s, const char * name, const str * value,
@ -2187,7 +2187,7 @@ static void insert_codec_parameters(GString *s, struct call_media *cm,
fmtp = pt->codec_def->format_print(pt); /* try appending list of parameters */ fmtp = pt->codec_def->format_print(pt); /* try appending list of parameters */
if (fmtp && fmtp->len) if (fmtp && fmtp->len)
append_int_tagged_attr_to_gstring(s, "fmtp", pt->payload_type, append_int_tagged_attr_to_gstring(s, "fmtp", pt->payload_type,
&STR_INIT_GS(fmtp), flags, cm->type_id);
&STR_GS(fmtp), flags, cm->type_id);
} }
if (!fmtp && pt->format_parameters.len) if (!fmtp && pt->format_parameters.len)
append_int_tagged_attr_to_gstring(s, "fmtp", pt->payload_type, append_int_tagged_attr_to_gstring(s, "fmtp", pt->payload_type,
@ -2678,7 +2678,7 @@ static void insert_candidate(GString *s, stream_fd *sfd,
insert_raddr_rport(s_dst, sfd, flags); insert_raddr_rport(s_dst, sfd, flags);
/* append to the chop->output */ /* append to the chop->output */
append_tagged_attr_to_gstring(s, "candidate", &ifa->ice_foundation, &STR_INIT_GS(s_dst), flags,
append_tagged_attr_to_gstring(s, "candidate", &ifa->ice_foundation, &STR_GS(s_dst), flags,
(sdp_media ? sdp_media->media_type_id : MT_UNKNOWN)); (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
} }
@ -2739,7 +2739,7 @@ static void insert_candidates(GString *s, struct packet_stream *rtp, struct pack
sockaddr_print_buf(&cand->endpoint.address), cand->endpoint.port); sockaddr_print_buf(&cand->endpoint.address), cand->endpoint.port);
} }
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, "remote-candidates", &STR_INIT_GS(s_dst), flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
append_attr_to_gstring(s, "remote-candidates", &STR_GS(s_dst), flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
} }
return; return;
} }
@ -2806,7 +2806,7 @@ static void insert_dtls(GString *s, struct call_media *media, struct dtls_connec
g_string_truncate(s_dst, s_dst->len - 1); g_string_truncate(s_dst, s_dst->len - 1);
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, "fingerprint", &STR_INIT_GS(s_dst), flags, media->type_id);
append_attr_to_gstring(s, "fingerprint", &STR_GS(s_dst), flags, media->type_id);
if (dtls) { if (dtls) {
/* prepare tls-id */ /* prepare tls-id */
@ -2817,7 +2817,7 @@ static void insert_dtls(GString *s, struct call_media *media, struct dtls_connec
g_string_append_printf(s_dst, "%02x", *p++); g_string_append_printf(s_dst, "%02x", *p++);
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, "tls-id", &STR_INIT_GS(s_dst), flags, media->type_id);
append_attr_to_gstring(s, "tls-id", &STR_GS(s_dst), flags, media->type_id);
} }
} }
@ -2869,7 +2869,7 @@ static void insert_crypto1(GString *s, struct call_media *media, struct crypto_p
g_string_append(s_dst, " UNAUTHENTICATED_SRTP"); g_string_append(s_dst, " UNAUTHENTICATED_SRTP");
/* append to the chop->output */ /* append to the chop->output */
append_int_tagged_attr_to_gstring(s, "crypto", cps->tag, &STR_INIT_GS(s_dst), flags, media->type_id);
append_int_tagged_attr_to_gstring(s, "crypto", cps->tag, &STR_GS(s_dst), flags, media->type_id);
} }
static void insert_crypto(GString *s, struct call_media *media, const sdp_ng_flags *flags) { static void insert_crypto(GString *s, struct call_media *media, const sdp_ng_flags *flags) {
@ -2897,7 +2897,7 @@ static void insert_rtcp_attr(GString *s, struct packet_stream *ps, const sdp_ng_
g_string_append_printf(s_dst, " IN %.*s", len, buf); g_string_append_printf(s_dst, " IN %.*s", len, buf);
} }
/* append to the chop->output */ /* append to the chop->output */
append_attr_to_gstring(s, "rtcp", &STR_INIT_GS(s_dst), flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
append_attr_to_gstring(s, "rtcp", &STR_GS(s_dst), flags, (sdp_media ? sdp_media->media_type_id : MT_UNKNOWN));
} }
@ -3030,7 +3030,7 @@ static void append_tagged_attr_to_gstring(GString *s, const char * name, const s
g_autoptr(GString) n = g_string_new(name); g_autoptr(GString) n = g_string_new(name);
g_string_append_c(n, ':'); g_string_append_c(n, ':');
g_string_append_len(n, tag->s, tag->len); g_string_append_len(n, tag->s, tag->len);
generic_append_attr_to_gstring(s, &STR_INIT_GS(n), ' ', value, flags, media_type);
generic_append_attr_to_gstring(s, &STR_GS(n), ' ', value, flags, media_type);
} }
/* A function used to append attributes (`a=name:uint value`) to the output chop */ /* A function used to append attributes (`a=name:uint value`) to the output chop */
@ -3041,7 +3041,7 @@ static void append_int_tagged_attr_to_gstring(GString *s, const char * name, uns
return; return;
g_autoptr(GString) n = g_string_new(name); g_autoptr(GString) n = g_string_new(name);
g_string_append_printf(n, ":%u", tag); g_string_append_printf(n, ":%u", tag);
generic_append_attr_to_gstring(s, &STR_INIT_GS(n), ' ', value, flags, media_type);
generic_append_attr_to_gstring(s, &STR_GS(n), ' ', value, flags, media_type);
} }
/* A function used to append attributes to the output chop */ /* A function used to append attributes to the output chop */


+ 1
- 1
daemon/t38.c View File

@ -719,7 +719,7 @@ int t38_gateway_input_udptl(struct t38_gateway *tg, const str *buf) {
"packet with seq %i from FEC", "packet with seq %i from FEC",
seq_fec); seq_fec);
str rec_str = STR_INIT_GS(rec_s);
str rec_str = STR_GS(rec_s);
__fec_save(tg, &rec_str, seq_fec); __fec_save(tg, &rec_str, seq_fec);
up = __make_udptl_packet(&rec_str, seq_fec); up = __make_udptl_packet(&rec_str, seq_fec);
packet_sequencer_insert(&tg->sequencer, &up->p); packet_sequencer_insert(&tg->sequencer, &up->p);


+ 1
- 1
lib/str.h View File

@ -38,7 +38,7 @@ TYPED_GQUEUE(str, str)
#define STR_EMPTY ((str) { "", 0 }) #define STR_EMPTY ((str) { "", 0 })
#define STR_CONST(s) ((str) { s, sizeof(s)-1 }) #define STR_CONST(s) ((str) { s, sizeof(s)-1 })
#define STR(s) ((str) { (char *) (s), (s) ? strlen(s) : 0 }) #define STR(s) ((str) { (char *) (s), (s) ? strlen(s) : 0 })
#define STR_INIT_GS(s) ((str) { (s)->str, (s)->len })
#define STR_GS(s) ((str) { (s)->str, (s)->len })
#define STR_LEN(s, len) ((str) { (char *) (s), len }) #define STR_LEN(s, len) ((str) { (char *) (s), len })
#define STR_INIT_DUP(s) ((str) { g_strdup(s), strlen(s) }) #define STR_INIT_DUP(s) ((str) { g_strdup(s), strlen(s) })
#define STR_CONST_BUF(buf) ((str) { (char *) &buf, sizeof(buf) }) #define STR_CONST_BUF(buf) ((str) { (char *) &buf, sizeof(buf) })


Write Preview
Loading…
Cancel
Save