kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Use ast_sip_is_content_type() where appropriate

Browse Source 
Change-Id: If3ab0d73d79ac4623308bd48508af2bfd554937d
This commit is contained in:
Sean Bright
2017-09-22 11:02:11 -04:00
parent 63a3d17f0b
commit ebd0a4bebf
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_messaging.c
View File

@@ -69,8 +69,8 @@ static enum pjsip_status_code check_content_type(const pjsip_rx_data *rdata)
&rdata->msg_info.msg->body->content_type, "text", "plain"); &rdata->msg_info.msg->body->content_type, "text", "plain");
} else { } else {
res = rdata->msg_info.ctype && res = rdata->msg_info.ctype &&
!pj_strcmp2(&rdata->msg_info.ctype->media.type, "text") && ast_sip_is_content_type(
!pj_strcmp2(&rdata->msg_info.ctype->media.subtype, "plain"); &rdata->msg_info.ctype->media, "text", "plain");
} }
return res ? PJSIP_SC_OK : PJSIP_SC_UNSUPPORTED_MEDIA_TYPE; return res ? PJSIP_SC_OK : PJSIP_SC_UNSUPPORTED_MEDIA_TYPE;

6
res/res_pjsip_publish_asterisk.c
View File

@@ -605,8 +605,7 @@ static int asterisk_publication_devicestate_state_change(struct ast_sip_publicat
} }
/* We only accept JSON for content */ /* We only accept JSON for content */
if (pj_strcmp2(&body->content_type.type, "application") || if (!ast_sip_is_content_type(&body->content_type, "application", "json")) {
pj_strcmp2(&body->content_type.subtype, "json")) {
ast_debug(2, "Received unsupported content type for Asterisk event on resource '%s'\n", ast_debug(2, "Received unsupported content type for Asterisk event on resource '%s'\n",
ast_sorcery_object_get_id(config)); ast_sorcery_object_get_id(config));
return -1; return -1;
@@ -697,8 +696,7 @@ static int asterisk_publication_mwi_state_change(struct ast_sip_publication *pub
} }
/* We only accept JSON for content */ /* We only accept JSON for content */
if (pj_strcmp2(&body->content_type.type, "application") || if (!ast_sip_is_content_type(&body->content_type, "application", "json")) {
pj_strcmp2(&body->content_type.subtype, "json")) {
ast_debug(2, "Received unsupported content type for Asterisk event on resource '%s'\n", ast_debug(2, "Received unsupported content type for Asterisk event on resource '%s'\n",
ast_sorcery_object_get_id(config)); ast_sorcery_object_get_id(config));
return -1; return -1;

15
res/res_pjsip_pubsub.c
View File

@@ -516,6 +516,8 @@ AST_RWLIST_HEAD_STATIC(subscriptions, sip_subscription_tree);
AST_RWLIST_HEAD_STATIC(body_generators, ast_sip_pubsub_body_generator); AST_RWLIST_HEAD_STATIC(body_generators, ast_sip_pubsub_body_generator);
AST_RWLIST_HEAD_STATIC(body_supplements, ast_sip_pubsub_body_supplement); AST_RWLIST_HEAD_STATIC(body_supplements, ast_sip_pubsub_body_supplement);
static pjsip_media_type rlmi_media_type;
static void pubsub_on_evsub_state(pjsip_evsub *sub, pjsip_event *event); static void pubsub_on_evsub_state(pjsip_evsub *sub, pjsip_event *event);
static void pubsub_on_rx_refresh(pjsip_evsub *sub, pjsip_rx_data *rdata, static void pubsub_on_rx_refresh(pjsip_evsub *sub, pjsip_rx_data *rdata,
int *p_st_code, pj_str_t **p_st_text, pjsip_hdr *res_hdr, pjsip_msg_body **p_body); int *p_st_code, pj_str_t **p_st_text, pjsip_hdr *res_hdr, pjsip_msg_body **p_body);
@@ -2022,8 +2024,6 @@ static void *rlmi_clone_data(pj_pool_t *pool, const void *data, unsigned len)
static pjsip_multipart_part *build_rlmi_body(pj_pool_t *pool, struct ast_sip_subscription *sub, static pjsip_multipart_part *build_rlmi_body(pj_pool_t *pool, struct ast_sip_subscription *sub,
struct body_part_list *body_parts, unsigned int full_state) struct body_part_list *body_parts, unsigned int full_state)
{ {
static const pj_str_t rlmi_type = { "application", 11 };
static const pj_str_t rlmi_subtype = { "rlmi+xml", 8 };
pj_xml_node *rlmi; pj_xml_node *rlmi;
pj_xml_node *name; pj_xml_node *name;
pjsip_multipart_part *rlmi_part; pjsip_multipart_part *rlmi_part;
@@ -2054,9 +2054,7 @@ static pjsip_multipart_part *build_rlmi_body(pj_pool_t *pool, struct ast_sip_sub
rlmi_part = pjsip_multipart_create_part(pool); rlmi_part = pjsip_multipart_create_part(pool);
rlmi_part->body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body); rlmi_part->body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body);
pj_strdup(pool, &rlmi_part->body->content_type.type, &rlmi_type); pjsip_media_type_cp(pool, &rlmi_part->body->content_type, &rlmi_media_type);
pj_strdup(pool, &rlmi_part->body->content_type.subtype, &rlmi_subtype);
pj_list_init(&rlmi_part->body->content_type.param);
rlmi_part->body->data = pj_xml_clone(pool, rlmi); rlmi_part->body->data = pj_xml_clone(pool, rlmi);
rlmi_part->body->clone_data = rlmi_clone_data; rlmi_part->body->clone_data = rlmi_clone_data;
@@ -3524,12 +3522,11 @@ error:
return PJ_TRUE; return PJ_TRUE;
} }
static pjsip_media_type simple_message_summary;
static pj_bool_t pubsub_on_rx_notify_request(pjsip_rx_data *rdata) static pj_bool_t pubsub_on_rx_notify_request(pjsip_rx_data *rdata)
{ {
if (rdata->msg_info.msg->body && if (rdata->msg_info.msg->body &&
pjsip_media_type_cmp(&rdata->msg_info.msg->body->content_type, &simple_message_summary, 0) == 0) { ast_sip_is_content_type(&rdata->msg_info.msg->body->content_type,
"application", "simple-message-summary")) {
return pubsub_on_rx_mwi_notify_request(rdata); return pubsub_on_rx_mwi_notify_request(rdata);
} }
return PJ_FALSE; return PJ_FALSE;
@@ -5365,7 +5362,7 @@ static int load_module(void)
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
pjsip_media_type_init2(&simple_message_summary, "application", "simple-message-summary"); pjsip_media_type_init2(&rlmi_media_type, "application", "rlmi+xml");
if (ast_sched_start_thread(sched)) { if (ast_sched_start_thread(sched)) {
ast_log(LOG_ERROR, "Could not start scheduler thread for publication expiration\n"); ast_log(LOG_ERROR, "Could not start scheduler thread for publication expiration\n");

5
res/res_pjsip_session.c
View File

@@ -3979,8 +3979,9 @@ static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_trans
int stream; int stream;
/* SDP produced by us directly will never be multipart */ /* SDP produced by us directly will never be multipart */
if (!transport_state || hook || !tdata->msg->body || pj_stricmp2(&tdata->msg->body->content_type.type, "application") || if (!transport_state || hook || !tdata->msg->body ||
pj_stricmp2(&tdata->msg->body->content_type.subtype, "sdp") || ast_strlen_zero(transport->external_media_address)) { !ast_sip_is_content_type(&tdata->msg->body->content_type, "application", "sdp") ||
ast_strlen_zero(transport->external_media_address)) {
return; return;
} }