<!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][14547] </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=14547">14547</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-17 05:05:07 -0500 (Mon, 17 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: naming, s/skypiax/celliax/g</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 (14546 => 14547)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-17 09:48:26 UTC (rev 14546)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-17 10:05:07 UTC (rev 14547)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> * Portions created by the Initial Developer are Copyright (C)
</span><span class="cx"> * the Initial Developer. All Rights Reserved.
</span><span class="cx"> *
</span><del>- * This module (mod_skypiax) has been contributed by:
</del><ins>+ * This module (mod_celliax) has been contributed by:
</ins><span class="cx"> *
</span><span class="cx"> * Giovanni Maruzzelli (gmaruzz@gmail.com)
</span><span class="cx"> *
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> *
</span><del>- * mod_skypiax.c -- Skype compatible Endpoint Module
</del><ins>+ * mod_celliax.c -- Skype compatible Endpoint Module
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> int interface_state; /*!< \brief 'state' of the interface (channel) */
</span><span class="cx"> char language[80]; /*!< \brief default Asterisk dialplan language for this interface */
</span><span class="cx"> char exten[80]; /*!< \brief default Asterisk dialplan extension for this interface */
</span><del>- int skypiax_sound_rate; /*!< \brief rate of the sound device, in Hz, eg: 8000 */
</del><ins>+ int celliax_sound_rate; /*!< \brief rate of the sound device, in Hz, eg: 8000 */
</ins><span class="cx"> char callid_name[50];
</span><span class="cx"> char callid_number[50];
</span><span class="cx"> double playback_boost;
</span><span class="lines">@@ -211,16 +211,16 @@
</span><span class="cx"> #ifdef WIN32
</span><span class="cx"> switch_file_t *audiopipe[2];
</span><span class="cx"> switch_file_t *audioskypepipe[2];
</span><del>- switch_file_t *skypiax_sound_capt_fd; /*!< \brief file descriptor for sound capture dev */
</del><ins>+ switch_file_t *celliax_sound_capt_fd; /*!< \brief file descriptor for sound capture dev */
</ins><span class="cx"> #else /* WIN32 */
</span><span class="cx"> int audiopipe[2];
</span><span class="cx"> int audioskypepipe[2];
</span><del>- int skypiax_sound_capt_fd; /*!< \brief file descriptor for sound capture dev */
</del><ins>+ int celliax_sound_capt_fd; /*!< \brief file descriptor for sound capture dev */
</ins><span class="cx"> #endif /* WIN32 */
</span><span class="cx"> switch_thread_t *tcp_srv_thread;
</span><span class="cx"> switch_thread_t *tcp_cli_thread;
</span><del>- switch_thread_t *skypiax_signaling_thread;
- switch_thread_t *skypiax_api_thread;
</del><ins>+ switch_thread_t *celliax_signaling_thread;
+ switch_thread_t *celliax_api_thread;
</ins><span class="cx"> short audiobuf[SAMPLES_PER_FRAME];
</span><span class="cx"> int audiobuf_is_loaded;
</span><span class="cx">
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> //int phonebook_number_lenght;
</span><span class="cx"> //int phonebook_text_lenght;
</span><span class="cx"> FILE *phonebook_writing_fp;
</span><del>- int skypiax_dir_entry_extension_prefix;
</del><ins>+ int celliax_dir_entry_extension_prefix;
</ins><span class="cx"> char skype_user[256];
</span><span class="cx"> char skype_password[256];
</span><span class="cx"> char destination[256];
</span><span class="lines">@@ -251,41 +251,41 @@
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span><span class="cx">
</span><del>-void *SWITCH_THREAD_FUNC skypiax_api_thread_func(switch_thread_t * thread, void *obj);
-int skypiax_audio_read(private_t * tech_pvt);
-int skypiax_audio_init(private_t * tech_pvt);
-int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype);
-int skypiax_signaling_read(private_t * tech_pvt);
</del><ins>+void *SWITCH_THREAD_FUNC celliax_api_thread_func(switch_thread_t * thread, void *obj);
+int celliax_audio_read(private_t * tech_pvt);
+int celliax_audio_init(private_t * tech_pvt);
+int celliax_signaling_write(private_t * tech_pvt, char *msg_to_skype);
+int celliax_signaling_read(private_t * tech_pvt);
</ins><span class="cx">
</span><del>-int skypiax_call(private_t * tech_pvt, char *idest, int timeout);
-int skypiax_senddigit(private_t * tech_pvt, char digit);
</del><ins>+int celliax_call(private_t * tech_pvt, char *idest, int timeout);
+int celliax_senddigit(private_t * tech_pvt, char digit);
</ins><span class="cx">
</span><del>-void *skypiax_do_tcp_srv_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj);
</del><ins>+void *celliax_do_tcp_srv_thread_func(void *obj);
+void *SWITCH_THREAD_FUNC celliax_do_tcp_srv_thread(switch_thread_t * thread, void *obj);
</ins><span class="cx">
</span><del>-void *skypiax_do_tcp_cli_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t * thread, void *obj);
</del><ins>+void *celliax_do_tcp_cli_thread_func(void *obj);
+void *SWITCH_THREAD_FUNC celliax_do_tcp_cli_thread(switch_thread_t * thread, void *obj);
</ins><span class="cx">
</span><del>-void *skypiax_do_skypeapi_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypiax_do_skypeapi_thread(switch_thread_t * thread, void *obj);
</del><ins>+void *celliax_do_skypeapi_thread_func(void *obj);
+void *SWITCH_THREAD_FUNC celliax_do_skypeapi_thread(switch_thread_t * thread, void *obj);
</ins><span class="cx"> int dtmf_received(private_t * tech_pvt, char *value);
</span><span class="cx"> int start_audio_threads(private_t * tech_pvt);
</span><span class="cx"> int new_inbound_channel(private_t * tech_pvt);
</span><span class="cx"> int outbound_channel_answered(private_t * tech_pvt);
</span><del>-int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype);
</del><ins>+int celliax_signaling_write(private_t * tech_pvt, char *msg_to_skype);
</ins><span class="cx"> #if defined(WIN32) && !defined(__CYGWIN__)
</span><del>-int skypiax_pipe_read(switch_file_t * pipe, short *buf, int howmany);
-int skypiax_pipe_write(switch_file_t * pipe, short *buf, int howmany);
</del><ins>+int celliax_pipe_read(switch_file_t * pipe, short *buf, int howmany);
+int celliax_pipe_write(switch_file_t * pipe, short *buf, int howmany);
</ins><span class="cx"> /* Visual C do not have strsep ? */
</span><span class="cx"> char *strsep(char **stringp, const char *delim);
</span><span class="cx"> #else
</span><del>-int skypiax_pipe_read(int pipe, short *buf, int howmany);
-int skypiax_pipe_write(int pipe, short *buf, int howmany);
</del><ins>+int celliax_pipe_read(int pipe, short *buf, int howmany);
+int celliax_pipe_write(int pipe, short *buf, int howmany);
</ins><span class="cx"> #endif /* WIN32 */
</span><del>-int skypiax_close_socket(unsigned int fd);
-private_t *find_available_skypiax_interface_rr(private_t * tech_pvt_calling);
</del><ins>+int celliax_close_socket(unsigned int fd);
+private_t *find_available_celliax_interface_rr(private_t * tech_pvt_calling);
</ins><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 skypiax_answer(private_t * tech_pvt, char *id, char *value);
-int skypiax_transfer(private_t * tech_pvt, char *id, char *value);
-int skypiax_socket_create_and_bind(private_t * tech_pvt, int *which_port);
</del><ins>+int celliax_answer(private_t * tech_pvt, char *id, char *value);
+int celliax_transfer(private_t * tech_pvt, char *id, char *value);
+int celliax_socket_create_and_bind(private_t * tech_pvt, int *which_port);
</ins></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14546 => 14547)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-17 09:48:26 UTC (rev 14546)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-17 10:05:07 UTC (rev 14547)
</span><span class="lines">@@ -1,18 +1,18 @@
</span><del>-#include "skypiax.h"
</del><ins>+#include "celliax.h"
</ins><span class="cx">
</span><span class="cx"> #ifdef ASTERISK
</span><del>-#define skypiax_sleep usleep
-#define skypiax_strncpy strncpy
</del><ins>+#define celliax_sleep usleep
+#define celliax_strncpy strncpy
</ins><span class="cx"> #define tech_pvt p
</span><del>-extern int skypiax_debug;
-extern char *skypiax_console_active;
</del><ins>+extern int celliax_debug;
+extern char *celliax_console_active;
</ins><span class="cx"> #else /* FREESWITCH */
</span><del>-#define skypiax_sleep switch_sleep
-#define skypiax_strncpy switch_copy_string
-extern switch_memory_pool_t *skypiax_module_pool;
-extern switch_endpoint_interface_t *skypiax_endpoint_interface;
</del><ins>+#define celliax_sleep switch_sleep
+#define celliax_strncpy switch_copy_string
+extern switch_memory_pool_t *celliax_module_pool;
+extern switch_endpoint_interface_t *celliax_endpoint_interface;
</ins><span class="cx"> #endif /* ASTERISK */
</span><del>-int samplerate_skypiax = SAMPLERATE_SKYPIAX;
</del><ins>+int samplerate_celliax = SAMPLERATE_SKYPIAX;
</ins><span class="cx">
</span><span class="cx"> extern int running;
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #endif /* WIN32 */
</span><span class="cx"> /*************************************/
</span><span class="cx">
</span><del>-int skypiax_socket_create_and_bind(private_t * tech_pvt, int *which_port)
</del><ins>+int celliax_socket_create_and_bind(private_t * tech_pvt, int *which_port)
</ins><span class="cx"> {
</span><span class="cx"> int s = -1;
</span><span class="cx"> struct sockaddr_in my_addr;
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return s;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_signaling_read(private_t * tech_pvt)
</del><ins>+int celliax_signaling_read(private_t * tech_pvt)
</ins><span class="cx"> {
</span><span class="cx"> char read_from_pipe[4096];
</span><span class="cx"> char message[4096];
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> memset(message, 0, 4096);
</span><span class="cx"> memset(message_2, 0, 4096);
</span><span class="cx">
</span><del>- howmany = skypiax_pipe_read(tech_pvt->SkypiaxHandles.fdesc[0], (short *) read_from_pipe, sizeof(read_from_pipe));
</del><ins>+ howmany = celliax_pipe_read(tech_pvt->SkypiaxHandles.fdesc[0], (short *) read_from_pipe, sizeof(read_from_pipe));
</ins><span class="cx">
</span><span class="cx"> a = 0;
</span><span class="cx"> for (i = 0; i < howmany; i++) {
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("If I don't connect immediately, please give the Skype client authorization to be connected by Skypiax (and to not ask you again)\n",
</span><span class="cx"> SKYPIAX_P_LOG);
</span><del>- skypiax_sleep(1000000);
- skypiax_signaling_write(tech_pvt, "PROTOCOL 7");
- skypiax_sleep(10000);
</del><ins>+ celliax_sleep(1000000);
+ celliax_signaling_write(tech_pvt, "PROTOCOL 7");
+ celliax_sleep(10000);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> if (!strncasecmp(message, "ERROR 92 CALL", 12)) {
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- skypiax_strncpy(message_2, message, sizeof(message) - 1);
</del><ins>+ celliax_strncpy(message_2, message, sizeof(message) - 1);
</ins><span class="cx"> buf = message;
</span><span class="cx"> stringp = &buf;
</span><span class="cx"> where = strsep(stringp, " ");
</span><span class="lines">@@ -167,9 +167,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(message, "CURRENTUSERHANDLE")) {
</span><del>- skypiax_strncpy(obj, where, sizeof(obj) - 1);
</del><ins>+ celliax_strncpy(obj, where, sizeof(obj) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(id, where, sizeof(id) - 1);
</del><ins>+ celliax_strncpy(id, where, sizeof(id) - 1);
</ins><span class="cx"> if (!strcasecmp(id, tech_pvt->skype_user)) {
</span><span class="cx"> tech_pvt->SkypiaxHandles.currentuserhandle = 1;
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="lines">@@ -178,51 +178,51 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(message, "USER")) {
</span><del>- skypiax_strncpy(obj, where, sizeof(obj) - 1);
</del><ins>+ celliax_strncpy(obj, where, sizeof(obj) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(id, where, sizeof(id) - 1);
</del><ins>+ celliax_strncpy(id, where, sizeof(id) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(prop, where, sizeof(prop) - 1);
</del><ins>+ celliax_strncpy(prop, where, sizeof(prop) - 1);
</ins><span class="cx"> if (!strcasecmp(prop, "RECEIVEDAUTHREQUEST")) {
</span><span class="cx"> char msg_to_skype[256];
</span><span class="cx"> DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n", SKYPIAX_P_LOG, message, obj, id, prop);
</span><span class="cx"> //TODO: allow authorization based on config param
</span><span class="cx"> sprintf(msg_to_skype, "SET USER %s ISAUTHORIZED TRUE", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(message, "MESSAGE")) {
</span><del>- skypiax_strncpy(obj, where, sizeof(obj) - 1);
</del><ins>+ celliax_strncpy(obj, where, sizeof(obj) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(id, where, sizeof(id) - 1);
</del><ins>+ celliax_strncpy(id, where, sizeof(id) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(prop, where, sizeof(prop) - 1);
</del><ins>+ celliax_strncpy(prop, where, sizeof(prop) - 1);
</ins><span class="cx"> if (!strcasecmp(prop, "STATUS")) {
</span><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(value, where, sizeof(value) - 1);
</del><ins>+ celliax_strncpy(value, where, sizeof(value) - 1);
</ins><span class="cx"> if (!strcasecmp(value, "RECEIVED")) {
</span><span class="cx"> char msg_to_skype[256];
</span><span class="cx"> DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s value: %s!\n", SKYPIAX_P_LOG, message, obj, id, prop, value);
</span><span class="cx"> //TODO: authomatically flag messages as read based on config param
</span><span class="cx"> sprintf(msg_to_skype, "SET MESSAGE %s SEEN", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(prop, "BODY")) {
</span><span class="cx"> char msg_to_skype[256];
</span><span class="cx"> DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n", SKYPIAX_P_LOG, message, obj, id, prop);
</span><span class="cx"> //TODO: authomatically flag messages as read based on config param
</span><span class="cx"> sprintf(msg_to_skype, "SET MESSAGE %s SEEN", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(message, "CALL")) {
</span><del>- skypiax_strncpy(obj, where, sizeof(obj) - 1);
</del><ins>+ celliax_strncpy(obj, where, sizeof(obj) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(id, where, sizeof(id) - 1);
</del><ins>+ celliax_strncpy(id, where, sizeof(id) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(prop, where, sizeof(prop) - 1);
</del><ins>+ celliax_strncpy(prop, where, sizeof(prop) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><del>- skypiax_strncpy(value, where, sizeof(value) - 1);
</del><ins>+ celliax_strncpy(value, where, sizeof(value) - 1);
</ins><span class="cx"> where = strsep(stringp, " ");
</span><span class="cx">
</span><span class="cx"> //DEBUGA_SKYPE
</span><span class="lines">@@ -234,16 +234,16 @@
</span><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><del>- skypiax_answer(tech_pvt, id, value);
</del><ins>+ celliax_answer(tech_pvt, id, value);
</ins><span class="cx"> } else {
</span><span class="cx"> /* we are inside an active call */
</span><span class="cx"> if (!strcasecmp(tech_pvt->skype_call_id, id)) {
</span><span class="cx"> /* this is the call in which we are calling out */
</span><span class="cx"> DEBUGA_SKYPE("Call %s DO NOTHING\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> } else {
</span><del>- skypiax_sleep(400000); //0.4 seconds
</del><ins>+ celliax_sleep(400000); //0.4 seconds
</ins><span class="cx"> DEBUGA_SKYPE("Call %s TRY TRANSFER\n", SKYPIAX_P_LOG, id);
</span><del>- skypiax_transfer(tech_pvt, id, value);
</del><ins>+ celliax_transfer(tech_pvt, id, value);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -272,18 +272,18 @@
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) {
</span><span class="cx"> if (strcasecmp(id, tech_pvt->skype_call_id)) {
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> DEBUGA_SKYPE("We called a Skype contact and he answered us on skype_call: %s.\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(prop, "DURATION") && (tech_pvt->interface_state == SKYPIAX_STATE_ERROR_DOUBLE_CALL)) {
</span><span class="cx"> char msg_to_skype[1024];
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> ERRORA("We are in a double call situation, trying to get out hanging up call id: %s.\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
- skypiax_sleep(10000);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
+ celliax_sleep(10000);
</ins><span class="cx"> //return CALLFLOW_INCOMING_HANGUP;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,15 +297,15 @@
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("NO ACTIVE calls in this moment, skype_call %s is RINGING, to ask PARTNER_HANDLE\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
- skypiax_sleep(10000);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
+ celliax_sleep(10000);
</ins><span class="cx"> } else {
</span><span class="cx"> /* we are inside an active call */
</span><span class="cx"> if (!strcasecmp(tech_pvt->skype_call_id, id)) {
</span><span class="cx"> /* this is the call in which we are calling out */
</span><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING;
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_RINGING;
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> remote_party_is_ringing(tech_pvt);
</span><span class="cx"> } else {
</span><span class="lines">@@ -313,8 +313,8 @@
</span><span class="cx"> ("We are in another call, but skype_call %s is RINGING on us, let's ask PARTNER_HANDLE, so maybe we'll TRANSFER\n",
</span><span class="cx"> SKYPIAX_P_LOG, id);
</span><span class="cx"> sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
- skypiax_sleep(10000);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
+ celliax_sleep(10000);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(value, "EARLYMEDIA")) {
</span><span class="lines">@@ -326,11 +326,11 @@
</span><span class="cx"> ERRORA("start_audio_threads FAILED\n", SKYPIAX_P_LOG);
</span><span class="cx"> return CALLFLOW_INCOMING_HANGUP;
</span><span class="cx"> }
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx">
</span><span class="cx"> remote_party_is_early_media(tech_pvt);
</span><span class="cx"> } else if (!strcasecmp(value, "MISSED")) {
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
</span><span class="cx"> DEBUGA_SKYPE("we tried to call Skype on skype_call %s and Skype has now FAILED\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> tech_pvt->skype_call_id[0] = '\0';
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
</span><span class="cx"> return CALLFLOW_INCOMING_HANGUP;
</span><span class="cx"> } else if (!strcasecmp(value, "REFUSED")) {
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> /* this is the id of the call we are in, probably we generated it */
</span><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_STATUS_REFUSED;
</span><span class="cx"> DEBUGA_SKYPE("we tried to call Skype on skype_call %s and Skype has now REFUSED\n", SKYPIAX_P_LOG, id);
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
</span><span class="cx"> tech_pvt->skype_call_id[0] = '\0';
</span><span class="cx"> return CALLFLOW_INCOMING_HANGUP;
</span><span class="lines">@@ -388,12 +388,12 @@
</span><span class="cx"> } else if (!strcasecmp(value, "ROUTING")) {
</span><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_STATUS_ROUTING;
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> } else if (!strcasecmp(value, "UNPLACED")) {
</span><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_STATUS_UNPLACED;
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> } else if (!strcasecmp(value, "INPROGRESS")) {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
</span><span class="cx"> if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id)
</span><span class="cx"> || !strcasecmp(tech_pvt->skype_call_id, id)) {
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id);
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) {
</span><span class="lines">@@ -415,12 +415,12 @@
</span><span class="cx"> ERRORA("start_audio_threads FAILED\n", SKYPIAX_P_LOG);
</span><span class="cx"> return CALLFLOW_INCOMING_HANGUP;
</span><span class="cx"> }
</span><del>- skypiax_sleep(1000); //FIXME
</del><ins>+ celliax_sleep(1000); //FIXME
</ins><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
- skypiax_sleep(1000); //FIXME
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
+ celliax_sleep(1000); //FIXME
</ins><span class="cx"> sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</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="lines">@@ -447,20 +447,20 @@
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("we tried to call Skype on skype_call %s and remote party (destination) was BUSY. Our outbound call has failed\n",
</span><span class="cx"> SKYPIAX_P_LOG, id);
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
</span><span class="cx"> tech_pvt->skype_call_id[0] = '\0';
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> return CALLFLOW_INCOMING_HANGUP;
</span><span class="cx"> } else if (!strcasecmp(value, "WAITING_REDIAL_COMMAND")) {
</span><span class="cx"> tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("we tried to call Skype on skype_call %s and remote party (destination) has rejected us (WAITING_REDIAL_COMMAND). Our outbound call has failed\n",
</span><span class="cx"> SKYPIAX_P_LOG, id);
</span><del>- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</del><ins>+ celliax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
</ins><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
</span><span class="cx"> tech_pvt->skype_call_id[0] = '\0';
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> return CALLFLOW_INCOMING_HANGUP;
</span><span class="cx"> } else {
</span><span class="cx"> WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPIAX_P_LOG, id, value);
</span><span class="lines">@@ -472,19 +472,19 @@
</span><span class="cx"> /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[11]: %s\n", SKYPIAX_P_LOG,
</span><span class="cx"> * message_2, &message_2[11]); */
</span><span class="cx"> memset(tech_pvt->skype_friends, 0, 4096);
</span><del>- skypiax_strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
</del><ins>+ celliax_strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
</ins><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(message, "#222")) {
</span><span class="cx"> /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
</span><span class="cx"> * message_2, &message_2[10]); */
</span><span class="cx"> memset(tech_pvt->skype_fullname, 0, 512);
</span><del>- skypiax_strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
</del><ins>+ celliax_strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
</ins><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(message, "#765")) {
</span><span class="cx"> /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
</span><span class="cx"> * message_2, &message_2[10]); */
</span><span class="cx"> memset(tech_pvt->skype_displayname, 0, 512);
</span><del>- skypiax_strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
</del><ins>+ celliax_strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
</ins><span class="cx"> }
</span><span class="cx"> a = 0;
</span><span class="cx"> } //message end
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void *skypiax_do_tcp_srv_thread_func(void *obj)
</del><ins>+void *celliax_do_tcp_srv_thread_func(void *obj)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = obj;
</span><span class="cx"> int s;
</span><span class="lines">@@ -514,9 +514,9 @@
</span><span class="cx"> short kill_cli_buff[SAMPLES_PER_FRAME];
</span><span class="cx"> short totalbuf[SAMPLES_PER_FRAME];
</span><span class="cx">
</span><del>- s = skypiax_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_srv_port);
</del><ins>+ s = celliax_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_srv_port);
</ins><span class="cx"> if (s < 0) {
</span><del>- ERRORA("skypiax_socket_create_and_bind error!\n", SKYPIAX_P_LOG);
</del><ins>+ ERRORA("celliax_socket_create_and_bind error!\n", SKYPIAX_P_LOG);
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx"> if (len == 320) {
</span><span class="cx"> unsigned int howmany;
</span><span class="cx">
</span><del>- if (samplerate_skypiax == 8000) {
</del><ins>+ if (samplerate_celliax == 8000) {
</ins><span class="cx"> /* we're downsampling from 16khz to 8khz, srv_out will contain each other sample from srv_in */
</span><span class="cx"> a = 0;
</span><span class="cx"> for (i = 0; i < len / sizeof(short); i++) {
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> i++;
</span><span class="cx"> a++;
</span><span class="cx"> }
</span><del>- } else if (samplerate_skypiax == 16000) {
</del><ins>+ } else if (samplerate_celliax == 16000) {
</ins><span class="cx"> /* we're NOT downsampling, srv_out will contain ALL samples from srv_in */
</span><span class="cx"> for (i = 0; i < len / sizeof(short); i++) {
</span><span class="cx"> srv_out[i] = srv_in[i];
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx"> i++;
</span><span class="cx"> }
</span><span class="cx"> /* send the complete frame through the pipe to our code waiting for incoming audio */
</span><del>- howmany = skypiax_pipe_write(tech_pvt->audiopipe[1], totalbuf, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+ howmany = celliax_pipe_write(tech_pvt->audiopipe[1], totalbuf, SAMPLES_PER_FRAME * sizeof(short));
</ins><span class="cx"> if (howmany != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx"> ERRORA("howmany is %d, but was expected to be %d\n", SKYPIAX_P_LOG,
</span><span class="cx"> howmany, (int) (SAMPLES_PER_FRAME * sizeof(short)));
</span><span class="lines">@@ -629,7 +629,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else if (len == 0) {
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("len=%d, expected 320\n", SKYPIAX_P_LOG, len);
</span><span class="cx"> }
</span><span class="lines">@@ -637,24 +637,24 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (rt)
</span><span class="cx"> ERRORA("SRV rt=%d\n", SKYPIAX_P_LOG, rt);
</span><del>- skypiax_sleep(10000);
</del><ins>+ celliax_sleep(10000);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die */
</span><span class="cx"> kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>- len = skypiax_pipe_write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+ len = celliax_pipe_write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx"> kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>- len = skypiax_pipe_write(tech_pvt->audioskypepipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+ len = celliax_pipe_write(tech_pvt->audioskypepipe[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
</span><span class="cx"> kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>- len = skypiax_pipe_write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+ len = celliax_pipe_write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx"> kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>- len = skypiax_pipe_write(tech_pvt->audioskypepipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+ len = celliax_pipe_write(tech_pvt->audioskypepipe[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("Skype incoming audio GONE\n", SKYPIAX_P_LOG);
</span><del>- skypiax_close_socket(fd);
</del><ins>+ celliax_close_socket(fd);
</ins><span class="cx"> //if (exit)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -662,12 +662,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("incoming audio server (I am it) EXITING\n", SKYPIAX_P_LOG);
</span><del>- skypiax_close_socket(s);
</del><ins>+ celliax_close_socket(s);
</ins><span class="cx"> tech_pvt->tcp_srv_thread = NULL;
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void *skypiax_do_tcp_cli_thread_func(void *obj)
</del><ins>+void *celliax_do_tcp_cli_thread_func(void *obj)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = obj;
</span><span class="cx"> int s;
</span><span class="lines">@@ -686,9 +686,9 @@
</span><span class="cx"> unsigned int sin_size;
</span><span class="cx"> #endif /* WIN32 */
</span><span class="cx">
</span><del>- s = skypiax_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_cli_port);
</del><ins>+ s = celliax_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_cli_port);
</ins><span class="cx"> if (s < 0) {
</span><del>- ERRORA("skypiax_socket_create_and_bind error!\n", SKYPIAX_P_LOG);
</del><ins>+ ERRORA("celliax_socket_create_and_bind error!\n", SKYPIAX_P_LOG);
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -768,7 +768,7 @@
</span><span class="cx"> /* until we drained the pipe to empty */
</span><span class="cx"> for (counter = 0; counter < 10; counter++) {
</span><span class="cx"> /* read from the pipe the audio frame we are supposed to send out */
</span><del>- got = skypiax_pipe_read(tech_pvt->audioskypepipe[0], cli_in, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+ got = celliax_pipe_read(tech_pvt->audioskypepipe[0], cli_in, SAMPLES_PER_FRAME * sizeof(short));
</ins><span class="cx"> if (got == -1)
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (got == SAMPLES_PER_FRAME * sizeof(short)) {
</span><del>- if (samplerate_skypiax == 8000) {
</del><ins>+ if (samplerate_celliax == 8000) {
</ins><span class="cx">
</span><span class="cx"> /* we're upsampling from 8khz to 16khz, cli_out will contain two times each sample from cli_in */
</span><span class="cx"> a = 0;
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx"> a++;
</span><span class="cx"> }
</span><span class="cx"> got = got * 2;
</span><del>- } else if (samplerate_skypiax == 16000) {
</del><ins>+ } else if (samplerate_celliax == 16000) {
</ins><span class="cx"> /* we're NOT upsampling, cli_out will contain just ALL samples from cli_in */
</span><span class="cx"> for (i = 0; i < got / sizeof(short); i++) {
</span><span class="cx"> cli_out[i] = cli_in[i];
</span><span class="lines">@@ -800,13 +800,13 @@
</span><span class="cx"> /* send the 16khz frame to the Skype client waiting for incoming audio to be sent to the remote party */
</span><span class="cx"> if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
</span><span class="cx"> len = send(fd, (char *) cli_out, got, 0);
</span><del>- skypiax_sleep(5000); //5 msec
</del><ins>+ celliax_sleep(5000); //5 msec
</ins><span class="cx">
</span><span class="cx"> if (len == -1) {
</span><span class="cx"> break;
</span><span class="cx"> } else if (len != got) {
</span><span class="cx"> ERRORA("len=%d\n", SKYPIAX_P_LOG, len);
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -830,28 +830,28 @@
</span><span class="cx"> */
</span><span class="cx"> //WARNINGA("we don't send it\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("Skype outbound audio GONE\n", SKYPIAX_P_LOG);
</span><del>- skypiax_close_socket(fd);
</del><ins>+ celliax_close_socket(fd);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("outbound audio server (I am it) EXITING\n", SKYPIAX_P_LOG);
</span><del>- skypiax_close_socket(s);
</del><ins>+ celliax_close_socket(s);
</ins><span class="cx"> tech_pvt->tcp_cli_thread = NULL;
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_audio_read(private_t * tech_pvt)
</del><ins>+int celliax_audio_read(private_t * tech_pvt)
</ins><span class="cx"> {
</span><span class="cx"> unsigned int samples;
</span><span class="cx">
</span><del>- samples = skypiax_pipe_read(tech_pvt->audiopipe[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+ samples = celliax_pipe_read(tech_pvt->audiopipe[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
</ins><span class="cx">
</span><span class="cx"> if (samples != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx"> if (samples)
</span><span class="lines">@@ -864,30 +864,30 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_senddigit(private_t * tech_pvt, char digit)
</del><ins>+int celliax_senddigit(private_t * tech_pvt, char digit)
</ins><span class="cx"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("DIGIT received: %c\n", SKYPIAX_P_LOG, digit);
</span><span class="cx"> sprintf(msg_to_skype, "SET CALL %s DTMF %c", tech_pvt->skype_call_id, digit);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_call(private_t * tech_pvt, char *rdest, int timeout)
</del><ins>+int celliax_call(private_t * tech_pvt, char *rdest, int timeout)
</ins><span class="cx"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="cx">
</span><del>- //skypiax_sleep(5000);
</del><ins>+ //celliax_sleep(5000);
</ins><span class="cx"> DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest);
</span><del>- //skypiax_signaling_write(tech_pvt, "SET AGC OFF");
- //skypiax_sleep(10000);
- //skypiax_signaling_write(tech_pvt, "SET AEC OFF");
- //skypiax_sleep(10000);
</del><ins>+ //celliax_signaling_write(tech_pvt, "SET AGC OFF");
+ //celliax_sleep(10000);
+ //celliax_signaling_write(tech_pvt, "SET AEC OFF");
+ //celliax_sleep(10000);
</ins><span class="cx">
</span><span class="cx"> sprintf(msg_to_skype, "CALL %s", rdest);
</span><del>- if (skypiax_signaling_write(tech_pvt, msg_to_skype) < 0) {
</del><ins>+ if (celliax_signaling_write(tech_pvt, msg_to_skype) < 0) {
</ins><span class="cx"> ERRORA("failed to communicate with Skype client, now exit\n", SKYPIAX_P_LOG);
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> /* PLATFORM SPECIFIC */
</span><span class="cx"> /***************************/
</span><span class="cx"> #if defined(WIN32) && !defined(__CYGWIN__)
</span><del>-int skypiax_pipe_read(switch_file_t * pipe, short *buf, int howmany)
</del><ins>+int celliax_pipe_read(switch_file_t * pipe, short *buf, int howmany)
</ins><span class="cx"> {
</span><span class="cx"> switch_size_t quantity;
</span><span class="cx">
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> return howmany;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_pipe_write(switch_file_t * pipe, short *buf, int howmany)
</del><ins>+int celliax_pipe_write(switch_file_t * pipe, short *buf, int howmany)
</ins><span class="cx"> {
</span><span class="cx"> switch_size_t quantity;
</span><span class="cx">
</span><span class="lines">@@ -924,7 +924,7 @@
</span><span class="cx"> return howmany;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_close_socket(unsigned int fd)
</del><ins>+int celliax_close_socket(unsigned int fd)
</ins><span class="cx"> {
</span><span class="cx"> int res;
</span><span class="cx">
</span><span class="lines">@@ -933,27 +933,27 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_audio_init(private_t * tech_pvt)
</del><ins>+int celliax_audio_init(private_t * tech_pvt)
</ins><span class="cx"> {
</span><span class="cx"> switch_status_t rv;
</span><del>- rv = switch_file_pipe_create(&tech_pvt->audiopipe[0], &tech_pvt->audiopipe[1], skypiax_module_pool);
- rv = switch_file_pipe_create(&tech_pvt->audioskypepipe[0], &tech_pvt->audioskypepipe[1], skypiax_module_pool);
</del><ins>+ rv = switch_file_pipe_create(&tech_pvt->audiopipe[0], &tech_pvt->audiopipe[1], celliax_module_pool);
+ rv = switch_file_pipe_create(&tech_pvt->audioskypepipe[0], &tech_pvt->audioskypepipe[1], celliax_module_pool);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> #else /* WIN32 */
</span><del>-int skypiax_pipe_read(int pipe, short *buf, int howmany)
</del><ins>+int celliax_pipe_read(int pipe, short *buf, int howmany)
</ins><span class="cx"> {
</span><span class="cx"> howmany = read(pipe, buf, howmany);
</span><span class="cx"> return howmany;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_pipe_write(int pipe, short *buf, int howmany)
</del><ins>+int celliax_pipe_write(int pipe, short *buf, int howmany)
</ins><span class="cx"> {
</span><span class="cx"> howmany = write(pipe, buf, howmany);
</span><span class="cx"> return howmany;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_close_socket(unsigned int fd)
</del><ins>+int celliax_close_socket(unsigned int fd)
</ins><span class="cx"> {
</span><span class="cx"> int res;
</span><span class="cx">
</span><span class="lines">@@ -962,7 +962,7 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_audio_init(private_t * tech_pvt)
</del><ins>+int celliax_audio_init(private_t * tech_pvt)
</ins><span class="cx"> {
</span><span class="cx"> if (pipe(tech_pvt->audiopipe)) {
</span><span class="cx"> fcntl(tech_pvt->audiopipe[0], F_SETFL, O_NONBLOCK);
</span><span class="lines">@@ -974,7 +974,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* this pipe is the audio fd for asterisk to poll on during a call. FS do not use it */
</span><del>- tech_pvt->skypiax_sound_capt_fd = tech_pvt->audiopipe[0];
</del><ins>+ tech_pvt->celliax_sound_capt_fd = tech_pvt->audiopipe[0];
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
</del><ins>+int celliax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
</ins><span class="cx"> {
</span><span class="cx"> static char acInputRow[1024];
</span><span class="cx"> COPYDATASTRUCT oCopyData;
</span><span class="lines">@@ -1051,7 +1051,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LRESULT APIENTRY skypiax_present(HWND hWindow, UINT uiMessage, WPARAM uiParam, LPARAM ulParam)
</del><ins>+LRESULT APIENTRY celliax_present(HWND hWindow, UINT uiMessage, WPARAM uiParam, LPARAM ulParam)
</ins><span class="cx"> {
</span><span class="cx"> LRESULT lReturnCode;
</span><span class="cx"> int fIssueDefProc;
</span><span class="lines">@@ -1081,10 +1081,10 @@
</span><span class="cx"> PCOPYDATASTRUCT poCopyData = (PCOPYDATASTRUCT) ulParam;
</span><span class="cx">
</span><span class="cx"> memset(msg_from_skype, '\0', sizeof(msg_from_skype));
</span><del>- skypiax_strncpy(msg_from_skype, (const char *) poCopyData->lpData, sizeof(msg_from_skype) - 2);
</del><ins>+ celliax_strncpy(msg_from_skype, (const char *) poCopyData->lpData, sizeof(msg_from_skype) - 2);
</ins><span class="cx">
</span><span class="cx"> howmany = strlen(msg_from_skype) + 1;
</span><del>- howmany = skypiax_pipe_write(tech_pvt->SkypiaxHandles.fdesc[1], (short *) msg_from_skype, howmany);
</del><ins>+ howmany = celliax_pipe_write(tech_pvt->SkypiaxHandles.fdesc[1], (short *) msg_from_skype, howmany);
</ins><span class="cx"> //DEBUGA_SKYPE("From Skype API: %s\n", SKYPIAX_P_LOG, msg_from_skype);
</span><span class="cx"> lReturnCode = 1;
</span><span class="cx"> }
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION:
</span><span class="cx"> //DEBUGA_SKYPE ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", SKYPIAX_P_LOG);
</span><del>- skypiax_sleep(5000);
</del><ins>+ celliax_sleep(5000);
</ins><span class="cx"> #if 0
</span><span class="cx"> if (!tech_pvt->SkypiaxHandles.currentuserhandle) {
</span><span class="cx"> SendMessage(HWND_BROADCAST,
</span><span class="lines">@@ -1120,7 +1120,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case SKYPECONTROLAPI_ATTACH_API_AVAILABLE:
</span><span class="cx"> DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG);
</span><del>- skypiax_sleep(5000);
</del><ins>+ celliax_sleep(5000);
</ins><span class="cx"> #if 0
</span><span class="cx"> if (!tech_pvt->SkypiaxHandles.currentuserhandle) {
</span><span class="cx"> SendMessage(HWND_BROADCAST,
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> strcat(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, (char *) paucUUIDString);
</span><span class="cx">
</span><span class="cx"> oWindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
</span><del>- oWindowClass.lpfnWndProc = (WNDPROC) & skypiax_present;
</del><ins>+ oWindowClass.lpfnWndProc = (WNDPROC) & celliax_present;
</ins><span class="cx"> oWindowClass.cbClsExtra = 0;
</span><span class="cx"> oWindowClass.cbWndExtra = 0;
</span><span class="cx"> oWindowClass.hInstance = tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle;
</span><span class="lines">@@ -1207,14 +1207,14 @@
</span><span class="cx"> DestroyWindow(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle), tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void *skypiax_do_skypeapi_thread_func(void *obj)
</del><ins>+void *celliax_do_skypeapi_thread_func(void *obj)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = obj;
</span><span class="cx"> #if defined(WIN32) && !defined(__CYGWIN__)
</span><span class="cx"> switch_status_t rv;
</span><span class="cx">
</span><del>- switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], &tech_pvt->SkypiaxHandles.fdesc[1], skypiax_module_pool);
- rv = switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], &tech_pvt->SkypiaxHandles.fdesc[1], skypiax_module_pool);
</del><ins>+ switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], &tech_pvt->SkypiaxHandles.fdesc[1], celliax_module_pool);
+ rv = switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], &tech_pvt->SkypiaxHandles.fdesc[1], celliax_module_pool);
</ins><span class="cx"> #else /* WIN32 */
</span><span class="cx"> if (pipe(tech_pvt->SkypiaxHandles.fdesc)) {
</span><span class="cx"> fcntl(tech_pvt->SkypiaxHandles.fdesc[0], F_SETFL, O_NONBLOCK);
</span><span class="lines">@@ -1225,7 +1225,7 @@
</span><span class="cx"> tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach = RegisterWindowMessage("SkypeControlAPIAttach");
</span><span class="cx"> tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = RegisterWindowMessage("SkypeControlAPIDiscover");
</span><span class="cx">
</span><del>- skypiax_sleep(200000); //0,2 sec
</del><ins>+ celliax_sleep(200000); //0,2 sec
</ins><span class="cx">
</span><span class="cx"> if (tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0
</span><span class="cx"> && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) {
</span><span class="lines">@@ -1262,7 +1262,7 @@
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><span class="cx"> xerror = err->error_code;
</span><del>- ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror); ///FIXME why crash the entire skypiax? just crash the interface, instead
</del><ins>+ ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror); ///FIXME why crash the entire celliax? just crash the interface, instead
</ins><span class="cx"> running = 0;
</span><span class="cx"> return 0; /* ignore the error */
</span><span class="cx"> }
</span><span class="lines">@@ -1279,7 +1279,7 @@
</span><span class="cx"> return (xerror != BadValue) && (xerror != BadWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
</del><ins>+int celliax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> Window w_P;
</span><span class="lines">@@ -1327,7 +1327,7 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
</del><ins>+int celliax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
</ins><span class="cx"> {
</span><span class="cx"> struct SkypiaxHandles *SkypiaxHandles;
</span><span class="cx">
</span><span class="lines">@@ -1335,7 +1335,7 @@
</span><span class="cx">
</span><span class="cx"> SkypiaxHandles = &tech_pvt->SkypiaxHandles;
</span><span class="cx">
</span><del>- if (!skypiax_send_message(SkypiaxHandles, msg_to_skype)) {
</del><ins>+ if (!celliax_send_message(SkypiaxHandles, msg_to_skype)) {
</ins><span class="cx"> ERRORA
</span><span class="cx"> ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax, then restart Skype, then launch Skypiax and try again.\n",
</span><span class="cx"> SKYPIAX_P_LOG);
</span><span class="lines">@@ -1346,7 +1346,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_present(struct SkypiaxHandles *SkypiaxHandles)
</del><ins>+int celliax_present(struct SkypiaxHandles *SkypiaxHandles)
</ins><span class="cx"> {
</span><span class="cx"> Atom skype_inst = XInternAtom(SkypiaxHandles->disp, "_SKYPE_INSTANCE", True);
</span><span class="cx">
</span><span class="lines">@@ -1381,7 +1381,7 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void skypiax_clean_disp(void *data)
</del><ins>+void celliax_clean_disp(void *data)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> int *dispptr;
</span><span class="lines">@@ -1399,10 +1399,10 @@
</span><span class="cx"> DEBUGA_SKYPE("NOT destroyed disp\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("OUT destroyed disp\n", SKYPIAX_P_LOG);
</span><del>- skypiax_sleep(1000);
</del><ins>+ celliax_sleep(1000);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void *skypiax_do_skypeapi_thread_func(void *obj)
</del><ins>+void *celliax_do_skypeapi_thread_func(void *obj)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> private_t *tech_pvt = obj;
</span><span class="lines">@@ -1441,22 +1441,22 @@
</span><span class="cx">
</span><span class="cx"> SkypiaxHandles->disp = disp;
</span><span class="cx">
</span><del>- if (skypiax_present(SkypiaxHandles)) {
</del><ins>+ if (celliax_present(SkypiaxHandles)) {
</ins><span class="cx"> root = DefaultRootWindow(disp);
</span><span class="cx"> win = XCreateSimpleWindow(disp, root, 0, 0, 1, 1, 0, BlackPixel(disp, DefaultScreen(disp)), BlackPixel(disp, DefaultScreen(disp)));
</span><span class="cx">
</span><span class="cx"> SkypiaxHandles->win = win;
</span><span class="cx">
</span><del>- snprintf(buf, 512, "NAME skypiax");
</del><ins>+ snprintf(buf, 512, "NAME celliax");
</ins><span class="cx">
</span><del>- if (!skypiax_send_message(SkypiaxHandles, buf)) {
</del><ins>+ if (!celliax_send_message(SkypiaxHandles, buf)) {
</ins><span class="cx"> ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG);
</span><span class="cx"> running = 0;
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> snprintf(buf, 512, "PROTOCOL 7");
</span><del>- if (!skypiax_send_message(SkypiaxHandles, buf)) {
</del><ins>+ if (!celliax_send_message(SkypiaxHandles, buf)) {
</ins><span class="cx"> ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG);
</span><span class="cx"> running = 0;
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -1511,7 +1511,7 @@
</span><span class="cx"> WARNINGA
</span><span class="cx"> ("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||. Let's introduce a 1 second delay.\n",
</span><span class="cx"> SKYPIAX_P_LOG, buf);
</span><del>- skypiax_sleep(1000000); //1 sec
</del><ins>+ celliax_sleep(1000000); //1 sec
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14546 => 14547)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-17 09:48:26 UTC (rev 14546)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-17 10:05:07 UTC (rev 14547)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> * Portions created by the Initial Developer are Copyright (C)
</span><span class="cx"> * the Initial Developer. All Rights Reserved.
</span><span class="cx"> *
</span><del>- * This module (mod_skypiax) has been contributed by:
</del><ins>+ * This module (mod_celliax) has been contributed by:
</ins><span class="cx"> *
</span><span class="cx"> * Giovanni Maruzzelli (gmaruzz@gmail.com)
</span><span class="cx"> *
</span><span class="lines">@@ -30,11 +30,11 @@
</span><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> *
</span><del>- * mod_skypiax.c -- Skype compatible Endpoint Module
</del><ins>+ * mod_celliax.c -- Skype compatible Endpoint Module
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "skypiax.h"
</del><ins>+#include "celliax.h"
</ins><span class="cx">
</span><span class="cx"> #ifdef WIN32
</span><span class="cx"> /***************/
</span><span class="lines">@@ -81,14 +81,14 @@
</span><span class="cx">
</span><span class="cx"> /***************/
</span><span class="cx"> #endif /* WIN32 */
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown);
-SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL);
</del><ins>+SWITCH_MODULE_LOAD_FUNCTION(mod_celliax_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_celliax_shutdown);
+SWITCH_MODULE_DEFINITION(mod_celliax, mod_celliax_load, mod_celliax_shutdown, NULL);
</ins><span class="cx"> SWITCH_STANDARD_API(sk_function);
</span><span class="cx"> /* BEGIN: Changes here */
</span><span class="cx"> #define SK_SYNTAX "list [full] || console || skype_API_msg || remove < skypeusername | #interface_name | #interface_id > || reload"
</span><span class="cx"> /* END: Changes heres */
</span><del>-SWITCH_STANDARD_API(skypiax_function);
</del><ins>+SWITCH_STANDARD_API(celliax_function);
</ins><span class="cx"> #define SKYPIAX_SYNTAX "interface_name skype_API_msg"
</span><span class="cx">
</span><span class="cx"> /* BEGIN: Changes here */
</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 celliax.h */
</ins><span class="cx"> "IDLE",
</span><span class="cx"> "DOWN",
</span><span class="cx"> "RING",
</span><span class="lines">@@ -110,7 +110,7 @@
</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 */
</del><ins>+char *skype_callflow[] = { /* should match CALLFLOW_XXX in celliax.h */
</ins><span class="cx"> "CALL_IDLE",
</span><span class="cx"> "CALL_DOWN",
</span><span class="cx"> "INCOMING_RNG",
</span><span class="lines">@@ -165,8 +165,8 @@
</span><span class="cx"> private_t *sk_console;
</span><span class="cx"> } globals;
</span><span class="cx">
</span><del>-switch_endpoint_interface_t *skypiax_endpoint_interface;
-switch_memory_pool_t *skypiax_module_pool = NULL;
</del><ins>+switch_endpoint_interface_t *celliax_endpoint_interface;
+switch_memory_pool_t *celliax_module_pool = NULL;
</ins><span class="cx"> int running = 0;
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
</span><span class="lines">@@ -194,9 +194,9 @@
</span><span class="cx"> static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
</span><span class="cx"> static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
</span><span class="cx"> static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
</span><del>-static switch_status_t skypiax_tech_init(private_t * tech_pvt, switch_core_session_t *session);
</del><ins>+static switch_status_t celliax_tech_init(private_t * tech_pvt, switch_core_session_t *session);
</ins><span class="cx">
</span><del>-static switch_status_t skypiax_codec(private_t * tech_pvt, int sample_rate, int codec_ms)
</del><ins>+static switch_status_t celliax_codec(private_t * tech_pvt, int sample_rate, int codec_ms)
</ins><span class="cx"> {
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx">
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skypiax_tech_init(private_t * tech_pvt, switch_core_session_t *session)
</del><ins>+switch_status_t celliax_tech_init(private_t * tech_pvt, switch_core_session_t *session)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="lines">@@ -248,11 +248,11 @@
</span><span class="cx"> ERRORA("no tech_pvt->session_uuid_str\n", SKYPIAX_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>- if (skypiax_codec(tech_pvt, SAMPLERATE_SKYPIAX, 20) != SWITCH_STATUS_SUCCESS) {
- ERRORA("skypiax_codec FAILED\n", SKYPIAX_P_LOG);
</del><ins>+ if (celliax_codec(tech_pvt, SAMPLERATE_SKYPIAX, 20) != SWITCH_STATUS_SUCCESS) {
+ ERRORA("celliax_codec FAILED\n", SKYPIAX_P_LOG);
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>- DEBUGA_SKYPE("skypiax_codec SUCCESS\n", SKYPIAX_P_LOG);
</del><ins>+ DEBUGA_SKYPE("celliax_codec SUCCESS\n", SKYPIAX_P_LOG);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx">
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].running = 0;
</span><span class="cx">
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread) {
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> switch_file_write(tech_pvt->SkypiaxHandles.fdesc[1], "sciutati", &howmany); // let's the controldev_thread die
</span><span class="cx"> #else /* WIN32 */
</span><span class="lines">@@ -352,11 +352,11 @@
</span><span class="cx"> #endif /* WIN32 */
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread) {
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread) {
</ins><span class="cx"> #ifdef WIN32
</span><del>- if (SendMessage(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the skypiax_api_thread_func die
</del><ins>+ if (SendMessage(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the celliax_api_thread_func die
</ins><span class="cx"> DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPIAX_P_LOG, GetLastError());
</span><del>- globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
</del><ins>+ globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread = NULL;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> XEvent e;
</span><span class="lines">@@ -378,12 +378,12 @@
</span><span class="cx"> switch_yield(50000);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
- switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread);
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread) {
+ switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread) {
- switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread);
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread) {
+ switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(globals.mutex);
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> //switch_thread_cond_signal(tech_pvt->cond);
</span><span class="cx"> DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id);
</span><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</span><span class="cx"> //memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
</span><span class="cx"> //*tech_pvt->session_uuid_str = '\0';
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx"> DEBUGA_SKYPE("%s CHANNEL SEND_DTMF\n", SKYPIAX_P_LOG, tech_pvt->name);
</span><span class="cx"> DEBUGA_SKYPE("DTMF: %c\n", SKYPIAX_P_LOG, dtmf->digit);
</span><span class="cx">
</span><del>- skypiax_senddigit(tech_pvt, dtmf->digit);
</del><ins>+ celliax_senddigit(tech_pvt, dtmf->digit);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -645,9 +645,9 @@
</span><span class="cx"> tech_pvt->read_frame.flags = SFF_NONE;
</span><span class="cx"> *frame = NULL;
</span><span class="cx">
</span><del>- if (!skypiax_audio_read(tech_pvt)) {
</del><ins>+ if (!celliax_audio_read(tech_pvt)) {
</ins><span class="cx">
</span><del>- ERRORA("skypiax_audio_read ERROR\n", SKYPIAX_P_LOG);
</del><ins>+ ERRORA("celliax_audio_read ERROR\n", SKYPIAX_P_LOG);
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> switch_set_flag(tech_pvt, TFLAG_VOICE);
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_state_handler_table_t skypiax_state_handlers = {
</del><ins>+switch_state_handler_table_t celliax_state_handlers = {
</ins><span class="cx"> /*.on_init */ channel_on_init,
</span><span class="cx"> /*.on_routing */ channel_on_routing,
</span><span class="cx"> /*.on_execute */ channel_on_execute,
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx"> /*.on_destroy */ channel_on_destroy
</span><span class="cx"> };
</span><span class="cx">
</span><del>-switch_io_routines_t skypiax_io_routines = {
</del><ins>+switch_io_routines_t celliax_io_routines = {
</ins><span class="cx"> /*.outgoing_channel */ channel_outgoing_channel,
</span><span class="cx"> /*.read_frame */ channel_read_frame,
</span><span class="cx"> /*.write_frame */ channel_write_frame,
</span><span class="lines">@@ -825,7 +825,7 @@
</span><span class="cx"> switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags)
</span><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><del>- if ((*new_session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
</del><ins>+ if ((*new_session = switch_core_session_request(celliax_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> switch_caller_profile_t *caller_profile;
</span><span class="cx"> char *rdest;
</span><span class="lines">@@ -848,13 +848,13 @@
</span><span class="cx"> if (strncmp("ANY", interface_name, strlen(interface_name)) == 0 || strncmp("RR", interface_name, strlen(interface_name)) == 0) {
</span><span class="cx"> /* we've been asked for the "ANY" interface, let's find the first idle interface */
</span><span class="cx"> //DEBUGA_SKYPE("Finding one available skype interface\n", SKYPIAX_P_LOG);
</span><del>- //tech_pvt = find_available_skypiax_interface(NULL);
</del><ins>+ //tech_pvt = find_available_celliax_interface(NULL);
</ins><span class="cx"> //if (tech_pvt)
</span><span class="cx"> //found = 1;
</span><span class="cx"> //} else if (strncmp("RR", interface_name, strlen(interface_name)) == 0) {
</span><span class="cx"> /* Find the first idle interface using Round Robin */
</span><span class="cx"> DEBUGA_SKYPE("Finding one available skype interface RR\n", SKYPIAX_P_LOG);
</span><del>- tech_pvt = find_available_skypiax_interface_rr(NULL);
</del><ins>+ tech_pvt = find_available_celliax_interface_rr(NULL);
</ins><span class="cx"> if (tech_pvt)
</span><span class="cx"> found = 1;
</span><span class="cx"> }
</span><span class="lines">@@ -903,7 +903,7 @@
</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>- if (skypiax_tech_init(tech_pvt, *new_session) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (celliax_tech_init(tech_pvt, *new_session) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> ERRORA("Doh! no tech_init?\n", SKYPIAX_P_LOG);
</span><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="lines">@@ -914,8 +914,8 @@
</span><span class="cx"> if (outbound_profile) {
</span><span class="cx"> char name[128];
</span><span class="cx">
</span><del>- snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number);
- //snprintf(name, sizeof(name), "skypiax/%s", tech_pvt->name);
</del><ins>+ snprintf(name, sizeof(name), "celliax/%s", outbound_profile->destination_number);
+ //snprintf(name, sizeof(name), "celliax/%s", tech_pvt->name);
</ins><span class="cx"> switch_channel_set_name(channel, name);
</span><span class="cx"> caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx"> rdest = strchr(caller_profile->destination_number, '/');
</span><span class="cx"> *rdest++ = '\0';
</span><span class="cx">
</span><del>- //skypiax_call(tech_pvt, rdest, 30);
</del><ins>+ //celliax_call(tech_pvt, rdest, 30);
</ins><span class="cx">
</span><span class="cx"> switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(*new_session), sizeof(tech_pvt->session_uuid_str));
</span><span class="cx"> caller_profile = tech_pvt->caller_profile;
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> switch_channel_set_flag(channel, CF_OUTBOUND);
</span><span class="cx"> switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
</span><span class="cx"> switch_channel_set_state(channel, CS_INIT);
</span><del>- skypiax_call(tech_pvt, rdest, 30);
</del><ins>+ celliax_call(tech_pvt, rdest, 30);
</ins><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return SWITCH_CAUSE_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -951,10 +951,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- * \brief This thread runs during a call, and monitor the interface for signaling, like hangup, caller id, etc most of signaling is handled inside the skypiax_signaling_read function
</del><ins>+ * \brief This thread runs during a call, and monitor the interface for signaling, like hangup, caller id, etc most of signaling is handled inside the celliax_signaling_read function
</ins><span class="cx"> *
</span><span class="cx"> */
</span><del>-static void *SWITCH_THREAD_FUNC skypiax_signaling_thread_func(switch_thread_t * thread, void *obj)
</del><ins>+static void *SWITCH_THREAD_FUNC celliax_signaling_thread_func(switch_thread_t * thread, void *obj)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = obj;
</span><span class="cx"> int res;
</span><span class="lines">@@ -963,12 +963,12 @@
</span><span class="cx"> if (!tech_pvt)
</span><span class="cx"> return NULL;
</span><span class="cx">
</span><del>- DEBUGA_SKYPE("In skypiax_signaling_thread_func: started, p=%p\n", SKYPIAX_P_LOG, (void *) tech_pvt);
</del><ins>+ DEBUGA_SKYPE("In celliax_signaling_thread_func: started, p=%p\n", SKYPIAX_P_LOG, (void *) tech_pvt);
</ins><span class="cx">
</span><span class="cx"> while (forever) {
</span><span class="cx"> if (!(running && tech_pvt->running))
</span><span class="cx"> break;
</span><del>- res = skypiax_signaling_read(tech_pvt);
</del><ins>+ res = celliax_signaling_read(tech_pvt);
</ins><span class="cx"> if (res == CALLFLOW_INCOMING_HANGUP) {
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="lines">@@ -1019,11 +1019,11 @@
</span><span class="cx"> static switch_status_t load_config(int reload_type)
</span><span class="cx"> /* END: Changes heres */
</span><span class="cx"> {
</span><del>- char *cf = "skypiax.conf";
</del><ins>+ char *cf = "celliax.conf";
</ins><span class="cx"> switch_xml_t cfg, xml, global_settings, param, interfaces, myinterface;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><del>- switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, skypiax_module_pool);
</del><ins>+ switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, celliax_module_pool);
</ins><span class="cx"> if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
</span><span class="cx"> ERRORA("open of %s failed\n", SKYPIAX_P_LOG, cf);
</span><span class="cx"> running = 0;
</span><span class="lines">@@ -1208,8 +1208,8 @@
</span><span class="cx">
</span><span class="cx"> if (interface_id && interface_id < SKYPIAX_MAX_INTERFACES) {
</span><span class="cx"> private_t newconf;
</span><del>- switch_threadattr_t *skypiax_api_thread_attr = NULL;
- switch_threadattr_t *skypiax_signaling_thread_attr = NULL;
</del><ins>+ switch_threadattr_t *celliax_api_thread_attr = NULL;
+ switch_threadattr_t *celliax_signaling_thread_attr = NULL;
</ins><span class="cx">
</span><span class="cx"> memset(&newconf, '\0', sizeof(newconf));
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id] = newconf;
</span><span class="lines">@@ -1267,22 +1267,22 @@
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].context);
</span><span class="cx"> WARNINGA("STARTING interface_id=%d\n", SKYPIAX_P_LOG, interface_id);
</span><span class="cx">
</span><del>- switch_threadattr_create(&skypiax_api_thread_attr, skypiax_module_pool);
- switch_threadattr_stacksize_set(skypiax_api_thread_attr, SWITCH_THREAD_STACKSIZE);
- switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread,
- skypiax_api_thread_attr, skypiax_do_skypeapi_thread, &globals.SKYPIAX_INTERFACES[interface_id], skypiax_module_pool);
</del><ins>+ switch_threadattr_create(&celliax_api_thread_attr, celliax_module_pool);
+ switch_threadattr_stacksize_set(celliax_api_thread_attr, SWITCH_THREAD_STACKSIZE);
+ switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread,
+ celliax_api_thread_attr, celliax_do_skypeapi_thread, &globals.SKYPIAX_INTERFACES[interface_id], celliax_module_pool);
</ins><span class="cx">
</span><span class="cx"> switch_sleep(100000);
</span><span class="cx">
</span><del>- switch_threadattr_create(&skypiax_signaling_thread_attr, skypiax_module_pool);
- switch_threadattr_stacksize_set(skypiax_signaling_thread_attr, SWITCH_THREAD_STACKSIZE);
</del><ins>+ switch_threadattr_create(&celliax_signaling_thread_attr, celliax_module_pool);
+ switch_threadattr_stacksize_set(celliax_signaling_thread_attr, SWITCH_THREAD_STACKSIZE);
</ins><span class="cx"> switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id].
</span><del>- skypiax_signaling_thread, skypiax_signaling_thread_attr,
- skypiax_signaling_thread_func, &globals.SKYPIAX_INTERFACES[interface_id], skypiax_module_pool);
</del><ins>+ celliax_signaling_thread, celliax_signaling_thread_attr,
+ celliax_signaling_thread_func, &globals.SKYPIAX_INTERFACES[interface_id], celliax_module_pool);
</ins><span class="cx">
</span><span class="cx"> switch_sleep(100000);
</span><span class="cx">
</span><del>- skypiax_audio_init(&globals.SKYPIAX_INTERFACES[interface_id]);
</del><ins>+ celliax_audio_init(&globals.SKYPIAX_INTERFACES[interface_id]);
</ins><span class="cx">
</span><span class="cx"> NOTICA
</span><span class="cx"> ("WAITING roughly 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d\n",
</span><span class="lines">@@ -1316,7 +1316,7 @@
</span><span class="cx"> ("Interface_id=%d is now STARTED, the Skype client to which we are connected gave us the correct CURRENTUSERHANDLE (%s)\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user);
</span><span class="cx">
</span><del>- skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET AUTOAWAY OFF");
</del><ins>+ celliax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET AUTOAWAY OFF");
</ins><span class="cx"> } else {
</span><span class="cx"> ERRORA
</span><span class="cx"> ("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypiax exiting now\n",
</span><span class="lines">@@ -1359,11 +1359,11 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load)
</del><ins>+SWITCH_MODULE_LOAD_FUNCTION(mod_celliax_load)
</ins><span class="cx"> {
</span><span class="cx"> switch_api_interface_t *commands_api_interface;
</span><span class="cx">
</span><del>- skypiax_module_pool = pool;
</del><ins>+ celliax_module_pool = pool;
</ins><span class="cx"> memset(&globals, '\0', sizeof(globals));
</span><span class="cx">
</span><span class="cx"> running = 1;
</span><span class="lines">@@ -1374,15 +1374,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><del>- skypiax_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
- skypiax_endpoint_interface->interface_name = "skypiax";
- skypiax_endpoint_interface->io_routines = &skypiax_io_routines;
- skypiax_endpoint_interface->state_handler = &skypiax_state_handlers;
</del><ins>+ celliax_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
+ celliax_endpoint_interface->interface_name = "celliax";
+ celliax_endpoint_interface->io_routines = &celliax_io_routines;
+ celliax_endpoint_interface->state_handler = &celliax_state_handlers;
</ins><span class="cx">
</span><span class="cx"> if (running) {
</span><span class="cx">
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax console commands", sk_function, SK_SYNTAX);
</span><del>- SWITCH_ADD_API(commands_api_interface, "skypiax", "Skypiax interface commands", skypiax_function, SKYPIAX_SYNTAX);
</del><ins>+ SWITCH_ADD_API(commands_api_interface, "celliax", "Skypiax interface commands", celliax_function, SKYPIAX_SYNTAX);
</ins><span class="cx">
</span><span class="cx"> /* indicate that the module should continue to be loaded */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1390,7 +1390,7 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown)
</del><ins>+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_celliax_shutdown)
</ins><span class="cx"> {
</span><span class="cx"> int x;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="lines">@@ -1404,7 +1404,7 @@
</span><span class="cx"> tech_pvt = &globals.SKYPIAX_INTERFACES[interface_id];
</span><span class="cx">
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[interface_id].name)) {
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread) {
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> switch_file_write(tech_pvt->SkypiaxHandles.fdesc[1], "sciutati", &howmany); // let's the controldev_thread die
</span><span class="cx"> #else /* WIN32 */
</span><span class="lines">@@ -1412,11 +1412,11 @@
</span><span class="cx"> #endif /* WIN32 */
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread) {
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread) {
</ins><span class="cx"> #ifdef WIN32
</span><del>- if (SendMessage(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the skypiax_api_thread_func die
</del><ins>+ if (SendMessage(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the celliax_api_thread_func die
</ins><span class="cx"> DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPIAX_P_LOG, GetLastError());
</span><del>- globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
</del><ins>+ globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread = NULL;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> XEvent e;
</span><span class="lines">@@ -1438,11 +1438,11 @@
</span><span class="cx"> x--;
</span><span class="cx"> switch_yield(50000);
</span><span class="cx"> }
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
- switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread);
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread) {
+ switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread);
</ins><span class="cx"> }
</span><del>- if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread) {
- switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread);
</del><ins>+ if (globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread) {
+ switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].celliax_api_thread);
</ins><span class="cx"> }
</span><span class="cx"> #ifndef WIN32
</span><span class="cx"> WARNINGA("SHUTDOWN interface_id=%d\n", SKYPIAX_P_LOG, interface_id);
</span><span class="lines">@@ -1471,19 +1471,19 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj)
</del><ins>+void *SWITCH_THREAD_FUNC celliax_do_tcp_srv_thread(switch_thread_t * thread, void *obj)
</ins><span class="cx"> {
</span><del>- return skypiax_do_tcp_srv_thread_func(obj);
</del><ins>+ return celliax_do_tcp_srv_thread_func(obj);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t * thread, void *obj)
</del><ins>+void *SWITCH_THREAD_FUNC celliax_do_tcp_cli_thread(switch_thread_t * thread, void *obj)
</ins><span class="cx"> {
</span><del>- return skypiax_do_tcp_cli_thread_func(obj);
</del><ins>+ return celliax_do_tcp_cli_thread_func(obj);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void *SWITCH_THREAD_FUNC skypiax_do_skypeapi_thread(switch_thread_t * thread, void *obj)
</del><ins>+void *SWITCH_THREAD_FUNC celliax_do_skypeapi_thread(switch_thread_t * thread, void *obj)
</ins><span class="cx"> {
</span><del>- return skypiax_do_skypeapi_thread_func(obj);
</del><ins>+ return celliax_do_skypeapi_thread_func(obj);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int dtmf_received(private_t * tech_pvt, char *value)
</span><span class="lines">@@ -1521,20 +1521,20 @@
</span><span class="cx"> {
</span><span class="cx"> switch_threadattr_t *thd_attr = NULL;
</span><span class="cx">
</span><del>- switch_threadattr_create(&thd_attr, skypiax_module_pool);
</del><ins>+ switch_threadattr_create(&thd_attr, celliax_module_pool);
</ins><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span><span class="cx"> switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
</span><del>- if (switch_thread_create(&tech_pvt->tcp_srv_thread, thd_attr, skypiax_do_tcp_srv_thread, tech_pvt, skypiax_module_pool) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_thread_create(&tech_pvt->tcp_srv_thread, thd_attr, celliax_do_tcp_srv_thread, tech_pvt, celliax_module_pool) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG);
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("failed to start tcp_srv_thread thread.\n", SKYPIAX_P_LOG);
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_threadattr_create(&thd_attr, skypiax_module_pool);
</del><ins>+ switch_threadattr_create(&thd_attr, celliax_module_pool);
</ins><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span><span class="cx"> switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
</span><del>- if (switch_thread_create(&tech_pvt->tcp_cli_thread, thd_attr, skypiax_do_tcp_cli_thread, tech_pvt, skypiax_module_pool) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_thread_create(&tech_pvt->tcp_cli_thread, thd_attr, celliax_do_tcp_cli_thread, tech_pvt, celliax_module_pool) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG);
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("failed to start tcp_cli_thread thread.\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -1555,7 +1555,7 @@
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx">
</span><del>- if ((session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
</del><ins>+ if ((session = switch_core_session_request(celliax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
</ins><span class="cx"> DEBUGA_SKYPE("2 SESSION_REQUEST %s\n", SKYPIAX_P_LOG, switch_core_session_get_uuid(session));
</span><span class="cx"> switch_core_session_add_stream(session, NULL);
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -1564,19 +1564,19 @@
</span><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- if (skypiax_tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (celliax_tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> ERRORA("Doh! no tech_init?\n", SKYPIAX_P_LOG);
</span><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((tech_pvt->caller_profile =
</span><del>- switch_caller_profile_new(switch_core_session_get_pool(session), "skypiax",
</del><ins>+ switch_caller_profile_new(switch_core_session_get_pool(session), "celliax",
</ins><span class="cx"> tech_pvt->dialplan, tech_pvt->callid_name,
</span><del>- tech_pvt->callid_number, NULL, NULL, NULL, NULL, "mod_skypiax", tech_pvt->context, tech_pvt->destination)) != 0) {
</del><ins>+ tech_pvt->callid_number, NULL, NULL, NULL, NULL, "mod_celliax", tech_pvt->context, tech_pvt->destination)) != 0) {
</ins><span class="cx"> char name[128];
</span><del>- //switch_snprintf(name, sizeof(name), "skypiax/%s/%s", tech_pvt->name, tech_pvt->caller_profile->destination_number);
- switch_snprintf(name, sizeof(name), "skypiax/%s", tech_pvt->name);
</del><ins>+ //switch_snprintf(name, sizeof(name), "celliax/%s/%s", tech_pvt->name, tech_pvt->caller_profile->destination_number);
+ switch_snprintf(name, sizeof(name), "celliax/%s", tech_pvt->name);
</ins><span class="cx"> switch_channel_set_name(channel, name);
</span><span class="cx"> switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
</span><span class="cx"> }
</span><span class="lines">@@ -1692,7 +1692,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-private_t *find_available_skypiax_interface_rr(private_t * tech_pvt_calling)
</del><ins>+private_t *find_available_celliax_interface_rr(private_t * tech_pvt_calling)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> int i;
</span><span class="lines">@@ -1840,7 +1840,7 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> if (globals.sk_console)
</span><del>- skypiax_signaling_write(globals.sk_console, (char *) cmd);
</del><ins>+ celliax_signaling_write(globals.sk_console, (char *) cmd);
</ins><span class="cx"> else
</span><span class="cx"> stream->write_function(stream, "sk console is NOT yet assigned\n");
</span><span class="cx"> }
</span><span class="lines">@@ -1850,7 +1850,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_STANDARD_API(skypiax_function)
</del><ins>+SWITCH_STANDARD_API(celliax_function)
</ins><span class="cx"> {
</span><span class="cx"> char *mycmd = NULL, *argv[10] = { 0 };
</span><span class="cx"> int argc = 0;
</span><span class="lines">@@ -1891,7 +1891,7 @@
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> } else {
</span><del>- skypiax_signaling_write(tech_pvt, (char *) &cmd[strlen(argv[0]) + 1]);
</del><ins>+ celliax_signaling_write(tech_pvt, (char *) &cmd[strlen(argv[0]) + 1]);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
</span><span class="lines">@@ -1902,7 +1902,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_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"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="cx"> int i;
</span><span class="lines">@@ -1940,7 +1940,7 @@
</span><span class="cx"> if (found) {
</span><span class="cx"> //tech_pvt->callid_number[0]='\0';
</span><span class="cx"> //sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
</span><del>- //skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ //celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1952,11 +1952,11 @@
</span><span class="cx"> tech_pvt->ib_calls++;
</span><span class="cx">
</span><span class="cx"> sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> switch_sleep(10000);
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_PREANSWER;
</span><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s ANSWER", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> //FIXME write a timestamp here
</span><span class="cx"> gettimeofday(&tech_pvt->answer_time, NULL);
</span><span class="lines">@@ -1972,13 +1972,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("We're in a call now (%s), let's refuse this one (%s)\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id, id);
</span><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-int skypiax_transfer(private_t * tech_pvt, char *id, char *value)
</del><ins>+int celliax_transfer(private_t * tech_pvt, char *id, char *value)
</ins><span class="cx"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="cx"> int i;
</span><span class="lines">@@ -2009,7 +2009,7 @@
</span><span class="cx"> if (found) {
</span><span class="cx"> //tech_pvt->callid_number[0]='\0';
</span><span class="cx"> //sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
</span><del>- //skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ //celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -2029,7 +2029,7 @@
</span><span class="cx"> <- CALL 288 CAN_TRANSFER test2 TRUE
</span><span class="cx"> **********************************/
</span><span class="cx">
</span><del>- private_t *available_skypiax_interface = NULL;
</del><ins>+ private_t *available_celliax_interface = NULL;
</ins><span class="cx">
</span><span class="cx"> gettimeofday(&timenow, NULL);
</span><span class="cx"> for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) {
</span><span class="lines">@@ -2052,15 +2052,15 @@
</span><span class="cx"> if (found) {
</span><span class="cx"> //tech_pvt->callid_number[0]='\0';
</span><span class="cx"> //sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
</span><del>- //skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ //celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("NOT FOUND\n", SKYPIAX_P_LOG);
</span><span class="cx">
</span><del>- available_skypiax_interface = find_available_skypiax_interface_rr(tech_pvt);
- if (available_skypiax_interface) {
- /* there is a skypiax interface idle, let's transfer the call to it */
</del><ins>+ available_celliax_interface = find_available_celliax_interface_rr(tech_pvt);
+ if (available_celliax_interface) {
+ /* there is a celliax interface idle, let's transfer the call to it */
</ins><span class="cx">
</span><span class="cx"> //FIXME write a timestamp here
</span><span class="cx"> gettimeofday(&tech_pvt->transfer_time, NULL);
</span><span class="lines">@@ -2069,28 +2069,28 @@
</span><span class="cx"> switch_copy_string(tech_pvt->transfer_callid_number, value, sizeof(tech_pvt->transfer_callid_number) - 1);
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE
</span><del>- ("Let's transfer the skype_call %s to %s interface (with skype_user: %s), because we are already in a skypiax call(%s)\n",
- SKYPIAX_P_LOG, tech_pvt->skype_call_id, available_skypiax_interface->name, available_skypiax_interface->skype_user, id);
</del><ins>+ ("Let's transfer the skype_call %s to %s interface (with skype_user: %s), because we are already in a celliax call(%s)\n",
+ SKYPIAX_P_LOG, tech_pvt->skype_call_id, available_celliax_interface->name, available_celliax_interface->skype_user, id);
</ins><span class="cx">
</span><span class="cx"> //FIXME why this? the inbound call will come, eventually, on that other interface
</span><del>- //available_skypiax_interface->ib_calls++;
</del><ins>+ //available_celliax_interface->ib_calls++;
</ins><span class="cx">
</span><del>- sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, available_skypiax_interface->skype_user);
- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, available_celliax_interface->skype_user);
+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> if (tech_pvt->interface_state == SKYPIAX_STATE_SELECTED) {
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_IDLE; //we marked it SKYPIAX_STATE_SELECTED just in case it has to make an outbound call
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- /* no skypiax interfaces idle, do nothing */
</del><ins>+ /* no celliax interfaces idle, do nothing */
</ins><span class="cx"> DEBUGA_SKYPE
</span><del>- ("Not answering the skype_call %s, because we are already in a skypiax call(%s) and not transferring, because no other skypiax interfaces are available\n",
</del><ins>+ ("Not answering the skype_call %s, because we are already in a celliax call(%s) and not transferring, because no other celliax interfaces are available\n",
</ins><span class="cx"> SKYPIAX_P_LOG, id, tech_pvt->skype_call_id);
</span><span class="cx"> sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
</span><del>- skypiax_signaling_write(tech_pvt, msg_to_skype);
</del><ins>+ celliax_signaling_write(tech_pvt, msg_to_skype);
</ins><span class="cx"> }
</span><span class="cx"> switch_sleep(10000);
</span><span class="cx"> DEBUGA_SKYPE
</span><del>- ("We have NOT answered a Skype RING from skype_call %s, because we are already in a skypiax call (%s)\n",
</del><ins>+ ("We have NOT answered a Skype RING from skype_call %s, because we are already in a celliax call (%s)\n",
</ins><span class="cx"> SKYPIAX_P_LOG, id, tech_pvt->skype_call_id);
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>