<!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][16236] </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=16236">16236</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-11 05:23:52 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: cosmetics</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp">freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16235 => 16236)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-11 04:40:39 UTC (rev 16235)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-11 11:23:52 UTC (rev 16236)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "gsmopen.h"
</span><del>-#define MDL_CHAT_PROTO "SMS"
</del><span class="cx">
</span><span class="cx"> #if 0
</span><span class="cx"> #ifdef WIN32
</span><span class="lines">@@ -89,6 +88,7 @@
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_gsmopen_shutdown);
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_gsmopen, mod_gsmopen_load, mod_gsmopen_shutdown, NULL);
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><ins>+#define MDL_CHAT_PROTO "SMS"
</ins><span class="cx"> #if 1
</span><span class="cx"> SWITCH_STANDARD_API(gsm_function);
</span><span class="cx"> /* BEGIN: Changes here */
</span><span class="lines">@@ -1870,12 +1870,10 @@
</span><span class="cx">
</span><span class="cx"> for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
</span><span class="cx"> tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
</span><ins>+ WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
</ins><span class="cx">
</span><span class="cx"> if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
</span><del>-
-
-
- //alsa_shutdown(&globals.GSMOPEN_INTERFACES[interface_id]);
</del><ins>+ WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running = 0;
</span><span class="cx"> if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
</span><span class="cx"> #ifdef WIN32
</span><span class="lines">@@ -1909,7 +1907,6 @@
</span><span class="cx"> WARNINGA("SHUTDOWN tech_pvt->controldevfd=%d\n", GSMOPEN_P_LOG, tech_pvt->controldevfd);
</span><span class="cx"> }
</span><span class="cx"> #ifndef WIN32
</span><del>- WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
</del><span class="cx"> shutdown(tech_pvt->audiogsmopenpipe[0], 2);
</span><span class="cx"> close(tech_pvt->audiogsmopenpipe[0]);
</span><span class="cx"> shutdown(tech_pvt->audiogsmopenpipe[1], 2);
</span><span class="lines">@@ -2463,7 +2460,6 @@
</span><span class="cx"> time_t now_timestamp;
</span><span class="cx">
</span><span class="cx"> //if (gsmopen_present(GSMopenHandles))
</span><del>- if (1) {
</del><span class="cx"> while (running && tech_pvt->running) {
</span><span class="cx"> int res;
</span><span class="cx"> //gsmopen_sleep(1000000); //1 sec
</span><span class="lines">@@ -2515,11 +2511,6 @@
</span><span class="cx"> gsmopen_serial_getstatus_AT(tech_pvt);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else {
- ERRORA("GSM is not running, maybe crashed. Please run/restart GSM and relaunch GSMopen\n", GSMOPEN_P_LOG);
- running = 0;
- return NULL;
- }
</del><span class="cx"> WARNINGA("EXIT\n", GSMOPEN_P_LOG);
</span><span class="cx"> //running = 0;
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -2664,7 +2655,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #ifdef NOTDEF
</span><del>-SWITCH_STANDARD_API(skypiax_chat_function)
</del><ins>+SWITCH_STANDARD_API(gsmopen_chat_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">@@ -2701,7 +2692,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> if (!found) {
</span><del>- stream->write_function(stream, "ERROR: A Skypiax interface with name='%s' was not found\n", argv[0]);
</del><ins>+ stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
</ins><span class="cx"> goto end;
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="lines">@@ -2717,7 +2708,7 @@
</span><span class="cx">
</span><span class="cx"> //NOTICA("TEXT is: %s\n", GSMOPEN_P_LOG, (char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1] );
</span><span class="cx"> //snprintf(skype_msg, sizeof(skype_msg), "CHAT CREATE %s", argv[1]);
</span><del>- //skypiax_signaling_write(tech_pvt, skype_msg);
</del><ins>+ //gsmopen_signaling_write(tech_pvt, skype_msg);
</ins><span class="cx"> //switch_sleep(100);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -2734,7 +2725,7 @@
</span><span class="cx"> if (!strcmp(tech_pvt->chats[i].dialog_partner, argv[1])) {
</span><span class="cx"> snprintf(skype_msg, sizeof(skype_msg), "CHATMESSAGE %s %s", tech_pvt->chats[i].chatname,
</span><span class="cx"> (char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]);
</span><del>- skypiax_signaling_write(tech_pvt, skype_msg);
</del><ins>+ gsmopen_signaling_write(tech_pvt, skype_msg);
</ins><span class="cx"> found = 1;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>