kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Add utils for checking media types

Browse Source 
Added two new functions to assist checking media types...

* ast_sip_are_media_types_equal compares two pjsip_media_types.
* ast_sip_is_media_type_in tests if one media type is in a list
  of others.

Added static definitions for commonly used media types to
res_pjsip.h.

Changed several modules to use the new functions and static
definitions.

ASTERISK_29813
(not ready to close)

Change-Id: Ief77675235bd3bf00a6b095d4673fd878d0801b9
This commit is contained in:
George Joseph
2022-01-06 12:05:34 -07:00
committed by Friendly Automation
parent 0d1b9e6baf
commit 921ab52cf3
5 changed files with 97 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
res/res_pjsip.c
View File

@@ -5292,6 +5292,34 @@ int ast_copy_pj_str2(char **dest, const pj_str_t *src)
return res;
}
int ast_sip_are_media_types_equal(pjsip_media_type *a, pjsip_media_type *b)
{
int rc = 0;
if (a != NULL && b != NULL) {
rc = pjsip_media_type_cmp(a, b, 0) ? 0 : 1;
}
return rc;
}
int ast_sip_is_media_type_in(pjsip_media_type *a, ...)
{
int rc = 0;
pjsip_media_type *b = NULL;
va_list ap;
ast_assert(a != NULL);
va_start(ap, a);
while ((b = va_arg(ap, pjsip_media_type *)) != (pjsip_media_type *)SENTINEL) {
if (pjsip_media_type_cmp(a, b, 0) == 0) {
rc = 1;
break;
}
}
va_end(ap);
return rc;
}
int ast_sip_is_content_type(pjsip_media_type *content_type, char *type, char *subtype)
{
@@ -5844,6 +5872,20 @@ void never_called_res_pjsip(void)
pjmedia_strerror(0, NULL, 0);
}
/* Definitions of media types declared "extern" in res_pjsip.h */
pjsip_media_type pjsip_media_type_application_json;
pjsip_media_type pjsip_media_type_application_media_control_xml;
pjsip_media_type pjsip_media_type_application_pidf_xml;
pjsip_media_type pjsip_media_type_application_xpidf_xml;
pjsip_media_type pjsip_media_type_application_cpim_xpidf_xml;
pjsip_media_type pjsip_media_type_application_rlmi_xml;
pjsip_media_type pjsip_media_type_application_simple_message_summary;
pjsip_media_type pjsip_media_type_application_sdp;
pjsip_media_type pjsip_media_type_multipart_alternative;
pjsip_media_type pjsip_media_type_multipart_mixed;
pjsip_media_type pjsip_media_type_multipart_related;
pjsip_media_type pjsip_media_type_text_plain;
static int load_module(void)
{
struct ast_threadpool_options options;
@@ -5863,6 +5905,21 @@ static int load_module(void)
ast_log(LOG_WARNING, "Failed to register pjmedia error codes. Codes will not be decoded.\n");
}
/* Initialize common media types */
pjsip_media_type_init2(&pjsip_media_type_application_json, "application", "json");
pjsip_media_type_init2(&pjsip_media_type_application_media_control_xml, "application", "media_control+xml");
pjsip_media_type_init2(&pjsip_media_type_application_pidf_xml, "application", "pidf+xml");
pjsip_media_type_init2(&pjsip_media_type_application_xpidf_xml, "application", "xpidf+xml");
pjsip_media_type_init2(&pjsip_media_type_application_cpim_xpidf_xml, "application", "cpim-xpidf+xml");
pjsip_media_type_init2(&pjsip_media_type_application_rlmi_xml, "application", "rlmi+xml");
pjsip_media_type_init2(&pjsip_media_type_application_sdp, "application", "sdp");
pjsip_media_type_init2(&pjsip_media_type_application_simple_message_summary, "application", "simple-message-summary");
pjsip_media_type_init2(&pjsip_media_type_multipart_alternative, "multipart", "alternative");
pjsip_media_type_init2(&pjsip_media_type_multipart_mixed, "multipart", "mixed");
pjsip_media_type_init2(&pjsip_media_type_multipart_related, "multipart", "related");
pjsip_media_type_init2(&pjsip_media_type_text_plain, "text", "plain");
if (ast_sip_initialize_system()) {
ast_log(LOG_ERROR, "Failed to initialize SIP 'system' configuration section. Aborting load\n");
goto error;