<!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][14674] </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=14674">14674</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-29 07:07:23 -0500 (Sat, 29 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: makes outbound calls, manage remote answer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliaxh">freeswitch/branches/gmaruzz/mod_celliax/celliax.h</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc">freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc">freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax.h (14673 => 14674)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-29 08:12:44 UTC (rev 14673)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-29 12:07:23 UTC (rev 14674)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> #define WARNINGA(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][WARNINGA %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
</span><span class="cx"> #define NOTICA(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][NOTICA %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
</span><span class="cx">
</span><del>-#define SKYPIAX_P_LOG NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->skype_callflow : -1
</del><ins>+#define SKYPIAX_P_LOG NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->phone_callflow : -1
</ins><span class="cx">
</span><span class="cx"> /*********************************/
</span><span class="cx"> #define SKYPIAX_CAUSE_NORMAL 1
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx"> #define CALLFLOW_STATUS_EARLYMEDIA 24
</span><span class="cx"> #define CALLFLOW_INCOMING_CALLID 25
</span><span class="cx"> #define CALLFLOW_STATUS_REMOTEHOLD 26
</span><ins>+#define CALLFLOW_CALL_REMOTEANSWER 27
</ins><span class="cx">
</span><span class="cx"> /*********************************/
</span><span class="cx">
</span><span class="lines">@@ -544,6 +545,9 @@
</span><span class="cx"> int celliax_serial_hangup(private_t * tech_pvt);
</span><span class="cx"> int celliax_serial_hangup_AT(private_t * tech_pvt);
</span><span class="cx"> int celliax_hangup(private_t * tech_pvt);
</span><ins>+int celliax_serial_call(private_t * tech_pvt, char *dstr);
+int celliax_serial_call_AT(private_t * tech_pvt, char *dstr);
+
</ins><span class="cx"> #ifdef CELLIAX_ALSA
</span><span class="cx"> int alsa_init(private_t * tech_pvt);
</span><span class="cx"> int alsa_shutdown(private_t * tech_pvt);
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14673 => 14674)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-29 08:12:44 UTC (rev 14673)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-29 12:07:23 UTC (rev 14674)
</span><span class="lines">@@ -2191,24 +2191,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_active) == 0)) {
</span><del>- tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
- if (option_debug > 1)
- DEBUGA_SKYPE("|%s| CALLFLOW_CALL_ACTIVE\n", SKYPIAX_P_LOG,
- tech_pvt->line_array.result[i]);
</del><ins>+ tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
+ DEBUGA_SKYPE("|%s| CALLFLOW_CALL_ACTIVE\n", SKYPIAX_P_LOG,
+ tech_pvt->line_array.result[i]);
</ins><span class="cx">
</span><del>- if (tech_pvt->owner && tech_pvt->interface_state == CALLFLOW_CALL_DIALING) {
- DEBUGA_PBX("just received a remote ANSWER\n", SKYPIAX_P_LOG);
- if (tech_pvt->owner->state != SKYPIAX_STATE_UP) {
- celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING);
- DEBUGA_PBX("just sent SKYPIAX_CONTROL_RINGING\n", SKYPIAX_P_LOG);
- DEBUGA_PBX("going to send SKYPIAX_CONTROL_ANSWER\n", SKYPIAX_P_LOG);
- celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_ANSWER);
- DEBUGA_PBX("just sent SKYPIAX_CONTROL_ANSWER\n", SKYPIAX_P_LOG);
- }
- } else {
- }
- tech_pvt->interface_state = SKYPIAX_STATE_UP;
- DEBUGA_PBX("just interface_state UP\n", SKYPIAX_P_LOG);
</del><ins>+ if (tech_pvt->interface_state == CALLFLOW_CALL_DIALING) {
+ DEBUGA_PBX("just received a remote ANSWER\n", SKYPIAX_P_LOG);
+ if (tech_pvt->phone_callflow == SKYPIAX_STATE_UP) {
+ //celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING);
+ DEBUGA_PBX("just sent SKYPIAX_CONTROL_RINGING\n", SKYPIAX_P_LOG);
+ DEBUGA_PBX("going to send SKYPIAX_CONTROL_ANSWER\n", SKYPIAX_P_LOG);
+ //celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_ANSWER);
+ tech_pvt->interface_state = CALLFLOW_CALL_REMOTEANSWER;
+ DEBUGA_PBX("just sent SKYPIAX_CONTROL_ANSWER\n", SKYPIAX_P_LOG);
+ }
+ } else {
+ }
+ //tech_pvt->interface_state = SKYPIAX_STATE_UP;
+ //DEBUGA_PBX("just interface_state UP\n", SKYPIAX_P_LOG);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_calling) == 0)) {
</span><span class="lines">@@ -3236,6 +3236,59 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+int celliax_serial_call(private_t * tech_pvt, char *dstr)
+{
+ if (tech_pvt->controldevprotocol == PROTOCOL_AT)
+ return celliax_serial_call_AT(tech_pvt, dstr);
+#ifdef CELLIAX_FBUS2
+ if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
+ return celliax_serial_call_FBUS2(tech_pvt, dstr);
+#endif /* CELLIAX_FBUS2 */
+ if (tech_pvt->controldevprotocol == PROTOCOL_NO_SERIAL)
+ return 0;
+#ifdef CELLIAX_CVM
+ if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
+ return celliax_serial_call_CVM_BUSMAIL(tech_pvt, dstr);
+#endif /* CELLIAX_CVM */
+ return -1;
+}
+
+int celliax_serial_call_AT(private_t * tech_pvt, char *dstr)
+{
+ int res;
+ char at_command[256];
+
+ if (option_debug)
+ DEBUGA_PBX("Dialing %s\n", SKYPIAX_P_LOG, dstr);
+ memset(at_command, 0, sizeof(at_command));
+ tech_pvt->phone_callflow = CALLFLOW_CALL_DIALING;
+ tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
+ //ast_uri_decode(dstr);
+/*
+ size_t fixdstr = strspn(dstr, AST_DIGIT_ANYDIG);
+ if (fixdstr == 0) {
+ ERRORA("dial command failed because of invalid dial number. dial string was: %s\n",
+ SKYPIAX_P_LOG, dstr);
+ return -1;
+ }
+*/
+ //dstr[fixdstr] = '\0';
+ sprintf(at_command, "%s%s%s", tech_pvt->at_dial_pre_number, dstr, tech_pvt->at_dial_post_number);
+ DEBUGA_PBX("Dialstring %s\n", SKYPIAX_P_LOG, at_command);
+ res = celliax_serial_write_AT_expect(tech_pvt, at_command, tech_pvt->at_dial_expect);
+ if (res) {
+ ERRORA("dial command failed, dial string was: %s\n", SKYPIAX_P_LOG, at_command);
+ return -1;
+ }
+ // jet - early audio
+ //if (tech_pvt->at_early_audio) {
+ //ast_queue_control(tech_pvt->owner, AST_CONTROL_ANSWER);
+ //}
+
+ return 0;
+}
+
</ins><span class="cx"> int ucs2_to_utf8(private_t * tech_pvt, char *ucs2_in, char *utf8_out,
</span><span class="cx"> size_t outbytesleft)
</span><span class="cx"> {
</span><span class="lines">@@ -3405,9 +3458,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (option_debug) {
- DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG);
- }
</del><ins>+ DEBUGA_SKYPE("ENTERING FUNC\n", SKYPIAX_P_LOG);
</ins><span class="cx">
</span><span class="cx"> #ifdef NOTDEF
</span><span class="cx"> /* shutdown the serial monitoring thread */
</span><span class="lines">@@ -4550,7 +4601,7 @@
</span><span class="cx">
</span><span class="cx"> int celliax_call(private_t * tech_pvt, char *rdest, int timeout)
</span><span class="cx"> {
</span><del>- char msg_to_skype[1024];
</del><ins>+ //char msg_to_skype[1024];
</ins><span class="cx">
</span><span class="cx"> //celliax_sleep(5000);
</span><span class="cx"> DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest);
</span><span class="lines">@@ -4559,7 +4610,8 @@
</span><span class="cx"> //celliax_signaling_write(tech_pvt, "SET AEC OFF");
</span><span class="cx"> //celliax_sleep(10000);
</span><span class="cx">
</span><del>- sprintf(msg_to_skype, "CALL %s", rdest);
</del><ins>+celliax_serial_call(tech_pvt, rdest);
+ //sprintf(msg_to_skype, "CALL %s", rdest);
</ins><span class="cx"> //if (celliax_signaling_write(tech_pvt, msg_to_skype) < 0) {
</span><span class="cx"> //ERRORA("failed to communicate with Skype client, now exit\n", SKYPIAX_P_LOG);
</span><span class="cx"> //return -1;
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14673 => 14674)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-29 08:12:44 UTC (rev 14673)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-29 12:07:23 UTC (rev 14674)
</span><span class="lines">@@ -712,7 +712,6 @@
</span><span class="cx"> teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str));
</span><span class="cx">
</span><span class="cx"> if (digit_str[0]) {
</span><del>- NOTICA("DTMF DETECTED: [%s]\n", SKYPIAX_P_LOG, digit_str);
</del><span class="cx"> switch_time_t new_dtmf_timestamp = switch_time_now();
</span><span class="cx"> if((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) { //FIXME: make it configurable
</span><span class="cx"> char *p = digit_str;
</span><span class="lines">@@ -958,6 +957,7 @@
</span><span class="cx"> tech_pvt = find_available_celliax_interface_rr(NULL);
</span><span class="cx"> if (tech_pvt)
</span><span class="cx"> found = 1;
</span><ins>+ DEBUGA_SKYPE("FOUND one available skype interface RR\n", SKYPIAX_P_LOG);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) {
</span><span class="lines">@@ -1941,6 +1941,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (channel) {
</span><span class="cx"> switch_channel_mark_answered(channel);
</span><ins>+tech_pvt->phone_callflow = SKYPIAX_STATE_UP;
+tech_pvt->interface_state = SKYPIAX_STATE_UP;
</ins><span class="cx"> //DEBUGA_SKYPE("skype_call: %s, answered\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("No channel???\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -2388,8 +2390,14 @@
</span><span class="cx"> //FIXME if (!celliax_new(p, AST_STATE_RING, tech_pvt->context)) {
</span><span class="cx"> //FIXME ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
</span><span class="cx"> //FIXME }
</span><ins>+ } else if (tech_pvt->interface_state == CALLFLOW_CALL_REMOTEANSWER) {
+ WARNINGA("REMOTE PARTY ANSWERED\n", SKYPIAX_P_LOG);
+outbound_channel_answered(tech_pvt);
+ //new_inbound_channel(tech_pvt);
+ //FIXME if (!celliax_new(p, AST_STATE_RING, tech_pvt->context)) {
+ //FIXME ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
+ //FIXME }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", SKYPIAX_P_LOG);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>