DeforaNetworks/siproxd
3
0
Fork 0
Code Releases Activity

- If RTP proxy is disabled, don't rewrite incomming

Browse Source 
SDP bodies (patch from Robert Högberg)
This commit is contained in:
Thomas Ries
2004-01-30 21:58:51 +00:00
parent ba2b99a635
commit f4ce99e003
2 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5 -3
View File
@@ -1,9 +1,11 @@
0.5.2
=====
30-Jan-2004: - If RTP proxy is disabled, don't rewrite incomming
SDP bodies (patch from Robert Högberg)
29-Jan-2004: - new doc/RFC3261_compliance.txt and comments in the
code that refer to the RFC.
28-Jan-2004: - don't die on INVITE requests that include no Contact
header - which is legal. (patch by Robert Högberg)
header - which is legal. (patch from Robert Högberg)
- RTP proxy: don't try to forward empty RTP packets
- renamed some variables of rtp_proxytable_t to make
better sense (changed meaning in fullduplex RTP proxy)
@@ -12,12 +14,12 @@
now honors RFC3261 for stateless proxies (section 16.11)
- SIP request: remove a Route-header pointing to myself.
This was an issue with Linphone 0.12.1.
(patch by Robert Högberg).
(patch from Robert Högberg).
- removed IPCHAINS & IPTABLES (netfilter) proxy support
- RTPPROXY correction: match RTP ports crosswise -
use one single port (and socket) on each side (inbound/
outbound) to send and receive RTP traffic for every
active stream (patch by Christof Meerwald).
active stream (patch from Christof Meerwald).
22-Jan-2004: - ./configure option: --enable-static to build
a completely statically linked executable
- REGISTER honors the expires parameter
src/proxy.c
+49 -38
View File
@@ -273,7 +273,7 @@ int proxy_request (osip_message_t *request) {
* (rewrite request URI to point to the real host)
*/
/* 'i' still holds the valid index into the URLMAP table */
if (check_rewrite_rq_uri(request)==STS_TRUE) {
if (check_rewrite_rq_uri(request) == STS_TRUE) {
proxy_rewrite_request_uri(request, i);
}
@@ -297,7 +297,9 @@ int proxy_request (osip_message_t *request) {
/* check for incoming request */
} else if (MSG_IS_INVITE(request)) {
/* First, rewrite the body */
sts = proxy_rewrite_invitation_body(request, DIR_INCOMING);
if (configuration.rtp_proxy_enable == 1) {
sts = proxy_rewrite_invitation_body(request, DIR_INCOMING);
}
/*
* Note: Incoming requests have no need to rewrite Contact
@@ -401,7 +403,7 @@ int proxy_request (osip_message_t *request) {
if (configuration.outbound_proxy_port) {
port=configuration.outbound_proxy_port;
} else {
port = 5060;
port = SIP_PORT;
}
} else {
/* get the destination from the SIP URI */
@@ -510,8 +512,10 @@ int proxy_response (osip_message_t *response) {
(compare_url(response->to->url, urlmap[i].reg_url)==STS_SUCCESS)){
type=RESTYP_OUTGOING;
DEBUGC(DBCLASS_PROXY,"outgoing response for %s@%s from inbound",
response->from->url->username? response->from->url->username:"*NULL*",
response->from->url->host? response->from->url->host : "*NULL*");
response->from->url->username ?
response->from->url->username : "*NULL*",
response->from->url->host ?
response->from->url->host : "*NULL*");
break;
}
}
@@ -529,7 +533,9 @@ int proxy_response (osip_message_t *response) {
((MSG_TEST_CODE(response, 200)) ||
(MSG_TEST_CODE(response, 183)))) {
/* This is an incoming response, therefore we need an incoming stream */
sts = proxy_rewrite_invitation_body(response, DIR_INCOMING);
if (configuration.rtp_proxy_enable == 1) {
sts = proxy_rewrite_invitation_body(response, DIR_INCOMING);
}
}
@@ -585,7 +591,7 @@ int proxy_response (osip_message_t *response) {
if (configuration.outbound_proxy_port) {
port=configuration.outbound_proxy_port;
} else {
port = 5060;
port = SIP_PORT;
}
} else {
/* get target address and port from VIA header */
@@ -666,6 +672,7 @@ int proxy_rewrite_invitation_body(osip_message_t *mymsg, int direction){
osip_free(bodybuff);
if (sts != 0) {
ERROR("rewrite_invitation_body: unable to sdp_message_parse body");
sdp_message_free(sdp);
return STS_FAILURE;
}
@@ -690,6 +697,7 @@ if (configuration.debuglevel)
if (sts == STS_FAILURE) {
DEBUGC(DBCLASS_PROXY, "proxy_rewrite_invitation_body: cannot resolve "
"m= (media) host [%s]", sdp_message_c_addr_get(sdp,-1,0));
sdp_message_free(sdp);
return STS_FAILURE;
}
@@ -697,12 +705,14 @@ if (configuration.debuglevel)
if (sts == STS_FAILURE) {
ERROR("can't find outbound interface %s - configuration error?",
configuration.outbound_if);
sdp_message_free(sdp);
return STS_FAILURE;
}
sts = get_ip_by_ifname(configuration.inbound_if, &inside_addr);
if (sts == STS_FAILURE) {
ERROR("can't find inbound interface %s - configuration error?",
configuration.inbound_if);
sdp_message_free(sdp);
return STS_FAILURE;
}
@@ -742,39 +752,40 @@ if (configuration.debuglevel)
* loop through all m= descritions,
* start RTP proxy and rewrite them
*/
for (media_stream_no=0;;media_stream_no++) {
/* check if n'th media stream is present */
if (sdp_message_m_port_get(sdp, media_stream_no) == NULL) break;
if (configuration.rtp_proxy_enable == 1) {
for (media_stream_no=0;;media_stream_no++) {
/* check if n'th media stream is present */
if (sdp_message_m_port_get(sdp, media_stream_no) == NULL) break;
/* start an RTP proxying stream */
if (sdp_message_m_port_get(sdp, media_stream_no)) {
msg_port=atoi(sdp_message_m_port_get(sdp, media_stream_no));
/* start an RTP proxying stream */
if (sdp_message_m_port_get(sdp, media_stream_no)) {
msg_port=atoi(sdp_message_m_port_get(sdp, media_stream_no));
if (msg_port > 0) {
rtp_start_fwd(osip_message_get_call_id(mymsg), direction,
media_stream_no,
map_addr, &map_port,
msg_addr, msg_port);
/* and rewrite the port */
sdp_med=osip_list_get(sdp->m_medias, media_stream_no);
if (sdp_med && sdp_med->m_port) {
osip_free(sdp_med->m_port);
sdp_med->m_port=osip_malloc(8);
sprintf(sdp_med->m_port, "%i", map_port);
DEBUGC(DBCLASS_PROXY, "proxy_rewrite_invitation_body: "
"m= rewrote port to [%i]",map_port);
} else {
ERROR("rewriting port in m= failed sdp_med=%p, "
"m_number_of_port=%p", sdp_med, sdp_med->m_port);
}
} // port > 0
} else {
/* no port defined - skip entry */
WARN("no port defined in m=(media) stream_no=%i", media_stream_no);
continue;
}
}
if (msg_port > 0) {
rtp_start_fwd(osip_message_get_call_id(mymsg), direction,
media_stream_no,
map_addr, &map_port,
msg_addr, msg_port);
/* and rewrite the port */
sdp_med=osip_list_get(sdp->m_medias, media_stream_no);
if (sdp_med && sdp_med->m_port) {
osip_free(sdp_med->m_port);
sdp_med->m_port=osip_malloc(8); /* 5 digits, \0 + align */
sprintf(sdp_med->m_port, "%i", map_port);
DEBUGC(DBCLASS_PROXY, "proxy_rewrite_invitation_body: "
"m= rewrote port to [%i]",map_port);
} else {
ERROR("rewriting port in m= failed sdp_med=%p, "
"m_number_of_port=%p", sdp_med, sdp_med->m_port);
}
} /* if msg_port > 0 */
} else {
/* no port defined - skip entry */
WARN("no port defined in m=(media) stream_no=%i", media_stream_no);
continue;
}
} /* for media_stream_no */
} /* if rtp_proxy_enable */
/* remove old body */
sts = osip_list_remove(mymsg->bodies, 0);