<!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][14628] </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=14628">14628</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-24 18:24:17 -0500 (Mon, 24 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: answers an incoming call. No hangup yet. No audio yet.</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 (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-24 22:02:22 UTC (rev 14627)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-24 23:24:17 UTC (rev 14628)
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> private_t *find_available_celliax_interface_rr(private_t * tech_pvt_calling);
</span><span class="cx"> int remote_party_is_ringing(private_t * tech_pvt);
</span><span class="cx"> int remote_party_is_early_media(private_t * tech_pvt);
</span><del>-int celliax_answer(private_t * tech_pvt, char *id, char *value);
</del><ins>+//int celliax_answer(private_t * tech_pvt, char *id, char *value);
</ins><span class="cx"> int celliax_transfer(private_t * tech_pvt, char *id, char *value);
</span><span class="cx"> int celliax_socket_create_and_bind(private_t * tech_pvt, int *which_port);
</span><span class="cx">
</span><span class="lines">@@ -491,3 +491,6 @@
</span><span class="cx"> #define ast_setstate(x, y) ERRORA("ast_setstate: %p, %d\n", SKYPIAX_P_LOG, (void *)x, y);
</span><span class="cx">
</span><span class="cx"> int celliax_serial_read(private_t * tech_pvt);
</span><ins>+int celliax_answer(private_t * tech_pvt);
+int celliax_serial_answer(private_t * tech_pvt);
+int celliax_serial_answer_AT(private_t * tech_pvt);
</ins></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-24 22:02:22 UTC (rev 14627)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-24 23:24:17 UTC (rev 14628)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> return s;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef NOTDEF
</ins><span class="cx"> int celliax_signaling_read(private_t * tech_pvt)
</span><span class="cx"> {
</span><span class="cx"> char read_from_pipe[4096];
</span><span class="lines">@@ -428,7 +429,7 @@
</span><span class="cx"> tech_pvt->skype_callflow = SKYPIAX_STATE_UP;
</span><span class="cx"> if (!strlen(tech_pvt->session_uuid_str)) {
</span><span class="cx"> DEBUGA_SKYPE("New Inbound Channel!\n\n\n\n", SKYPIAX_P_LOG);
</span><del>- new_inbound_channel(tech_pvt);
</del><ins>+ celliax_answer(tech_pvt);
</ins><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("Outbound Channel Answered! session_uuid_str=%s\n", SKYPIAX_P_LOG, tech_pvt->session_uuid_str);
</span><span class="cx"> outbound_channel_answered(tech_pvt);
</span><span class="lines">@@ -494,6 +495,7 @@
</span><span class="cx"> } //read_from_pipe
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+#endif// NOTDEF
</ins><span class="cx">
</span><span class="cx"> void *celliax_do_tcp_srv_thread_func(void *obj)
</span><span class="cx"> {
</span><span class="lines">@@ -1390,42 +1392,6 @@
</span><span class="cx"> DEBUGA_SKYPE("OUT destroyed disp\n", SKYPIAX_P_LOG);
</span><span class="cx"> celliax_sleep(1000);
</span><span class="cx"> }
</span><del>-
-void *celliax_do_skypeapi_thread_func(void *obj)
-{
-
- private_t *tech_pvt = obj;
- //if (celliax_present(SkypiaxHandles))
- if (1) {
- while (running) {
- int res;
- //celliax_sleep(1000000); //1 sec
- //DEBUGA_SKYPE("ciao!\n", SKYPIAX_P_LOG);
- res=celliax_serial_read(tech_pvt);
- if (res == -1) { //manage the graceful interface shutdown
- tech_pvt->controldev_dead = 1;
- close(tech_pvt->controldevfd);
- ERRORA("celliax_serial_monitor failed, declaring %s dead\n", SKYPIAX_P_LOG,
- tech_pvt->controldevice_name);
- } else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL
- && tech_pvt->interface_state == SKYPIAX_STATE_RING) {
- if (option_debug)
- WARNINGA("INCOMING RING, let's take the incoming call\n", SKYPIAX_P_LOG);
- //FIXME if (!celliax_new(p, AST_STATE_RING, tech_pvt->context)) {
- //FIXME ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
- //FIXME }
- }
-
- }
- } else {
- ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", SKYPIAX_P_LOG);
- running = 0;
- return NULL;
- }
- //running = 0;
- return NULL;
-
-}
</del><span class="cx"> #endif // WIN32
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -3219,6 +3185,22 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int celliax_serial_answer(private_t * tech_pvt)
+{
+ if (tech_pvt->controldevprotocol == PROTOCOL_AT)
+ return celliax_serial_answer_AT(tech_pvt);
+#ifdef CELLIAX_FBUS2
+ if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
+ return celliax_serial_answer_FBUS2(tech_pvt);
+#endif /* CELLIAX_FBUS2 */
+#ifdef CELLIAX_CVM
+ if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
+ return celliax_serial_answer_CVM_BUSMAIL(tech_pvt);
+#endif /* CELLIAX_CVM */
+ return -1;
+}
+
+
</ins><span class="cx"> int celliax_serial_answer_AT(private_t * tech_pvt)
</span><span class="cx"> {
</span><span class="cx"> int res;
</span><span class="lines">@@ -3371,8 +3353,58 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+/*! \brief Answer incoming call,
+ * Part of PBX interface */
+int celliax_answer(private_t * tech_pvt)
+{
+ int res;
</ins><span class="cx">
</span><ins>+ if (option_debug) {
+ DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG);
+ }
+ /* do something to actually answer the call, if needed (eg. pick up the phone) */
+ if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
+ if (celliax_serial_answer(tech_pvt)) {
+ ERRORA("celliax_answer FAILED\n", SKYPIAX_P_LOG);
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return -1;
+ }
+ }
+ tech_pvt->interface_state = SKYPIAX_STATE_UP;
+ tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
</ins><span class="cx">
</span><ins>+ while (tech_pvt->interface_state == SKYPIAX_STATE_RING) {
+ usleep(10000); //10msec
+ }
+ if (tech_pvt->interface_state != SKYPIAX_STATE_UP) {
+ ERRORA("call answering failed\n", SKYPIAX_P_LOG);
+ res = -1;
+ } else {
+ if (option_debug)
+ DEBUGA_PBX("call answered\n", SKYPIAX_P_LOG);
+ res = 0;
+#ifdef CELLIAX_PORTAUDIO
+ speex_echo_state_reset(tech_pvt->stream->echo_state);
+#endif // CELLIAX_PORTAUDIO
+
+ new_inbound_channel(tech_pvt);
+ if (tech_pvt->owner) {
+ DEBUGA_PBX("going to send SKYPIAX_STATE_UP\n", SKYPIAX_P_LOG);
+ ast_setstate(tech_pvt->owner, SKYPIAX_STATE_UP);
+ //ast_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_ANSWER);
+ //celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_ANSWER);
+ DEBUGA_PBX("just sent SKYPIAX_STATE_UP\n", SKYPIAX_P_LOG);
+ }
+ }
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return res;
+}
+
+
</ins><span class="cx"> #ifdef NOTDEF
</span><span class="cx"> int celliax_serial_call_AT(private_t * tech_pvt, char *dstr)
</span><span class="cx"> {
</span><span class="lines">@@ -3600,4 +3632,5 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #endif// NOTDEF
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-24 22:02:22 UTC (rev 14627)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-24 23:24:17 UTC (rev 14628)
</span><span class="lines">@@ -642,9 +642,11 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> tech_pvt->read_frame.flags = SFF_NONE;
</span><span class="cx"> *frame = NULL;
</span><span class="cx">
</span><ins>+ goto cng; //FIXME FIXME FIXME
</ins><span class="cx"> if (!celliax_audio_read(tech_pvt)) {
</span><span class="cx">
</span><span class="cx"> ERRORA("celliax_audio_read ERROR\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -723,11 +725,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> sent = frame->datalen;
</span><ins>+#ifdef NOTDEF //FIXME
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> switch_file_write(tech_pvt->audioskypepipe[1], frame->data, &sent);
</span><span class="cx"> #else /* WIN32 */
</span><span class="cx"> sent = write(tech_pvt->audioskypepipe[1], frame->data, sent);
</span><span class="cx"> #endif /* WIN32 */
</span><ins>+#endif //NOTDEF
</ins><span class="cx"> if (sent != frame->datalen && sent != -1) {
</span><span class="cx"> DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent);
</span><span class="cx"> }
</span><span class="lines">@@ -2051,6 +2055,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef NOTDEF
</ins><span class="cx"> int celliax_answer(private_t * tech_pvt, char *id, char *value)
</span><span class="cx"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="lines">@@ -2127,6 +2132,7 @@
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+#endif// NOTDEF
</ins><span class="cx"> int celliax_transfer(private_t * tech_pvt, char *id, char *value)
</span><span class="cx"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="lines">@@ -2247,6 +2253,43 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void *celliax_do_skypeapi_thread_func(void *obj)
+{
+
+ private_t *tech_pvt = obj;
+ //if (celliax_present(SkypiaxHandles))
+ if (1) {
+ while (running) {
+ int res;
+ //celliax_sleep(1000000); //1 sec
+ //DEBUGA_SKYPE("ciao!\n", SKYPIAX_P_LOG);
+ res=celliax_serial_read(tech_pvt);
+ if (res == -1) { //manage the graceful interface shutdown
+ tech_pvt->controldev_dead = 1;
+ close(tech_pvt->controldevfd);
+ ERRORA("celliax_serial_monitor failed, declaring %s dead\n", SKYPIAX_P_LOG,
+ tech_pvt->controldevice_name);
+ } else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL
+ && tech_pvt->interface_state == SKYPIAX_STATE_RING) {
+ WARNINGA("INCOMING RING, let's take the incoming call\n", SKYPIAX_P_LOG);
+ celliax_answer(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 }
+ }
+
+ }
+ } else {
+ ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", SKYPIAX_P_LOG);
+ running = 0;
+ return NULL;
+ }
+ //running = 0;
+ return NULL;
+
+}
+
</ins><span class="cx"> /* For Emacs:
</span><span class="cx"> * Local Variables:
</span><span class="cx"> * mode:c
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>