From 457b0d6cc6ade0a1c40b8712b30bd4abe2cd42ee Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Tue, 12 Oct 2010 11:35:55 +0000 Subject: Closed #1146: support for multipart message bodies in incoming NOTIFY requests git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3337 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/include/pjsip-simple/presence.h | 42 +++++++ pjsip/src/pjsip-simple/presence.c | 31 ++++++ pjsip/src/pjsip-simple/presence_body.c | 26 ++++- .../uas-subscribe-multipart-notify.xml | 124 +++++++++++++++++++++ 4 files changed, 217 insertions(+), 6 deletions(-) create mode 100644 tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.xml diff --git a/pjsip/include/pjsip-simple/presence.h b/pjsip/include/pjsip-simple/presence.h index 7c996123..eaf8ba86 100644 --- a/pjsip/include/pjsip-simple/presence.h +++ b/pjsip/include/pjsip-simple/presence.h @@ -328,11 +328,31 @@ PJ_DECL(pj_status_t) pjsip_pres_create_xpidf(pj_pool_t *pool, * @param status The presence status to be initialized. * * @return PJ_SUCCESS on success. + * + * @see pjsip_pres_parse_pidf2() */ PJ_DECL(pj_status_t) pjsip_pres_parse_pidf(pjsip_rx_data *rdata, pj_pool_t *pool, pjsip_pres_status *status); +/** + * This is a utility function to parse PIDF body into PJSIP presence status. + * + * @param body Text body, with one extra space at the end to place + * NULL character temporarily during parsing. + * @param body_len Length of the body, not including the NULL termination + * character. + * @param pool Pool to allocate memory to copy the strings into + * the presence status structure. + * @param status The presence status to be initialized. + * + * @return PJ_SUCCESS on success. + * + * @see pjsip_pres_parse_pidf() + */ +PJ_DECL(pj_status_t) pjsip_pres_parse_pidf2(char *body, unsigned body_len, + pj_pool_t *pool, + pjsip_pres_status *status); /** @@ -344,12 +364,34 @@ PJ_DECL(pj_status_t) pjsip_pres_parse_pidf(pjsip_rx_data *rdata, * @param status The presence status to be initialized. * * @return PJ_SUCCESS on success. + * + * @see pjsip_pres_parse_xpidf2() */ PJ_DECL(pj_status_t) pjsip_pres_parse_xpidf(pjsip_rx_data *rdata, pj_pool_t *pool, pjsip_pres_status *status); +/** + * This is a utility function to parse X-PIDF body into PJSIP presence status. + * + * @param body Text body, with one extra space at the end to place + * NULL character temporarily during parsing. + * @param body_len Length of the body, not including the NULL termination + * character. + * @param pool Pool to allocate memory to copy the strings into + * the presence status structure. + * @param status The presence status to be initialized. + * + * @return PJ_SUCCESS on success. + * + * @see pjsip_pres_parse_xpidf() + */ +PJ_DECL(pj_status_t) pjsip_pres_parse_xpidf2(char *body, unsigned body_len, + pj_pool_t *pool, + pjsip_pres_status *status); + + /** * @} diff --git a/pjsip/src/pjsip-simple/presence.c b/pjsip/src/pjsip-simple/presence.c index 24049359..b2f48262 100644 --- a/pjsip/src/pjsip-simple/presence.c +++ b/pjsip/src/pjsip-simple/presence.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -682,6 +683,7 @@ static pj_status_t pres_process_rx_notify( pjsip_pres *pres, pj_str_t **p_st_text, pjsip_hdr *res_hdr) { + const pj_str_t STR_MULTIPART = { "multipart", 9 }; pjsip_ctype_hdr *ctype_hdr; pj_status_t status; @@ -707,7 +709,36 @@ static pj_status_t pres_process_rx_notify( pjsip_pres *pres, } /* Parse content. */ + if (pj_stricmp(&ctype_hdr->media.type, &STR_MULTIPART)==0) { + pjsip_multipart_part *mpart; + pjsip_media_type ctype; + + pjsip_media_type_init(&ctype, (pj_str_t*)&STR_APPLICATION, + (pj_str_t*)&STR_PIDF_XML); + mpart = pjsip_multipart_find_part(rdata->msg_info.msg->body, + &ctype, NULL); + if (mpart) { + status = pjsip_pres_parse_pidf2((char*)mpart->body->data, + mpart->body->len, pres->tmp_pool, + &pres->tmp_status); + } + if (mpart==NULL) { + pjsip_media_type_init(&ctype, (pj_str_t*)&STR_APPLICATION, + (pj_str_t*)&STR_XPIDF_XML); + mpart = pjsip_multipart_find_part(rdata->msg_info.msg->body, + &ctype, NULL); + if (mpart) { + status = pjsip_pres_parse_xpidf2((char*)mpart->body->data, + mpart->body->len, + pres->tmp_pool, + &pres->tmp_status); + } else { + status = PJSIP_SIMPLE_EBADCONTENT; + } + } + } + else if (pj_stricmp(&ctype_hdr->media.type, &STR_APPLICATION)==0 && pj_stricmp(&ctype_hdr->media.subtype, &STR_PIDF_XML)==0) { diff --git a/pjsip/src/pjsip-simple/presence_body.c b/pjsip/src/pjsip-simple/presence_body.c index a57e8df9..70ce0226 100644 --- a/pjsip/src/pjsip-simple/presence_body.c +++ b/pjsip/src/pjsip-simple/presence_body.c @@ -198,13 +198,20 @@ PJ_DEF(pj_status_t) pjsip_pres_create_xpidf( pj_pool_t *pool, PJ_DEF(pj_status_t) pjsip_pres_parse_pidf( pjsip_rx_data *rdata, pj_pool_t *pool, pjsip_pres_status *pres_status) +{ + return pjsip_pres_parse_pidf2((char*)rdata->msg_info.msg->body->data, + rdata->msg_info.msg->body->len, + pool, pres_status); +} + +PJ_DEF(pj_status_t) pjsip_pres_parse_pidf2(char *body, unsigned body_len, + pj_pool_t *pool, + pjsip_pres_status *pres_status) { pjpidf_pres *pidf; pjpidf_tuple *pidf_tuple; - pidf = pjpidf_parse(rdata->tp_info.pool, - (char*)rdata->msg_info.msg->body->data, - rdata->msg_info.msg->body->len); + pidf = pjpidf_parse(pool, body, body_len); if (pidf == NULL) return PJSIP_SIMPLE_EBADPIDF; @@ -250,12 +257,19 @@ PJ_DEF(pj_status_t) pjsip_pres_parse_pidf( pjsip_rx_data *rdata, PJ_DEF(pj_status_t) pjsip_pres_parse_xpidf(pjsip_rx_data *rdata, pj_pool_t *pool, pjsip_pres_status *pres_status) +{ + return pjsip_pres_parse_xpidf2((char*)rdata->msg_info.msg->body->data, + rdata->msg_info.msg->body->len, + pool, pres_status); +} + +PJ_DEF(pj_status_t) pjsip_pres_parse_xpidf2(char *body, unsigned body_len, + pj_pool_t *pool, + pjsip_pres_status *pres_status) { pjxpidf_pres *xpidf; - xpidf = pjxpidf_parse(rdata->tp_info.pool, - (char*)rdata->msg_info.msg->body->data, - rdata->msg_info.msg->body->len); + xpidf = pjxpidf_parse(pool, body, body_len); if (xpidf == NULL) return PJSIP_SIMPLE_EBADXPIDF; diff --git a/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.xml b/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.xml new file mode 100644 index 00000000..49e42747 --- /dev/null +++ b/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Content-Length: 0 + Expires: 60 + ]]> + + + + ;tag=[call_number] + To[$3] + Call-ID: [call_id] + Cseq: 1 NOTIFY + Contact: sip:sipp@[local_ip]:[local_port] + Max-Forwards: 70 + Event: presence + Subscription-State: active;expires=50 + Content-Type: multipart/mixed;boundary=abcd + + --abcd + Content-Type: text/plain + + Hi there, please don't read this part. + --abcd + Content-Type: application/pidf+xml + + + + + + open + + + + --abcd-- + ]]> + + + + + + + + + + + + + + + + Content-Length: 0 + ]]> + + + + + + + + + + + + + -- cgit v1.2.3