change name part 2

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@819 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/Makefile.am b/libs/openzap/Makefile.am
index c8d334c86476caa09a6eb24d8ad04a99ece9e366..0a942a2bfe1b1497e344d26eecfda317981dfcae 100644 (file)
--- a/libs/openzap/Makefile.am
+++ b/libs/openzap/Makefile.am
@@ -36,7 +36,7 @@ moddir = @modinstdir@
 libdir = $(PREFIX)/lib/
 library_includedir = $(PREFIX)/include
 
-INCS      = -I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include -I$(OZ_SRCDIR)/$(SRC)/ozmod/ozmod_ss7_boost 
+INCS      = -I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include -I$(OZ_SRCDIR)/$(SRC)/ozmod/ozmod_sangoma_boost 
 MY_CFLAGS = $(INCS) $(ZAP_CFLAGS) -DZAP_CONFIG_DIR=\"@confdir@\" -DZAP_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
 COMPILE   = $(CC) $(MY_CFLAGS) $(INCS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
@@ -146,7 +146,7 @@ testanalog_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
 #
 # ozmod modules
 #
-mod_LTLIBRARIES = ozmod_zt.la ozmod_skel.la ozmod_isdn.la ozmod_analog.la ozmod_analog_em.la ozmod_ss7_boost.la
+mod_LTLIBRARIES = ozmod_zt.la ozmod_skel.la ozmod_isdn.la ozmod_analog.la ozmod_analog_em.la ozmod_sangoma_boost.la
 
 if LIBSANGOMA
 mod_LTLIBRARIES += ozmod_wanpipe.la
@@ -214,10 +214,10 @@ ozmod_analog_em_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
 ozmod_analog_em_la_LDFLAGS = -module -avoid-version
 ozmod_analog_em_la_LIBADD  = $(MYLIB)
 
-ozmod_ss7_boost_la_SOURCES = $(SRC)/ozmod/ozmod_ss7_boost/ss7_boost_client.c $(SRC)/ozmod/ozmod_ss7_boost/ozmod_ss7_boost.c
-ozmod_ss7_boost_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
-ozmod_ss7_boost_la_LDFLAGS = -module -avoid-version
-ozmod_ss7_boost_la_LIBADD  = $(MYLIB)
+ozmod_sangoma_boost_la_SOURCES = $(SRC)/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c $(SRC)/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
+ozmod_sangoma_boost_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+ozmod_sangoma_boost_la_LDFLAGS = -module -avoid-version
+ozmod_sangoma_boost_la_LIBADD  = $(MYLIB)
 
 if LIBPRI
 ozmod_libpri_la_SOURCES = $(SRC)/ozmod/ozmod_libpri/ozmod_libpri.c $(SRC)/ozmod/ozmod_libpri/lpwrap_pri.c

diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index 87bce7353f8c25a5b7979db0bfd5dbaf7627ae51..de32b348ce53cc414823405332eed73b7083a912 100644 (file)
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -2300,7 +2300,7 @@ static switch_status_t load_config(void)
                                span_id = span->span_id;
                        }
 
-                       if (zap_configure_span("ss7_boost", span, on_clear_channel_signal, 
+                       if (zap_configure_span("sangoma_boost", span, on_clear_channel_signal, 
                                                                   "local_ip", local_ip,
                                                                   "local_port", &local_port,
                                                                   "remote_ip", remote_ip,
@@ -2315,7 +2315,7 @@ static switch_status_t load_config(void)
                        switch_copy_string(SPAN_CONFIG[span->span_id].dialplan, dialplan, sizeof(SPAN_CONFIG[span->span_id].dialplan));
 
                        zap_span_start(span);
-                       switch_copy_string(SPAN_CONFIG[span->span_id].type, "ss7 (boost)", sizeof(SPAN_CONFIG[span->span_id].type));
+                       switch_copy_string(SPAN_CONFIG[span->span_id].type, "Sangoma (boost)", sizeof(SPAN_CONFIG[span->span_id].type));
                }
        }
 

diff --git a/libs/openzap/src/include/zap_types.h b/libs/openzap/src/include/zap_types.h
index b403f043877ead5044b2986bd70c772f35c788ab..d745a72f466059bc65de92470756f9c73b0a00ff 100644 (file)
--- a/libs/openzap/src/include/zap_types.h
+++ b/libs/openzap/src/include/zap_types.h
@@ -174,7 +174,7 @@ typedef enum {
        ZAP_SIGTYPE_ISDN,
        ZAP_SIGTYPE_RBS,
        ZAP_SIGTYPE_ANALOG,
-       ZAP_SIGTYPE_SS7BOOST,
+       ZAP_SIGTYPE_SANGOMABOOST,
        ZAP_SIGTYPE_M3UA,
        ZAP_SIGTYPE_R2
 } zap_signal_type_t;