<!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][17291] </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=17291">17291</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-14 17:00:16 -0500 (Wed, 14 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add ss7 skeleton config section</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_typesh">freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17290 => 17291)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-14 22:00:16 UTC (rev 17290)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-14 22:00:16 UTC (rev 17291)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> char hold_music[256];
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> analog_option_t analog_options;
</span><ins>+ switch_hash_t *ss7_configs;
</ins><span class="cx"> } globals;
</span><span class="cx">
</span><span class="cx"> struct private_object {
</span><span class="lines">@@ -1961,6 +1962,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+static FIO_SIGNAL_CB_FUNCTION(on_ss7_signal)
+{
+ if (on_common_signal(sigmsg) == FTDM_BREAK) {
+ return FTDM_SUCCESS;
+ }
+ ftdm_log(FTDM_LOG_DEBUG, "got ss7 sig %d:%d [%s]\n", sigmsg->channel->span_id, sigmsg->channel->chan_id, ftdm_signal_event2str(sigmsg->event_id));
+ return FTDM_SUCCESS;
+}
+
</ins><span class="cx"> static FIO_SIGNAL_CB_FUNCTION(on_analog_signal)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -2022,10 +2032,16 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static ftdm_conf_node_t *get_ss7_config_node(switch_xml_t cfg, const char *confname)
+{
+ return NULL;
+}
+
</ins><span class="cx"> static switch_status_t load_config(void)
</span><span class="cx"> {
</span><span class="cx"> const char *cf = "freetdm.conf";
</span><span class="cx"> switch_xml_t cfg, xml, settings, param, spans, myspan;
</span><ins>+ ftdm_conf_node_t *ss7confnode = NULL;
</ins><span class="cx"> ftdm_span_t *boost_spans[FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN];
</span><span class="cx"> ftdm_span_t *boost_span = NULL;
</span><span class="cx"> unsigned boosti = 0;
</span><span class="lines">@@ -2054,6 +2070,53 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_core_hash_init(&globals.ss7_configs, module_pool);
+ if ((spans = switch_xml_child(cfg, "ss7_spans"))) {
+ for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
+ ftdm_status_t zstatus = FTDM_FAIL;
+ char *id = (char *) switch_xml_attr(myspan, "id");
+ char *name = (char *) switch_xml_attr(myspan, "name");
+ char *configname = (char *) switch_xml_attr(myspan, "config");
+ ftdm_span_t *span = NULL;
+ uint32_t span_id = 0;
+ if (!name || !configname || !id) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ss7 span missing required param 'id' or 'name' or 'config', skipping ...\n");
+ continue;
+ }
+ if (name) {
+ zstatus = ftdm_span_find_by_name(name, &span);
+ } else {
+ if (switch_is_number(id)) {
+ span_id = atoi(id);
+ zstatus = ftdm_span_find(span_id, &span);
+ }
+
+ if (zstatus != FTDM_SUCCESS) {
+ zstatus = ftdm_span_find_by_name(id, &span);
+ }
+ }
+
+ if (zstatus != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span id:%s name:%s\n", switch_str_nil(id), switch_str_nil(name));
+ continue;
+ }
+
+ if (!span_id) {
+ span_id = span->span_id;
+ }
+
+ ss7confnode = get_ss7_config_node(cfg, configname);
+
+ if (ftdm_configure_span("ss7", span, on_ss7_signal,
+ "confnode", ss7confnode,
+ TAG_END) != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_ERROR, "Error configuring ss7 FreeTDM span %d\n", span_id);
+ continue;
+ }
+ ftdm_log(FTDM_LOG_DEBUG, "Configured ss7 FreeTDM span %d with config node %s\n", span_id, configname);
+ }
+ }
+
</ins><span class="cx"> if ((spans = switch_xml_child(cfg, "analog_spans"))) {
</span><span class="cx"> for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
</span><span class="cx"> char *id = (char *) switch_xml_attr(myspan, "id");
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h (17290 => 17291)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-14 22:00:16 UTC (rev 17290)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-14 22:00:16 UTC (rev 17291)
</span><span class="lines">@@ -572,6 +572,14 @@
</span><span class="cx">
</span><span class="cx"> #include "ftdm_dso.h"
</span><span class="cx">
</span><ins>+typedef struct ftdm_conf_node_s {
+ char name[255];
+ ftdm_conf_parameter_t attr[10];
+ ftdm_conf_parameter_t settings[100];
+ struct ftdm_conf_node_t *childs;
+ struct ftdm_config_node_s *next;
+} ftdm_conf_node_t;
+
</ins><span class="cx"> typedef struct {
</span><span class="cx"> char name[256];
</span><span class="cx"> fio_io_load_t io_load;
</span><span class="lines">@@ -583,9 +591,9 @@
</span><span class="cx"> \brief configure a given span signaling
</span><span class="cx"> \see sig_configure
</span><span class="cx"> This is just like sig_configure but receives
</span><del>- an array of paramters instead of va_list
</del><ins>+ an an ftdm_conf_node_t instead
</ins><span class="cx"> I'd like to deprecate sig_configure and move
</span><del>- all modules to use sigparam_configure
</del><ins>+ all modules to use configure_span_signaling
</ins><span class="cx"> */
</span><span class="cx"> fio_configure_span_signaling_t configure_span_signaling;
</span><span class="cx"> ftdm_dso_lib_t lib;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>