<!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][15269] </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=15269">15269</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-10-29 09:19:50 -0500 (Thu, 29 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: less clutter in debug</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_protocolcpp">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp</a></li>
<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_gsmopengsmopenh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (15268 => 15269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2009-10-29 13:55:09 UTC (rev 15268)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2009-10-29 14:19:50 UTC (rev 15269)
</span><span class="lines">@@ -401,6 +401,9 @@
</span><span class="cx"> char sms_sender[256];
</span><span class="cx"> char sms_date[256];
</span><span class="cx"> char sms_body[4800];
</span><ins>+ char sms_datacodingscheme[256];
+ char sms_servicecentreaddress[256];
+ int sms_messagetype;
</ins><span class="cx"> int sms_cnmi_not_supported;
</span><span class="cx"> //char sms_receiving_program[256];
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (15268 => 15269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2009-10-29 13:55:09 UTC (rev 15268)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2009-10-29 14:19:50 UTC (rev 15269)
</span><span class="lines">@@ -1470,10 +1470,11 @@
</span><span class="cx"> strncpy(sms_body, content2, 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><del>- strncpy(tech_pvt->sms_sender, "ciapa", sizeof(tech_pvt->sms_sender));
</del><span class="cx"> strncpy(tech_pvt->sms_sender, sms->address().toString().c_str(), sizeof(tech_pvt->sms_sender));
</span><del>- strncpy(tech_pvt->sms_date, "cucu", sizeof(tech_pvt->sms_date));
</del><span class="cx"> strncpy(tech_pvt->sms_date, sms->serviceCentreTimestamp().toString().c_str(), sizeof(tech_pvt->sms_date));
</span><ins>+ strncpy(tech_pvt->sms_datacodingscheme, sms->dataCodingScheme().toString().c_str(), sizeof(tech_pvt->sms_datacodingscheme));
+ strncpy(tech_pvt->sms_servicecentreaddress, sms->serviceCentreAddress().toString().c_str(), sizeof(tech_pvt->sms_servicecentreaddress));
+ tech_pvt->sms_messagetype = sms->messageType();
</ins><span class="cx"> //messagetype = sms->messageType();
</span><span class="cx"> //servicecentreaddress = sms->serviceCentreAddress();
</span><span class="cx"> //servicecentretimestamp = sms->serviceCentreTimestamp();
</span><span class="lines">@@ -1565,9 +1566,7 @@
</span><span class="cx"> struct timeval call_incoming_timeout;
</span><span class="cx"> gettimeofday(&call_incoming_timeout, NULL);
</span><span class="cx"> call_incoming_timeout.tv_sec -= 10;
</span><del>- DEBUGA_GSMOPEN
- ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
- GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
</del><ins>+ // DEBUGA_GSMOPEN ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
</ins><span class="cx"> if (call_incoming_timeout.tv_sec > tech_pvt->ringtime.tv_sec) {
</span><span class="cx"> ERRORA("Ringing stopped and I have not answered. Why?\n", GSMOPEN_P_LOG);
</span><span class="cx"> DEBUGA_GSMOPEN
</span><span class="lines">@@ -2124,7 +2123,7 @@
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx">
</span><span class="cx"> if (option_debug) {
</span><del>- DEBUGA_PBX("ENTERING FUNC\n", GSMOPEN_P_LOG);
</del><ins>+ //DEBUGA_PBX("ENTERING FUNC\n", GSMOPEN_P_LOG);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> session = switch_core_session_locate(tech_pvt->session_uuid_str);
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (15268 => 15269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2009-10-29 13:55:09 UTC (rev 15268)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2009-10-29 14:19:50 UTC (rev 15269)
</span><span class="lines">@@ -909,7 +909,7 @@
</span><span class="cx">
</span><span class="cx"> WARNINGA("%s CHANNEL got SWITCH_MESSAGE_INDICATE_AUDIO_SYNC\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
</span><span class="cx"> while ((samples = alsa_read(tech_pvt, tmp_buffer, tech_pvt->read_codec.implementation->samples_per_packet * 4)) > 160) {
</span><del>- WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
</del><ins>+ //WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
</ins><span class="cx"> }
</span><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_read);
</span><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_write);
</span><span class="lines">@@ -2379,7 +2379,7 @@
</span><span class="cx"> switch_sleep(1000000);
</span><span class="cx"> } else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL && tech_pvt->interface_state == GSMOPEN_STATE_RING
</span><span class="cx"> && tech_pvt->phone_callflow != CALLFLOW_CALL_HANGUP_REQUESTED) {
</span><del>- WARNINGA("INCOMING RING\n", GSMOPEN_P_LOG);
</del><ins>+ //WARNINGA("INCOMING RING\n", GSMOPEN_P_LOG);
</ins><span class="cx">
</span><span class="cx"> gsmopen_ring(tech_pvt);
</span><span class="cx">
</span><span class="lines">@@ -2522,9 +2522,12 @@
</span><span class="cx"> //switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->chatmessages[which].from_dispname);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->sms_sender);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "date", tech_pvt->sms_date);
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
</del><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "datacodingscheme", tech_pvt->sms_datacodingscheme);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "servicecentreaddress", tech_pvt->sms_servicecentreaddress);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "messagetype", "%d", tech_pvt->sms_messagetype);
</ins><span class="cx"> //switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
</span><span class="cx"> //switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
</ins><span class="cx"> switch_event_add_body(event, "%s", tech_pvt->sms_body);
</span><span class="cx"> if (session) {
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
</span><span class="lines">@@ -2551,6 +2554,9 @@
</span><span class="cx"> //switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->chatmessages[which].from_handle);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->sms_sender);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "date", tech_pvt->sms_date);
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "datacodingscheme", tech_pvt->sms_datacodingscheme);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "servicecentreaddress", tech_pvt->sms_servicecentreaddress);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "messagetype", "%d", tech_pvt->sms_messagetype);
</ins><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
</span><span class="cx"> //switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
</span><span class="cx"> //switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>