Changeset 4967 for pjproject/trunk

Timestamp:

Dec 5, 2014 4:03:06 AM (10 years ago)

Author:

ming

Message:

Fixed #1805: Make UAS as refresher in session timer when UAC doesn't support it (thanks to Glenn Walbran for the patch)

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

@@ -1089 +1089 @@
             inv->timer->refresher = as_refresher? TR_UAS : TR_UAC;
         } else {
-            /* If UAC support timer (currently check the existance of 
-             * Session-Expires header in the request), set UAC as refresher.
+            /* If UAC supports timer and Session-Expires header is present
+             * in the request, set UAC as refresher.
+             * If UAC doesn't support timer and a proxy inserts a
+             * Session-Expires header, then UAS has to be the
+             * refresher (according to RFC 4028 Section 9).
              */
-            inv->timer->refresher = se_hdr? TR_UAC : TR_UAS;
+            pj_bool_t uac_supports_timer = PJ_FALSE;
+            pjsip_supported_hdr *sup_hdr;
+            
+            sup_hdr = (pjsip_supported_hdr*)
+                      pjsip_msg_find_hdr(msg, PJSIP_H_SUPPORTED, NULL);
+            if (sup_hdr) {
+                unsigned i;
+                
+                for (i = 0; i < sup_hdr->count; i++) {
+                    if (pj_stricmp(&sup_hdr->values[i], &STR_TIMER) == 0) {
+                        uac_supports_timer = PJ_TRUE;
+                        break;
+                    }
+                }
+            }
+            inv->timer->refresher = (uac_supports_timer && se_hdr)? TR_UAC:
+                                    TR_UAS;
         }
     }