<!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][16448] </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=16448">16448</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-21 19:46:04 -0600 (Thu, 21 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: adding +CSQ and +CREG requesting (signal quality and network registration), beefing up gsmopen_dump API command and CUSTOM gsmopen::dump_event 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_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 (16447 => 16448)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-22 01:17:29 UTC (rev 16447)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-22 01:46:04 UTC (rev 16448)
</span><span class="lines">@@ -485,12 +485,16 @@
</span><span class="cx"> #endif// GSMOPEN_PORTAUDIO
</span><span class="cx"> dtmf_rx_state_t dtmf_state;
</span><span class="cx"> int active;
</span><del>- int registered;
</del><ins>+ int home_network_registered;
+ int roaming_registered;
+ int not_registered;
</ins><span class="cx"> int got_signal;
</span><span class="cx"> char imei[128];
</span><span class="cx"> int requesting_imei;
</span><span class="cx"> char imsi[128];
</span><span class="cx"> int requesting_imsi;
</span><ins>+ int network_creg_not_supported;
+ char creg[128];
</ins><span class="cx">
</span><span class="cx"> };
</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 (16447 => 16448)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-22 01:17:29 UTC (rev 16447)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-22 01:46:04 UTC (rev 16448)
</span><span class="lines">@@ -744,6 +744,18 @@
</span><span class="cx"> DEBUGA_GSMOPEN("AT+CGMM failed\n", GSMOPEN_P_LOG);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* signal network registration with a +CREG unsolicited msg */
+ res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CREG=1");
+ if (res) {
+ DEBUGA_GSMOPEN("AT+CREG=1 failed\n", GSMOPEN_P_LOG);
+ tech_pvt->network_creg_not_supported = 1;
+ }
+ if(!tech_pvt->network_creg_not_supported){
+ res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CREG?");
+ if (res) {
+ DEBUGA_GSMOPEN("AT+CREG? failed\n", GSMOPEN_P_LOG);
+ }
+ }
</ins><span class="cx"> /* IMEI */
</span><span class="cx"> tech_pvt->requesting_imei = 1;
</span><span class="cx"> res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+GSN");
</span><span class="lines">@@ -1290,17 +1302,54 @@
</span><span class="cx"> ERRORA("|%s| is not formatted as: |+CSQ: xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> } else {
</span><span class="cx"> if (signal_quality < 11 || signal_quality == 99) {
</span><del>- WARNINGA
</del><ins>+ ERRORA
</ins><span class="cx"> ("|%s| CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or additional antenna\n",
</span><span class="cx"> GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><ins>+ tech_pvt->got_signal=0;
</ins><span class="cx"> } else if (signal_quality < 15) {
</span><span class="cx"> WARNINGA("|%s| CELLPHONE GETS SIGNAL LOW\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><ins>+ tech_pvt->got_signal=1;
+ } else {
+ tech_pvt->got_signal=2;
+ }
</ins><span class="cx">
</span><ins>+ }
+
+ }
+ if ((strncmp(tech_pvt->line_array.result[i], "+CREG:", 6) == 0)) {
+ int n, stat, err;
+
+ n = stat = 0;
+
+ err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &n, &stat);
+ if (option_debug > 1)
+ DEBUGA_GSMOPEN("|%s| +CREG: Display: %d, Registration=%d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], n, stat);
+ if (err < 2) {
+ ERRORA("|%s| is not formatted as: |+CREG: xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
+ } else {
+ if (stat==0) {
+ ERRORA
+ ("|%s| CELLPHONE is not registered to network, consider to move it or additional antenna\n",
+ GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
+ tech_pvt->not_registered=1;
+ tech_pvt->home_network_registered=0;
+ tech_pvt->roaming_registered=0;
+ } else if (stat==1) {
+ DEBUGA_GSMOPEN("|%s| CELLPHONE is registered to the HOME network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
+ tech_pvt->not_registered=0;
+ tech_pvt->home_network_registered=1;
+ tech_pvt->roaming_registered=0;
+ } else {
+ WARNINGA("|%s| CELLPHONE is registered to a ROAMING network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
+ tech_pvt->not_registered=0;
+ tech_pvt->home_network_registered=0;
+ tech_pvt->roaming_registered=1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ((strncmp(tech_pvt->line_array.result[i], "+CMGW:", 6) == 0)) {
</span><span class="cx"> int err;
</span><span class="cx">
</span><span class="lines">@@ -3818,6 +3867,15 @@
</span><span class="cx"> }
</span><span class="cx"> gsmopen_sleep(1000);
</span><span class="cx"> }
</span><ins>+
+ if (!p->network_creg_not_supported) {
+ res = gsmopen_serial_write_AT_ack(p, "AT+CREG?");
+ if (res) {
+ WARNINGA("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, "AT+CREG?", "OK");
+ }
+ gsmopen_sleep(1000);
+ }
+
</ins><span class="cx"> //FIXME all the following commands in config!
</span><span class="cx">
</span><span class="cx"> if (p->sms_cnmi_not_supported) {
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16447 => 16448)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-22 01:17:29 UTC (rev 16447)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-22 01:46:04 UTC (rev 16448)
</span><span class="lines">@@ -2869,7 +2869,7 @@
</span><span class="cx">
</span><span class="cx"> if ((now_timestamp - tech_pvt->gsmopen_serial_synced_timestamp) > 30) { //TODO find a sensible period. 5min? in config?
</span><span class="cx"> gsmopen_serial_sync(tech_pvt);
</span><del>- //gsmopen_serial_getstatus_AT(tech_pvt);
</del><ins>+ gsmopen_serial_getstatus_AT(tech_pvt);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> WARNINGA("EXIT\n", GSMOPEN_P_LOG);
</span><span class="lines">@@ -2952,8 +2952,18 @@
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_id", tech_pvt->id);
</span><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->active);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "active", value);
</span><del>- snprintf(value, sizeof(value)-1, "%d", tech_pvt->registered);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "registered", value);
</del><ins>+ if(!tech_pvt->network_creg_not_supported){
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->not_registered);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", value);
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->home_network_registered);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", value);
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->roaming_registered);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", value);
+ }else{
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", "N/A");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", "N/A");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", "N/A");
+ }
</ins><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->got_signal);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "got_signal", value);
</span><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
</span><span class="lines">@@ -3022,8 +3032,18 @@
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_id", tech_pvt->id);
</span><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->active);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "active", value);
</span><del>- snprintf(value, sizeof(value)-1, "%d", tech_pvt->registered);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "registered", value);
</del><ins>+ if(!tech_pvt->network_creg_not_supported){
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->not_registered);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", value);
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->home_network_registered);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", value);
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->roaming_registered);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", value);
+ }else{
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", "N/A");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", "N/A");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", "N/A");
+ }
</ins><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->got_signal);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "got_signal", value);
</span><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>