Changeset 5282 for pjproject

Timestamp:

May 9, 2016 3:29:28 AM (9 years ago)

Author:

ming

Message:

Fixed #1913: Add callback for address change notification from STUN keep alive

Location:

pjproject/trunk

Files:

• pjnath/include/pjnath/ice_strans.h (modified) (1 diff)
• pjnath/src/pjnath/ice_strans.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjnath/include/pjnath/ice_strans.h

@@ -126 +126 @@
     PJ_ICE_STRANS_OP_NEGOTIATION,
 
-    /** This operatino is used to report failure in keep-alive operation.
+    /** This operation is used to report failure in keep-alive operation.
      *  Currently it is only used to report TURN Refresh failure.
      */
-    PJ_ICE_STRANS_OP_KEEP_ALIVE
+    PJ_ICE_STRANS_OP_KEEP_ALIVE,
+
+    /** IP address change notification from STUN keep-alive operation.
+     */
+    PJ_ICE_STRANS_OP_ADDR_CHANGE
 
 } pj_ice_strans_op;

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

@@ -1641 +1641 @@
 
                 sess_init_update(ice_st);
+                
+                if (op == PJ_STUN_SOCK_MAPPED_ADDR_CHANGE &&
+                    ice_st->cb.on_ice_complete)
+                {
+                    (*ice_st->cb.on_ice_complete)(ice_st, 
+                                                  PJ_ICE_STRANS_OP_ADDR_CHANGE,
+                                                  status);
+                }
             }
         }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -680 +680 @@
         break;
     case PJ_ICE_STRANS_OP_KEEP_ALIVE:
+    case PJ_ICE_STRANS_OP_ADDR_CHANGE:
         if (result != PJ_SUCCESS) {
             PJ_PERROR(4,(THIS_FILE, result,
@@ -696 +697 @@
                 call->index, &info);
         }
-        if (pjsua_var.ua_cfg.cb.on_ice_transport_error) {
+        if (pjsua_var.ua_cfg.cb.on_ice_transport_error &&
+            op == PJ_ICE_STRANS_OP_KEEP_ALIVE)
+        {
             pjsua_call_id id = call->index;
             (*pjsua_var.ua_cfg.cb.on_ice_transport_error)(id, op, result,