From 5e1800a062ed2c43f8f981810ace6522fa8528fd Mon Sep 17 00:00:00 2001 From: Eric Rescorla Date: Wed, 11 Sep 2013 15:43:09 -0700 Subject: [PATCH] Bug 915420 - Use foundation address instead of relay address to determine priority r=bwc --- media/mtransport/third_party/nICEr/src/ice/ice_candidate.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c b/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c index 8d6bcae41f0..9d8fbe51796 100644 --- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c +++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c @@ -60,6 +60,7 @@ static char *RCSSTRING __UNUSED__="$Id: ice_candidate.c,v 1.2 2008/04/28 17:59:0 #include "ice_reg.h" #include "ice_util.h" #include "nr_socket_turn.h" +#include "nr_socket.h" static int next_automatic_preference = 224; @@ -382,8 +383,12 @@ int nr_ice_candidate_compute_priority(nr_ice_candidate *cand) } else { char key_of_interface[MAXIFNAME + 41]; + nr_transport_addr addr; - if(r=nr_transport_addr_fmt_ifname_addr_string(&cand->base,key_of_interface, + if(r=nr_socket_getaddr(cand->isock->sock, &addr)) + ABORT(r); + + if(r=nr_transport_addr_fmt_ifname_addr_string(&addr,key_of_interface, sizeof(key_of_interface))) { ABORT(r); }