Changeset 6035 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.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-ua/sip_reg.c (modified) (16 diffs)

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

@@ -46 +46 @@
 #define REGC_TSX_TIMEOUT        33000
 
-enum { NOEXP = 0x1FFFFFFF };
+enum { NOEXP = PJSIP_REGC_EXPIRATION_NOT_SPECIFIED };
 
 static const pj_str_t XUID_PARAM_NAME = { "x-uid", 5 };
@@ -740 +740 @@
                           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,
                           int contact_cnt, pjsip_contact_hdr *contact[],
                           pj_bool_t is_unreg)
@@ -751 +751 @@
     cbparam->rdata = rdata;
     cbparam->contact_cnt = contact_cnt;
-    cbparam->expiration = (expiration >= 0? expiration:
-                           regc->expires_requested);
+    cbparam->expiration = (expiration != PJSIP_REGC_EXPIRATION_NOT_SPECIFIED?
+                           expiration: regc->expires_requested);
     cbparam->is_unreg = is_unreg;
     if (contact_cnt) {
@@ -762 +762 @@
 static void call_callback(pjsip_regc *regc, 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,
                           int contact_cnt, pjsip_contact_hdr *contact[],
                           pj_bool_t is_unreg)
@@ -799 +799 @@
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
-        call_callback(regc, status, 400, &reason, NULL, -1, 0, NULL,
+        call_callback(regc, status, 400, &reason, NULL, NOEXP, 0, NULL,
                       PJ_FALSE);
     }
@@ -809 +809 @@
 }
 
-static void schedule_registration ( pjsip_regc *regc, pj_int32_t expiration )
-{
-    if (regc->auto_reg && expiration > 0) {
+static void schedule_registration ( pjsip_regc *regc, pj_uint32_t expiration )
+{
+    if (regc->auto_reg && expiration > 0 && expiration != NOEXP) {
         pj_time_val delay = { 0, 0};
 
@@ -893 +893 @@
 
 
-static pj_int32_t calculate_response_expiration(const pjsip_regc *regc,
-                                                const pjsip_rx_data *rdata,
-                                                unsigned *contact_cnt,
-                                                unsigned max_contact,
-                                                pjsip_contact_hdr *contacts[])
-{
-    pj_int32_t expiration = NOEXP;
+static pj_uint32_t calculate_response_expiration(const pjsip_regc *regc,
+                                                 const pjsip_rx_data *rdata,
+                                                 unsigned *contact_cnt,
+                                                 unsigned max_contact,
+                                                 pjsip_contact_hdr *contacts[])
+{
+    pj_uint32_t expiration = NOEXP;
     const pjsip_msg *msg = rdata->msg_info.msg;
     const pjsip_hdr *hdr;
@@ -983 +983 @@
                         has_our_contact = PJ_TRUE;
 
-                        if (contacts[i]->expires >= 0 && 
-                            contacts[i]->expires < expiration) 
+                        if (contacts[i]->expires != PJSIP_EXPIRES_NOT_SPECIFIED
+                            && contacts[i]->expires < expiration) 
                         {
                             /* Get the lowest expiration time. */
@@ -1038 +1038 @@
 
             if (*contact_cnt == our_contact_cnt && *contact_cnt &&
-                contacts[0]->expires >= 0) 
+                contacts[0]->expires != PJSIP_EXPIRES_NOT_SPECIFIED) 
             {
                 expiration = contacts[0]->expires;
@@ -1098 +1098 @@
                      (event->body.tsx_state.type==PJSIP_EVENT_RX_MSG) ? 
                       event->body.tsx_state.src.rdata : NULL,
-                     -1, 0, NULL, PJ_FALSE);
+                     NOEXP, 0, NULL, PJ_FALSE);
 
         /* Call regc tsx callback before handling any response */
@@ -1118 +1118 @@
                     pjsip_contact_hdr *next = h->next;
 
-                    if (h->expires == -1) {
+                    if (h->expires == PJSIP_EXPIRES_NOT_SPECIFIED) {
                         pj_list_erase(h);
                     }
@@ -1206 +1206 @@
                 call_callback(regc, status, tsx->status_code, 
                               &rdata->msg_info.msg->line.status.reason,
-                              rdata, -1, 0, NULL, is_unreg);
+                              rdata, NOEXP, 0, NULL, is_unreg);
                 pj_lock_acquire(regc->lock);
             }
@@ -1233 +1233 @@
         pjsip_min_expires_hdr *me_hdr;
         pjsip_tx_data *tdata;
-        pj_int32_t min_exp;
+        pj_uint32_t min_exp;
 
         /* reset current op */
@@ -1295 +1295 @@
                 call_callback(regc, status, tsx->status_code,
                               &rdata->msg_info.msg->line.status.reason,
-                              rdata, -1, 0, NULL, PJ_FALSE);
+                              rdata, NOEXP, 0, NULL, PJ_FALSE);
                 pj_lock_acquire(regc->lock);
             }
@@ -1307 +1307 @@
     if (!handled) {
         pjsip_rx_data *rdata;
-        pj_int32_t expiration = NOEXP;
+        pj_uint32_t expiration = NOEXP;
         unsigned contact_cnt = 0;
         pjsip_contact_hdr *contact[PJSIP_REGC_MAX_CONTACT];
@@ -1331 +1331 @@
 
         /* Update registration */
-        if (expiration==NOEXP) expiration=-1;
+        // if (expiration==NOEXP) expiration=-1;
         regc->expires = expiration;