Added support for updated RFC7866 content-type sub type with XML extension

pjsip/src/pjsip-ua/sip_siprec.c

@@ -194,10 +194,10 @@ PJ_DEF(pj_status_t) pjsip_siprec_verify_request(pjsip_rx_data *rdata,
     status = pjsip_siprec_get_metadata(rdata->tp_info.pool,
                                         rdata->msg_info.msg->body,
                                         metadata);
-    
+
     if(status != PJ_SUCCESS) {
         code = PJSIP_SC_BAD_REQUEST;
-        warn_text = "SIPREC INVITE must have a 'rs-metadata' Content-Type";
+        warn_text = "SIPREC INVITE must have a content-type of 'rs-metadata' or with XML extension 'rs-metadata+xml'";
         goto on_return;
     }
 
@@ -265,21 +265,31 @@ PJ_DEF(pj_status_t) pjsip_siprec_verify_request(pjsip_rx_data *rdata,
  * Find siprec metadata from the message body
  */
 PJ_DEF(pj_status_t) pjsip_siprec_get_metadata(pj_pool_t *pool,
-                                              pjsip_msg_body *body,
-                                              pj_str_t* metadata)
+                                            pjsip_msg_body *body,
+                                            pj_str_t* metadata)
 {
-    pjsip_media_type app_metadata;
-    pjsip_multipart_part *metadata_part;
-
-    PJ_UNUSED_ARG(pool);
-    pjsip_media_type_init2(&app_metadata, "application", "rs-metadata");
-    metadata_part = pjsip_multipart_find_part(body, &app_metadata, NULL);
+    pjsip_media_type application_metadata;
+    pjsip_multipart_part *metadata_part = NULL;
+
+    /* 
+    * Updated to support RFC base content type extension
+    * https://datatracker.ietf.org/doc/html/draft-sipcore-siprec-fix-mediatype-00
+    */
+    /* Try rs-metadata first */
+    pjsip_media_type_init2(&application_metadata, "application", "rs-metadata");
+    metadata_part = pjsip_multipart_find_part(body, &application_metadata, NULL);
+
+    /* Fallback to XML extension rs-metadata+xml if needed */
+    if (!metadata_part) {
+        pjsip_media_type_init2(&application_metadata, "application", "rs-metadata+xml");
+        metadata_part = pjsip_multipart_find_part(body, &application_metadata, NULL);
+    }
 
     if(!metadata_part)
         return PJ_ENOTFOUND;
 
     metadata->ptr  = (char*)metadata_part->body->data;
     metadata->slen = metadata_part->body->len;
-    
+
     return PJ_SUCCESS;
 }