MT#65570 obsolete stream-level ICE flag

Change-Id: I34eac86d4fb94d6c9c4ec4074a47c9723103c527
pull/2149/head
Richard Fuchs 1 week ago
parent be90f1b246
commit 64d82a1cdb

@ -1297,7 +1297,6 @@ static bool __init_streams(struct call_media *A, const struct stream_params *sp,
ilog(LOG_WARN, "Both strict-source and media-handover are set, "
"which are mutually exclusive");
}
bf_copy_same(&a->ps_flags, &A->media_flags, SHARED_FLAG_ICE);
/* RTCP */
if (!MEDIA_ISSET(A, RTCP_MUX))
@ -1337,7 +1336,6 @@ static bool __init_streams(struct call_media *A, const struct stream_params *sp,
ilog(LOG_WARN, "Both strict-source and media-handover are set, "
"which are mutually exclusive");
}
bf_copy_same(&a->ps_flags, &A->media_flags, SHARED_FLAG_ICE);
PS_CLEAR(a, ZERO_ADDR);

@ -844,7 +844,6 @@ static void ng_stats_stream(ng_command_ctx_t *ctx, parser_arg list, const struct
BF_PS("DTLS fingerprint verified", FINGERPRINT_VERIFIED);
BF_PS("strict source address", STRICT_SOURCE);
BF_PS("media handover", MEDIA_HANDOVER);
BF_PS("ICE", ICE);
stats:
if (totals->last_packet_us < packet_stream_last_packet(ps))

@ -63,7 +63,7 @@ struct dtls_connection *dtls_ptr(stream_fd *sfd) {
if (!sfd)
return NULL;
struct packet_stream *ps = sfd->stream;
if (PS_ISSET(ps, ICE)) // ignore which sfd we were given
if (MEDIA_ISSET(ps->media, ICE)) // ignore which sfd we were given
return &ps->ice_dtls;
return &sfd->dtls;
}

@ -171,7 +171,6 @@ enum {
#define PS_FLAG_FINGERPRINT_VERIFIED (1LL << 25)
#define PS_FLAG_STRICT_SOURCE SHARED_FLAG_STRICT_SOURCE
#define PS_FLAG_MEDIA_HANDOVER SHARED_FLAG_MEDIA_HANDOVER
#define PS_FLAG_ICE SHARED_FLAG_ICE
#define PS_FLAG_ZERO_ADDR (1LL << 26)
#define PS_FLAG_PIERCE_NAT (1LL << 27)
#define PS_FLAG_NAT_WAIT (1LL << 28)

Loading…
Cancel
Save