<!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][14899] </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=14899">14899</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-09-17 06:23:29 -0500 (Thu, 17 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: continuing to bring SMSs to use standard MESSAGE events</pre>
<h3>Modified Paths</h3>
<ul>
<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_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14898 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-09-17 02:31:31 UTC (rev 14898)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-09-17 11:23:29 UTC (rev 14899)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> #endif //0
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_API(sendsms_function);
</span><del>-#define SENDSMS_SYNTAX "sendsms interface_name destination_number SMS_text"
</del><ins>+#define SENDSMS_SYNTAX "celliax_sendsms interface_name destination_number SMS_text"
</ins><span class="cx"> /* BEGIN: Changes here */
</span><span class="cx"> #define FULL_RELOAD 0
</span><span class="cx"> #define SOFT_RELOAD 1
</span><span class="lines">@@ -1463,10 +1463,86 @@
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><ins>+static switch_status_t chat_send(const char *proto, const char *from, const char *to, const char *subject, const char *body, const char *type, const char *hint)
+{
+ char *user, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL;
+ private_t * tech_pvt=NULL;
+ int i=0, found=0;
</ins><span class="cx">
</span><ins>+ switch_assert(proto != NULL);
+
+ DEBUGA_CELLIAX("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=%s, hint=%s)\n", CELLIAX_P_LOG, proto, from, to, subject, body, type, hint?hint:"NULL");
+
+ if (!to || !strlen(to)) {
+ ERRORA("Missing To: header.\n", CELLIAX_P_LOG);
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ if ((!from && !hint) || (!strlen(from) && !strlen(hint)) ) {
+ ERRORA("Missing From: AND Hint: headers.\n", CELLIAX_P_LOG);
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ if (from && (f_user = strdup(from))) {
+ if ((f_host = strchr(f_user, '@'))) {
+ *f_host++ = '\0';
+ if ((f_resource = strchr(f_host, '/'))) {
+ *f_resource++ = '\0';
+ }
+ }
+ }
+
+if(!strlen(hint)){ //FIXME FIXME FIXME
+ hint=from;
+}
+ if (to && (user = strdup(to))) {
+ if ((host = strchr(user, '@'))) {
+ *host++ = '\0';
+ }
+
+ DEBUGA_CELLIAX("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=%s, hint=%s)\n", CELLIAX_P_LOG, proto, from, to, subject, body, type, hint?hint:"NULL");
+ if (hint && strlen(hint)) {
+ //in hint we receive the interface name to use
+ for (i = 0; !found && i < CELLIAX_MAX_INTERFACES; i++) {
+ if (strlen(globals.CELLIAX_INTERFACES[i].name)
+ && (strncmp(globals.CELLIAX_INTERFACES[i].name, hint, strlen(hint)) == 0)) {
+ tech_pvt = &globals.CELLIAX_INTERFACES[i];
+ DEBUGA_CELLIAX("Using interface: globals.CELLIAX_INTERFACES[%d].name=|||%s|||\n", CELLIAX_P_LOG, i, globals.CELLIAX_INTERFACES[i].name);
+ found = 1;
+ break;
+ }
+ }
+ } /* FIXME add a tech_pvt member for the SIM telephone number //else {
+ //we have no a predefined interface name to use (hint is NULL), so let's choose an interface from the username (from)
+ for (i = 0; !found && i < CELLIAX_MAX_INTERFACES; i++) {
+ if (strlen(globals.CELLIAX_INTERFACES[i].name)
+ && (strncmp(globals.CELLIAX_INTERFACES[i].skype_user, from, strlen(from)) == 0)) {
+ tech_pvt = &globals.CELLIAX_INTERFACES[i];
+ DEBUGA_CELLIAX("Using interface: globals.CELLIAX_INTERFACES[%d].name=|||%s|||\n", CELLIAX_P_LOG, i, globals.CELLIAX_INTERFACES[i].name);
+ found = 1;
+ break;
+ }
+ }
+ }
+ */
+ if (!found) {
+ ERRORA("ERROR: A Celliax interface with name='%s' or one with SIM_number='%s' was not found\n", CELLIAX_P_LOG, hint?hint:"NULL", from?from:"NULL");
+ goto end;
+ } else {
+ celliax_sendsms(tech_pvt, to, body);
+ }
+ }
+end:
+ switch_safe_free(user);
+ switch_safe_free(f_user);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
</ins><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_celliax_load)
</span><span class="cx"> {
</span><span class="cx"> switch_api_interface_t *commands_api_interface;
</span><ins>+ switch_chat_interface_t *chat_interface;
</ins><span class="cx">
</span><span class="cx"> celliax_module_pool = pool;
</span><span class="cx"> memset(&globals, '\0', sizeof(globals));
</span><span class="lines">@@ -1495,7 +1571,8 @@
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "sk", "Celliax console commands", sk_function, SK_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "celliax", "Celliax interface commands", celliax_function, CELLIAX_SYNTAX);
</span><span class="cx"> #endif //0
</span><del>- SWITCH_ADD_API(commands_api_interface, "sendsms", "sendsms interface destination_number SMS_text", sendsms_function, SENDSMS_SYNTAX);
</del><ins>+ SWITCH_ADD_API(commands_api_interface, "celliax_sendsms", "celliax_sendsms interface destination_number SMS_text", sendsms_function, SENDSMS_SYNTAX);
+ SWITCH_ADD_CHAT(chat_interface, MDL_CHAT_PROTO, chat_send);
</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">@@ -1957,59 +2034,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif //0
</span><span class="cx">
</span><del>-SWITCH_STANDARD_API(sendsms_function)
-{
- char *mycmd = NULL, *argv[3] = { 0 };
- int argc = 0;
- private_t *tech_pvt = NULL;
-
- if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
- argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
- }
-
- if (!argc) {
- stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
- goto end;
- }
-
- if (argc < 3) {
- stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
- goto end;
- }
-
- if (argv[0]) {
- int i;
- int found = 0;
-
- for (i = 0; !found && i < CELLIAX_MAX_INTERFACES; i++) {
- /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
- if (strlen(globals.CELLIAX_INTERFACES[i].name)
- && (strncmp(globals.CELLIAX_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
- tech_pvt = &globals.CELLIAX_INTERFACES[i];
- stream->write_function(stream, "Trying to send your SMS: interface=%s, dest=%s, text=%s\n", argv[0], argv[1], argv[2]);
- found = 1;
- break;
- }
-
- }
- if (!found) {
- stream->write_function(stream, "ERROR: A Celliax interface with name='%s' was not found\n", argv[0]);
- switch_safe_free(mycmd);
-
- return SWITCH_STATUS_SUCCESS;
- } else {
- celliax_sendsms(tech_pvt, (char *) argv[1], (char *) argv[2]);
- }
- } else {
- stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
- }
- end:
- switch_safe_free(mycmd);
-
- return SWITCH_STATUS_SUCCESS;
-}
-
-
</del><span class="cx"> int celliax_transfer(private_t * tech_pvt, char *id, char *value)
</span><span class="cx"> {
</span><span class="cx"> char msg_to_celliax[1024];
</span><span class="lines">@@ -2207,7 +2231,63 @@
</span><span class="cx"> #endif// NOTDEF
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWITCH_STANDARD_API(sendsms_function)
+{
+ char *mycmd = NULL, *argv[3] = { 0 };
+ int argc = 0;
+ private_t *tech_pvt = NULL;
</ins><span class="cx">
</span><ins>+ if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ }
+
+ if (!argc) {
+ stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
+ goto end;
+ }
+
+ if (argc < 3) {
+ stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
+ goto end;
+ }
+
+ if (argv[0]) {
+ int i;
+ int found = 0;
+
+ for (i = 0; !found && i < CELLIAX_MAX_INTERFACES; i++) {
+ /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
+ if (strlen(globals.CELLIAX_INTERFACES[i].name)
+ && (strncmp(globals.CELLIAX_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
+ tech_pvt = &globals.CELLIAX_INTERFACES[i];
+ stream->write_function(stream, "Trying to send your SMS: interface=%s, dest=%s, text=%s\n", argv[0], argv[1], argv[2]);
+ found = 1;
+ break;
+ }
+
+ }
+ if (!found) {
+ stream->write_function(stream, "ERROR: A Celliax interface with name='%s' was not found\n", argv[0]);
+ switch_safe_free(mycmd);
+
+ return SWITCH_STATUS_SUCCESS;
+ } else {
+ //celliax_sendsms(tech_pvt, (char *) argv[1], (char *) argv[2]);
+ NOTICA("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=NULL, hint=%s)\n", CELLIAX_P_LOG, MDL_CHAT_PROTO, tech_pvt->name, argv[1], "SIMPLE MESSAGE", switch_str_nil(argv[2]), tech_pvt->name);
+
+ chat_send(MDL_CHAT_PROTO, tech_pvt->name, argv[1], "SIMPLE MESSAGE", switch_str_nil(argv[2]), NULL, tech_pvt->name);
+ }
+ } else {
+ stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
+ }
+ end:
+ switch_safe_free(mycmd);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+
</ins><span class="cx"> int sms_incoming(private_t * tech_pvt, char *value)
</span><span class="cx"> {
</span><span class="cx"> switch_event_t *event;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>