diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-09-20 08:10:42 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-20 08:10:42 -0500 |
| commit | 5ac8b9fcc24410e190da5d0d71b4b78b42203995 (patch) | |
| tree | c592b6311f83fff15467db0b3e4337a887816d3d | |
| parent | 8c8369b6e0934ebe16984fc3ff88c1d262b1ef4e (diff) | |
| parent | fbbc4d2433ee7a5c99ff36ae66b0d4543fa94c6c (diff) | |
Merge "res_pjsip_pubsub: Check for Content-Type header in rx_notify_request" into 15
| -rw-r--r-- | res/res_pjsip_pubsub.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 81b25ac2e..b0365d9d4 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -3524,10 +3524,12 @@ error: return PJ_TRUE; } +static pjsip_media_type simple_message_summary; + static pj_bool_t pubsub_on_rx_notify_request(pjsip_rx_data *rdata) { - if (pj_stricmp2(&rdata->msg_info.msg->body->content_type.type, "application") == 0 && - pj_stricmp2(&rdata->msg_info.msg->body->content_type.subtype, "simple-message-summary") == 0) { + if (rdata->msg_info.msg->body && + pjsip_media_type_cmp(&rdata->msg_info.msg->body->content_type, &simple_message_summary, 0) == 0) { return pubsub_on_rx_mwi_notify_request(rdata); } return PJ_FALSE; @@ -5363,6 +5365,8 @@ static int load_module(void) return AST_MODULE_LOAD_DECLINE; } + pjsip_media_type_init2(&simple_message_summary, "application", "simple-message-summary"); + if (ast_sched_start_thread(sched)) { ast_log(LOG_ERROR, "Could not start scheduler thread for publication expiration\n"); ast_sched_context_destroy(sched); |