<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14541] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14541">14541</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-08-16 19:32:26 -0500 (Sun, 16 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_sofia: refactor sofia_glue_tech_choose_[video_]port</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (14540 => 14541)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-08-16 21:57:30 UTC (rev 14540)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-08-17 00:32:26 UTC (rev 14541)
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx"> void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now);
</span><span class="cx"> void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now);
</span><span class="cx"> void sofia_reg_unregister(sofia_profile_t *profile);
</span><del>-switch_status_t sofia_glue_ext_address_lookup(sofia_profile_t *profile, private_object_t *tech_pvt, char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool);
</del><ins>+switch_status_t sofia_glue_ext_address_lookup(sofia_profile_t *profile, private_object_t *tech_pvt, char **ip, switch_port_t *port, const char *sourceip, switch_memory_pool_t *pool);
</ins><span class="cx">
</span><span class="cx"> void sofia_glue_pass_sdp(private_object_t *tech_pvt, char *sdp);
</span><span class="cx"> int sofia_glue_get_user_host(char *in, char **user, char **host);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (14540 => 14541)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-08-16 21:57:30 UTC (rev 14540)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-08-17 00:32:26 UTC (rev 14541)
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> switch_channel_set_name(tech_pvt->channel, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t sofia_glue_ext_address_lookup(sofia_profile_t *profile, private_object_t *tech_pvt, char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool)
</del><ins>+switch_status_t sofia_glue_ext_address_lookup(sofia_profile_t *profile, private_object_t *tech_pvt, char **ip, switch_port_t *port, const char *sourceip, switch_memory_pool_t *pool)
</ins><span class="cx"> {
</span><span class="cx"> char *error = "";
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> if (!sofia_test_pflag(profile, PFLAG_STUN_ENABLED)) {
</span><span class="cx"> *ip = switch_core_strdup(pool, profile->rtpip);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Trying to use STUN but its disabled!\n");
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ goto out;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stun_ip = strdup(sourceip + 5);
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- *ip = sourceip;
</del><ins>+ *ip = (char*)sourceip;
</ins><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -635,13 +635,11 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t sofia_glue_tech_choose_port(private_object_t *tech_pvt, int force)
</span><span class="cx"> {
</span><del>- char *rtpip = tech_pvt->profile->rtpip;
- char *lookup_rtpip = NULL;
- switch_port_t sdp_port;
- char tmp[50];
- const char *use_ip = NULL;
- switch_port_t external_port = 0;
</del><ins>+ char *lookup_rtpip = tech_pvt->profile->rtpip; /* Pointer to externally looked up address */
+ switch_port_t sdp_port; /* The external port to be sent in the SDP */
+ const char *use_ip = NULL; /* The external IP to be sent in the SDP */
</ins><span class="cx">
</span><ins>+ /* Don't do anything if we're in proxy mode or if a (remote) port already has been found */
</ins><span class="cx"> if (!force) {
</span><span class="cx"> if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) ||
</span><span class="cx"> switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->adv_sdp_audio_port) {
</span><span class="lines">@@ -649,90 +647,123 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Release the local sdp port */
</ins><span class="cx"> if (tech_pvt->local_sdp_audio_port) {
</span><span class="cx"> switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
- tech_pvt->local_sdp_audio_ip = rtpip;
-
</del><ins>+ /* Request a local port from the core's allocator */
</ins><span class="cx"> if (!(tech_pvt->local_sdp_audio_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><ins>+
+ tech_pvt->local_sdp_audio_ip = tech_pvt->profile->rtpip;
+
</ins><span class="cx"> sdp_port = tech_pvt->local_sdp_audio_port;
</span><span class="cx">
</span><del>- if (!(use_ip = switch_channel_get_variable(tech_pvt->channel, "rtp_adv_audio_ip")) && !sofia_test_pflag(tech_pvt->profile, PFLAG_AUTO_NAT)) {
- if (tech_pvt->profile->extrtpip) {
</del><ins>+ if (!(use_ip = switch_channel_get_variable(tech_pvt->channel, "rtp_adv_audio_ip"))
+ && !switch_strlen_zero(tech_pvt->profile->extrtpip)) {
</ins><span class="cx"> use_ip = tech_pvt->profile->extrtpip;
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (use_ip) {
</span><del>- tech_pvt->extrtpip = switch_core_session_strdup(tech_pvt->session, use_ip);
</del><span class="cx"> if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &lookup_rtpip, &sdp_port,
</span><del>- tech_pvt->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
- return SWITCH_STATUS_FALSE;
</del><ins>+ use_ip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
+ /* Address lookup was required and fail (external ip was "host:..." or "stun:...") */
+ return SWITCH_STATUS_FALSE;
+ } else {
+ if (lookup_rtpip == use_ip) {
+ /* sofia_glue_ext_address_lookup didn't return any error, but the return IP is the same as the original one,
+ which means no lookup was necessary. Check if NAT is detected */
+ if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
+ /* Yes, map the port through switch_nat */
+ switch_nat_add_mapping(tech_pvt->local_sdp_audio_port, SWITCH_NAT_UDP, &sdp_port, SWITCH_FALSE);
+ } else {
+ /* No NAT detected */
+ use_ip = tech_pvt->profile->rtpip;
+ }
+ } else {
+ /* Address properly resolved, use it as external ip */
+ use_ip = lookup_rtpip;
+ }
</ins><span class="cx"> }
</span><del>- }
-
- if (tech_pvt->profile->extrtpip && sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
- tech_pvt->adv_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, lookup_rtpip ? lookup_rtpip : tech_pvt->profile->extrtpip);
- switch_nat_add_mapping((switch_port_t)sdp_port, SWITCH_NAT_UDP, &external_port, SWITCH_FALSE);
</del><span class="cx"> } else {
</span><del>- tech_pvt->adv_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, rtpip);
</del><ins>+ /* No NAT traversal required, use the profile's rtp ip */
+ use_ip = tech_pvt->profile->rtpip;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- tech_pvt->adv_sdp_audio_port = external_port != 0 ? external_port : sdp_port;
</del><ins>+ tech_pvt->adv_sdp_audio_port = sdp_port;
+ tech_pvt->adv_sdp_audio_ip = tech_pvt->extrtpip = switch_core_session_strdup(tech_pvt->session, use_ip);
</ins><span class="cx">
</span><del>- switch_snprintf(tmp, sizeof(tmp), "%d", sdp_port);
</del><span class="cx"> switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip);
</span><del>- switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, tmp);
</del><ins>+ switch_channel_set_variable_printf(tech_pvt->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, "%d", sdp_port);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, int force)
</span><span class="cx"> {
</span><del>- char *ip = tech_pvt->profile->rtpip;
- switch_port_t sdp_port;
- char tmp[50];
- switch_port_t external_port = 0;
</del><ins>+ char *lookup_rtpip = tech_pvt->profile->rtpip; /* Pointer to externally looked up address */
+ switch_port_t sdp_port; /* The external port to be sent in the SDP */
+ const char *use_ip = NULL; /* The external IP to be sent in the SDP */
</ins><span class="cx">
</span><ins>+ /* Don't do anything if we're in proxy mode or if a (remote) port already has been found */
</ins><span class="cx"> if (!force) {
</span><del>- if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)
- || tech_pvt->local_sdp_video_port) {
</del><ins>+ if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) ||
+ switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->adv_sdp_video_port) {
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Release the local sdp port */
</ins><span class="cx"> if (tech_pvt->local_sdp_video_port) {
</span><span class="cx"> switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Request a local port from the core's allocator */
</ins><span class="cx"> if (!(tech_pvt->local_sdp_video_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> sdp_port = tech_pvt->local_sdp_video_port;
</span><span class="cx">
</span><ins>+ if (!(use_ip = switch_channel_get_variable(tech_pvt->channel, "rtp_adv_video_ip"))
+ && !switch_strlen_zero(tech_pvt->profile->extrtpip)) {
+ use_ip = tech_pvt->profile->extrtpip;
+ }
</ins><span class="cx">
</span><del>- if (tech_pvt->profile->extrtpip) {
- if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &ip, &sdp_port, tech_pvt->profile->extrtpip,
- switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
- return SWITCH_STATUS_FALSE;
</del><ins>+ if (use_ip) {
+ if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &lookup_rtpip, &sdp_port,
+ use_ip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
+ /* Address lookup was required and fail (external ip was "host:..." or "stun:...") */
+ return SWITCH_STATUS_FALSE;
+ } else {
+ if (lookup_rtpip == use_ip) {
+ /* sofia_glue_ext_address_lookup didn't return any error, but the return IP is the same as the original one,
+ which means no lookup was necessary. Check if NAT is detected */
+ if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
+ /* Yes, map the port through switch_nat */
+ switch_nat_add_mapping(tech_pvt->local_sdp_video_port, SWITCH_NAT_UDP, &sdp_port, SWITCH_FALSE);
+ } else {
+ /* No NAT detected */
+ use_ip = tech_pvt->profile->rtpip;
+ }
+ } else {
+ /* Address properly resolved, use it as external ip */
+ use_ip = lookup_rtpip;
+ }
</ins><span class="cx"> }
</span><ins>+ } else {
+ /* No NAT traversal required, use the profile's rtp ip */
+ use_ip = tech_pvt->profile->rtpip;
</ins><span class="cx"> }
</span><del>-
- if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
- switch_nat_add_mapping((switch_port_t)sdp_port, SWITCH_NAT_UDP, &external_port, SWITCH_FALSE);
- }
</del><span class="cx">
</span><del>- tech_pvt->adv_sdp_video_port = external_port != 0 ? external_port : sdp_port;
-
- switch_snprintf(tmp, sizeof(tmp), "%d", sdp_port);
</del><ins>+ tech_pvt->adv_sdp_video_port = sdp_port;
</ins><span class="cx"> switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_VIDEO_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip);
</span><del>- switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_VIDEO_PORT_VARIABLE, tmp);
</del><ins>+ switch_channel_set_variable_printf(tech_pvt->channel, SWITCH_LOCAL_VIDEO_PORT_VARIABLE, "%d", sdp_port);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>