automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-20 05:04:37 +00:00
parent 38504cba52
commit d8220c853c

View File

@@ -3627,7 +3627,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
return -2;
}
/* Check for Media-description-level-address for audio */
if (pedanticsipchecking) {
c = get_sdp_iterate(&destiterator, req, "c");
if (!ast_strlen_zero(c)) {
if (sscanf(c, "IN IP4 %256s", host) != 1) {
@@ -3640,7 +3639,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
}
}
}
}
/* RTP addresses and ports for audio and video */
sin.sin_family = AF_INET;
memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
@@ -3655,7 +3653,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
}
}
/* Check for Media-description-level-address for video */
if (pedanticsipchecking) {
c = get_sdp_iterate(&destiterator, req, "c");
if (!ast_strlen_zero(c)) {
if (sscanf(c, "IN IP4 %256s", host) != 1) {
@@ -3668,7 +3665,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
}
}
}
}
/* Setup video port number */
sin.sin_port = htons(vportno);
if (p->vrtp && sin.sin_port) {