diff --git a/daemon/call.c b/daemon/call.c index c24533929..7239ea5f2 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -1285,7 +1285,7 @@ static void __ice_offer(const struct sdp_ng_flags *flags, struct call_media *thi /* determine roles (even if we don't actually do ICE) */ /* this = receiver, other = sender */ /* ICE_CONTROLLING is from our POV, the other ICE flags are from peer's POV */ - if (MEDIA_ISSET(this, ICE_LITE)) + if (MEDIA_ISSET(this, ICE_LITE_PEER)) MEDIA_SET(this, ICE_CONTROLLING); else if (!MEDIA_ISSET(this, INITIALIZED)) { if (flags->opmode == OP_OFFER) @@ -1295,7 +1295,7 @@ static void __ice_offer(const struct sdp_ng_flags *flags, struct call_media *thi } /* roles are reversed for the other side */ - if (MEDIA_ISSET(other, ICE_LITE)) + if (MEDIA_ISSET(other, ICE_LITE_PEER)) MEDIA_SET(other, ICE_CONTROLLING); else if (!MEDIA_ISSET(other, INITIALIZED)) { if (flags->opmode == OP_OFFER) @@ -2099,7 +2099,7 @@ int monologue_offer_answer(struct call_monologue *other_ml, GQueue *streams, /* copy parameters advertised by the sender of this message */ bf_copy_same(&other_media->media_flags, &sp->sp_flags, SHARED_FLAG_RTCP_MUX | SHARED_FLAG_ASYMMETRIC | SHARED_FLAG_UNIDIRECTIONAL | - SHARED_FLAG_ICE | SHARED_FLAG_TRICKLE_ICE | SHARED_FLAG_ICE_LITE | + SHARED_FLAG_ICE | SHARED_FLAG_TRICKLE_ICE | SHARED_FLAG_ICE_LITE_PEER | SHARED_FLAG_RTCP_FB); // steal the entire queue of offered crypto params diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index 1e17a591e..5d71a3ce1 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -1454,7 +1454,7 @@ static void ng_stats_media(bencode_item_t *list, const struct call_media *m, BF_M("ICE", ICE); BF_M("trickle ICE", TRICKLE_ICE); BF_M("ICE controlling", ICE_CONTROLLING); - BF_M("ICE-lite", ICE_LITE); + BF_M("ICE-lite peer", ICE_LITE_PEER); BF_M("unidirectional", UNIDIRECTIONAL); BF_M("loop check", LOOP_CHECK); BF_M("transcoding", TRANSCODE); diff --git a/daemon/sdp.c b/daemon/sdp.c index 4e48dceba..371cbf65c 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -1373,7 +1373,7 @@ no_cand: SP_SET(sp, TRICKLE_ICE); if (attr_get_by_id(&media->attributes, ATTR_ICE_LITE)) - SP_SET(sp, ICE_LITE); + SP_SET(sp, ICE_LITE_PEER); attr = attr_get_by_id_m_s(media, ATTR_ICE_PWD); if (attr) diff --git a/include/call.h b/include/call.h index 743d17185..1e64bf0c8 100644 --- a/include/call.h +++ b/include/call.h @@ -94,7 +94,7 @@ enum call_type { #define SHARED_FLAG_STRICT_SOURCE 0x00000100 #define SHARED_FLAG_MEDIA_HANDOVER 0x00000200 #define SHARED_FLAG_TRICKLE_ICE 0x00000400 -#define SHARED_FLAG_ICE_LITE 0x00000800 +#define SHARED_FLAG_ICE_LITE_PEER 0x00000800 #define SHARED_FLAG_UNIDIRECTIONAL 0x00001000 #define SHARED_FLAG_RTCP_FB 0x00002000 @@ -112,7 +112,7 @@ enum call_type { #define SP_FLAG_STRICT_SOURCE SHARED_FLAG_STRICT_SOURCE #define SP_FLAG_MEDIA_HANDOVER SHARED_FLAG_MEDIA_HANDOVER #define SP_FLAG_TRICKLE_ICE SHARED_FLAG_TRICKLE_ICE -#define SP_FLAG_ICE_LITE SHARED_FLAG_ICE_LITE +#define SP_FLAG_ICE_LITE_PEER SHARED_FLAG_ICE_LITE_PEER #define SP_FLAG_RTCP_FB SHARED_FLAG_RTCP_FB /* struct packet_stream */ @@ -146,7 +146,7 @@ enum call_type { #define MEDIA_FLAG_PASSTHRU 0x00100000 #define MEDIA_FLAG_ICE SHARED_FLAG_ICE #define MEDIA_FLAG_TRICKLE_ICE SHARED_FLAG_TRICKLE_ICE -#define MEDIA_FLAG_ICE_LITE SHARED_FLAG_ICE_LITE +#define MEDIA_FLAG_ICE_LITE_PEER SHARED_FLAG_ICE_LITE_PEER #define MEDIA_FLAG_ICE_CONTROLLING 0x00200000 #define MEDIA_FLAG_LOOP_CHECK 0x00400000 #define MEDIA_FLAG_TRANSCODE 0x00800000