oops

diff --git a/src/mod/endpoints/mod_media_gateway/media_gateway_xml.c b/src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
index b52d4da0f1090b5318d83df8b715d92b3687ec70..68d546985d04c0bffcca4f6a1fb334021e68a5f0 100644 (file)
--- a/src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
+++ b/src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
@@ -65,6 +65,58 @@ switch_status_t config_profile(megaco_profile_t *profile, switch_bool_t reload)
 
 
                profile->idx = ++mg_sap_id;
+        
+        
+        if ((mg_phys_terms = switch_xml_child(mg_interface, "physical_terminations"))) {
+            for (mg_term = switch_xml_child(mg_phys_terms, "map"); mg_term; mg_term = mg_term->next) {
+                switch_memory_pool_t *pool;
+                mg_termination_t *term;
+                // <map  termination-id-prefix="Term1/" termination-id-base="1" tech="freetdm" channel-prefix="wp2" channel-map"1-15,17-31"/>
+                const char *prefix = switch_xml_attr(mg_term, "termination-id-prefix");
+                //const char *sztermination_id_base = switch_xml_attr(mg_term, "termination-id-base");
+                //const char *tech =  switch_xml_attr(mg_term, "tech");
+                const char *channel_prefix = switch_xml_attr(mg_term, "channel-prefix");
+                const char *channel_map = switch_xml_attr(mg_term, "channel-map");
+                const char *szspan_id = switch_xml_attr(mg_term, "span-id");
+                const int span_id = !zstr(szspan_id) ? atoi(szspan_id) : 0;
+                
+                
+                if (!zstr(channel_map)) {
+                    /* Split channel-map */
+                    char *channel_map_dup = strdup(channel_map);
+                    char *chanmap[24];
+                    int chanmap_count, i;
+                    chanmap_count = switch_split(channel_map_dup, ' ', chanmap);
+                    for (i = 0; i < chanmap_count; i++) {
+                        char *p = strchr(chanmap[i], '-');
+                        if (p) {
+                            int startchan, endchan, j;
+                            *p++ = '\0';
+                            startchan = atoi(chanmap[i]);
+                            endchan = atoi(p);
+                            
+                            for (j = startchan; j < endchan; j++) {
+                                switch_core_new_memory_pool(&pool);
+                                term = switch_core_alloc(profile->pool, sizeof *term);
+                                term->pool = pool;
+                                term->type = MG_TERM_TDM;
+                                term->profile = profile;
+                                term->name = switch_core_sprintf(pool, "%s%d", prefix, j);
+                                term->u.tdm.span = span_id;
+                                term->u.tdm.channel = j;
+                                
+                                switch_core_hash_insert_wrlock(profile->terminations, term->name, term, profile->terminations_rwlock);
+                                
+                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Mapped termination [%s] to freetdm span: %d chan: %d\n", term->name, term->u.tdm.span, term->u.tdm.channel);
+                            }
+                        }
+                    }
+                    
+                    free(channel_map_dup);
+                }
+            }
+        }
+
 
                /* we should break from here , profile name should be unique */
                break;
@@ -113,59 +165,6 @@ switch_status_t config_profile(megaco_profile_t *profile, switch_bool_t reload)
                }
        }
     
-    
-    if ((mg_phys_terms = switch_xml_child(cfg, "physical_terminations"))) {
-        
-        for (mg_term = switch_xml_child(mg_phys_terms, "map"); mg_term; mg_term = mg_term->next) {
-            switch_memory_pool_t *pool;
-            mg_termination_t *term;
-            // <map  termination-id-prefix="Term1/" termination-id-base="1" tech="freetdm" channel-prefix="wp2" channel-map"1-15,17-31"/>
-            const char *prefix = switch_xml_attr(mg_term, "termination-id-prefix");
-            //const char *sztermination_id_base = switch_xml_attr(mg_term, "termination-id-base");
-            //const char *tech =  switch_xml_attr(mg_term, "tech");
-            const char *channel_prefix = switch_xml_attr(mg_term, "channel-prefix");
-            const char *channel_map = switch_xml_attr(mg_term, "channel-map");
-            const char *szspan_id = switch_xml_attr(mg_term, "span-id");
-            const int span_id = !zstr(szspan_id) ? atoi(szspan_id) : 0;
-            
-            
-            if (!zstr(channel_map)) {
-                /* Split channel-map */
-                char *channel_map_dup = strdup(channel_map);
-                char *chanmap[24];
-                int chanmap_count, i;
-                chanmap_count = switch_split(channel_map_dup, ' ', chanmap);
-                for (i = 0; i < chanmap_count; i++) {
-                    char *p = strchr(chanmap[i], '-');
-                    if (p) {
-                        int startchan, endchan, j;
-                        *p++ = '\0';
-                        startchan = atoi(chanmap[i]);
-                        endchan = atoi(p);
-                        
-                        for (j = startchan; j < endchan; j++) {
-                            switch_core_new_memory_pool(&pool);
-                            term = switch_core_alloc(profile->pool, sizeof *term);
-                            term->pool = pool;
-                            term->type = MG_TERM_TDM;
-                            term->profile = profile;
-                            term->name = switch_core_sprintf(pool, "%s%d", prefix, j);
-                            term->u.tdm.span = span_id;
-                            term->u.tdm.channel = j;
-                            
-                            switch_core_hash_insert_wrlock(profile->terminations, term->name, term, profile->terminations_rwlock);
-                         
-                            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Mapped termination [%s] to freetdm span: %d chan: %d\n", term->name, term->u.tdm.span, term->u.tdm.channel);
-                        }
-                    }
-                }
-                
-                free(channel_map_dup);
-            }
-            
-        }
-    }
-
        /* configure the MEGACO stack */
        status = sng_mgco_cfg(profile);