<!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][16726] </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=16726">16726</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-22 16:48:50 -0600 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: no more tcp ports in config, cleaning</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (16725 => 16726)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-22 22:42:29 UTC (rev 16725)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-22 22:48:50 UTC (rev 16726)
</span><span class="lines">@@ -147,23 +147,23 @@
</span><span class="cx">
</span><span class="cx"> static struct {
</span><span class="cx"> int debug;
</span><del>- char *ip;
- int port;
</del><ins>+ //char *ip;
+ //int port;
</ins><span class="cx"> char *dialplan;
</span><span class="cx"> char *destination;
</span><span class="cx"> char *context;
</span><del>- char *codec_string;
- char *codec_order[SWITCH_MAX_CODECS];
- int codec_order_last;
- char *codec_rates_string;
- char *codec_rates[SWITCH_MAX_CODECS];
- int codec_rates_last;
- unsigned int flags;
- int fd;
</del><ins>+ //char *codec_string;
+ //char *codec_order[SWITCH_MAX_CODECS];
+ //int codec_order_last;
+ //char *codec_rates_string;
+ //char *codec_rates[SWITCH_MAX_CODECS];
+ //int codec_rates_last;
+ //unsigned int flags;
+ //int fd;
</ins><span class="cx"> int calls;
</span><span class="cx"> int real_interfaces;
</span><span class="cx"> int next_interface;
</span><del>- char hold_music[256];
</del><ins>+ //char hold_music[256];
</ins><span class="cx"> private_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES];
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> private_t *sk_console;
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_destination, globals.destination);
</span><del>-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string);
</del><ins>+//SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string);
+//SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string);
</ins><span class="cx">
</span><span class="cx"> /* BEGIN: Changes here */
</span><span class="cx"> static switch_status_t interface_exists(char *the_interface);
</span><span class="lines">@@ -1416,6 +1416,7 @@
</span><span class="cx"> DEBUGA_SKYPE("globals.debug=%d\n", SKYPIAX_P_LOG, globals.debug);
</span><span class="cx"> globals.debug = atoi(val);
</span><span class="cx"> DEBUGA_SKYPE("globals.debug=%d\n", SKYPIAX_P_LOG, globals.debug);
</span><ins>+#if 0
</ins><span class="cx"> } else if (!strcasecmp(var, "hold-music")) {
</span><span class="cx"> switch_set_string(globals.hold_music, val);
</span><span class="cx"> DEBUGA_SKYPE("globals.hold_music=%s\n", SKYPIAX_P_LOG, globals.hold_music);
</span><span class="lines">@@ -1427,6 +1428,7 @@
</span><span class="cx"> switch_set_flag(&globals, GFLAG_MY_CODEC_PREFS);
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("codec-master globals.debug=%d\n", SKYPIAX_P_LOG, globals.debug);
</span><ins>+#endif //0
</ins><span class="cx"> } else if (!strcmp(var, "dialplan")) {
</span><span class="cx"> set_global_dialplan(val);
</span><span class="cx"> DEBUGA_SKYPE("globals.dialplan=%s\n", SKYPIAX_P_LOG, globals.dialplan);
</span><span class="lines">@@ -1436,6 +1438,7 @@
</span><span class="cx"> } else if (!strcmp(var, "context")) {
</span><span class="cx"> set_global_context(val);
</span><span class="cx"> DEBUGA_SKYPE("globals.context=%s\n", SKYPIAX_P_LOG, globals.context);
</span><ins>+#if 0
</ins><span class="cx"> } else if (!strcmp(var, "codec-prefs")) {
</span><span class="cx"> set_global_codec_string(val);
</span><span class="cx"> DEBUGA_SKYPE("globals.codec_string=%s\n", SKYPIAX_P_LOG, globals.codec_string);
</span><span class="lines">@@ -1444,6 +1447,7 @@
</span><span class="cx"> set_global_codec_rates_string(val);
</span><span class="cx"> DEBUGA_SKYPE("globals.codec_rates_string=%s\n", SKYPIAX_P_LOG, globals.codec_rates_string);
</span><span class="cx"> globals.codec_rates_last = switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
</span><ins>+#endif //0
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1468,8 +1472,8 @@
</span><span class="cx"> char *fail_dial_regex = NULL;
</span><span class="cx"> char *enable_callerid = "true";
</span><span class="cx"> char *X11_display = NULL;
</span><del>- char *tcp_cli_port = NULL;
- char *tcp_srv_port = NULL;
</del><ins>+ //char *tcp_cli_port = "45000";
+ //char *tcp_srv_port = "45001";
</ins><span class="cx"> char *skype_user = NULL;
</span><span class="cx"> char *report_incoming_chatmessages = "true";
</span><span class="cx">
</span><span class="lines">@@ -1503,10 +1507,12 @@
</span><span class="cx"> skype_user = val;
</span><span class="cx"> } else if (!strcasecmp(var, "report_incoming_chatmessages")) {
</span><span class="cx"> report_incoming_chatmessages = val;
</span><ins>+#if 0
</ins><span class="cx"> } else if (!strcasecmp(var, "tcp_cli_port")) {
</span><span class="cx"> tcp_cli_port = val;
</span><span class="cx"> } else if (!strcasecmp(var, "tcp_srv_port")) {
</span><span class="cx"> tcp_srv_port = val;
</span><ins>+#endif//0
</ins><span class="cx"> } else if (!strcasecmp(var, "X11-display") || !strcasecmp(var, "X11_display")) {
</span><span class="cx"> X11_display = val;
</span><span class="cx"> } else if (!strcasecmp(var, "max_digits") || !strcasecmp(var, "max-digits")) {
</span><span class="lines">@@ -1532,10 +1538,13 @@
</span><span class="cx"> }
</span><span class="cx"> /* END: Changes here */
</span><span class="cx">
</span><ins>+#ifndef WIN32
</ins><span class="cx"> if (!X11_display) {
</span><span class="cx"> ERRORA("interface missing REQUIRED param 'X11_display'\n", SKYPIAX_P_LOG);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+#endif
+#if 0
</ins><span class="cx"> if (!tcp_cli_port) {
</span><span class="cx"> ERRORA("interface missing REQUIRED param 'tcp_cli_port'\n", SKYPIAX_P_LOG);
</span><span class="cx"> continue;
</span><span class="lines">@@ -1545,6 +1554,7 @@
</span><span class="cx"> ERRORA("interface missing REQUIRED param 'tcp_srv_port'\n", SKYPIAX_P_LOG);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+#endif//0
</ins><span class="cx"> if (!id) {
</span><span class="cx"> ERRORA("interface missing REQUIRED param 'id'\n", SKYPIAX_P_LOG);
</span><span class="cx"> continue;
</span><span class="lines">@@ -1604,6 +1614,7 @@
</span><span class="cx"> switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].name, "N/A");
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("CONFIGURING interface_id=%d\n", SKYPIAX_P_LOG, interface_id);
</span><ins>+#if 0
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port = (unsigned short) atoi(tcp_cli_port);
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port = (unsigned short) atoi(tcp_srv_port);
</span><span class="lines">@@ -1611,6 +1622,7 @@
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port = atoi(tcp_cli_port);
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port = atoi(tcp_srv_port);
</span><span class="cx"> #endif /* WIN32 */
</span><ins>+#endif//0
</ins><span class="cx"> switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].X11_display, X11_display);
</span><span class="cx"> switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].skype_user, skype_user);
</span><span class="cx"> switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].context, context);
</span><span class="lines">@@ -1631,12 +1643,14 @@
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].skype_user=%s\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user);
</span><ins>+#if 0
</ins><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port=%d\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port);
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port=%d\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].tcp_srv_port);
</span><ins>+#endif//0
</ins><span class="cx"> DEBUGA_SKYPE("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].name=%s\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].name);
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="lines">@@ -1751,7 +1765,6 @@
</span><span class="cx"> DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].context=%s\n", SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].context);
</span><span class="cx"> DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].dialplan=%s\n", SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].dialplan);
</span><span class="cx"> DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].destination=%s\n", SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].destination);
</span><del>- DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].context=%s\n", SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].context);
</del><span class="cx"> DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].report_incoming_chatmessages=%d\n", SKYPIAX_P_LOG, i, i,
</span><span class="cx"> globals.SKYPIAX_INTERFACES[i].report_incoming_chatmessages);
</span><span class="cx"> }
</span><span class="lines">@@ -1999,8 +2012,8 @@
</span><span class="cx"> switch_safe_free(globals.dialplan);
</span><span class="cx"> switch_safe_free(globals.context);
</span><span class="cx"> switch_safe_free(globals.destination);
</span><del>- switch_safe_free(globals.codec_string);
- switch_safe_free(globals.codec_rates_string);
</del><ins>+ //switch_safe_free(globals.codec_string);
+ //switch_safe_free(globals.codec_rates_string);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (16725 => 16726)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-22 22:42:29 UTC (rev 16725)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-22 22:48:50 UTC (rev 16726)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DEBUGA_SKYPE("SUCCESS! *which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPIAX_P_LOG, *which_port, tech_pvt->tcp_cli_port,
</del><ins>+ DEBUGA_SKYPE("Binded! *which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPIAX_P_LOG, *which_port, tech_pvt->tcp_cli_port,
</ins><span class="cx"> tech_pvt->tcp_srv_port);
</span><span class="cx">
</span><span class="cx"> sockbufsize = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>