dect/asterisk
Archived
14
0
Fork 0
Code Releases Activity

Merged revisions 89280 via svnmerge from

Browse source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89280 | oej | 2007-11-15 12:15:09 +0100 (Tor, 15 Nov 2007) | 5 lines

Improve support for multipart messages. Code by gasparz, changes
by me (mostly formatting). Thanks, gasparz!

Closes issue #10947

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89282 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
oej 2007-11-15 11:27:19 +00:00
parent 9801c2468b
commit 9d192dfb80
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
channels/chan_sip.c
View file

@ -5444,6 +5444,8 @@ static int find_sdp(struct sip_request *req)
char *boundary;
unsigned int x;
int boundaryisquoted = FALSE;
int found_application_sdp = FALSE;
int found_end_of_headers = FALSE;
content_type = get_header(req, "Content-Type");
@ -5476,31 +5478,36 @@ static int find_sdp(struct sip_request *req)
at the beginning */
boundary = ast_strdupa(search - 2);
boundary[0] = boundary[1] = '-';
/* Remove final quote */
if (boundaryisquoted)
boundary[strlen(boundary) - 1] = '\0';
/* search for the boundary marker, but stop when there are not enough
lines left for it, the Content-Type header and at least one line of
body */
for (x = 0; x < (req->lines - 2); x++) {
if (!strncasecmp(req->line[x], boundary, strlen(boundary)) &&
!strcasecmp(req->line[x + 1], "Content-Type: application/sdp")) {
x += 2;
req->sdp_start = x;
/* search for the boundary marker, the empty line delimiting headers from
sdp part and the end boundry if it exists */
/* search for the end of the body part */
for ( ; x < req->lines; x++) {
if (!strncasecmp(req->line[x], boundary, strlen(boundary)))
break;
for (x = 0; x < (req->lines ); x++) {
if(!strncasecmp(req->line[x], boundary, strlen(boundary))){
if(found_application_sdp && found_end_of_headers){
req->sdp_end = x-1;
return 1;
}
found_application_sdp = FALSE;
}
if(!strcasecmp(req->line[x], "Content-Type: application/sdp"))
found_application_sdp = TRUE;
if(strlen(req->line[x]) == 0 ){
if(found_application_sdp && !found_end_of_headers){
req->sdp_start = x;
found_end_of_headers = TRUE;
}
req->sdp_end = x;
return 1;
}
}
return 0;
if(found_application_sdp && found_end_of_headers) {
req->sdp_end = x;
return TRUE;
}
return FALSE;
}
/*! \brief Process SIP SDP offer, select formats and activate RTP channels