Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17291 => 17292)
--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-14 22:00:16 UTC (rev 17291)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-14 22:00:16 UTC (rev 17292)
@@ -2032,9 +2032,133 @@
}
+/* create ftdm_conf_node_t tree based on a fixed pattern XML configuration list
+ * last 2 args are for limited aka dumb recursivity
+ * */
+static int add_config_list_nodes(switch_xml_t swnode, ftdm_conf_node_t *rootnode,
+ const char *list_name, const char *list_element_name,
+ const char *sub_list_name, const char *sub_list_element_name)
+{
+ char *var, *val;
+ switch_xml_t list;
+ switch_xml_t element;
+ switch_xml_t param;
+
+ ftdm_conf_node_t *n_list;
+ ftdm_conf_node_t *n_element;
+
+ list = switch_xml_child(swnode, list_name);
+ if (!list) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no list %s found\n", list_name);
+ return -1;
+ }
+
+ if ((FTDM_SUCCESS != ftdm_conf_node_create(list_name, &n_list, rootnode))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create %s node\n", list_name);
+ return -1;
+ }
+
+ for (element = switch_xml_child(list, list_element_name); element; element = element->next) {
+ char *element_name = (char *) switch_xml_attr(element, "name");
+
+ if (!element_name) {
+ continue;
+ }
+
+ if ((FTDM_SUCCESS != ftdm_conf_node_create(list_element_name, &n_element, n_list))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create %s node for %s\n", list_element_name, element_name);
+ return -1;
+ }
+ ftdm_conf_node_add_param(n_element, "name", element_name);
+
+ for (param = switch_xml_child(element, "param"); param; param = param->next) {
+ var = (char *) switch_xml_attr_soft(param, "name");
+ val = (char *) switch_xml_attr_soft(param, "value");
+ ftdm_conf_node_add_param(n_element, var, val);
+ }
+
+ if (sub_list_name && sub_list_element_name) {
+ if (add_config_list_nodes(element, n_element, sub_list_name, sub_list_element_name, NULL, NULL)) {
+ return -1;
+ }
+ }
+ }
+
+ return 0;
+}
+
static ftdm_conf_node_t *get_ss7_config_node(switch_xml_t cfg, const char *confname)
{
- return NULL;
+ switch_xml_t signode, ss7configs, isup;
+ ftdm_conf_node_t *rootnode;
+
+ /* try to find the conf in the hash first */
+ rootnode = switch_core_hash_find(globals.ss7_configs, confname);
+ if (rootnode) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ss7 config %s was found in the hash already\n", confname);
+ return rootnode;
+ }
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not found %s config in hash, searching in xml ...\n", confname);
+
+ signode = switch_xml_child(cfg, "signaling_configs");
+ if (!signode) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "not found 'signaling_configs' XML config section\n");
+ return NULL;
+ }
+
+ ss7configs = switch_xml_child(signode, "sngss7_configs");
+ if (!ss7configs) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "not found 'sngss7_configs' XML config section\n");
+ return NULL;
+ }
+
+ /* search the isup config */
+ for (isup = switch_xml_child(ss7configs, "sng_isup"); isup; isup = isup->next) {
+ char *name = (char *) switch_xml_attr(isup, "name");
+ if (!name) {
+ continue;
+ }
+ if (!strcasecmp(name, confname)) {
+ break;
+ }
+ }
+
+ if (!isup) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "not found '%s' sng_isup XML config section\n", confname);
+ return NULL;
+ }
+
+ /* found our XML chunk, create the root node */
+ if ((FTDM_SUCCESS != ftdm_conf_node_create("sng_isup", &rootnode, NULL))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create root node for sng_isup config %s\n", confname);
+ return NULL;
+ }
+
+ /* add mtp linksets */
+ if (add_config_list_nodes(isup, rootnode, "mtp_linksets", "mtp_linkset", "mtp_links", "mtp_link")) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to process mtp_linksets for sng_isup config %s\n", confname);
+ ftdm_conf_node_destroy(rootnode);
+ return NULL;
+ }
+
+ /* add mtp routes */
+ if (add_config_list_nodes(isup, rootnode, "mtp_routes", "mtp_route", NULL, NULL)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to process mtp_routes for sng_isup config %s\n", confname);
+ ftdm_conf_node_destroy(rootnode);
+ return NULL;
+ }
+
+ /* add isup interfaces */
+ if (add_config_list_nodes(isup, rootnode, "isup_interfaces", "isup_interface", NULL, NULL)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to process isup_interfaces for sng_isup config %s\n", confname);
+ ftdm_conf_node_destroy(rootnode);
+ return NULL;
+ }
+
+ switch_core_hash_insert(globals.ss7_configs, confname, rootnode);
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Added SS7 node configuration %s\n", confname);
+ return rootnode;
}
static switch_status_t load_config(void)
@@ -2079,10 +2203,14 @@
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");
+ if (!name && !id) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ss7 span missing required attribute 'id' or 'name', skipping ...\n");
continue;
}
+ if (!configname) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ss7 span missing required attribute, skipping ...\n");
+ continue;
+ }
if (name) {
zstatus = ftdm_span_find_by_name(name, &span);
} else {
@@ -2106,13 +2234,19 @@
}
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);
+ if (!ss7confnode) {
+ ftdm_log(FTDM_LOG_ERROR, "Error finding ss7config '%s' for FreeTDM span id: %s\n", configname, switch_str_nil(id));
continue;
}
+
+ if (0) {
+ 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);
}
}
Modified: freeswitch/trunk/libs/freetdm/src/ftdm_config.c (17291 => 17292)
--- freeswitch/trunk/libs/freetdm/src/ftdm_config.c 2010-04-14 22:00:16 UTC (rev 17291)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_config.c 2010-04-14 22:00:16 UTC (rev 17292)
@@ -29,6 +29,10 @@
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors:
+ *
+ * Moises Silva <moy@sangoma.com>
*/
#include "freetdm.h"
@@ -239,6 +243,82 @@
return 0;
}
+#define PARAMETERS_CHUNK_SIZE 20
+FT_DECLARE(ftdm_status_t) ftdm_conf_node_create(const char *name, ftdm_conf_node_t **node, ftdm_conf_node_t *parent)
+{
+ ftdm_conf_node_t *newnode;
+ ftdm_conf_node_t *sibling = NULL;
+
+ ftdm_assert_return(name != NULL, FTDM_FAIL, "null node name");
+
+ newnode = ftdm_calloc(1, sizeof(**node));
+ if (!newnode) {
+ return FTDM_MEMERR;
+ }
+
+ strncpy(newnode->name, name, sizeof(newnode->name)-1);
+ newnode->name[sizeof(newnode->name)-1] = 0;
+
+ newnode->parameters = ftdm_calloc(PARAMETERS_CHUNK_SIZE, sizeof(*newnode->parameters));
+ if (!newnode->parameters) {
+ ftdm_safe_free(newnode);
+ return FTDM_MEMERR;
+ }
+ newnode->t_parameters = PARAMETERS_CHUNK_SIZE;
+
+ if (parent) {
+ /* store who my parent is */
+ newnode->parent = parent;
+ /* save any siblings */
+ sibling = parent->child;
+ /* as a newborn I am first */
+ parent->child = newnode;
+ if (sibling) {
+ /* store a pointer to my next sibling */
+ newnode->next = sibling;
+ }
+ }
+
+ *node = newnode;
+
+ return FTDM_SUCCESS;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_conf_node_add_param(ftdm_conf_node_t *node, const char *param, const char *val)
+{
+ void *newparameters;
+
+ ftdm_assert_return(param != NULL, FTDM_FAIL, "param is null");
+ ftdm_assert_return(val != NULL, FTDM_FAIL, "val is null");
+
+ if (node->n_parameters == node->t_parameters) {
+ newparameters = ftdm_realloc(node->parameters, (node->t_parameters + PARAMETERS_CHUNK_SIZE) * sizeof(*node->parameters));
+ if (!newparameters) {
+ return FTDM_MEMERR;
+ }
+ node->parameters = newparameters;
+ node->t_parameters = node->n_parameters + PARAMETERS_CHUNK_SIZE;
+ }
+ node->parameters[node->n_parameters].var = param;
+ node->parameters[node->n_parameters].val = val;
+ node->n_parameters++;
+ return FTDM_SUCCESS;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_conf_node_destroy(ftdm_conf_node_t *node)
+{
+ ftdm_conf_node_t *curr = NULL;
+ ftdm_conf_node_t *child = node->child;
+ while (child) {
+ curr = child;
+ child = curr->next;
+ ftdm_conf_node_destroy(curr);
+ }
+ ftdm_free(node->parameters);
+ ftdm_free(node);
+ return FTDM_SUCCESS;
+}
+
/* For Emacs:
* Local Variables:
* mode:c