<!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][14534] </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=14534">14534</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-15 10:38:46 -0500 (Sat, 15 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: indent</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_skypiaxskypiaxh">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h</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 (14533 => 14534)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-08-15 15:37:44 UTC (rev 14533)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-08-15 15:38:46 UTC (rev 14534)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> #define SOFT_RELOAD 1
</span><span class="cx"> /* END: Changes heres */
</span><span class="cx">
</span><del>-char *interface_status[] = { /* should match SKYPIAX_STATE_xxx in skypiax.h */
</del><ins>+char *interface_status[] = { /* should match SKYPIAX_STATE_xxx in skypiax.h */
</ins><span class="cx"> "IDLE",
</span><span class="cx"> "DOWN",
</span><span class="cx"> "RING",
</span><span class="lines">@@ -110,34 +110,34 @@
</span><span class="cx"> "HANG_RQ",
</span><span class="cx"> "PREANSW"
</span><span class="cx"> };
</span><del>-char *skype_callflow[] = { /* should match CALLFLOW_XXX in skypiax.h */
-"CALL_IDLE",
-"CALL_DOWN",
-"INCOMING_RNG",
-"CALL_DIALING",
-"CALL_LINEBUSY",
-"CALL_ACTIVE",
-"INCOMING_HNG",
-"CALL_RLEASD",
-"CALL_NOCARR",
-"CALL_INFLUX",
-"CALL_INCOMING",
-"CALL_FAILED",
-"CALL_NOSRVC",
-"CALL_OUTRESTR",
-"CALL_SECFAIL",
-"CALL_NOANSWER",
-"STATUS_FNSHED",
-"STATUS_CANCLED",
-"STATUS_FAILED",
-"STATUS_REFUSED",
-"STATUS_RINGING",
-"STATUS_INPROGRS",
-"STATUS_UNPLACD",
-"STATUS_ROUTING",
-"STATUS_EARLYMD",
-"INCOMING_CLID",
-"STATUS_RMTEHOLD"
</del><ins>+char *skype_callflow[] = { /* should match CALLFLOW_XXX in skypiax.h */
+ "CALL_IDLE",
+ "CALL_DOWN",
+ "INCOMING_RNG",
+ "CALL_DIALING",
+ "CALL_LINEBUSY",
+ "CALL_ACTIVE",
+ "INCOMING_HNG",
+ "CALL_RLEASD",
+ "CALL_NOCARR",
+ "CALL_INFLUX",
+ "CALL_INCOMING",
+ "CALL_FAILED",
+ "CALL_NOSRVC",
+ "CALL_OUTRESTR",
+ "CALL_SECFAIL",
+ "CALL_NOANSWER",
+ "STATUS_FNSHED",
+ "STATUS_CANCLED",
+ "STATUS_FAILED",
+ "STATUS_REFUSED",
+ "STATUS_RINGING",
+ "STATUS_INPROGRS",
+ "STATUS_UNPLACD",
+ "STATUS_ROUTING",
+ "STATUS_EARLYMD",
+ "INCOMING_CLID",
+ "STATUS_RMTEHOLD"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> globals.calls++;
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><del>- DEBUGA_SKYPE("%s CHANNEL INIT %s\n", SKYPIAX_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
</del><ins>+ DEBUGA_SKYPE("%s CHANNEL INIT %s\n", SKYPIAX_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> }
</span><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
</span><del>- if(tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED){
</del><ins>+ if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
</ins><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
</span><span class="cx"> }
</span><span class="cx"> switch_core_session_set_private(session, NULL);
</span><span class="lines">@@ -481,13 +481,13 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
- if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
- tech_pvt->ob_failed_calls++;
- } else {
- tech_pvt->ib_failed_calls++;
- }
- }
</del><ins>+ if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
+ if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+ tech_pvt->ob_failed_calls++;
+ } else {
+ tech_pvt->ib_failed_calls++;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> switch_clear_flag(tech_pvt, TFLAG_IO);
</span><span class="cx"> switch_clear_flag(tech_pvt, TFLAG_VOICE);
</span><span class="lines">@@ -508,10 +508,10 @@
</span><span class="cx"> globals.calls = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
- if(tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED){
- tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
- }
</del><ins>+ tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
+ if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
+ tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
+ }
</ins><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -926,9 +926,9 @@
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><del>-
- tech_pvt->ob_calls++;
</del><span class="cx">
</span><ins>+ tech_pvt->ob_calls++;
+
</ins><span class="cx"> rdest = strchr(caller_profile->destination_number, '/');
</span><span class="cx"> *rdest++ = '\0';
</span><span class="cx">
</span><span class="lines">@@ -992,21 +992,21 @@
</span><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("no session\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><del>- switch_mutex_lock(globals.mutex);
</del><ins>+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
</span><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> *tech_pvt->skype_call_id = '\0';
</span><del>- switch_mutex_unlock(globals.mutex);
</del><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx">
</span><span class="cx"> //ERRORA("LET'S WAIT\n", SKYPIAX_P_LOG);
</span><span class="cx"> switch_sleep(300000); //0.3 sec
</span><span class="cx"> //ERRORA("WAIT'S OVER\n", SKYPIAX_P_LOG);
</span><span class="cx"> //tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED;
</span><del>- //usleep(30000); //0.03 sec
- switch_mutex_lock(globals.mutex);
</del><ins>+ //usleep(30000); //0.03 sec
+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
</span><del>- switch_mutex_unlock(globals.mutex);
</del><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> } else {
</span><span class="cx"> ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><span class="lines">@@ -1764,27 +1764,26 @@
</span><span class="cx"> int i;
</span><span class="cx"> char next_flag_char = ' ';
</span><span class="cx">
</span><del>- stream->write_function(stream, "F ID\t Name \tIB (F/T) OB (F/T)\tState\tCallFlw\t\tUUID\n");
- stream->write_function(stream, "= ====\t ======== \t======= =======\t======\t============\t======\n");
</del><ins>+ stream->write_function(stream, "F ID\t Name \tIB (F/T) OB (F/T)\tState\tCallFlw\t\tUUID\n");
+ stream->write_function(stream, "= ====\t ======== \t======= =======\t======\t============\t======\n");
</ins><span class="cx">
</span><span class="cx"> for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) {
</span><span class="cx"> next_flag_char = i == globals.next_interface ? '*' : ' ';
</span><span class="cx">
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[i].name)) {
</span><span class="cx"> stream->write_function(stream,
</span><del>- "%c %d\t[%s]\t%3ld/%ld\t%6ld/%ld\t%s\t%s\t%s\n",
- next_flag_char,
- i, globals.SKYPIAX_INTERFACES[i].name,
- globals.SKYPIAX_INTERFACES[i].ib_failed_calls,
- globals.SKYPIAX_INTERFACES[i].ib_calls,
- globals.SKYPIAX_INTERFACES[i].ob_failed_calls,
- globals.SKYPIAX_INTERFACES[i].ob_calls,
- interface_status[globals.SKYPIAX_INTERFACES[i].interface_state],
- skype_callflow[globals.SKYPIAX_INTERFACES[i].skype_callflow],
- globals.SKYPIAX_INTERFACES[i].session_uuid_str);
- } else if(argc > 1 && !strcasecmp(argv[1], "full")) {
</del><ins>+ "%c %d\t[%s]\t%3ld/%ld\t%6ld/%ld\t%s\t%s\t%s\n",
+ next_flag_char,
+ i, globals.SKYPIAX_INTERFACES[i].name,
+ globals.SKYPIAX_INTERFACES[i].ib_failed_calls,
+ globals.SKYPIAX_INTERFACES[i].ib_calls,
+ globals.SKYPIAX_INTERFACES[i].ob_failed_calls,
+ globals.SKYPIAX_INTERFACES[i].ob_calls,
+ interface_status[globals.SKYPIAX_INTERFACES[i].interface_state],
+ skype_callflow[globals.SKYPIAX_INTERFACES[i].skype_callflow], globals.SKYPIAX_INTERFACES[i].session_uuid_str);
+ } else if (argc > 1 && !strcasecmp(argv[1], "full")) {
</ins><span class="cx"> stream->write_function(stream, "%c\t%d\n", next_flag_char, i);
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> stream->write_function(stream, "\nTotal: %d\n", globals.real_interfaces - 1);
</span><span class="lines">@@ -2078,8 +2077,8 @@
</span><span class="cx">
</span><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, available_skypiax_interface->skype_user);
</span><span class="cx"> skypiax_signaling_write(tech_pvt, msg_to_skype);
</span><del>- if(tech_pvt->interface_state == SKYPIAX_STATE_SELECTED) {
- tech_pvt->interface_state = SKYPIAX_STATE_IDLE; //we marked it SKYPIAX_STATE_SELECTED just in case it has to make an outbound call
</del><ins>+ if (tech_pvt->interface_state == SKYPIAX_STATE_SELECTED) {
+ tech_pvt->interface_state = SKYPIAX_STATE_IDLE; //we marked it SKYPIAX_STATE_SELECTED just in case it has to make an outbound call
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> /* no skypiax interfaces idle, do nothing */
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h (14533 => 14534)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2009-08-15 15:37:44 UTC (rev 14533)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2009-08-15 15:38:46 UTC (rev 14534)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> #define CALLFLOW_CALL_DIALING 3
</span><span class="cx"> #define CALLFLOW_CALL_LINEBUSY 4
</span><span class="cx"> #define CALLFLOW_CALL_ACTIVE 5
</span><del>-#define CALLFLOW_INCOMING_HANGUP 6
</del><ins>+#define CALLFLOW_INCOMING_HANGUP 6
</ins><span class="cx"> #define CALLFLOW_CALL_RELEASED 7
</span><span class="cx"> #define CALLFLOW_CALL_NOCARRIER 8
</span><span class="cx"> #define CALLFLOW_CALL_INFLUX 9
</span><span class="lines">@@ -243,10 +243,10 @@
</span><span class="cx"> char transfer_callid_number[50];
</span><span class="cx"> char skype_transfer_call_id[512];
</span><span class="cx"> int running;
</span><del>- unsigned long ib_calls;
- unsigned long ob_calls;
- unsigned long ib_failed_calls;
- unsigned long ob_failed_calls;
</del><ins>+ unsigned long ib_calls;
+ unsigned long ob_calls;
+ unsigned long ib_failed_calls;
+ unsigned long ob_failed_calls;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</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 (14533 => 14534)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-08-15 15:37:44 UTC (rev 14533)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-08-15 15:38:46 UTC (rev 14534)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> //SKYPIAX_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(prop, "PARTNER_HANDLE")) {
</span><del>- if (tech_pvt->interface_state != SKYPIAX_STATE_SELECTED && (!strlen(tech_pvt->skype_call_id) || !strlen(tech_pvt->session_uuid_str)) ) {
</del><ins>+ if (tech_pvt->interface_state != SKYPIAX_STATE_SELECTED && (!strlen(tech_pvt->skype_call_id) || !strlen(tech_pvt->session_uuid_str))) {
</ins><span class="cx"> //if (!strlen(tech_pvt->skype_call_id)) {
</span><span class="cx"> /* we are NOT inside an active call */
</span><span class="cx"> DEBUGA_SKYPE("Call %s TRY ANSWER\n", SKYPIAX_P_LOG, id);
</span><span class="lines">@@ -256,12 +256,12 @@
</span><span class="cx"> if (!strcasecmp(prop, "CONF_ID") && !strcasecmp(value, "0")) {
</span><span class="cx"> //DEBUGA_SKYPE("the skype_call %s is NOT a conference call\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> //if (tech_pvt->interface_state == SKYPIAX_STATE_DOWN)
</span><del>- //tech_pvt->interface_state = SKYPIAX_STATE_PRERING;
</del><ins>+ //tech_pvt->interface_state = SKYPIAX_STATE_PRERING;
</ins><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(prop, "CONF_ID") && strcasecmp(value, "0")) {
</span><span class="cx"> DEBUGA_SKYPE("the skype_call %s is a conference call\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> //if (tech_pvt->interface_state == SKYPIAX_STATE_DOWN)
</span><del>- //tech_pvt->interface_state = SKYPIAX_STATE_PRERING;
</del><ins>+ //tech_pvt->interface_state = SKYPIAX_STATE_PRERING;
</ins><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(prop, "DTMF")) {
</span><span class="cx"> DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>