Changeset 1450 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Sep 24, 2007 7:46:41 PM (17 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:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -591 +591 @@
 
         /* Send STUN binding request */
-        PJ_LOG(5,(ice_st->obj_name, "Sending STUN keep-alive"));
+        PJ_LOG(5,(ice_st->obj_name, "Sending STUN keep-alive from %s;%d",
+                  pj_inet_ntoa(comp->local_addr.ipv4.sin_addr),
+                  pj_ntohs(comp->local_addr.ipv4.sin_port)));
         status = pj_stun_session_send_msg(comp->stun_sess, PJ_FALSE, 
                                           &ice_st->stun_srv, 
@@ -1138 +1140 @@
     }
 
+    /* Save IP address for logging */
+    pj_ansi_strcpy(ip, pj_inet_ntoa(comp->local_addr.ipv4.sin_addr));
+
     /* Ignore response if it reports the same address */
-    if (cand->addr.ipv4.sin_addr.s_addr == mapped_addr->ipv4.sin_addr.s_addr &&
-        cand->addr.ipv4.sin_port == mapped_addr->ipv4.sin_port)
+    if (comp->local_addr.ipv4.sin_addr.s_addr == mapped_addr->ipv4.sin_addr.s_addr &&
+        comp->local_addr.ipv4.sin_port == mapped_addr->ipv4.sin_port)
     {
+        PJ_LOG(4,(comp->ice_st->obj_name, 
+                  "Candidate %s:%d is directly connected to Internet, "
+                  "STUN mapped address is ignored",
+                  ip, pj_ntohs(comp->local_addr.ipv4.sin_port)));
         return;
     }
-
-    pj_ansi_strcpy(ip, pj_inet_ntoa(comp->local_addr.ipv4.sin_addr));
 
     PJ_LOG(4,(comp->ice_st->obj_name,