Browse Source

don't skip address family selection when zero port is present

closes #837

Change-Id: Ife85f3a383981ccf3efcc95cb71c82d6e89117d9
pull/841/head
Richard Fuchs 6 years ago
parent
commit
22ea251157
1 changed files with 8 additions and 7 deletions
  1. +8
    -7
      daemon/call.c

+ 8
- 7
daemon/call.c View File

@ -1919,6 +1919,14 @@ int monologue_offer_answer(struct call_monologue *other_ml, GQueue *streams,
bf_copy(&other_media->media_flags, MEDIA_FLAG_RECV, &sp->sp_flags, SP_FLAG_SEND); bf_copy(&other_media->media_flags, MEDIA_FLAG_RECV, &sp->sp_flags, SP_FLAG_SEND);
bf_copy(&other_media->media_flags, MEDIA_FLAG_SEND, &sp->sp_flags, SP_FLAG_RECV); bf_copy(&other_media->media_flags, MEDIA_FLAG_SEND, &sp->sp_flags, SP_FLAG_RECV);
/* deduct address family from stream parameters received */
other_media->desired_family = sp->rtp_endpoint.address.family;
/* for outgoing SDP, use "direction"/DF or default to what was offered */
if (!media->desired_family)
media->desired_family = other_media->desired_family;
if (sp->desired_family)
media->desired_family = sp->desired_family;
if (sp->rtp_endpoint.port) { if (sp->rtp_endpoint.port) {
/* DTLS stuff */ /* DTLS stuff */
__dtls_logic(flags, other_media, sp); __dtls_logic(flags, other_media, sp);
@ -1929,13 +1937,6 @@ int monologue_offer_answer(struct call_monologue *other_ml, GQueue *streams,
/* SDES and DTLS */ /* SDES and DTLS */
__generate_crypto(flags, media, other_media); __generate_crypto(flags, media, other_media);
/* deduct address family from stream parameters received */
other_media->desired_family = sp->rtp_endpoint.address.family;
/* for outgoing SDP, use "direction"/DF or default to what was offered */
if (!media->desired_family)
media->desired_family = other_media->desired_family;
if (sp->desired_family)
media->desired_family = sp->desired_family;
} }
/* determine number of consecutive ports needed locally. /* determine number of consecutive ports needed locally.


Loading…
Cancel
Save