MT#61625 update __init_stream(s) to bool

Change-Id: I34b619371f2d9d3f683cd9ebb4993a57367f4c35
pull/1918/head
Richard Fuchs 9 months ago
parent 4744885ec5
commit 69d100d41a

@ -1151,7 +1151,7 @@ void call_media_state_machine(struct call_media *m) {
call_stream_state_machine(l->data); call_stream_state_machine(l->data);
} }
int __init_stream(struct packet_stream *ps) { bool __init_stream(struct packet_stream *ps) {
struct call_media *media = ps->media; struct call_media *media = ps->media;
call_t *call = ps->call; call_t *call = ps->call;
int dtls_active = -1; int dtls_active = -1;
@ -1201,13 +1201,13 @@ int __init_stream(struct packet_stream *ps) {
&& media->fingerprint.digest_len && ps->dtls_cert) && media->fingerprint.digest_len && ps->dtls_cert)
{ {
if (dtls_verify_cert(ps)) if (dtls_verify_cert(ps))
return -1; return false;
} }
call_stream_state_machine(ps); call_stream_state_machine(ps);
} }
return 0; return true;
} }
static void rtp_stats_add_pt(rtp_stats_ht dst, const struct rtp_payload_type *pt) { static void rtp_stats_add_pt(rtp_stats_ht dst, const struct rtp_payload_type *pt) {
@ -1270,7 +1270,7 @@ static void __reset_streams(struct call_media *media) {
* TODO: this function seems to do two things - stream init (with B NULL) and sink init - split up? * TODO: this function seems to do two things - stream init (with B NULL) and sink init - split up?
*/ */
__attribute__((nonnull(1))) __attribute__((nonnull(1)))
static int __init_streams(struct call_media *A, struct call_media *B, const struct stream_params *sp, static bool __init_streams(struct call_media *A, struct call_media *B, const struct stream_params *sp,
const sdp_ng_flags *flags, const struct sink_attrs *attrs) { const sdp_ng_flags *flags, const struct sink_attrs *attrs) {
struct packet_stream *a, *ax, *b; struct packet_stream *a, *ax, *b;
unsigned int port_off = 0; unsigned int port_off = 0;
@ -1317,8 +1317,8 @@ static int __init_streams(struct call_media *A, struct call_media *B, const stru
PS_SET(b, ZERO_ADDR); PS_SET(b, ZERO_ADDR);
} }
if (__init_stream(a)) if (!__init_stream(a))
return -1; return false;
/* RTCP */ /* RTCP */
if (B && lb && b && !MEDIA_ISSET(B, RTCP_MUX)) { if (B && lb && b && !MEDIA_ISSET(B, RTCP_MUX)) {
@ -1386,8 +1386,8 @@ static int __init_streams(struct call_media *A, struct call_media *B, const stru
PS_SET(a, ZERO_ADDR); PS_SET(a, ZERO_ADDR);
} }
if (__init_stream(a)) if (!__init_stream(a))
return -1; return false;
no_rtcp: no_rtcp:
recording_setup_stream(ax); // RTP recording_setup_stream(ax); // RTP
@ -1399,7 +1399,7 @@ no_rtcp:
port_off += 2; port_off += 2;
} }
return 0; return true;
} }
__attribute__((nonnull(1, 2, 3))) __attribute__((nonnull(1, 2, 3)))
@ -2617,7 +2617,7 @@ static void __update_init_subscribers(struct call_media *media, struct stream_pa
struct call_media * sub_media = ms->media; struct call_media * sub_media = ms->media;
if (!sub_media) if (!sub_media)
continue; continue;
if (__init_streams(media, sub_media, sp, flags, &ms->attrs)) if (!__init_streams(media, sub_media, sp, flags, &ms->attrs))
ilog(LOG_WARN, "Error initialising streams"); ilog(LOG_WARN, "Error initialising streams");
} }
@ -3554,7 +3554,7 @@ int monologue_publish(struct call_monologue *ml, sdp_streams_q *streams, sdp_ng_
__assign_stream_fds(media, &em->intf_sfds); __assign_stream_fds(media, &em->intf_sfds);
// XXX this should be covered by __update_init_subscribers ? // XXX this should be covered by __update_init_subscribers ?
if (__init_streams(media, NULL, sp, flags, NULL)) if (!__init_streams(media, NULL, sp, flags, NULL))
return -1; return -1;
__ice_start(media); __ice_start(media);
ice_update(media->ice_agent, sp, false); ice_update(media->ice_agent, sp, false);
@ -3628,7 +3628,7 @@ static int monologue_subscribe_request1(struct call_monologue *src_ml, struct ca
__num_media_streams(dst_media, num_ports); __num_media_streams(dst_media, num_ports);
__assign_stream_fds(dst_media, &em->intf_sfds); __assign_stream_fds(dst_media, &em->intf_sfds);
if (__init_streams(dst_media, NULL, NULL, flags, NULL)) if (!__init_streams(dst_media, NULL, NULL, flags, NULL))
return -1; return -1;
__update_init_subscribers(src_media, NULL, NULL, flags->opmode); __update_init_subscribers(src_media, NULL, NULL, flags->opmode);
@ -3718,7 +3718,7 @@ int monologue_subscribe_answer(struct call_monologue *dst_ml, sdp_ng_flags *flag
__dtls_logic(flags, dst_media, sp); __dtls_logic(flags, dst_media, sp);
if (__init_streams(dst_media, NULL, sp, flags, NULL)) if (!__init_streams(dst_media, NULL, sp, flags, NULL))
return -1; return -1;
MEDIA_CLEAR(dst_media, RECV); MEDIA_CLEAR(dst_media, RECV);

@ -892,7 +892,7 @@ void add_total_calls_duration_in_interval(struct timeval *interval_tv);
enum thread_looper_action call_timer(void); enum thread_looper_action call_timer(void);
void __rtp_stats_update(rtp_stats_ht dst, struct codec_store *); void __rtp_stats_update(rtp_stats_ht dst, struct codec_store *);
int __init_stream(struct packet_stream *ps); bool __init_stream(struct packet_stream *ps);
void call_stream_crypto_reset(struct packet_stream *ps); void call_stream_crypto_reset(struct packet_stream *ps);
const rtp_payload_type *__rtp_stats_codec(struct call_media *m); const rtp_payload_type *__rtp_stats_codec(struct call_media *m);

Loading…
Cancel
Save