Browse Source

restore ICE log message

pull/163/head
Richard Fuchs 11 years ago
parent
commit
415b8462ea
2 changed files with 3 additions and 13 deletions
  1. +0
    -5
      daemon/call.h
  2. +3
    -8
      daemon/ice.c

+ 0
- 5
daemon/call.h View File

@ -329,11 +329,6 @@ struct call_media {
sockfamily_t *desired_family;
const struct logical_intf *logical_intf;
/* local_address is protected by call->master_lock in W mode, but may
* still be modified if the lock is held in R mode, therefore we use
* atomic ops to access it when holding an R lock. */
//const volatile struct local_intf *local_intf;
struct ice_agent *ice_agent;
struct {


+ 3
- 8
daemon/ice.c View File

@ -993,14 +993,6 @@ static int __check_valid(struct ice_agent *ag) {
ilog(LOG_DEBUG, "ICE completed, using pair "PAIR_FORMAT, PAIR_FMT(pair));
AGENT_SET(ag, COMPLETED);
// XXX restore this
// ifa = g_atomic_pointer_get(&media->local_intf);
// if (ifa != pair->local_intf
// && g_atomic_pointer_compare_and_exchange(&media->local_intf, ifa,
// pair->local_intf))
// ilog(LOG_INFO, "ICE negotiated: local interface %s",
// sockaddr_print_buf(&pair->local_intf->spec->address.addr));
for (l = media->streams.head, k = all_compos.head; l && k; l = l->next, k = k->next) {
ps = l->data;
pair = k->data;
@ -1018,6 +1010,9 @@ static int __check_valid(struct ice_agent *ag) {
if (sfd->local_intf != pair->local_intf)
continue;
ps->selected_sfd = sfd;
if (ps->component == 1)
ilog(LOG_INFO, "ICE negotiated: local interface %s",
sockaddr_print_buf(&pair->local_intf->spec->address.addr));
}
}


Loading…
Cancel
Save