<!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][16441] </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=16441">16441</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-21 17:43:31 -0600 (Thu, 21 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: adding IMEI and IMSI requesting, 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 (16440 => 16441)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-21 19:59:28 UTC (rev 16440)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-21 23:43:31 UTC (rev 16441)
</span><span class="lines">@@ -488,6 +488,9 @@
</span><span class="cx"> int registered;
</span><span class="cx"> int got_signal;
</span><span class="cx"> char imei[128];
</span><ins>+ int requesting_imei;
+ char imsi[128];
+ int requesting_imsi;
</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 (16440 => 16441)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-21 19:59:28 UTC (rev 16440)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-21 23:43:31 UTC (rev 16441)
</span><span class="lines">@@ -744,10 +744,26 @@
</span><span class="cx"> DEBUGA_GSMOPEN("AT+CGMM failed\n", GSMOPEN_P_LOG);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGSN");
</del><ins>+ /* IMEI */
+ tech_pvt->requesting_imei = 1;
+ res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+GSN");
+ tech_pvt->requesting_imei = 0;
</ins><span class="cx"> if (res) {
</span><del>- DEBUGA_GSMOPEN("AT+CGSN failed\n", GSMOPEN_P_LOG);
</del><ins>+ DEBUGA_GSMOPEN("AT+GSN failed\n", GSMOPEN_P_LOG);
+ tech_pvt->requesting_imei = 1;
+ res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGSN");
+ tech_pvt->requesting_imei = 0;
+ if (res) {
+ DEBUGA_GSMOPEN("AT+CGSN failed\n", GSMOPEN_P_LOG);
+ }
</ins><span class="cx"> }
</span><ins>+ /* IMSI */
+ tech_pvt->requesting_imsi = 1;
+ res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CIMI");
+ tech_pvt->requesting_imsi = 0;
+ if (res) {
+ DEBUGA_GSMOPEN("AT+CIMI failed\n", GSMOPEN_P_LOG);
+ }
</ins><span class="cx">
</span><span class="cx"> /* signal incoming SMS with a +CMTI unsolicited msg */
</span><span class="cx"> res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CNMI=3,1,0,0,0");
</span><span class="lines">@@ -1873,6 +1889,19 @@
</span><span class="cx"> at_ack = AT_ERROR;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* if we are requesting IMEI, put the line into the imei buffer if the line is not "OK" or "ERROR" */
+ if (tech_pvt->requesting_imei && at_ack == -1) {
+ if (strlen(tech_pvt->line_array.result[i])) { /* we are reading the IMEI */
+ strncpy(tech_pvt->imei, tech_pvt->line_array.result[i], sizeof(tech_pvt->imei));
+ }
+ }
+
+ /* if we are requesting IMSI, put the line into the imei buffer if the line is not "OK" or "ERROR" */
+ if (tech_pvt->requesting_imsi && at_ack == -1) {
+ if (strlen(tech_pvt->line_array.result[i])) { /* we are reading the IMSI */
+ strncpy(tech_pvt->imsi, tech_pvt->line_array.result[i], sizeof(tech_pvt->imsi));
+ }
+ }
</ins><span class="cx"> /* if we are reading an sms message from memory, put the line into the sms buffer if the line is not "OK" or "ERROR" */
</span><span class="cx"> if (tech_pvt->reading_sms_msg > 1 && at_ack == -1) {
</span><span class="cx"> int c;
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16440 => 16441)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-21 19:59:28 UTC (rev 16440)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-21 23:43:31 UTC (rev 16441)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> SWITCH_STANDARD_API(sendsms_function);
</span><span class="cx"> #define SENDSMS_SYNTAX "gsmopen_sendsms interface_name destination_number SMS_text"
</span><span class="cx"> SWITCH_STANDARD_API(gsmopen_dump_function);
</span><del>-#define GSMOPEN_DUMP_SYNTAX "gsmopen_dump interface_name"
</del><ins>+#define GSMOPEN_DUMP_SYNTAX "gsmopen_dump <interface_name|list>"
</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">@@ -2614,7 +2614,6 @@
</span><span class="cx"> stream->write_function(stream, "dumping interface '%s'\n", globals.GSMOPEN_INTERFACES[i].name);
</span><span class="cx"> tech_pvt = &globals.GSMOPEN_INTERFACES[i];
</span><span class="cx"> dump_event(tech_pvt);
</span><del>- break;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -2960,6 +2959,7 @@
</span><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "running", value);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imei", tech_pvt->imei);
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imsi", tech_pvt->imsi);
</ins><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->controldev_dead);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldev_dead", value);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldevice_name", tech_pvt->controldevice_name);
</span><span class="lines">@@ -3029,6 +3029,7 @@
</span><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "running", value);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imei", tech_pvt->imei);
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imsi", tech_pvt->imsi);
</ins><span class="cx"> snprintf(value, sizeof(value)-1, "%d", tech_pvt->controldev_dead);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldev_dead", value);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldevice_name", tech_pvt->controldevice_name);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>