Ticket #679: ticket679.patch

pjmedia/include/pjmedia/sdp.h

@@ -64 +64 @@
 #   define PJMEDIA_MAX_SDP_MEDIA        16
 #endif
 
+/**
+ * The PJMEDIA_MAX_SDP_GEN_LINE macro defines maximum SDP generic lines in a
+ * SDP session descriptor.
+ */
+#ifndef PJMEDIA_MAX_SDP_GEN_LINE
+#   define PJMEDIA_MAX_SDP_GEN_LINE     8
+#endif
 
+
 /* **************************************************************************
  * SDP ATTRIBUTES
  ***************************************************************************
@@ -535 +543 @@
  ****************************************************************************
  */
 
+/**
+ * This structure describes generic SDP line description.
+ */
+typedef struct pjmedia_sdp_gen_line
+{
+    char        type;               /**< SDP line type.                 */
+    pj_str_t    value;              /**< SDP line value.                */
+} pjmedia_sdp_gen_line;
 
+
 /**
  * This structure describes SDP session description. A SDP session descriptor
  * contains complete information about a session, and normally is exchanged
@@ -570 +587 @@
     unsigned           media_count;             /**< Number of media.       */
     pjmedia_sdp_media *media[PJMEDIA_MAX_SDP_MEDIA];    /**< Media array.   */
 
+    unsigned           generic_count;           /**< Number of generic lines*/
+    pjmedia_sdp_gen_line *generic[PJMEDIA_MAX_SDP_GEN_LINE]; 
+                                                /**< Generic lines array.   */
 };
 
 /**
@@ -578 +598 @@
 typedef struct pjmedia_sdp_session pjmedia_sdp_session;
 
 
-
 /**
  * Parse SDP message.
  *

pjmedia/src/pjmedia/sdp.c

@@ -785 +785 @@
         p += printed;
     }
 
+    /* Print generic lines. */
+    for (i=0; i<ses->generic_count; ++i) {
+        if ((end-p) < 4 + ses->generic[i]->value.slen) {
+            return -1;
+        }
+        *p++ = (char)ses->generic[i]->type;
+        *p++ = '=';
+        pj_memcpy(p, ses->generic[i]->value.ptr, ses->generic[i]->value.slen);
+        p += ses->generic[i]->value.slen;
+        *p++ = '\r';
+        *p++ = '\n';
+    }
+
     return p-buf;
 }
 
@@ -1122 +1135 @@
                     }
                     break;
                 default:
-                    if (cur_name >= 'a' && cur_name <= 'z')
+                    if (cur_name >= 'a' && cur_name <= 'z') {
                         parse_generic_line(&scanner, &dummy, &ctx);
-                    else  {
+                        if (session->generic_count < PJMEDIA_MAX_SDP_GEN_LINE)
+                        {
+                            pjmedia_sdp_gen_line *gen;
+
+                            gen = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_gen_line);
+                            gen->type = (char)cur_name;
+                            gen->value = dummy;
+                            session->generic[session->generic_count++] = gen;
+                        }
+                    } else {
                         ctx.last_error = PJMEDIA_SDP_EINSDP;
                         on_scanner_error(&scanner);
                     }
@@ -1213 +1235 @@
         sess->media[i] = pjmedia_sdp_media_clone(pool, rhs->media[i]);
     }
 
+    /* Duplicate generic lines. */
+    sess->generic_count = rhs->generic_count;
+    for (i=0; i<rhs->generic_count; ++i) {
+        pjmedia_sdp_gen_line *gen;
+
+        gen = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_gen_line);
+        gen->type = rhs->generic[i]->type;
+        pj_strdup(pool, &gen->value, &rhs->generic[i]->value);
+        sess->generic[i] = gen;
+    }
+
     return sess;
 }
 

pjmedia/src/pjmedia/sdp_cmp.c

@@ -285 +285 @@
             return status;
     }
 
+    /* Compare generic lines. */
+    if (sd1->generic_count != sd2->generic_count)
+        return PJMEDIA_SDP_ESESSNOTEQUAL;
+
+    for (i=0; i<sd1->generic_count; ++i) {
+        unsigned j;
+        pj_bool_t match = PJ_FALSE;
+
+        for (j=0; j<sd2->generic_count && !match; ++j) {
+            if (sd1->generic[i]->type == sd2->generic[j]->type) {
+                if (pj_strcmp(&sd1->generic[i]->value, 
+                    &sd2->generic[j]->value) == 0)
+                    match = PJ_TRUE;
+                else
+                    return PJMEDIA_SDP_ESESSNOTEQUAL;
+            }
+        }
+
+        if (!match)
+            return PJMEDIA_SDP_ESESSNOTEQUAL;
+    }
+
     /* Looks equal. */
     return PJ_SUCCESS;
 }