<!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][17235] </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=17235">17235</a></dd>
<dt>Author</dt> <dd>dyatsin</dd>
<dt>Date</dt> <dd>2010-04-07 10:22:25 -0500 (Wed, 07 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added support for passing CLI commands to boost sigmod module</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostsangoma_boost_interfaceh">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17234 => 17235)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-07 06:46:00 UTC (rev 17234)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-07 15:22:25 UTC (rev 17235)
</span><span class="lines">@@ -60,6 +60,9 @@
</span><span class="cx">
</span><span class="cx"> static ftdm_sangoma_boost_trunkgroup_t *g_trunkgroups[MAX_TRUNK_GROUPS];
</span><span class="cx">
</span><ins>+static ftdm_io_interface_t ftdm_sangoma_boost_interface;
+static ftdm_status_t ftdm_sangoma_boost_list_sigmods(ftdm_stream_handle_t *stream);
+
</ins><span class="cx"> #define BOOST_QUEUE_SIZE 500
</span><span class="cx">
</span><span class="cx"> /* get freetdm span and chan depending on the span mode */
</span><span class="lines">@@ -1762,7 +1765,82 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+#define FTDM_BOOST_SYNTAX "list sigmods | <sigmod_name> <command>"
</ins><span class="cx"> /**
</span><ins>+ * \brief API function to kill or debug a sangoma_boost span
+ * \param stream API stream handler
+ * \param data String containing argurments
+ * \return Flags
+ */
+static FIO_API_FUNCTION(ftdm_sangoma_boost_api)
+{
+ char *mycmd = NULL, *argv[10] = { 0 };
+ int argc = 0;
+
+ if (data) {
+ mycmd = ftdm_strdup(data);
+ argc = ftdm_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ }
+
+ if (argc > 1) {
+ if (!strcasecmp(argv[0], "list")) {
+ if (!strcasecmp(argv[1], "sigmods")) {
+ if (ftdm_sangoma_boost_list_sigmods(stream) != FTDM_SUCCESS) {
+ stream->write_function(stream, "%s: -ERR failed to execute cmd\n", __FILE__);
+ goto done;
+ }
+ goto done;
+ }
+ } else {
+ boost_sigmod_interface_t *sigmod_iface = NULL;
+ sigmod_iface = hashtable_search(g_boost_modules_hash, argv[0]);
+ if (sigmod_iface) {
+ char *p = strchr(data, ' ');
+ if (++p) {
+ char* mydup = strdup(p);
+ if(sigmod_iface->exec_api == NULL) {
+ stream->write_function(stream, "%s does not support api functions\n", sigmod_iface->name);
+ goto done;
+ }
+ //stream->write_function(stream, "sigmod:%s command:%s\n", sigmod_iface->name, mydup);
+ if (sigmod_iface->exec_api(stream, mydup) != FTDM_SUCCESS) {
+ stream->write_function(stream, "-ERR:failed to execute command:%s\n", mydup);
+ }
+ free(mydup);
+ }
+
+ goto done;
+ } else {
+ stream->write_function(stream, "-ERR: Could not find sigmod %s\n", argv[0]);
+ }
+ }
+ }
+ stream->write_function(stream, "-ERR: Usage: %s\n", FTDM_BOOST_SYNTAX);
+done:
+ ftdm_safe_free(mycmd);
+ return FTDM_SUCCESS;
+}
+
+/**
+ * \brief Loads sangoma_boost IO module
+ * \param fio FreeTDM IO interface
+ * \return Success
+ */
+static FIO_IO_LOAD_FUNCTION(ftdm_sangoma_boost_io_init)
+{
+ assert(fio != NULL);
+ memset(&ftdm_sangoma_boost_interface, 0, sizeof(ftdm_sangoma_boost_interface));
+
+ ftdm_sangoma_boost_interface.name = "boost";
+ ftdm_sangoma_boost_interface.api = ftdm_sangoma_boost_api;
+
+ *fio = &ftdm_sangoma_boost_interface;
+
+ return FTDM_SUCCESS;
+}
+
+/**
</ins><span class="cx"> * \brief Loads sangoma boost signaling module
</span><span class="cx"> * \param fio FreeTDM IO interface
</span><span class="cx"> * \return Success
</span><span class="lines">@@ -2250,12 +2328,31 @@
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static ftdm_status_t ftdm_sangoma_boost_list_sigmods(ftdm_stream_handle_t *stream)
+{
+ ftdm_hash_iterator_t *i = NULL;
+ boost_sigmod_interface_t *sigmod_iface = NULL;
+ const void *key = NULL;
+ void *val = NULL;
+
+ stream->write_function(stream, "List of loaded sigmod modules:\n");
+ for (i = hashtable_first(g_boost_modules_hash); i; i = hashtable_next(i)) {
+ hashtable_this(i, &key, NULL, &val);
+ if (key && val) {
+ sigmod_iface = val;
+ stream->write_function(stream, " %s\n", sigmod_iface->name);
+ }
+ }
+ stream->write_function(stream, "\n");
+ return FTDM_SUCCESS;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * \brief FreeTDM sangoma boost signaling module definition
</span><span class="cx"> */
</span><span class="cx"> EX_DECLARE_DATA ftdm_module_t ftdm_module = {
</span><span class="cx"> /*.name =*/ "sangoma_boost",
</span><del>- /*.io_load =*/ NULL,
</del><ins>+ /*.io_load =*/ ftdm_sangoma_boost_io_init,
</ins><span class="cx"> /*.io_unload =*/ NULL,
</span><span class="cx"> /*.sig_load = */ ftdm_sangoma_boost_init,
</span><span class="cx"> /*.sig_configure =*/ NULL,
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostsangoma_boost_interfaceh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h (17234 => 17235)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h 2010-04-07 06:46:00 UTC (rev 17234)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h 2010-04-07 15:22:25 UTC (rev 17235)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> #include "freetdm.h"
</span><span class="cx">
</span><del>-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="lines">@@ -180,6 +179,15 @@
</span><span class="cx"> typedef ftdm_status_t (*boost_on_unload_func_t) BOOST_ON_UNLOAD_ARGS;
</span><span class="cx"> #define BOOST_ON_UNLOAD_FUNCTION(name) ftdm_status_t name BOOST_ON_UNLOAD_ARGS
</span><span class="cx">
</span><ins>+/*!
+ \brief Called when user wants to execute sigmod api function
+ \return FTDM_SUCCESS or FTDM_FAIL
+ */
+#define BOOST_API_ARGS (ftdm_stream_handle_t *stream, char *cmd)
+typedef ftdm_status_t (*boost_api_func_t) BOOST_API_ARGS;
+#define BOOST_API_FUNCTION(name) ftdm_status_t name BOOST_API_ARGS
+
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief The boost signaling module interface
</span><span class="cx"> */
</span><span class="lines">@@ -212,6 +220,8 @@
</span><span class="cx"> boost_on_load_func_t on_load;
</span><span class="cx"> /*! \brief the module is about to be unloaded */
</span><span class="cx"> boost_on_unload_func_t on_unload;
</span><ins>+ /*! \brief module api function */
+ boost_api_func_t exec_api;
</ins><span class="cx"> /*! \brief private pointer for the interface user */
</span><span class="cx"> void *pvt;
</span><span class="cx"> } boost_sigmod_interface_t;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>