diff --git a/daemon/call.c b/daemon/call.c index c242ac25a..7ed61b620 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -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); diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index 8d15360a9..ab004a095 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -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)) diff --git a/daemon/dtls.c b/daemon/dtls.c index a9520b274..cfb38adb6 100644 --- a/daemon/dtls.c +++ b/daemon/dtls.c @@ -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; } diff --git a/include/call.h b/include/call.h index 49a74ed28..4c1b51bff 100644 --- a/include/call.h +++ b/include/call.h @@ -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)