]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
OPENZAP-237: [freetdm] Use __FTDM_FUNC__ instead of __FUNCTION__ to comply with c99...
authorMoises Silva <moy@sangoma.com>
Mon, 29 Jun 2015 02:50:03 +0000 (22:50 -0400)
committerMichael Jerris <mike@jerris.com>
Tue, 25 Aug 2015 19:51:34 +0000 (14:51 -0500)
17 files changed:
libs/freetdm/configure.ac
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
libs/freetdm/src/include/freetdm.h
libs/freetdm/src/include/ftdm_declare.h
libs/freetdm/src/include/ftdm_threadmutex.h
libs/freetdm/src/include/private/ftdm_state.h
libs/freetdm/src/include/private/ftdm_types.h
libs/freetdm/src/priserver.c

index 5236ad59209ecd75d5d975cd9e613f40e7fe9e73..e6aad59e52373d62e60625e02ed1bae52788162d 100644 (file)
@@ -91,7 +91,7 @@ gnu)
        COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
        ;;
 sun)
-       COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -D__FUNCTION__=__func__ -xvpara"
+       COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -xvpara"
        if test "$enable_64" != "no" ; then
                COMP_VENDOR_CFLAGS="-m64 $COMP_VENDOR_CFLAGS"
        fi
index e8468c0394af7ad9a5ee26b9978935ff54cbec68..ce417c8c9d7110b9a13215fb0e8165792a5adfd4 100644 (file)
 
 //#define CUDATEL_DEBUG
 
-#ifndef __FUNCTION__
-#define __FUNCTION__ __SWITCH_FUNC__
-#endif
-
 #define FREETDM_LIMIT_REALM "__freetdm"
 #define FREETDM_VAR_PREFIX "freetdm_"
 #define FREETDM_VAR_PREFIX_LEN (sizeof(FREETDM_VAR_PREFIX)-1)
index 9e43c526dca61441ed444d97c5e1ba050f8971ab..fd411b55d682b3118895fc38911afe122dadbc69 100644 (file)
@@ -3863,7 +3863,7 @@ skipdebug:
                        if (!strcmp(ftdmchan->dtmf_hangup_buf, ftdmchan->span->dtmf_hangup)) {
                                ftdm_log(FTDM_LOG_DEBUG, "DTMF hangup detected.\n");
 
-                               ftdm_channel_set_state(__FILE__, __FUNCTION__, __LINE__, ftdmchan, FTDM_CHANNEL_STATE_HANGUP, 0, NULL);
+                               ftdm_channel_set_state(__FILE__, __FTDM_FUNC__, __LINE__, ftdmchan, FTDM_CHANNEL_STATE_HANGUP, 0, NULL);
                                break;
                        }
                }
@@ -6122,7 +6122,7 @@ static void execute_safety_hangup(void *data)
        fchan->hangup_timer = 0;
        if (fchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
                ftdm_log_chan(fchan, FTDM_LOG_WARNING, "Forcing hangup since the user did not confirmed our hangup after %dms\n", FORCE_HANGUP_TIMER);
-               _ftdm_channel_call_hangup_nl(__FILE__, __FUNCTION__, __LINE__, fchan, NULL);
+               _ftdm_channel_call_hangup_nl(__FILE__, __FTDM_FUNC__, __LINE__, fchan, NULL);
        } else {
                ftdm_log_chan(fchan, FTDM_LOG_CRIT, "Not performing safety hangup, channel state is %s\n", ftdm_channel_state2str(fchan->state));
        }
index 8e03f76f73ba8180e42dd8911c52db24cd35a445..152ff0452e5308d3afe8278c682e3a0e92382967 100755 (executable)
@@ -507,7 +507,7 @@ void on_wat_log_span(uint8_t span_id, uint8_t level, char *fmt, ...)
        
        vsprintf(buff, fmt, argptr);
 
-       ftdm_log_chan_ex(gsm_data->dchan, __FILE__, __FUNCTION__, __LINE__, ftdm_level, "%s", buff);
+       ftdm_log_chan_ex(gsm_data->dchan, __FILE__, __FTDM_FUNC__, __LINE__, ftdm_level, "%s", buff);
 
        va_end(argptr);
 }
index f9516235b71c8ba9be1f469e4fdad669150004ac..688c083adb8d16864917d730a45863c7c8b94755 100644 (file)
@@ -50,7 +50,7 @@ void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
        sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
        ConEvnt *conEvnt = &sngisdn_event->event.conEvnt;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE), "State change flag pending\n");
        
@@ -274,7 +274,7 @@ void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
                        ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Processing SETUP in an invalid state (%s)\n", ftdm_channel_state2str(ftdmchan->state));
                        break;
        }
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -289,7 +289,7 @@ void sngisdn_process_con_cfm (sngisdn_event_data_t *sngisdn_event)
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
        CnStEvnt *cnStEvnt = &sngisdn_event->event.cnStEvnt;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
                                
        ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE), "State change flag pending\n");
        
@@ -304,7 +304,7 @@ void sngisdn_process_con_cfm (sngisdn_event_data_t *sngisdn_event)
                } else {
                        /* We already assigned this call, do nothing */
                        ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Call already assigned, ignoring connect\n");
-                       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+                       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                }
        }
@@ -359,7 +359,7 @@ void sngisdn_process_con_cfm (sngisdn_event_data_t *sngisdn_event)
                }
        }
 
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -377,7 +377,7 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
        
        CnStEvnt *cnStEvnt = &sngisdn_event->event.cnStEvnt;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE), "State change flag pending\n");
 
@@ -535,7 +535,7 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
        }
 
 sngisdn_process_cnst_ind_end:
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -549,7 +549,7 @@ void sngisdn_process_disc_ind (sngisdn_event_data_t *sngisdn_event)
        
        DiscEvnt *discEvnt = &sngisdn_event->event.discEvnt;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing DISCONNECT (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
 
@@ -599,7 +599,7 @@ void sngisdn_process_disc_ind (sngisdn_event_data_t *sngisdn_event)
                        break;
        }
 
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -613,7 +613,7 @@ void sngisdn_process_rel_ind (sngisdn_event_data_t *sngisdn_event)
        
        RelEvnt *relEvnt = &sngisdn_event->event.relEvnt;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing RELEASE/RELEASE COMPLETE (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
        
@@ -626,7 +626,7 @@ void sngisdn_process_rel_ind (sngisdn_event_data_t *sngisdn_event)
                ftdm_clear_flag(sngisdn_info, FLAG_DELAYED_REL);
                clear_call_glare_data(sngisdn_info);
 
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -702,7 +702,7 @@ void sngisdn_process_rel_ind (sngisdn_event_data_t *sngisdn_event)
        }
 
 
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -715,13 +715,13 @@ void sngisdn_process_dat_ind (sngisdn_event_data_t *sngisdn_event)
        sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);    
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);   
 
        /* Function does not require any info from infoEvnt struct for now */
        /* InfoEvnt *infoEvnt = &sngisdn_event->event.infoEvnt; */
        
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing DATA IND (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -734,13 +734,13 @@ void sngisdn_process_sshl_ind (sngisdn_event_data_t *sngisdn_event)
        sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        /* Function does not require any info from ssHlEvnt struct for now */
        /* SsHlEvnt *ssHlEvnt = &sngisdn_event->event.ssHlEvnt; */
        
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing SSHL IND (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -753,13 +753,13 @@ void sngisdn_process_sshl_cfm (sngisdn_event_data_t *sngisdn_event)
        sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        /* Function does not require any info from ssHlEvnt struct for now */
        /* SsHlEvnt *ssHlEvnt = &sngisdn_event->event.ssHlEvnt; */
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing SSHL CFM (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -772,13 +772,13 @@ void sngisdn_process_rmrt_ind (sngisdn_event_data_t *sngisdn_event)
        sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        /* Function does not require any info from ssHlEvnt struct for now */
        /* RmRtEvnt *rmRtEvnt = &sngisdn_event->event.rmRtEvnt; */
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing RESUME/RETRIEVE IND (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -791,13 +791,13 @@ void sngisdn_process_rmrt_cfm (sngisdn_event_data_t *sngisdn_event)
        sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
        
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        /* Function does not require any info from ssHlEvnt struct for now */
        /* RmRtEvnt *rmRtEvnt = &sngisdn_event->event.rmRtEvnt; */
        
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing RESUME/RETRIEVE CFM (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -810,13 +810,13 @@ void sngisdn_process_flc_ind (sngisdn_event_data_t *sngisdn_event)
        sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
        ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        /* Function does not require any info from ssHlEvnt struct for now */
        /* StaEvnt *staEvnt = &sngisdn_event->event.staEvnt; */
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing FLOW CONTROL IND (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -832,7 +832,7 @@ void sngisdn_process_fac_ind (sngisdn_event_data_t *sngisdn_event)
 
        FacEvnt *facEvnt = &sngisdn_event->event.facEvnt;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing FACILITY IND (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
 
@@ -842,7 +842,7 @@ void sngisdn_process_fac_ind (sngisdn_event_data_t *sngisdn_event)
                        get_facility_ie_str(ftdmchan, &facEvnt->facElmt.facStr.val[2], facEvnt->facElmt.facStr.len-2);
                        sngisdn_send_signal(sngisdn_info, FTDM_SIGEVENT_FACILITY);
                }
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -895,7 +895,7 @@ void sngisdn_process_fac_ind (sngisdn_event_data_t *sngisdn_event)
                        /* We do not support other FACILITY types for now, so do nothing */
                        break;
        }
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -911,7 +911,7 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
        
        uint8_t call_state = 0;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        if (!suInstId && !spInstId) {
                /* We already cleared this call */
@@ -932,13 +932,13 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
                        call_state = staEvnt->callSte.callGlblSte.val;
                } else {
                        ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Received STATUS without call state\n");
-                       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+                       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                }
                switch (staEvnt->causeDgn[0].causeVal.val) {
                        case FTDM_CAUSE_RESPONSE_TO_STATUS_ENQUIRY:
                                ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Status Check OK:%d", call_state);
-                               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+                               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                                return;
                        case FTDM_CAUSE_WRONG_CALL_STATE:
                                ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Message incompatible with call state (call_state:%d channel-state:%s cause:%d) (suId:%u suInstId:%u spInstId:%u)\n", call_state, ftdm_channel_state2str(ftdmchan->state), staEvnt->causeDgn[0].causeVal.val, suId, suInstId, spInstId);
@@ -1117,7 +1117,7 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
                }
        }
 
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -1128,13 +1128,13 @@ void sngisdn_process_srv_ind (sngisdn_event_data_t *sngisdn_event)
        int16_t dChan = sngisdn_event->dChan;
        uint8_t ces = sngisdn_event->ces;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        /* Function does not require any info from ssHlEvnt struct for now */
        /*Srv *srvEvnt = &sngisdn_event->event.srvEvnt;*/
        
        ftdm_log(FTDM_LOG_DEBUG, "Processing SERVICE IND (suId:%u dChan:%d ces:%d)\n", suId, dChan, ces);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -1144,13 +1144,13 @@ void sngisdn_process_srv_cfm (sngisdn_event_data_t *sngisdn_event)
        int16_t dChan = sngisdn_event->dChan;
        uint8_t ces = sngisdn_event->ces;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        /* Function does not require any info from ssHlEvnt struct for now */
        /*Srv *srvEvnt = &sngisdn_event->event.srvEvnt;*/
        
        ftdm_log(FTDM_LOG_DEBUG, "Processing SERVICE CFM (suId:%u dChan:%d ces:%d)\n", suId, dChan, ces);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -1286,7 +1286,7 @@ void sngisdn_process_rst_cfm (sngisdn_event_data_t *sngisdn_event)
        }
 
        ftdm_log(FTDM_LOG_DEBUG, "Processing RESTART CFM (suId:%u dChan:%d ces:%d type:%d)\n", suId, dChan, ces, evntType);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
@@ -1303,7 +1303,7 @@ void sngisdn_process_rst_ind (sngisdn_event_data_t *sngisdn_event)
        Rst *rstEvnt = NULL;
        sngisdn_span_data_t     *signal_data = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        rstEvnt = &sngisdn_event->event.rstEvnt;
 
@@ -1396,7 +1396,7 @@ void sngisdn_process_rst_ind (sngisdn_event_data_t *sngisdn_event)
        }
 
        
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
index 64e2abda8a9bb2e4057136f299195441e238dfcb..e5bebb1c8ba043b7e7832e6f85df21c83ce7704e 100644 (file)
@@ -42,7 +42,7 @@ void sngisdn_rcv_con_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Co
        sngisdn_chan_data_t *sngisdn_info = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_assert(g_sngisdn_data.ccs[suId].activation_done != 0, "Con Ind on unconfigured cc\n");
        ftdm_assert(g_sngisdn_data.spans[dChan], "Con Ind on unconfigured dchan\n");
@@ -50,7 +50,7 @@ void sngisdn_rcv_con_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Co
        if (conEvnt->chanId.eh.pres != PRSNT_NODEF) {
                /* TODO: Implement me */
                ftdm_log(FTDM_LOG_ERROR, "Incoming call without Channel Id not supported yet\n");
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -66,18 +66,18 @@ void sngisdn_rcv_con_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Co
 
        if (!bchan_no) {
                ftdm_log(FTDM_LOG_ERROR, "Failed to obtain b-channel number from SETUP message\n");
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        if (g_sngisdn_data.spans[dChan]->nfas.trunk) {
                if (interface_id < 0) {
                        ftdm_log(FTDM_LOG_ERROR, "Interface ID not present on NFAS interface\n");
-                       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+                       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                } else if (!g_sngisdn_data.spans[dChan]->nfas.trunk->spans[interface_id]) {
                        ftdm_log(FTDM_LOG_ERROR, "NFAS group:%s does not have logical interface %d\n", g_sngisdn_data.spans[dChan]->nfas.trunk->name, interface_id);
-                       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+                       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                } else {
                        sngisdn_info = g_sngisdn_data.spans[dChan]->nfas.trunk->spans[interface_id]->channels[bchan_no];
@@ -85,7 +85,7 @@ void sngisdn_rcv_con_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Co
        } else {
                if (g_sngisdn_data.spans[dChan]->channels[bchan_no] == NULL) {
                        ftdm_log(FTDM_LOG_ERROR, "Incoming call on unconfigured b-channel:%d\n", bchan_no);
-                       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+                       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                }
                
@@ -113,7 +113,7 @@ void sngisdn_rcv_con_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Co
        memcpy(&sngisdn_event->event.conEvnt, conEvnt, sizeof(*conEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_con_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, CnStEvnt *cnStEvnt, int16_t dChan, uint8_t ces)
@@ -121,14 +121,14 @@ void sngisdn_rcv_con_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, Cn
        sngisdn_chan_data_t *sngisdn_info = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_assert(g_sngisdn_data.ccs[suId].activation_done != 0, "Con Cfm on unconfigured cc\n");
        ftdm_assert(g_sngisdn_data.spans[dChan] != 0, "Con Cfm on unconfigured dchan\n");
 
        if (get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) != FTDM_SUCCESS) {
                ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -157,7 +157,7 @@ void sngisdn_rcv_con_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, Cn
        memcpy(&sngisdn_event->event.cnStEvnt, cnStEvnt, sizeof(*cnStEvnt));
        
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_cnst_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, CnStEvnt *cnStEvnt, uint8_t evntType, int16_t dChan, uint8_t ces)
@@ -165,14 +165,14 @@ void sngisdn_rcv_cnst_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, C
        sngisdn_chan_data_t *sngisdn_info = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
        
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_assert(g_sngisdn_data.ccs[suId].activation_done != 0, "Cnst Ind on unconfigured cc\n");
        ftdm_assert(g_sngisdn_data.spans[dChan] != 0, "Cnst Ind on unconfigured dchan\n");
 
        if (get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) != FTDM_SUCCESS) {
                ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -209,7 +209,7 @@ void sngisdn_rcv_cnst_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, C
        memcpy(&sngisdn_event->event.cnStEvnt, cnStEvnt, sizeof(*cnStEvnt));
        
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_disc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, DiscEvnt *discEvnt)
@@ -217,7 +217,7 @@ void sngisdn_rcv_disc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, D
        sngisdn_chan_data_t *sngisdn_info = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_assert(spInstId != 0, "Received DISCONNECT with invalid id");
 
@@ -245,7 +245,7 @@ void sngisdn_rcv_disc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, D
        
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
        
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_rel_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, RelEvnt *relEvnt)
@@ -253,7 +253,7 @@ void sngisdn_rcv_rel_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Re
        sngisdn_chan_data_t  *sngisdn_info = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -279,7 +279,7 @@ void sngisdn_rcv_rel_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Re
        memcpy(&sngisdn_event->event.relEvnt, relEvnt, sizeof(*relEvnt));
        
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_dat_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, InfoEvnt *infoEvnt)
@@ -287,7 +287,7 @@ void sngisdn_rcv_dat_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, In
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
        
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -312,7 +312,7 @@ void sngisdn_rcv_dat_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, In
        memcpy(&sngisdn_event->event.infoEvnt, infoEvnt, sizeof(*infoEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_sshl_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, SsHlEvnt *ssHlEvnt, uint8_t action)
@@ -320,7 +320,7 @@ void sngisdn_rcv_sshl_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, S
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -346,7 +346,7 @@ void sngisdn_rcv_sshl_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, S
        memcpy(&sngisdn_event->event.ssHlEvnt, ssHlEvnt, sizeof(*ssHlEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_sshl_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, SsHlEvnt *ssHlEvnt, uint8_t action)
@@ -354,7 +354,7 @@ void sngisdn_rcv_sshl_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, S
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -380,14 +380,14 @@ void sngisdn_rcv_sshl_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, S
        memcpy(&sngisdn_event->event.ssHlEvnt, ssHlEvnt, sizeof(*ssHlEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 void sngisdn_rcv_rmrt_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, RmRtEvnt *rmRtEvnt, uint8_t action)
 {
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -413,7 +413,7 @@ void sngisdn_rcv_rmrt_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, R
        memcpy(&sngisdn_event->event.rmRtEvnt, rmRtEvnt, sizeof(*rmRtEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_rmrt_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, RmRtEvnt *rmRtEvnt, uint8_t action)
@@ -421,7 +421,7 @@ void sngisdn_rcv_rmrt_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, R
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -447,7 +447,7 @@ void sngisdn_rcv_rmrt_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, R
        memcpy(&sngisdn_event->event.rmRtEvnt, rmRtEvnt, sizeof(*rmRtEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_flc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, StaEvnt *staEvnt)
@@ -455,7 +455,7 @@ void sngisdn_rcv_flc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                         !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -480,7 +480,7 @@ void sngisdn_rcv_flc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
        memcpy(&sngisdn_event->event.staEvnt, staEvnt, sizeof(*staEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 
@@ -489,7 +489,7 @@ void sngisdn_rcv_fac_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Fa
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        if (!(spInstId && get_ftdmchan_by_spInstId(suId, spInstId, &sngisdn_info) == FTDM_SUCCESS) &&
                !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
@@ -514,7 +514,7 @@ void sngisdn_rcv_fac_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Fa
        memcpy(&sngisdn_event->event.facEvnt, facEvnt, sizeof(*facEvnt));
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 
@@ -523,12 +523,12 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
        sngisdn_chan_data_t  *sngisdn_info;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        if (!suInstId && !spInstId) {
                /* This is a response to a sngisdn_snd_info_req
                 * that was sent to attempt to re-establish DL link */
-               ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+               ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -560,7 +560,7 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
 
        ftdm_queue_enqueue(((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->event_queue, sngisdn_event);
        ftdm_mutex_unlock(g_sngisdn_data.ccs[suId].mutex);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_srv_ind (int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces)
@@ -569,7 +569,7 @@ void sngisdn_rcv_srv_ind (int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces
        sngisdn_span_data_t     *signal_data;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_log(FTDM_LOG_INFO, "Received SERVICE IND (dChan:%d ces:%u)\n", dChan, ces);
 
@@ -594,7 +594,7 @@ void sngisdn_rcv_srv_ind (int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces
        } else {
                ftdm_queue_enqueue(signal_data->event_queue, sngisdn_event);
        }
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 
@@ -603,7 +603,7 @@ void sngisdn_rcv_srv_cfm (int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces
        sngisdn_span_data_t     *signal_data = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_log(FTDM_LOG_INFO, "Received SERVICE CFM (dChan:%d ces:%u)\n", dChan, ces);
 
@@ -628,7 +628,7 @@ void sngisdn_rcv_srv_cfm (int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces
        } else {
                ftdm_queue_enqueue(signal_data->event_queue, sngisdn_event);
        }
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_rst_ind (int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces, uint8_t evntType)
@@ -636,7 +636,7 @@ void sngisdn_rcv_rst_ind (int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces
        sngisdn_span_data_t     *signal_data = NULL;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_log(FTDM_LOG_INFO, "Received RESTART IND (dChan:%d ces:%u type:%u)\n", dChan, ces, evntType);
 
@@ -661,7 +661,7 @@ void sngisdn_rcv_rst_ind (int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces
        } else {
                ftdm_queue_enqueue(signal_data->event_queue, sngisdn_event);
        }
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void sngisdn_rcv_rst_cfm (int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces, uint8_t evntType)
@@ -669,7 +669,7 @@ void sngisdn_rcv_rst_cfm (int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces
        sngisdn_span_data_t     *signal_data;
        sngisdn_event_data_t *sngisdn_event = NULL;
 
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
 
        ftdm_log(FTDM_LOG_INFO, "Received RESTART CFM (dChan:%d ces:%u type:%u)\n", dChan, ces, evntType);
@@ -695,7 +695,7 @@ void sngisdn_rcv_rst_cfm (int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces
        } else {
                ftdm_queue_enqueue(signal_data->event_queue, sngisdn_event);
        }
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 
@@ -866,15 +866,15 @@ void sngisdn_rcv_q931_ind(InMngmt *status)
                                                                                        DECODE_LCM_CAUSE(status->t.usta.alarm.cause), status->t.usta.alarm.cause);
        }
        
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return;
 }
 
 void sngisdn_rcv_cc_ind(CcMngmt *status)
 {
-       ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
-       ftdm_log(FTDM_LOG_INFO, "RECEIVED %s\n", __FUNCTION__);
-       ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
+       ISDN_FUNC_TRACE_ENTER(__FTDM_FUNC__);
+       ftdm_log(FTDM_LOG_INFO, "RECEIVED %s\n", __FTDM_FUNC__);
+       ISDN_FUNC_TRACE_EXIT(__FTDM_FUNC__);
     return;
 }
 
index 29f70f2fe3cbdc087e6da9581cb4df0fab7e9f1d..f120114667abc7f527cf1b7766b275bc25a25e9b 100644 (file)
@@ -92,7 +92,7 @@ ftdm_status_t handle_olm_msg(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiConEvnt *siConEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t *sngss7_info = NULL;
        ftdm_channel_t *ftdmchan = NULL;
@@ -105,7 +105,7 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -366,14 +366,14 @@ handle_glare:
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCnStEvnt *siCnStEvnt, uint8_t evntType)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -383,7 +383,7 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -642,14 +642,14 @@ ftdm_status_t handle_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiConEvnt *siConEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -659,7 +659,7 @@ ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -722,14 +722,14 @@ ftdm_status_t handle_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRelEvnt *siRelEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -739,7 +739,7 @@ ftdm_status_t handle_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -854,14 +854,14 @@ rel_ind_reset:
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRelEvnt *siRelEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -871,7 +871,7 @@ ftdm_status_t handle_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -907,14 +907,14 @@ ftdm_status_t handle_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiInfoEvnt *siInfoEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -924,7 +924,7 @@ ftdm_status_t handle_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -936,14 +936,14 @@ ftdm_status_t handle_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t evntType, SiFacEvnt *siFacEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -953,7 +953,7 @@ ftdm_status_t handle_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -965,14 +965,14 @@ ftdm_status_t handle_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t evntType, SiFacEvnt *siFacEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -982,7 +982,7 @@ ftdm_status_t handle_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -994,14 +994,14 @@ ftdm_status_t handle_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -1011,7 +1011,7 @@ ftdm_status_t handle_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -1023,14 +1023,14 @@ ftdm_status_t handle_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiSuspEvnt *siSuspEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -1040,7 +1040,7 @@ ftdm_status_t handle_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -1052,14 +1052,14 @@ ftdm_status_t handle_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiResmEvnt *siResmEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info ;
        ftdm_channel_t    *ftdmchan;
@@ -1069,7 +1069,7 @@ ftdm_status_t handle_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -1081,14 +1081,14 @@ ftdm_status_t handle_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* unlock the channel */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        ftdm_running_return(FTDM_FAIL);
 
@@ -1280,7 +1280,7 @@ ftdm_status_t handle_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                break;
        } /* switch (evntType) */
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 
 }
@@ -1288,7 +1288,7 @@ ftdm_status_t handle_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 /******************************************************************************/
 ftdm_status_t handle_reattempt(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1301,13 +1301,13 @@ ftdm_status_t handle_reattempt(uint32_t suInstId, uint32_t spInstId, uint32_t ci
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1375,14 +1375,14 @@ ftdm_status_t handle_reattempt(uint32_t suInstId, uint32_t spInstId, uint32_t ci
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_pause(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
        
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1442,14 +1442,14 @@ ftdm_status_t handle_pause(uint32_t suInstId, uint32_t spInstId, uint32_t circui
        
        } /* while (g_ftdm_sngss7_data.cfg.isupCkt[i].id != 0) */
        
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_resume(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1510,14 +1510,14 @@ ftdm_status_t handle_resume(uint32_t suInstId, uint32_t spInstId, uint32_t circu
 
        } /* while (g_ftdm_sngss7_data.cfg.isupCkt[i].id != 0) */
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_cot_start(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1530,13 +1530,13 @@ ftdm_status_t handle_cot_start(uint32_t suInstId, uint32_t spInstId, uint32_t ci
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1553,7 +1553,7 @@ ftdm_status_t handle_cot_start(uint32_t suInstId, uint32_t spInstId, uint32_t ci
                if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
                        SS7_ERROR("Failed to open CIC %d for CCR test!\n", sngss7_info->circuit->cic);
                        /* KONRAD FIX ME */
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
        }
@@ -1567,14 +1567,14 @@ ftdm_status_t handle_cot_start(uint32_t suInstId, uint32_t spInstId, uint32_t ci
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_cot_stop(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1587,13 +1587,13 @@ ftdm_status_t handle_cot_stop(uint32_t suInstId, uint32_t spInstId, uint32_t cir
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1614,14 +1614,14 @@ ftdm_status_t handle_cot_stop(uint32_t suInstId, uint32_t spInstId, uint32_t cir
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_cot(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1634,13 +1634,13 @@ ftdm_status_t handle_cot(uint32_t suInstId, uint32_t spInstId, uint32_t circuit,
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1684,14 +1684,14 @@ ftdm_status_t handle_cot(uint32_t suInstId, uint32_t spInstId, uint32_t circuit,
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_blo_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1704,13 +1704,13 @@ ftdm_status_t handle_blo_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1737,14 +1737,14 @@ ftdm_status_t handle_blo_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_blo_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1757,13 +1757,13 @@ ftdm_status_t handle_blo_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1780,14 +1780,14 @@ ftdm_status_t handle_blo_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_ubl_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1800,13 +1800,13 @@ ftdm_status_t handle_ubl_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1837,14 +1837,14 @@ ftdm_status_t handle_ubl_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_ubl_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1855,13 +1855,13 @@ ftdm_status_t handle_ubl_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1870,14 +1870,14 @@ ftdm_status_t handle_ubl_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                        DECODE_LCC_EVENT(evntType));
        }
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1890,13 +1890,13 @@ ftdm_status_t handle_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1932,14 +1932,14 @@ ftdm_status_t handle_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_local_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -1952,13 +1952,13 @@ ftdm_status_t handle_local_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -1992,14 +1992,14 @@ ftdm_status_t handle_local_rsc_req(uint32_t suInstId, uint32_t spInstId, uint32_
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_rsc_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -2012,13 +2012,13 @@ ftdm_status_t handle_rsc_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2083,13 +2083,13 @@ ftdm_status_t handle_rsc_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 /******************************************************************************/
 ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t *sngss7_info = NULL;
        ftdm_channel_t *ftdmchan = NULL;
@@ -2104,13 +2104,13 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2124,7 +2124,7 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                range = siStaEvnt->rangStat.range.val;
        } else {
                SS7_ERROR("Received GRS with no range value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2132,7 +2132,7 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        sngss7_span = ftdmchan->span->signal_data;
        if (sngss7_info->rx_grs.range) {
                SS7_CRITICAL("Cannot handle another GRS on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
        sngss7_info->rx_grs.circuit = circuit; 
@@ -2141,14 +2141,14 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        ftdm_set_flag(sngss7_span, SNGSS7_RX_GRS_PENDING);
        /* the reset will be started in the main thread by "check_if_rx_grs_started" */
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t *sngss7_info = NULL;
        ftdm_channel_t *ftdmchan = NULL;
@@ -2163,13 +2163,13 @@ ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2183,7 +2183,7 @@ ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                range = siStaEvnt->rangStat.range.val;
        } else {
                SS7_ERROR("Received GRA with no range value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2191,7 +2191,7 @@ ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        sngss7_span = ftdmchan->span->signal_data;
        if (sngss7_info->rx_gra.range) {
                SS7_ERROR("Cannot handle another GRA on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
        sngss7_info->rx_gra.circuit = circuit; 
@@ -2209,14 +2209,14 @@ ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
        /* the reset will be started in the main thread by "check_if_rx_gra_started" */
        
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_local_blk(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -2229,13 +2229,13 @@ ftdm_status_t handle_local_blk(uint32_t suInstId, uint32_t spInstId, uint32_t ci
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2261,14 +2261,14 @@ ftdm_status_t handle_local_blk(uint32_t suInstId, uint32_t spInstId, uint32_t ci
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_local_ubl(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t  *sngss7_info = NULL;
        ftdm_channel_t    *ftdmchan = NULL;
@@ -2281,13 +2281,13 @@ ftdm_status_t handle_local_ubl(uint32_t suInstId, uint32_t spInstId, uint32_t ci
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2313,14 +2313,14 @@ ftdm_status_t handle_local_ubl(uint32_t suInstId, uint32_t spInstId, uint32_t ci
        /* unlock the channel again before we exit */
        ftdm_mutex_unlock(ftdmchan->mutex);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_ucic(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        ftdm_iterator_t *iter = NULL;
        ftdm_iterator_t *curr = NULL;
@@ -2337,13 +2337,13 @@ ftdm_status_t handle_ucic(uint32_t suInstId, uint32_t spInstId, uint32_t circuit
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2395,14 +2395,14 @@ done:
                ftdm_iterator_free(iter);
        }
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
 ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        sngss7_span_data_t      *sngss7_span = NULL;
@@ -2425,13 +2425,13 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2447,7 +2447,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                blockType = siStaEvnt->cgsmti.typeInd.val;
        } else {
                SS7_ERROR("Received CGB with no circuit group supervision value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }       
 
@@ -2456,7 +2456,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                range = siStaEvnt->rangStat.range.val;
        } else {
                SS7_ERROR("Received CGB with no range value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2467,7 +2467,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                }
        } else {
                SS7_ERROR("Received CGB with no status value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2534,7 +2534,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2546,7 +2546,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 /******************************************************************************/
 ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        sngss7_span_data_t      *sngss7_span = NULL;
@@ -2571,13 +2571,13 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2594,7 +2594,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                blockType = siStaEvnt->cgsmti.typeInd.val;
        } else {
                SS7_ERROR("Received CGU with no circuit group supervision value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }       
 
@@ -2603,7 +2603,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                range = siStaEvnt->rangStat.range.val;
        } else {
                SS7_ERROR("Received CGU with no range value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2614,7 +2614,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                }
        } else {
                SS7_ERROR("Received CGU with no status value on CIC = %d\n", sngss7_info->circuit->cic);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2687,7 +2687,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        }
 
@@ -2699,7 +2699,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 /******************************************************************************/
 ftdm_status_t handle_olm_msg(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -2712,13 +2712,13 @@ ftdm_status_t handle_olm_msg(uint32_t suInstId, uint32_t spInstId, uint32_t circ
                                        g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic,
                                        DECODE_LCC_EVENT(evntType));
 
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return FTDM_FAIL;
        } else {
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for ISUP circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return FTDM_FAIL;
                }
 
@@ -2732,7 +2732,7 @@ ftdm_status_t handle_olm_msg(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
        sng_isup_reg_info_show();
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
        return FTDM_SUCCESS;
 }
 
index 60a3fca737b03f35f8cab290b2b2c9ef15711dec..95ff402ae87f68a6b8586831871e1be85e352525 100644 (file)
@@ -60,7 +60,7 @@ void sngss7_ssp_sta_cfm(uint32_t infId);
 /* FUNCTIONS ******************************************************************/
 void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiConEvnt *siConEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -68,14 +68,14 @@ void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -84,7 +84,7 @@ void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
        
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -99,13 +99,13 @@ void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiConEvnt *siConEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -113,14 +113,14 @@ void sngss7_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -128,7 +128,7 @@ void sngss7_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -143,13 +143,13 @@ void sngss7_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCnStEvnt *siCnStEvnt, uint8_t evntType)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -157,14 +157,14 @@ void sngss7_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCn
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -172,7 +172,7 @@ void sngss7_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCn
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -188,13 +188,13 @@ void sngss7_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCn
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRelEvnt *siRelEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -202,14 +202,14 @@ void sngss7_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -217,7 +217,7 @@ void sngss7_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -232,13 +232,13 @@ void sngss7_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRelEvnt *siRelEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -246,14 +246,14 @@ void sngss7_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -261,7 +261,7 @@ void sngss7_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -276,13 +276,13 @@ void sngss7_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiInfoEvnt *siInfoEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -290,14 +290,14 @@ void sngss7_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiIn
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -305,7 +305,7 @@ void sngss7_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiIn
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -320,13 +320,13 @@ void sngss7_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiIn
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t evntType, SiFacEvnt *siFacEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -334,14 +334,14 @@ void sngss7_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -349,7 +349,7 @@ void sngss7_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -365,13 +365,13 @@ void sngss7_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t evntType, SiFacEvnt *siFacEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -379,14 +379,14 @@ void sngss7_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -394,7 +394,7 @@ void sngss7_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -410,13 +410,13 @@ void sngss7_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void sngss7_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -424,14 +424,14 @@ void sngss7_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit)
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -439,7 +439,7 @@ void sngss7_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit)
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -453,13 +453,13 @@ void sngss7_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit)
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 
 }
 /* GENERAL STATUS *************************************************************/
 void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -509,7 +509,7 @@ void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 
                                        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                                                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-                                               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                                               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                                                return;
                                        }
 
@@ -525,7 +525,7 @@ void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
                /* check if we found any circuits that are on the intfId, drop the message
                 * if none are found */
                if (!ftdmchan) {
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                }
 
@@ -535,14 +535,14 @@ void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
                if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                        ftdm_log(FTDM_LOG_DEBUG, "Rx %s on circuit that is not a voice CIC (%d) (circuit:%d)\n",
                                                DECODE_LCC_EVENT(evntType), g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic, circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                }
 
                /* get the ftdmchan and ss7_chan_data from the circuit */
                if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                        SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-                       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+                       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                        return;
                }
                break;
@@ -553,7 +553,7 @@ void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -576,7 +576,7 @@ void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 /******************************************************************************/
 void sngss7_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiSuspEvnt *siSuspEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -584,14 +584,14 @@ void sngss7_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiS
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -599,7 +599,7 @@ void sngss7_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiS
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -616,14 +616,14 @@ void sngss7_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiS
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 
 }
 
 /******************************************************************************/
 void sngss7_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiResmEvnt *siResmEvnt)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -631,14 +631,14 @@ void sngss7_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiR
 
        if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != SNG_CKT_VOICE) {
                SS7_ERROR("Rx sig event on circuit that is not a voice CIC (%d)\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -646,7 +646,7 @@ void sngss7_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiR
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -663,14 +663,14 @@ void sngss7_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiR
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 
 }
 
 /******************************************************************************/
 void sngss7_ssp_sta_cfm(uint32_t infId)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 #if 0
        sngss7_chan_data_t      *sngss7_info = NULL;
        ftdm_channel_t          *ftdmchan = NULL;
@@ -679,7 +679,7 @@ void sngss7_ssp_sta_cfm(uint32_t infId)
        /* get the ftdmchan and ss7_chan_data from the circuit */
        if (extract_chan_data(circuit, &sngss7_info, &ftdmchan)) {
                SS7_ERROR("Failed to extract channel data for circuit = %d!\n", circuit);
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
 
@@ -687,7 +687,7 @@ void sngss7_ssp_sta_cfm(uint32_t infId)
        sngss7_event = ftdm_malloc(sizeof(*sngss7_event));
        if (sngss7_event == NULL) {
                SS7_ERROR("Failed to allocate memory for sngss7_event!\n");
-               SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+               SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
                return;
        }
        memset(sngss7_event, 0x0, sizeof(*sngss7_event));
@@ -704,7 +704,7 @@ void sngss7_ssp_sta_cfm(uint32_t infId)
        /* enqueue this event */
        ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 #endif
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 
 }
 /******************************************************************************/
index 030138658be9927ec082e7b3574e066d22bcf124..47c88c29c52dec21828e93398ae380bb1c14f153 100644 (file)
@@ -2340,7 +2340,7 @@ outgoing_successful:
 #if 0
          static FIO_CHANNEL_REQUEST_FUNCTION (ftdm_sangoma_ss7_request_chan)
          {
-       SS7_INFO ("KONRAD-> I got called %s\n", __FUNCTION__);
+       SS7_INFO ("KONRAD-> I got called %s\n", __FTDM_FUNC__);
        return FTDM_SUCCESS;
          }
 
index 91a6696187c783264a70be8474d6f505ee0f2de3..7c567ab6eac50cb555ce6573d9ac44c6bad42a6e 100644 (file)
@@ -50,7 +50,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;;
        sngss7_event_data_t *event_clone = NULL;
        
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_info->suInstId   = get_unique_id ();
        sngss7_info->spInstId   = 0;
@@ -245,7 +245,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
        
        ftdm_safe_free(event_clone);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
@@ -344,7 +344,7 @@ void ft_to_sngss7_inr(ftdm_channel_t *ftdmchan)
 
 void ft_to_sngss7_acm (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
        SiCnStEvnt acm;
@@ -427,14 +427,14 @@ void ft_to_sngss7_acm (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ACM\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 void ft_to_sngss7_cpg (ftdm_channel_t *ftdmchan)
 {
        SiCnStEvnt cpg;
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -453,12 +453,12 @@ void ft_to_sngss7_cpg (ftdm_channel_t *ftdmchan)
        sng_cc_con_status  (1, sngss7_info->suInstId, sngss7_info->spInstId, sngss7_info->circuit->id, &cpg, PROGRESS);
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "[CIC:%d]Tx CPG\n", sngss7_info->circuit->cic);
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 void ft_to_sngss7_anm (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        SiConEvnt anm;
@@ -475,7 +475,7 @@ void ft_to_sngss7_anm (ftdm_channel_t * ftdmchan)
 
   SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ANM\n", sngss7_info->circuit->cic);
 
-  SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+  SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
   return;
 }
 
@@ -483,7 +483,7 @@ void ft_to_sngss7_anm (ftdm_channel_t * ftdmchan)
 void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 {
        const char *loc_ind = NULL;
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        SiRelEvnt rel;
@@ -519,14 +519,14 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
                                                        sngss7_info->circuit->cic,
                                                        ftdmchan->caller_data.hangup_cause );
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_rlc (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        SiRelEvnt rlc;
@@ -542,14 +542,14 @@ void ft_to_sngss7_rlc (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RLC\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_rsc (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -563,14 +563,14 @@ void ft_to_sngss7_rsc (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RSC\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_rsca (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -584,14 +584,14 @@ void ft_to_sngss7_rsca (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RSC-RLC\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
   return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_blo (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -605,14 +605,14 @@ void ft_to_sngss7_blo (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx BLO\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_bla (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -626,7 +626,7 @@ void ft_to_sngss7_bla (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx BLA\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
@@ -634,7 +634,7 @@ void ft_to_sngss7_bla (ftdm_channel_t * ftdmchan)
 void
 ft_to_sngss7_ubl (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -648,14 +648,14 @@ ft_to_sngss7_ubl (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx UBL\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_uba (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -669,14 +669,14 @@ void ft_to_sngss7_uba (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx UBA\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_lpa (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        
@@ -690,14 +690,14 @@ void ft_to_sngss7_lpa (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx LPA\n", sngss7_info->circuit->cic);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
 return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_gra (ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
        SiStaEvnt       gra;
@@ -734,14 +734,14 @@ void ft_to_sngss7_gra (ftdm_channel_t * ftdmchan)
                                                        (sngss7_info->circuit->cic + sngss7_info->rx_grs.range));
        
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_grs (ftdm_channel_t *fchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_chan_data_t *cinfo = fchan->call_data;
        
@@ -770,13 +770,13 @@ void ft_to_sngss7_grs (ftdm_channel_t *fchan)
 
        sngss7_set_ckt_flag(cinfo, FLAG_GRP_RESET_SENT);
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
 }
 
 /******************************************************************************/
 void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan)
 {      
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_span_data_t      *sngss7_span = ftdmchan->span->signal_data;
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
@@ -818,14 +818,14 @@ void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan)
        /* clean out the saved data */
        memset(&sngss7_span->rx_cgb, 0x0, sizeof(sngss7_group_data_t));
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan)
 {      
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        
        sngss7_span_data_t      *sngss7_span = ftdmchan->span->signal_data;
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
@@ -868,14 +868,14 @@ void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan)
        memset(&sngss7_span->rx_cgu, 0x0, sizeof(sngss7_group_data_t));
 
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
 
        sngss7_span_data_t      *sngss7_span = ftdmchan->span->signal_data;
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
@@ -919,14 +919,14 @@ void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan)
        memset(&sngss7_span->tx_cgb, 0x0, sizeof(sngss7_group_data_t));
 
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
 /******************************************************************************/
 void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
 {
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
 
        sngss7_span_data_t      *sngss7_span = ftdmchan->span->signal_data;
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
@@ -970,7 +970,7 @@ void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
        memset(&sngss7_span->tx_cgu, 0x0, sizeof(sngss7_group_data_t));
 
 
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
@@ -979,14 +979,14 @@ void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
 void ft_to_sngss7_itx (ftdm_channel_t * ftdmchan)
 {
 #ifndef SANGOMA_SPIROU
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "ITX message not supported!, please update your libsng_ss7\n");
 #else
        const char* var = NULL;
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
        SiCnStEvnt itx;
        
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
 
        memset (&itx, 0x0, sizeof (itx));
 
@@ -1013,7 +1013,7 @@ void ft_to_sngss7_itx (ftdm_channel_t * ftdmchan)
 
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ITX\n", sngss7_info->circuit->cic);
 #endif
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
@@ -1021,12 +1021,12 @@ void ft_to_sngss7_itx (ftdm_channel_t * ftdmchan)
 void ft_to_sngss7_txa (ftdm_channel_t * ftdmchan)
 {      
 #ifndef SANGOMA_SPIROU
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
        ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "TXA message not supported!, please update your libsng_ss7\n");      
 #else
        SiCnStEvnt txa;
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;
-       SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER (__FTDM_FUNC__);
                
        memset (&txa, 0x0, sizeof(txa));
 
@@ -1034,7 +1034,7 @@ void ft_to_sngss7_txa (ftdm_channel_t * ftdmchan)
        
        SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx TXA\n", sngss7_info->circuit->cic);
 #endif
-       SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT (__FTDM_FUNC__);
        return;
 }
 
index 9e95a2231bc3be20c0a33d3fe94f5bd515a9934b..541f1077042ca24f9e5334d3aba3e51fa9519b47 100644 (file)
@@ -55,7 +55,7 @@
 /* FUNCTIONS ******************************************************************/
 void handle_isup_t35(void *userdata)
 {
-    SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+    SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
     sngss7_timer_data_t *timer = userdata;
     sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
@@ -87,14 +87,14 @@ void handle_isup_t35(void *userdata)
     /*unlock*/
     ftdm_channel_unlock(ftdmchan);
 
-    SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+    SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
     return;
 }
 
 
 void handle_isup_t10(void *userdata)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_timer_data_t *timer = userdata;
        sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
@@ -109,12 +109,12 @@ void handle_isup_t10(void *userdata)
 
        ftdm_channel_unlock(ftdmchan);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void handle_isup_t39(void *userdata)
 {
-       SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+       SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
        sngss7_timer_data_t *timer = userdata;
        sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
@@ -146,7 +146,7 @@ void handle_isup_t39(void *userdata)
        /*unlock*/
        ftdm_channel_unlock(ftdmchan);
 
-       SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+       SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 /******************************************************************************/
 /* For Emacs:
index 46bf880e12462397f67718a80bd915b8b6308336..f90744df8d24e19b310db66c5a902276b9ce466b 100755 (executable)
@@ -1014,8 +1014,8 @@ FT_DECLARE(int) ftdm_channel_get_availability(ftdm_channel_t *ftdmchan);
  *        there is no guarantee of whether the event will arrive after or before your execution thread returns
  *        from ftdm_channel_call_answer 
  */
-#define ftdm_channel_call_answer(ftdmchan) _ftdm_channel_call_answer(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), NULL)
-#define ftdm_channel_call_answer_ex(ftdmchan, usrmsg) _ftdm_channel_call_answer(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (usrmsg))
+#define ftdm_channel_call_answer(ftdmchan) _ftdm_channel_call_answer(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), NULL)
+#define ftdm_channel_call_answer_ex(ftdmchan, usrmsg) _ftdm_channel_call_answer(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (usrmsg))
 
 /*! \brief Answer call recording the source code point where the it was called (see ftdm_channel_call_answer for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg);
@@ -1023,8 +1023,8 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
 /*! \brief Place an outgoing call in the given channel 
  *  \deprecated This macro is deprecated since leaves the door open to glare issues, use ftdm_call_place instead
  */
-#define ftdm_channel_call_place(ftdmchan) _ftdm_channel_call_place(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), NULL)
-#define ftdm_channel_call_place_ex(ftdmchan, usrmsg) _ftdm_channel_call_place_ex(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (usrmsg))
+#define ftdm_channel_call_place(ftdmchan) _ftdm_channel_call_place(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), NULL)
+#define ftdm_channel_call_place_ex(ftdmchan, usrmsg) _ftdm_channel_call_place_ex(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (usrmsg))
 
 /*! \brief Place an outgoing call recording the source code point where it was called (see ftdm_channel_call_place for an easy to use macro)
  *  \deprecated This function is deprecated since leaves the door open to glare issues, use ftdm_call_place instead
@@ -1032,8 +1032,8 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_place(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg);
 
 /*! \brief Place an outgoing call with the given caller data in a channel according to the hunting scheme provided */
-#define ftdm_call_place(callerdata, hunting) _ftdm_call_place(__FILE__, __FUNCTION__, __LINE__, (callerdata), (hunting), NULL)
-#define ftdm_call_place_ex(callerdata, hunting, usrmsg) _ftdm_call_place(__FILE__, __FUNCTION__, __LINE__, (callerdata), (hunting), (usrmsg))
+#define ftdm_call_place(callerdata, hunting) _ftdm_call_place(__FILE__, __FTDM_FUNC__, __LINE__, (callerdata), (hunting), NULL)
+#define ftdm_call_place_ex(callerdata, hunting, usrmsg) _ftdm_call_place(__FILE__, __FTDM_FUNC__, __LINE__, (callerdata), (hunting), (usrmsg))
 
 /*! \brief Place an outgoing call with the given caller data in a channel according to the hunting scheme provided and records
  *         the place where it was called. See ftdm_call_place for an easy to use macro
@@ -1065,22 +1065,22 @@ FT_DECLARE(ftdm_status_t) _ftdm_call_place(const char *file, const char *func, i
  * \note  You cannot send more than one indication at the time. You must wait for the completed event before 
  *        calling this function again (unless the return code was different than FTDM_SUCCESS)
  */
-#define ftdm_channel_call_indicate(ftdmchan, indication) _ftdm_channel_call_indicate(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (indication), NULL)
-#define ftdm_channel_call_indicate_ex(ftdmchan, indication, usrmsg) _ftdm_channel_call_indicate(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (indication), (usrmsg))
+#define ftdm_channel_call_indicate(ftdmchan, indication) _ftdm_channel_call_indicate(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (indication), NULL)
+#define ftdm_channel_call_indicate_ex(ftdmchan, indication, usrmsg) _ftdm_channel_call_indicate(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (indication), (usrmsg))
 
 /*! \brief Indicate a new condition in an incoming call recording the source code point where it was called (see ftdm_channel_call_indicate for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_channel_indication_t indication, ftdm_usrmsg_t *usrmsg);
 
 /*! \brief Hangup the call without cause */
-#define ftdm_channel_call_hangup(ftdmchan) _ftdm_channel_call_hangup(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), NULL)
-#define ftdm_channel_call_hangup_ex(ftdmchan, usrmsg) _ftdm_channel_call_hangup(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (usrmsg))
+#define ftdm_channel_call_hangup(ftdmchan) _ftdm_channel_call_hangup(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), NULL)
+#define ftdm_channel_call_hangup_ex(ftdmchan, usrmsg) _ftdm_channel_call_hangup(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (usrmsg))
 
 /*! \brief Hangup the call without cause recording the source code point where it was called (see ftdm_channel_call_hangup for an easy to use macro)*/
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_hangup(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg);
 
 /*! \brief Hangup the call with cause */
-#define ftdm_channel_call_hangup_with_cause(ftdmchan, cause) _ftdm_channel_call_hangup_with_cause(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (cause), NULL)
-#define ftdm_channel_call_hangup_with_cause_ex(ftdmchan, cause, usrmsg) _ftdm_channel_call_hangup_with_cause(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (cause), (usrmsg))
+#define ftdm_channel_call_hangup_with_cause(ftdmchan, cause) _ftdm_channel_call_hangup_with_cause(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (cause), NULL)
+#define ftdm_channel_call_hangup_with_cause_ex(ftdmchan, cause, usrmsg) _ftdm_channel_call_hangup_with_cause(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (cause), (usrmsg))
 
 /*! \brief Hangup the call with cause recording the source code point where it was called (see ftdm_channel_call_hangup_with_cause for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_hangup_with_cause(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_call_cause_t, ftdm_usrmsg_t *usrmsg);
@@ -1093,15 +1093,15 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_hangup_with_cause(const char *file,
  *        there is no guarantee of whether the event will arrive after or before your execution thread returns
  *        from ftdm_channel_call_transfer
  */
-#define ftdm_channel_call_transfer(ftdmchan, arg) _ftdm_channel_call_transfer(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (arg), NULL)
-#define ftdm_channel_call_transfer_ex(ftdmchan, arg, usrmsg) _ftdm_channel_call_transfer(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (arg), (usrmsg))
+#define ftdm_channel_call_transfer(ftdmchan, arg) _ftdm_channel_call_transfer(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (arg), NULL)
+#define ftdm_channel_call_transfer_ex(ftdmchan, arg, usrmsg) _ftdm_channel_call_transfer(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (arg), (usrmsg))
 
 /*! \brief Answer call recording the source code point where the it was called (see ftdm_channel_call_tranasfer for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_transfer(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, const char* arg, ftdm_usrmsg_t *usrmsg);
 
 /*! \brief Reset the channel */
-#define ftdm_channel_reset(ftdmchan) _ftdm_channel_reset(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), NULL)
-#define ftdm_channel_reset_ex(ftdmchan, usrmsg) _ftdm_channel_reset(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), usrmsg)
+#define ftdm_channel_reset(ftdmchan) _ftdm_channel_reset(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), NULL)
+#define ftdm_channel_reset_ex(ftdmchan, usrmsg) _ftdm_channel_reset(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), usrmsg)
 
 /*! \brief Reset the channel (see _ftdm_channel_reset for an easy to use macro) 
  *  \note if there was a call on this channel, call will be cleared without any notifications to the user
@@ -1109,15 +1109,15 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_transfer(const char *file, const ch
 FT_DECLARE(ftdm_status_t) _ftdm_channel_reset(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg);
 
 /*! \brief Put a call on hold (if supported by the signaling stack) */
-#define ftdm_channel_call_hold(ftdmchan) _ftdm_channel_call_hold(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), NULL)
-#define ftdm_channel_call_hold_ex(ftdmchan, usrmsg) _ftdm_channel_call_hold(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (usrmsg))
+#define ftdm_channel_call_hold(ftdmchan) _ftdm_channel_call_hold(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), NULL)
+#define ftdm_channel_call_hold_ex(ftdmchan, usrmsg) _ftdm_channel_call_hold(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (usrmsg))
 
 /*! \brief Put a call on hold recording the source code point where it was called (see ftdm_channel_call_hold for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_hold(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg);
 
 /*! \brief Unhold a call */
-#define ftdm_channel_call_unhold(ftdmchan) _ftdm_channel_call_unhold(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), NULL)
-#define ftdm_channel_call_unhold_ex(ftdmchan, usrmsg) _ftdm_channel_call_unhold(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (usrmsg))
+#define ftdm_channel_call_unhold(ftdmchan) _ftdm_channel_call_unhold(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), NULL)
+#define ftdm_channel_call_unhold_ex(ftdmchan, usrmsg) _ftdm_channel_call_unhold(__FILE__, __FTDM_FUNC__, __LINE__, (ftdmchan), (usrmsg))
 
 /*! \brief Unhold a call recording the source code point where it was called (see ftdm_channel_call_unhold for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_unhold(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_usrmsg_t *usrmsg);
@@ -1985,7 +1985,7 @@ FIO_CODEC_FUNCTION(fio_alaw2slin);
 FIO_CODEC_FUNCTION(fio_ulaw2alaw);
 FIO_CODEC_FUNCTION(fio_alaw2ulaw);
 
-#define FTDM_PRE __FILE__, __FUNCTION__, __LINE__
+#define FTDM_PRE __FILE__, __func__, __LINE__
 #define FTDM_LOG_LEVEL_DEBUG 7
 #define FTDM_LOG_LEVEL_INFO 6
 #define FTDM_LOG_LEVEL_NOTICE 5
index 34e01542670e93f06c7ea7bc935b57179b585a4c..5b9ba28beb2817e3c4a816f417a125f799fad864 100644 (file)
@@ -57,6 +57,7 @@ extern "C" {
 #endif
 
 #ifdef _MSC_VER
+#define __FTDM_FUNC__ __FUNCTION__
 #if defined(FT_DECLARE_STATIC)
 #define FT_DECLARE(type)                       type __stdcall
 #define FT_DECLARE_NONSTD(type)                type __cdecl
@@ -73,6 +74,7 @@ extern "C" {
 #define FT_DECLARE_INLINE(type)                extern __inline__ type /* why extern? see http://support.microsoft.com/kb/123768 */
 #define EX_DECLARE_DATA                                __declspec(dllexport)
 #else
+#define __FTDM_FUNC__ (const char *)__func__
 #if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY)
 #define FT_DECLARE(type)               __attribute__((visibility("default"))) type
 #define FT_DECLARE_NONSTD(type)        __attribute__((visibility("default"))) type
index 9427a094efd4c852fc01428bff6bf8f7b20e138c..45eb87d441ecb2c8115577730322d46fb1537cc0 100644 (file)
@@ -43,13 +43,13 @@ FT_DECLARE(void) ftdm_thread_override_default_stacksize(ftdm_size_t size);
 FT_DECLARE(ftdm_status_t) ftdm_mutex_create(ftdm_mutex_t **mutex);
 FT_DECLARE(ftdm_status_t) ftdm_mutex_destroy(ftdm_mutex_t **mutex);
 
-#define ftdm_mutex_lock(_x) _ftdm_mutex_lock(__FILE__, __LINE__, __FUNCTION__, _x)
+#define ftdm_mutex_lock(_x) _ftdm_mutex_lock(__FILE__, __LINE__, __FTDM_FUNC__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_lock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
-#define ftdm_mutex_trylock(_x) _ftdm_mutex_trylock(__FILE__, __LINE__, __FUNCTION__, _x)
+#define ftdm_mutex_trylock(_x) _ftdm_mutex_trylock(__FILE__, __LINE__, __FTDM_FUNC__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_trylock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
-#define ftdm_mutex_unlock(_x) _ftdm_mutex_unlock(__FILE__, __LINE__, __FUNCTION__, _x)
+#define ftdm_mutex_unlock(_x) _ftdm_mutex_unlock(__FILE__, __LINE__, __FTDM_FUNC__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_unlock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_create(ftdm_interrupt_t **cond, ftdm_socket_t device, ftdm_wait_flag_t device_flags);
index b2a9ce2bdd3707b4d943baae2ab0f068293f74fe..733a561dcc421b7a19ebea1a9792cb0ea088bc76 100644 (file)
@@ -106,7 +106,7 @@ typedef ftdm_status_t (*ftdm_channel_state_processor_t)(ftdm_channel_t *fchan);
 FT_DECLARE(ftdm_status_t) ftdm_channel_advance_states(ftdm_channel_t *fchan);
 
 FT_DECLARE(ftdm_status_t) _ftdm_channel_complete_state(const char *file, const char *function, int line, ftdm_channel_t *fchan);
-#define ftdm_channel_complete_state(obj) _ftdm_channel_complete_state(__FILE__, __FUNCTION__, __LINE__, obj)
+#define ftdm_channel_complete_state(obj) _ftdm_channel_complete_state(__FILE__, __FTDM_FUNC__, __LINE__, obj)
 FT_DECLARE(int) ftdm_check_state_all(ftdm_span_t *span, ftdm_channel_state_t state);
 
 /*!
@@ -201,7 +201,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_set_state(const char *file, const char *f
  * */
 FT_DECLARE(ftdm_status_t) _ftdm_set_state(const char *file, const char *func, int line,
                        ftdm_channel_t *fchan, ftdm_channel_state_t state);
-#define ftdm_set_state(obj, s) _ftdm_set_state(__FILE__, __FUNCTION__, __LINE__, obj, s);                                                                      \
+#define ftdm_set_state(obj, s) _ftdm_set_state(__FILE__, __FTDM_FUNC__, __LINE__, obj, s);                                                                     \
 
 /*!\brief This macro is deprecated, signaling modules should always lock the channel themselves anyways since they must
  * process first the user pending state changes then set a new state before releasing the lock 
@@ -211,11 +211,11 @@ FT_DECLARE(ftdm_status_t) _ftdm_set_state(const char *file, const char *func, in
 #define ftdm_set_state_locked(obj, s) \
        do { \
                ftdm_channel_lock(obj); \
-               ftdm_channel_set_state(__FILE__, __FUNCTION__, __LINE__, obj, s, 0, NULL);                                                                      \
+               ftdm_channel_set_state(__FILE__, __FTDM_FUNC__, __LINE__, obj, s, 0, NULL);                                                                     \
                ftdm_channel_unlock(obj); \
        } while(0);
 
-#define ftdm_set_state_r(obj, s, r) r = ftdm_channel_set_state(__FILE__, __FUNCTION__, __LINE__, obj, s, 0);
+#define ftdm_set_state_r(obj, s, r) r = ftdm_channel_set_state(__FILE__, __FTDM_FUNC__, __LINE__, obj, s, 0);
 
 #define ftdm_set_state_all(span, state) \
        do { \
index ee3406ea31b61d0da431f24ba6891bb8e57851c4..6cd4e191e26d66cee3be179d924064e35240d317 100755 (executable)
@@ -337,10 +337,6 @@ typedef struct ftdm_module {
        char path[256];
 } ftdm_module_t;
 
-#ifndef __FUNCTION__
-#define __FUNCTION__ (const char *)__func__
-#endif
-
 typedef struct ftdm_fsk_data_state ftdm_fsk_data_state_t;
 typedef int (*ftdm_fsk_data_decoder_t)(ftdm_fsk_data_state_t *state);
 typedef ftdm_status_t (*ftdm_fsk_write_sample_t)(int16_t *buf, ftdm_size_t buflen, void *user_data);
index 786f5929823a13d78a9573a7f41ed5f73fe3cdfa..bbc1f2236eea63cc26b6ab4fa4224a87ae08602d 100644 (file)
@@ -234,7 +234,7 @@ static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type,
 
 static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event) 
 {
-       printf("%s: Caught Event %d (%s)\n", __FUNCTION__, event_type, sangoma_pri_event_str(event_type));
+       printf("%s: Caught Event %d (%s)\n", __FTDM_FUNC__, event_type, sangoma_pri_event_str(event_type));
        return 0;
 }