Browse Source

MT#63317 update return type to bool

Change-Id: I95de33bcd2eecfcd0bb3229c7897c048f8ad1404
pull/2008/head
Richard Fuchs 5 months ago
parent
commit
6a893b1a83
4 changed files with 18 additions and 18 deletions
  1. +6
    -6
      daemon/call_interfaces.c
  2. +4
    -4
      daemon/janus.c
  3. +6
    -6
      daemon/sdp.c
  4. +2
    -2
      include/sdp.h

+ 6
- 6
daemon/call_interfaces.c View File

@ -2543,7 +2543,7 @@ static const char *call_offer_answer_ng(ng_command_ctx_t *ctx, const char* addr)
sdp = call_str_cpy(&flags.sdp);
errstr = "Failed to parse SDP";
if (sdp_parse(&sdp, &parsed, &flags))
if (!sdp_parse(&sdp, &parsed, &flags))
goto out;
if (flags.loop_protect && sdp_is_duplicate(&parsed)) {
@ -2554,7 +2554,7 @@ static const char *call_offer_answer_ng(ng_command_ctx_t *ctx, const char* addr)
}
errstr = "Incomplete SDP specification";
if (sdp_streams(&parsed, &streams, &flags))
if (!sdp_streams(&parsed, &streams, &flags))
goto out;
// SDP fragments for trickle ICE must always operate on an existing call
@ -4040,10 +4040,10 @@ const char *call_publish_ng(ng_command_ctx_t *ctx, const char *addr) {
sdp_in = call_str_cpy(&flags.sdp);
if (sdp_parse(&sdp_in, &parsed, &flags))
if (!sdp_parse(&sdp_in, &parsed, &flags))
return "Failed to parse SDP";
if (sdp_streams(&parsed, &streams, &flags))
if (!sdp_streams(&parsed, &streams, &flags))
return "Incomplete SDP specification";
if (trickle_ice_update(ctx->ngbuf, call, &flags, &streams))
@ -4200,10 +4200,10 @@ const char *call_subscribe_answer_ng(ng_command_ctx_t *ctx) {
if (!call)
return "Unknown call-ID";
if (sdp_parse(&flags.sdp, &parsed, &flags))
if (!sdp_parse(&flags.sdp, &parsed, &flags))
return "Failed to parse SDP";
if (sdp_streams(&parsed, &streams, &flags))
if (!sdp_streams(&parsed, &streams, &flags))
return "Incomplete SDP specification";
if (trickle_ice_update(ctx->ngbuf, call, &flags, &streams))


+ 4
- 4
daemon/janus.c View File

@ -854,9 +854,9 @@ static const char *janus_videoroom_configure(struct websocket_message *wm, struc
g_auto(sdp_streams_q) streams = TYPED_GQUEUE_INIT;
call_ng_flags_init(&flags, OP_PUBLISH);
*retcode = 512;
if (sdp_parse(&sdp_in, &parsed, &flags))
if (!sdp_parse(&sdp_in, &parsed, &flags))
return "Failed to parse SDP";
if (sdp_streams(&parsed, &streams, &flags))
if (!sdp_streams(&parsed, &streams, &flags))
return "Incomplete SDP specification";
ml = janus_get_monologue(handle->id, call, call_get_or_create_monologue);
@ -967,11 +967,11 @@ static const char *janus_videoroom_start(struct websocket_message *wm, struct ja
g_auto(sdp_streams_q) streams = TYPED_GQUEUE_INIT;
call_ng_flags_init(&flags, OP_PUBLISH);
*retcode = 512;
if (sdp_parse(&sdp_in, &parsed, &flags))
if (!sdp_parse(&sdp_in, &parsed, &flags))
return "Failed to parse SDP";
*retcode = 512;
if (sdp_streams(&parsed, &streams, &flags))
if (!sdp_streams(&parsed, &streams, &flags))
return "Incomplete SDP specification";
*retcode = 456;


+ 6
- 6
daemon/sdp.c View File

@ -1298,7 +1298,7 @@ static bool parse_attribute(struct sdp_attribute *a) {
return ret;
}
int sdp_parse(str *body, sdp_sessions_q *sessions, const sdp_ng_flags *flags) {
bool sdp_parse(str *body, sdp_sessions_q *sessions, const sdp_ng_flags *flags) {
str b;
struct sdp_session *session = NULL;
struct sdp_media *media = NULL;
@ -1485,12 +1485,12 @@ new_session:
adj_s->len = b.s - adj_s->s;
}
return 0;
return true;
error:
ilog(LOG_WARNING, "Error parsing SDP at offset %zu: %s", (size_t) (b.s - body->s), errstr);
sdp_sessions_clear(sessions);
return -1;
return false;
}
static void attr_free(struct sdp_attribute *p) {
@ -1883,7 +1883,7 @@ static void sdp_attr_append_other(sdp_attr_q *dst, struct sdp_attributes *src) {
}
/* XXX split this function up */
int sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_flags *flags) {
bool sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_flags *flags) {
struct sdp_session *session;
struct sdp_media *media;
struct stream_params *sp;
@ -2104,12 +2104,12 @@ next:
}
}
return 0;
return true;
error:
ilog(LOG_WARNING, "Failed to extract streams from SDP: %s", errstr);
g_free(sp);
return -1;
return false;
}
void sdp_streams_clear(sdp_streams_q *q) {


+ 2
- 2
include/sdp.h View File

@ -44,8 +44,8 @@ void sdp_attr_free(struct sdp_attr *);
sdp_origin *sdp_orig_dup(const sdp_origin *orig);
void sdp_orig_free(sdp_origin *o);
int sdp_parse(str *body, sdp_sessions_q *sessions, const sdp_ng_flags *);
int sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_flags *);
bool sdp_parse(str *body, sdp_sessions_q *sessions, const sdp_ng_flags *);
bool sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_flags *);
void sdp_streams_clear(sdp_streams_q *);
void sdp_sessions_clear(sdp_sessions_q *sessions);
int sdp_is_duplicate(sdp_sessions_q *sessions);


Loading…
Cancel
Save