freetdm: Fix ss7 logger broken compilation

diff --git a/configure.in b/configure.in
index 83cb4144ebe07eec7fea1c9c533e01ebd9322ad5..f6390b85e551834fcfeae8c872cba9fd4a1b7374 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,11 +3,11 @@
 
 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.2-rc2], BUG-REPORT-ADDRESS)
-AC_SUBST(SWITCH_VERSION_MAJOR, [1])
-AC_SUBST(SWITCH_VERSION_MINOR, [2])
+AC_INIT([freeswitch], [4.3.0], BUG-REPORT-ADDRESS)
+AC_SUBST(SWITCH_VERSION_MAJOR, [4])
+AC_SUBST(SWITCH_VERSION_MINOR, [3])
 AC_SUBST(SWITCH_VERSION_MICRO, [0])
-AC_SUBST(SWITCH_VERSION_REVISION, [-rc2])
+AC_SUBST(SWITCH_VERSION_REVISION, [3e39945d73bc55c9bae492161e968bed239a4f4f])
 
 AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
 AC_CONFIG_FILES([.version:.version.in])

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
index 5280aeaa06156c9bacfa087ab17720c8f367217a..7ea447f739b927c3643cebe370c89baa99d3b8b8 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
@@ -114,7 +114,7 @@ void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
 {
        char    buf[50];
        int             x = 1;
-    int log_level = FTDM_LOG_DEBUG;
+       int log_level = FTDM_LOG_LEVEL_DEBUG;
 
        memset(buf, '\0', sizeof(buf));
 
@@ -159,22 +159,22 @@ void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
                                        break;                  
                                case (LCM_CAUSE_UNKNOWN):
                                default:
-                    {
-                        if((LSD_EVENT_ALIGN_LOST == sta->t.usta.alarm.event) || 
-                                (LSD_EVENT_PROT_ST_DN == sta->t.usta.alarm.event)){
-                            log_level = FTDM_LOG_ERROR;
-                        }else if((LSD_EVENT_LINK_ALIGNED == sta->t.usta.alarm.event) ||
-                                ( LSD_EVENT_PROT_ST_UP == sta->t.usta.alarm.event)){
-                            log_level = FTDM_LOG_DEBUG;
-                        }else {
-                            log_level = FTDM_LOG_WARNING;
-                        }
-                        ftdm_log(log_level,"[MTP2]%s cause:%s event:%s\n",
-                                buf,
-                                DECODE_LCM_CAUSE(sta->t.usta.alarm.cause),
-                                DECODE_LSD_EVENT(sta->t.usta.alarm.event));
-                        break;
-                    }
+                               {
+                                       if ((LSD_EVENT_ALIGN_LOST == sta->t.usta.alarm.event) ||
+                                               (LSD_EVENT_PROT_ST_DN == sta->t.usta.alarm.event)) {
+                                               log_level = FTDM_LOG_LEVEL_ERROR;
+                                       } else if ((LSD_EVENT_LINK_ALIGNED == sta->t.usta.alarm.event) ||
+                                                     (LSD_EVENT_PROT_ST_UP == sta->t.usta.alarm.event)){
+                                               log_level = FTDM_LOG_LEVEL_DEBUG;
+                                       } else {
+                                               log_level = FTDM_LOG_LEVEL_WARNING;
+                                       }
+                                       ftdm_log(FTDM_PRE, log_level,"[MTP2]%s cause:%s event:%s\n",
+                                               buf,
+                                               DECODE_LCM_CAUSE(sta->t.usta.alarm.cause),
+                                               DECODE_LSD_EVENT(sta->t.usta.alarm.event));
+                                       break;
+                               }
                        /******************************************************************/
                        } /* switch (sta->t.usta.alarm.cause) */
                        break;