<!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][15137] </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=15137">15137</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-10-10 12:25:54 -0500 (Sat, 10 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: disposing of sms_receiving_program, obsoleted by MESSAGE event</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopenh">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolc">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopenc">freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopenh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (15136 => 15137)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2009-10-10 16:46:54 UTC (rev 15136)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2009-10-10 17:25:54 UTC (rev 15137)
</span><span class="lines">@@ -397,12 +397,12 @@
</span><span class="cx">
</span><span class="cx"> int unread_sms_msg_id;
</span><span class="cx"> int reading_sms_msg;
</span><del>- char sms_message[4800];
</del><ins>+ //char sms_message[4800];
</ins><span class="cx"> char sms_sender[256];
</span><span class="cx"> char sms_date[256];
</span><span class="cx"> char sms_body[4800];
</span><span class="cx"> int sms_cnmi_not_supported;
</span><del>- char sms_receiving_program[256];
</del><ins>+ //char sms_receiving_program[256];
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> struct timeval call_incoming_time;
</span><span class="lines">@@ -561,5 +561,5 @@
</span><span class="cx">
</span><span class="cx"> void gsmopen_store_boost(char *s, double *boost);
</span><span class="cx"> int gsmopen_sound_boost(void *data, int samples_num, double boost);
</span><del>-int sms_incoming(private_t * tech_pvt, char *value);
</del><ins>+int sms_incoming(private_t * tech_pvt);
</ins><span class="cx"> int gsmopen_ring(private_t * tech_pvt);
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c (15136 => 15137)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c 2009-10-10 16:46:54 UTC (rev 15136)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c 2009-10-10 17:25:54 UTC (rev 15137)
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx">
</span><span class="cx"> memset(at_command, 0, sizeof(at_command));
</span><span class="cx"> sprintf(at_command, "AT+CMGR=%d", tech_pvt->unread_sms_msg_id);
</span><del>- memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
</del><ins>+ //memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
</ins><span class="cx">
</span><span class="cx"> tech_pvt->reading_sms_msg = 1;
</span><span class="cx"> res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
</span><span class="lines">@@ -933,6 +933,9 @@
</span><span class="cx"> ERRORA("AT+CMGD (Delete SMS) do not got OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ res = sms_incoming(tech_pvt);
+
+#if 0
</ins><span class="cx"> if (strlen(tech_pvt->sms_message)) {
</span><span class="cx"> //FIXME manager_event(EVENT_FLAG_SYSTEM, "GSMOPENincomingsms",
</span><span class="cx"> //FIXME "Interface: %s\r\nSMS_Message: %s\r\n", tech_pvt->name,
</span><span class="lines">@@ -978,6 +981,7 @@
</span><span class="cx"> GSMOPEN_P_LOG, tech_pvt->sms_message);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif //0
</ins><span class="cx"> #if 1 //is this one needed? maybe it can interrupt an incoming call that is just to announce itself
</span><span class="cx"> if (tech_pvt->phone_callflow == CALLFLOW_CALL_IDLE && tech_pvt->interface_state == GSMOPEN_STATE_DOWN && tech_pvt->owner == NULL) {
</span><span class="cx"> /* we're not in a call, neither calling */
</span><span class="lines">@@ -1369,9 +1373,9 @@
</span><span class="cx"> //ERRORA("END_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote, &tech_pvt->line_array.result[i][c]);
</span><span class="cx"> DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content);
</span><span class="cx">
</span><del>- strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- strncat(tech_pvt->sms_message, content, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</del><ins>+ //strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //strncat(tech_pvt->sms_message, content, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</ins><span class="cx">
</span><span class="cx"> memset(content2, '\0', sizeof(content2));
</span><span class="cx"> if (which_field == 1) {
</span><span class="lines">@@ -1381,10 +1385,10 @@
</span><span class="cx"> strncpy(content2, content, sizeof(content2));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- if (!err)
- strncat(tech_pvt->sms_message, content2, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</del><ins>+ //strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //if (!err)
+ //strncat(tech_pvt->sms_message, content2, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</ins><span class="cx"> memset(content, '\0', sizeof(content));
</span><span class="cx"> d = 0;
</span><span class="cx"> if (which_field == 1) {
</span><span class="lines">@@ -1412,21 +1416,21 @@
</span><span class="cx"> } //it was the +CMGR answer from the cellphone
</span><span class="cx"> else {
</span><span class="cx"> DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
</span><del>- strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- strncat(tech_pvt->sms_message, tech_pvt->line_array.result[i], ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</del><ins>+ //strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //strncat(tech_pvt->sms_message, tech_pvt->line_array.result[i], ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</ins><span class="cx">
</span><span class="cx"> memset(sms_body, '\0', sizeof(sms_body));
</span><span class="cx"> err = ucs2_to_utf8(tech_pvt, tech_pvt->line_array.result[i], sms_body, sizeof(sms_body));
</span><span class="cx"> DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
</span><span class="cx"> strncpy(tech_pvt->sms_body, sms_body, sizeof(tech_pvt->sms_body));
</span><span class="cx">
</span><del>- strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- if (!err)
- strncat(tech_pvt->sms_message, sms_body, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
- strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</del><ins>+ //strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //if (!err)
+ //strncat(tech_pvt->sms_message, sms_body, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+ //strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
</ins><span class="cx">
</span><del>- DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
</del><ins>+ //DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
</ins><span class="cx"> } //it was the UCS2 from cellphone
</span><span class="cx">
</span><span class="cx"> } //we were reading the SMS
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopenc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c (15136 => 15137)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c 2009-10-10 16:46:54 UTC (rev 15136)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c 2009-10-10 17:25:54 UTC (rev 15137)
</span><span class="lines">@@ -1214,7 +1214,7 @@
</span><span class="cx"> char *at_indicator_callsetupincoming_string = "CIEV: 6;1";
</span><span class="cx"> char *at_indicator_callsetupoutgoing_string = "CIEV: 6;2";
</span><span class="cx"> char *at_indicator_callsetupremoteringing_string = "CIEV: 6;3";
</span><del>- char *sms_receiving_program = "/usr/local/bin/ciapalo";
</del><ins>+ //char *sms_receiving_program = "/usr/local/bin/ciapalo";
</ins><span class="cx"> char *alsacname = "plughw:1";
</span><span class="cx"> char *alsapname = "plughw:1";
</span><span class="cx"> char *at_early_audio = "0";
</span><span class="lines">@@ -1365,8 +1365,8 @@
</span><span class="cx"> at_indicator_callsetupoutgoing_string = val;
</span><span class="cx"> } else if (!strcasecmp(var, "at_indicator_callsetupremoteringing_string")) {
</span><span class="cx"> at_indicator_callsetupremoteringing_string = val;
</span><del>- } else if (!strcasecmp(var, "sms_receiving_program")) {
- sms_receiving_program = val;
</del><ins>+ //} else if (!strcasecmp(var, "sms_receiving_program")) {
+ //sms_receiving_program = val;
</ins><span class="cx"> } else if (!strcasecmp(var, "alsacname")) {
</span><span class="cx"> alsacname = val;
</span><span class="cx"> } else if (!strcasecmp(var, "alsapname")) {
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx"> switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupoutgoing_string, at_indicator_callsetupoutgoing_string);
</span><span class="cx"> switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupremoteringing_string,
</span><span class="cx"> at_indicator_callsetupremoteringing_string);
</span><del>- switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].sms_receiving_program, sms_receiving_program);
</del><ins>+ //switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].sms_receiving_program, sms_receiving_program);
</ins><span class="cx"> switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsacname, alsacname);
</span><span class="cx"> switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsapname, alsapname);
</span><span class="cx">
</span><span class="lines">@@ -2492,13 +2492,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-int sms_incoming(private_t * tech_pvt, char *value)
</del><ins>+int sms_incoming(private_t * tech_pvt)
</ins><span class="cx"> {
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx"> int event_sent_to_esl = 0;
</span><span class="cx">
</span><del>- DEBUGA_GSMOPEN("received SMS on interface %s: %s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_message);
</del><ins>+ //DEBUGA_GSMOPEN("received SMS on interface %s: %s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_message);
</ins><span class="cx"> DEBUGA_GSMOPEN("received SMS on interface %s: DATE=%s, SENDER=%s, BODY=%s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_date, tech_pvt->sms_sender,
</span><span class="cx"> tech_pvt->sms_body);
</span><span class="cx">
</span><span class="lines">@@ -2559,7 +2559,7 @@
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="cx"> //memset(&tech_pvt->chatmessages[which], '\0', sizeof(&tech_pvt->chatmessages[which]) );
</span><del>- memset(tech_pvt->sms_message, '\0', sizeof(tech_pvt->sms_message));
</del><ins>+ //memset(tech_pvt->sms_message, '\0', sizeof(tech_pvt->sms_message));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>