kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add NTATAG_SERVER_RPORT(2) that will act like there is always a rport in the via. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8643 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-25 21:22:35 +00:00
parent ce9ccd4ae7
commit ebe2cf67af
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/sofia-sip/libsofia-sip-ua/nta/nta.c
View File

@ -987,7 +987,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
void *smime = agent->sa_smime;
uint32_t flags = agent->sa_flags;
int rport = agent->sa_rport;
int server_rport = agent->sa_server_rport;
unsigned server_rport = agent->sa_server_rport;
int tcp_rport = agent->sa_tcp_rport;
unsigned preload = agent->sa_preload;
unsigned threadpool = agent->sa_tport_threadpool;
@ -2579,7 +2579,7 @@ int agent_check_request_via(nta_agent_t *agent,
rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
msg_header_replace_param(msg_home(msg), v->v_common, rport);
}
else {
else if (agent->sa_server_rport == 2) {
rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
msg_header_replace_param(msg_home(msg), v->v_common, rport);
}

2
libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h
View File

@ -226,7 +226,7 @@ struct nta_agent_s
/** If true, use rport at client */
unsigned sa_rport:1;
/** If true, use rport at server */
unsigned sa_server_rport:1;
unsigned sa_server_rport:2;
/** If true, use rport with tcp, too */
unsigned sa_tcp_rport:1;

2
libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
View File

@ -1334,7 +1334,7 @@ tag_typedef_t ntatag_client_rport = BOOLTAG_TYPEDEF(client_rport);
*
* @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via
*/
tag_typedef_t ntatag_server_rport = BOOLTAG_TYPEDEF(server_rport);
tag_typedef_t ntatag_server_rport = UINTTAG_TYPEDEF(server_rport);
/**@def NTATAG_TCP_RPORT(x)

2
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -544,6 +544,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)),
TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)),
NTATAG_UDP_MTU(65536),
NTATAG_SERVER_RPORT(2),
TAG_IF(tportlog, TPTAG_LOG(1)),
TAG_END()); /* Last tag should always finish the sequence */
@ -586,6 +587,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
node->nua = nua_create(profile->s_root, /* Event loop */
sofia_event_callback, /* Callback for processing events */
profile, /* Additional data to pass to callback */
NTATAG_SERVER_RPORT(2),
NUTAG_URL(node->url), TAG_END()); /* Last tag should always finish the sequence */
nua_set_params(node->nua,