Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Process client responses with multipart content #126

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Process client responses with multipart content #126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6169f6e
Process client responses with multipart content
tinusm369 May 3, 2022
e1678b0
Fixed build errors
tinusm369 May 4, 2022
f4e752b
Merge branch 'freeswitch:master' into multipart
tinusm369 Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 55 additions & 1 deletion libsofia-sip-ua/nua/nua_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,8 +940,62 @@ static int nua_session_client_response(nua_client_request_t *cr,
SU_DEBUG_5(("nua(%p): %s: %s %s in %u %s (%u)\n", \
(void *)nh, cr->cr_method_name, (m), received, status, phrase, cr->cr_answer_recv))

retry:
sip_t *req = (sip_t *) sip;
msg_t *msg = nta_outgoing_getrequest(cr->cr_orq);
su_home_t * home_temp = NULL;
home_temp = su_home_create();
su_home_init(home_temp);

//For multipart content type, parse it, find application/sdp part and replace payload in response.
if (req->sip_content_type && su_casenmatch(req->sip_content_type->c_type, "multipart/", 10)) {
msg_multipart_t *mp, *mpp;

if (req->sip_multipart) {
mp = req->sip_multipart;
} else {
mp = msg_multipart_parse(home_temp, req->sip_content_type, (sip_payload_t *)req->sip_payload);
req->sip_multipart = mp;
}

if (mp) {
int sdp = 0;
/* extract the SDP and set the primary content-type and payload to that SDP as if it was the only content so SOA will work */
for (mpp = mp; mpp; mpp = mpp->mp_next) {
if (mpp->mp_content_type && mpp->mp_content_type->c_type &&
mpp->mp_payload && mpp->mp_payload->pl_data &&
su_casenmatch(mpp->mp_content_type->c_type, "application/sdp", 15)) {
req->sip_content_type = msg_content_type_dup (msg_home(msg), mpp->mp_content_type);

if (req->sip_content_length) {
req->sip_content_length->l_length = mpp->mp_payload->pl_len;
}

req->sip_payload->pl_data = su_strdup (msg_home(msg), mpp->mp_payload->pl_data);
req->sip_payload->pl_len = mpp->mp_payload->pl_len;

sdp++;
break;
}
}

/* insist on the existance of a SDP in the content */
if (!sdp) {
if (home_temp) {
su_home_destroy (home_temp);
su_home_unref (home_temp);
home_temp = NULL;
}
}
}
}
if (home_temp) {
su_home_destroy (home_temp);
su_home_unref (home_temp);
home_temp = NULL;
}

retry:

if (!ss || !sip || 300 <= status)
/* Xyzzy */;
else if (!session_get_description(sip, &sdp, &len))
Expand Down