Ignore:
Timestamp:
Sep 24, 2007 7:46:41 PM (15 years ago)
Author:
bennylp
Message:

Ticket #382: Updated ICE from draft-ietf-mmusic-ice-14 to ice-18 specification, and also done some other tweaks as well

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjnath/src/pjnath/ice_strans.c

    r1434 r1450  
    591591 
    592592        /* Send STUN binding request */ 
    593         PJ_LOG(5,(ice_st->obj_name, "Sending STUN keep-alive")); 
     593        PJ_LOG(5,(ice_st->obj_name, "Sending STUN keep-alive from %s;%d", 
     594                  pj_inet_ntoa(comp->local_addr.ipv4.sin_addr), 
     595                  pj_ntohs(comp->local_addr.ipv4.sin_port))); 
    594596        status = pj_stun_session_send_msg(comp->stun_sess, PJ_FALSE,  
    595597                                          &ice_st->stun_srv,  
     
    11381140    } 
    11391141 
     1142    /* Save IP address for logging */ 
     1143    pj_ansi_strcpy(ip, pj_inet_ntoa(comp->local_addr.ipv4.sin_addr)); 
     1144 
    11401145    /* Ignore response if it reports the same address */ 
    1141     if (cand->addr.ipv4.sin_addr.s_addr == mapped_addr->ipv4.sin_addr.s_addr && 
    1142         cand->addr.ipv4.sin_port == mapped_addr->ipv4.sin_port) 
     1146    if (comp->local_addr.ipv4.sin_addr.s_addr == mapped_addr->ipv4.sin_addr.s_addr && 
     1147        comp->local_addr.ipv4.sin_port == mapped_addr->ipv4.sin_port) 
    11431148    { 
     1149        PJ_LOG(4,(comp->ice_st->obj_name,  
     1150                  "Candidate %s:%d is directly connected to Internet, " 
     1151                  "STUN mapped address is ignored", 
     1152                  ip, pj_ntohs(comp->local_addr.ipv4.sin_port))); 
    11441153        return; 
    11451154    } 
    1146  
    1147     pj_ansi_strcpy(ip, pj_inet_ntoa(comp->local_addr.ipv4.sin_addr)); 
    11481155 
    11491156    PJ_LOG(4,(comp->ice_st->obj_name,  
Note: See TracChangeset for help on using the changeset viewer.