<!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][16253] </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=16253">16253</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-01-11 18:40:43 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> don't segfault when -nonat is used and nat_map reinit is called </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_nath">freeswitch/trunk/src/include/switch_nat.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcswitch_natc">freeswitch/trunk/src/switch_nat.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_nath"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_nat.h (16252 => 16253)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_nat.h 2010-01-12 00:31:29 UTC (rev 16252)
+++ freeswitch/trunk/src/include/switch_nat.h 2010-01-12 00:40:43 UTC (rev 16253)
</span><span class="lines">@@ -89,6 +89,10 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto, switch_port_t *external_port, switch_bool_t sticky);
</span><span class="cx"> /*!
</span><ins>+ \brief Has the NAT subsystem been initialized
+*/
+SWITCH_DECLARE(switch_bool_t) switch_nat_is_initialized(void);
+/*!
</ins><span class="cx"> \brief Deletes a NAT mapping
</span><span class="cx"> \param proto Protocol
</span><span class="cx"> */
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (16252 => 16253)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-01-12 00:31:29 UTC (rev 16252)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-01-12 00:40:43 UTC (rev 16253)
</span><span class="lines">@@ -112,6 +112,11 @@
</span><span class="cx"> if (!cmd) {
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><ins>+
+ if (!switch_nat_is_initialized()) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "nat_map API called while NAT not initialized\n");
+ goto error;
+ }
</ins><span class="cx">
</span><span class="cx"> mydata = strdup(cmd);
</span><span class="cx"> switch_assert(mydata);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (16252 => 16253)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-01-12 00:31:29 UTC (rev 16252)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-01-12 00:40:43 UTC (rev 16253)
</span><span class="lines">@@ -2399,6 +2399,66 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_recordings_dir_set(void * jarg1, char * jarg2) {
+ switch_directories *arg1 = (switch_directories *) 0 ;
+ char *arg2 = (char *) 0 ;
+
+ arg1 = (switch_directories *)jarg1;
+ arg2 = (char *)jarg2;
+ {
+ if (arg1->recordings_dir) delete [] arg1->recordings_dir;
+ if (arg2) {
+ arg1->recordings_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+ strcpy((char *)arg1->recordings_dir, (const char *)arg2);
+ } else {
+ arg1->recordings_dir = 0;
+ }
+ }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_recordings_dir_get(void * jarg1) {
+ char * jresult ;
+ switch_directories *arg1 = (switch_directories *) 0 ;
+ char *result = 0 ;
+
+ arg1 = (switch_directories *)jarg1;
+ result = (char *) ((arg1)->recordings_dir);
+ jresult = SWIG_csharp_string_callback((const char *)result);
+ return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_sounds_dir_set(void * jarg1, char * jarg2) {
+ switch_directories *arg1 = (switch_directories *) 0 ;
+ char *arg2 = (char *) 0 ;
+
+ arg1 = (switch_directories *)jarg1;
+ arg2 = (char *)jarg2;
+ {
+ if (arg1->sounds_dir) delete [] arg1->sounds_dir;
+ if (arg2) {
+ arg1->sounds_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+ strcpy((char *)arg1->sounds_dir, (const char *)arg2);
+ } else {
+ arg1->sounds_dir = 0;
+ }
+ }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_sounds_dir_get(void * jarg1) {
+ char * jresult ;
+ switch_directories *arg1 = (switch_directories *) 0 ;
+ char *result = 0 ;
+
+ arg1 = (switch_directories *)jarg1;
+ result = (char *) ((arg1)->sounds_dir);
+ jresult = SWIG_csharp_string_callback((const char *)result);
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directories() {
</span><span class="cx"> void * jresult ;
</span><span class="cx"> switch_directories *result = 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (16252 => 16253)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-01-12 00:31:29 UTC (rev 16252)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-01-12 00:40:43 UTC (rev 16253)
</span><span class="lines">@@ -5490,6 +5490,18 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_storage_dir_get")]
</span><span class="cx"> public static extern string switch_directories_storage_dir_get(HandleRef jarg1);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_recordings_dir_set")]
+ public static extern void switch_directories_recordings_dir_set(HandleRef jarg1, string jarg2);
+
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_recordings_dir_get")]
+ public static extern string switch_directories_recordings_dir_get(HandleRef jarg1);
+
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_sounds_dir_set")]
+ public static extern void switch_directories_sounds_dir_set(HandleRef jarg1, string jarg2);
+
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_sounds_dir_get")]
+ public static extern string switch_directories_sounds_dir_get(HandleRef jarg1);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_new_switch_directories")]
</span><span class="cx"> public static extern IntPtr new_switch_directories();
</span><span class="cx">
</span><span class="lines">@@ -21594,6 +21606,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public string recordings_dir {
+ set {
+ freeswitchPINVOKE.switch_directories_recordings_dir_set(swigCPtr, value);
+ }
+ get {
+ string ret = freeswitchPINVOKE.switch_directories_recordings_dir_get(swigCPtr);
+ return ret;
+ }
+ }
+
+ public string sounds_dir {
+ set {
+ freeswitchPINVOKE.switch_directories_sounds_dir_set(swigCPtr, value);
+ }
+ get {
+ string ret = freeswitchPINVOKE.switch_directories_sounds_dir_get(swigCPtr);
+ return ret;
+ }
+ }
+
</ins><span class="cx"> public switch_directories() : this(freeswitchPINVOKE.new_switch_directories(), true) {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -22473,6 +22505,7 @@
</span><span class="cx"> SWITCH_EVENT_RECORD_STOP,
</span><span class="cx"> SWITCH_EVENT_CALL_UPDATE,
</span><span class="cx"> SWITCH_EVENT_FAILURE,
</span><ins>+ SWITCH_EVENT_SOCKET_DATA,
</ins><span class="cx"> SWITCH_EVENT_ALL
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -26256,7 +26289,8 @@
</span><span class="cx"> SCSC_CANCEL_SHUTDOWN,
</span><span class="cx"> SCSC_SEND_SIGHUP,
</span><span class="cx"> SCSC_DEBUG_LEVEL,
</span><del>- SCSC_FLUSH_DB_HANDLES
</del><ins>+ SCSC_FLUSH_DB_HANDLES,
+ SCSC_SHUTDOWN_NOW
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_natc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_nat.c (16252 => 16253)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_nat.c 2010-01-12 00:31:29 UTC (rev 16252)
+++ freeswitch/trunk/src/switch_nat.c 2010-01-12 00:40:43 UTC (rev 16253)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> static nat_globals_perm_t nat_globals_perm;
</span><span class="cx">
</span><span class="cx"> static switch_bool_t first_init = SWITCH_TRUE;
</span><ins>+static switch_bool_t initialized = SWITCH_FALSE;
</ins><span class="cx">
</span><span class="cx"> static switch_status_t get_upnp_pubaddr(char *pub_addr)
</span><span class="cx"> {
</span><span class="lines">@@ -414,6 +415,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No PMP or UPnP NAT devices detected!\n");
</span><span class="cx"> }
</span><span class="cx"> first_init = SWITCH_FALSE;
</span><ins>+ initialized = SWITCH_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t switch_nat_add_mapping_pmp(switch_port_t port, switch_nat_ip_proto_t proto, switch_port_t *external_port)
</span><span class="lines">@@ -630,7 +632,6 @@
</span><span class="cx"> if (!(natxml = switch_xml_parse_str_dup(stream.data))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to parse XML: %s\n", (char *) stream.data);
</span><span class="cx"> switch_safe_free(stream.data);
</span><del>- return;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* iterate the xml and publish the mappings */
</span><span class="lines">@@ -677,6 +678,10 @@
</span><span class="cx"> return stream.data; /* caller frees */
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_bool_t) switch_nat_is_initialized(void)
+{
+ return initialized;
+}
</ins><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_nat_shutdown(void)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>