Changeset 6035 for pjproject/trunk/pjsip/include/pjsip/sip_msg.h

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/include/pjsip/sip_msg.h (modified) (11 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_msg.h

@@ -1071 +1071 @@
     PJSIP_DECL_HDR_MEMBER(struct pjsip_generic_int_hdr);
     /** ivalue */
-    pj_int32_t ivalue;
+    pj_uint32_t ivalue;
 } pjsip_generic_int_hdr;
 
@@ -1088 +1088 @@
 PJ_DECL(pjsip_generic_int_hdr*) pjsip_generic_int_hdr_create( pj_pool_t *pool,
                                                       const pj_str_t *hname,
-                                                      int hvalue );
+                                                      unsigned hvalue );
 
 
@@ -1111 +1111 @@
                                                             void *mem,
                                                             const pj_str_t *hname,
-                                                            int value );
+                                                            unsigned value );
 
 /* **************************************************************************/
@@ -1350 +1350 @@
 
 /* **************************************************************************/
+
+/** Expires not specified. */
+#define PJSIP_EXPIRES_NOT_SPECIFIED     ((pj_uint32_t)0xFFFFFFFFUL)
+
 /**
  * Contact header.
@@ -1359 +1363 @@
 {
     PJSIP_DECL_HDR_MEMBER(struct pjsip_contact_hdr);
-    int             star;           /**< The contact contains only a '*' character */
-    pjsip_uri      *uri;            /**< URI in the contact. */
-    int             q1000;          /**< The "q" value times 1000 (to avoid float) */
-    pj_int32_t      expires;        /**< Expires parameter, otherwise -1 if not present. */
-    pjsip_param     other_param;    /**< Other parameters, concatenated in a single string. */
+    int             star;           /**< The contact contains only a '*'
+                                         character                          */
+    pjsip_uri      *uri;            /**< URI in the contact.                */
+    int             q1000;          /**< The "q" value times 1000
+                                         (to avoid float)                   */
+    pj_uint32_t     expires;        /**< Expires parameter, otherwise
+                                         PJSIP_EXPIRES_NOT_SPECIFIED
+                                         if not present.                    */
+    pjsip_param     other_param;    /**< Other parameters, concatenated in
+                                         a single string.                   */
 } pjsip_contact_hdr;
 
@@ -1442 +1451 @@
  */
 PJ_DECL(pjsip_expires_hdr*) pjsip_expires_hdr_create( pj_pool_t *pool,
-                                                      int value);
+                                                      unsigned value);
 
 /**
@@ -1461 +1470 @@
 PJ_DECL(pjsip_expires_hdr*) pjsip_expires_hdr_init( pj_pool_t *pool,
                                                     void *mem,
-                                                    int value );
+                                                    unsigned value );
 
 
@@ -1565 +1574 @@
  */
 PJ_DECL(pjsip_max_fwd_hdr*) 
-pjsip_max_fwd_hdr_create(pj_pool_t *pool, int value);
+pjsip_max_fwd_hdr_create(pj_pool_t *pool, unsigned value);
 
 
@@ -1584 +1593 @@
  */
 PJ_DECL(pjsip_max_fwd_hdr*) 
-pjsip_max_fwd_hdr_init( pj_pool_t *pool, void *mem, int value );
+pjsip_max_fwd_hdr_init( pj_pool_t *pool, void *mem, unsigned value );
 
 
@@ -1602 +1611 @@
  */
 PJ_DECL(pjsip_min_expires_hdr*) pjsip_min_expires_hdr_create(pj_pool_t *pool,
-                                                             int value);
+                                                             unsigned value);
 
 
@@ -1622 +1631 @@
 PJ_DECL(pjsip_min_expires_hdr*) pjsip_min_expires_hdr_init( pj_pool_t *pool,
                                                             void *mem,
-                                                            int value );
+                                                            unsigned value );