Changeset 6035 for pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

Timestamp:

Jul 1, 2019 7:12:43 AM (5 years ago)

Author:

ming

Message:

Fixed #2209: Insufficient variable storage to contain Expires header field/ parameter

File:

• pjproject/trunk/pjsip/src/pjsip-simple/publishc.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -533 +533 @@
 static void call_callback(pjsip_publishc *pubc, pj_status_t status, 
                           int st_code, const pj_str_t *reason,
-                          pjsip_rx_data *rdata, pj_int32_t expiration)
+                          pjsip_rx_data *rdata, pj_uint32_t expiration)
 {
     struct pjsip_publishc_cbparam cbparam;
@@ -563 +563 @@
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
-        call_callback(pubc, status, 400, &reason, NULL, -1);
+        call_callback(pubc, status, 400, &reason, NULL,
+                      PJSIP_PUBC_EXPIRATION_NOT_SPECIFIED);
         return;
     }
@@ -605 +606 @@
             call_callback(pubc, status, tsx->status_code, 
                           &rdata->msg_info.msg->line.status.reason,
-                          rdata, -1);
+                          rdata, PJSIP_PUBC_EXPIRATION_NOT_SPECIFIED);
         } else {
             status = pjsip_publishc_send(pubc, tdata);
@@ -612 +613 @@
     } else {
         pjsip_rx_data *rdata;
-        pj_int32_t expiration = 0xFFFF;
+        pj_uint32_t expiration = PJSIP_PUBC_EXPIRATION_NOT_SPECIFIED;
 
         if (tsx->status_code/100 == 2) {
@@ -639 +640 @@
                 expiration = expires->ivalue;
             
-            if (pubc->auto_refresh && expiration!=0 && expiration!=0xFFFF) {
+            if (pubc->auto_refresh && expiration!=0 &&
+                expiration!=PJSIP_PUBC_EXPIRATION_NOT_SPECIFIED)
+            {
                 pj_time_val delay = { 0, 0};
 
@@ -672 +675 @@
 
         /* Call callback. */
-        if (expiration == 0xFFFF) expiration = -1;
+        // if (expiration == 0xFFFF) expiration = -1;
 
         /* Temporarily increment pending_tsx to prevent callback from