<!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][16486] </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=16486">16486</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-23 13:44:22 -0600 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: added CUSTOM gsmopen::alarm EVENT, to signal all those situation like an interface fails, no network signal, no network registration, serial port dies, etc</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 (16485 => 16486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-23 19:09:01 UTC (rev 16485)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-23 19:44:22 UTC (rev 16486)
</span><span class="lines">@@ -41,7 +41,19 @@
</span><span class="cx">
</span><span class="cx"> #define MY_EVENT_INCOMING_SMS "gsmopen::incoming_sms"
</span><span class="cx"> #define MY_EVENT_DUMP "gsmopen::dump_event"
</span><ins>+#define MY_EVENT_ALARM "gsmopen::alarm"
</ins><span class="cx">
</span><ins>+#define ALARM_FAILED_INTERFACE 0
+#define ALARM_NO_NETWORK_REGISTRATION 1
+#define ALARM_ROAMING_NETWORK_REGISTRATION 2
+#define ALARM_NETWORK_NO_SERVICE 3
+#define ALARM_NETWORK_NO_SIGNAL 4
+#define ALARM_NETWORK_LOW_SIGNAL 5
+
+
+
+
+
</ins><span class="cx"> #undef GIOVA48
</span><span class="cx">
</span><span class="cx"> #ifndef GIOVA48
</span><span class="lines">@@ -643,3 +655,5 @@
</span><span class="cx">
</span><span class="cx"> #endif // GSMOPEN_PORTAUDIO
</span><span class="cx"> int dump_event(private_t *tech_pvt);
</span><ins>+int alarm_event(private_t * tech_pvt, int alarm_code, const char *alarm_message);
+int dump_event_full(private_t * tech_pvt, int is_alarm, int alarm_code, const char *alarm_message);
</ins></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (16485 => 16486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-23 19:09:01 UTC (rev 16485)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-23 19:44:22 UTC (rev 16486)
</span><span class="lines">@@ -1007,11 +1007,18 @@
</span><span class="cx"> GSMOPEN_P_LOG, tech_pvt->controldevice_name);
</span><span class="cx"> tech_pvt->controldev_dead = 1;
</span><span class="cx"> close(tech_pvt->controldevfd);
</span><ins>+ ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
+ tech_pvt->running=0;
+ alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
+ tech_pvt->active=0;
+ tech_pvt->name[0]='\0';
+
</ins><span class="cx"> UNLOCKA(tech_pvt->controldev_lock);
</span><span class="cx"> if (tech_pvt->owner) {
</span><span class="cx"> tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
</span><span class="cx"> gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
</span><span class="cx"> }
</span><ins>+ switch_sleep(1000000);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1311,9 +1318,11 @@
</span><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><span class="cx"> tech_pvt->got_signal=0;
</span><ins>+ alarm_event(tech_pvt, ALARM_NETWORK_NO_SIGNAL, "CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or additional antenna");
</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><span class="cx"> tech_pvt->got_signal=1;
</span><ins>+ alarm_event(tech_pvt, ALARM_NETWORK_LOW_SIGNAL, "CELLPHONE GETS SIGNAL LOW");
</ins><span class="cx"> } else {
</span><span class="cx"> tech_pvt->got_signal=2;
</span><span class="cx"> }
</span><span class="lines">@@ -1339,16 +1348,18 @@
</span><span class="cx"> tech_pvt->not_registered=1;
</span><span class="cx"> tech_pvt->home_network_registered=0;
</span><span class="cx"> tech_pvt->roaming_registered=0;
</span><ins>+ alarm_event(tech_pvt, ALARM_NO_NETWORK_REGISTRATION, "CELLPHONE is not registered to network, consider to move it or additional antenna");
</ins><span class="cx"> } else if (stat==1) {
</span><span class="cx"> DEBUGA_GSMOPEN("|%s| CELLPHONE is registered to the HOME network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> tech_pvt->not_registered=0;
</span><span class="cx"> tech_pvt->home_network_registered=1;
</span><span class="cx"> tech_pvt->roaming_registered=0;
</span><span class="cx"> } else {
</span><del>- WARNINGA("|%s| CELLPHONE is registered to a ROAMING network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</del><ins>+ ERRORA("|%s| CELLPHONE is registered to a ROAMING network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</ins><span class="cx"> tech_pvt->not_registered=0;
</span><span class="cx"> tech_pvt->home_network_registered=0;
</span><span class="cx"> tech_pvt->roaming_registered=1;
</span><ins>+ alarm_event(tech_pvt, ALARM_ROAMING_NETWORK_REGISTRATION, "CELLPHONE is registered to a ROAMING network");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1864,58 +1875,50 @@
</span><span class="cx">
</span><span class="cx"> /* at_indicator_* are unsolicited messages sent by the phone to signal us that some of its visual indicators on its screen has changed, based on CIND CMER ETSI docs */
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_noservice_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> ERRORA("|%s| at_indicator_noservice_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><ins>+ alarm_event(tech_pvt, ALARM_NETWORK_NO_SERVICE, "at_indicator_noservice_string");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nosignal_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> ERRORA("|%s| at_indicator_nosignal_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><ins>+ alarm_event(tech_pvt, ALARM_NETWORK_NO_SIGNAL, "at_indicator_nosignal_string");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_lowsignal_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> WARNINGA("|%s| at_indicator_lowsignal_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><ins>+ alarm_event(tech_pvt, ALARM_NETWORK_LOW_SIGNAL, "at_indicator_lowsignal_string");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_lowbattchg_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> WARNINGA("|%s| at_indicator_lowbattchg_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nobattchg_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> ERRORA("|%s| at_indicator_nobattchg_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callactive_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> DEBUGA_GSMOPEN("|%s| at_indicator_callactive_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nocallactive_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> DEBUGA_GSMOPEN("|%s| at_indicator_nocallactive_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nocallsetup_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> DEBUGA_GSMOPEN("|%s| at_indicator_nocallsetup_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupincoming_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> DEBUGA_GSMOPEN("|%s| at_indicator_callsetupincoming_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupoutgoing_string) == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> DEBUGA_GSMOPEN("|%s| at_indicator_callsetupoutgoing_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupremoteringing_string)
</span><span class="cx"> == 0)) {
</span><del>- if (option_debug > 1)
</del><span class="cx"> DEBUGA_GSMOPEN("|%s| at_indicator_callsetupremoteringing_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2157,8 +2160,14 @@
</span><span class="cx"> ERRORA("select returned -1 on %s, setting controldev_dead, error was: %s\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name, strerror(errno));
</span><span class="cx"> tech_pvt->controldev_dead = 1;
</span><span class="cx"> close(tech_pvt->controldevfd);
</span><ins>+
+ tech_pvt->running=0;
+ alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "select returned -1 on interface, setting controldev_dead");
+ tech_pvt->active=0;
+ tech_pvt->name[0]='\0';
</ins><span class="cx"> if (tech_pvt->owner)
</span><span class="cx"> gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
</span><ins>+ switch_sleep(1000000);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16485 => 16486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-23 19:09:01 UTC (rev 16485)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-23 19:44:22 UTC (rev 16486)
</span><span class="lines">@@ -1884,6 +1884,7 @@
</span><span class="cx"> ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
</span><span class="cx"> //return SWITCH_STATUS_FALSE;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running=0;
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_init failed");
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].active=0;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
</span><span class="cx"> continue;
</span><span class="lines">@@ -1898,6 +1899,7 @@
</span><span class="cx"> ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
</span><span class="cx"> //return SWITCH_STATUS_FALSE;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running=0;
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_config failed");
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].active=0;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
</span><span class="cx"> continue;
</span><span class="lines">@@ -1911,6 +1913,7 @@
</span><span class="cx"> ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
</span><span class="cx"> //return SWITCH_STATUS_FALSE;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running=0;
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "alsa_init failed");
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].active=0;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
</span><span class="cx"> continue;
</span><span class="lines">@@ -1922,6 +1925,7 @@
</span><span class="cx"> ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
</span><span class="cx"> //return SWITCH_STATUS_FALSE;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running=0;
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "alsa_shutdown failed");
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].active=0;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
</span><span class="cx"> continue;
</span><span class="lines">@@ -1934,6 +1938,7 @@
</span><span class="cx"> ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
</span><span class="cx"> //return SWITCH_STATUS_FALSE;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running=0;
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_portaudio_init failed");
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].active=0;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
</span><span class="cx"> continue;
</span><span class="lines">@@ -1945,6 +1950,7 @@
</span><span class="cx"> ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
</span><span class="cx"> //return SWITCH_STATUS_FALSE;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].running=0;
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_portaudio_shutdown failed");
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].active=0;
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
</span><span class="cx"> continue;
</span><span class="lines">@@ -1971,6 +1977,7 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("interface id %d is higher than GSMOPEN_MAX_INTERFACES (%d)\n", GSMOPEN_P_LOG, interface_id, GSMOPEN_MAX_INTERFACES);
</span><ins>+ alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "interface id is higher than GSMOPEN_MAX_INTERFACES");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2861,6 +2868,10 @@
</span><span class="cx"> tech_pvt->controldev_dead = 1;
</span><span class="cx"> close(tech_pvt->controldevfd);
</span><span class="cx"> ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
</span><ins>+ tech_pvt->running=0;
+ alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
+ tech_pvt->active=0;
+ tech_pvt->name[0]='\0';
</ins><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><span class="lines">@@ -2966,23 +2977,32 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int dump_event(private_t * tech_pvt)
</del><ins>+int dump_event_full(private_t * tech_pvt, int is_alarm, int alarm_code, const char *alarm_message)
</ins><span class="cx"> {
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> char value[512];
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><ins>+ switch_status_t status;
</ins><span class="cx">
</span><span class="cx"> session = switch_core_session_locate(tech_pvt->session_uuid_str);
</span><span class="cx"> if(session){
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
- DEBUGA_GSMOPEN("DUMP of interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name );
-
- if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_DUMP) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (is_alarm){
+ ERRORA("ALARM on interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name );
+ status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ALARM);
+ }else{
+ DEBUGA_GSMOPEN("DUMP on interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name );
+ status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_DUMP);
+ }
+ if (status == SWITCH_STATUS_SUCCESS) {
+ if (is_alarm){
+ snprintf(value, sizeof(value)-1, "%d", alarm_code);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm_code", value);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm_message", alarm_message);
+ }
</ins><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_name", tech_pvt->name);
</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="lines">@@ -3063,8 +3083,16 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int dump_event(private_t * tech_pvt)
+{
+ return dump_event_full(tech_pvt, 0, 0, NULL);
+}
</ins><span class="cx">
</span><span class="cx">
</span><ins>+int alarm_event(private_t * tech_pvt, int alarm_code, const char *alarm_message)
+{
+ return dump_event_full(tech_pvt, 1, alarm_code, alarm_message);
+}
</ins><span class="cx">
</span><span class="cx"> int sms_incoming(private_t * tech_pvt)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>