freetdm - ISDN fix for callback pointers

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 75379eef643c00d95976dede28ae77631e871054..cd09f8606d1f39dd9d4cacf3469d52401738a60f 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
@@ -1156,10 +1156,9 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_isdn_init)
        g_sngisdn_event_interface.cc.sng_fac_ind        = sngisdn_rcv_fac_ind;
        g_sngisdn_event_interface.cc.sng_sta_cfm        = sngisdn_rcv_sta_cfm;
        g_sngisdn_event_interface.cc.sng_srv_ind        = sngisdn_rcv_srv_ind;
-       g_sngisdn_event_interface.cc.sng_srv_ind        = sngisdn_rcv_srv_cfm;
-       g_sngisdn_event_interface.cc.sng_rst_ind        = sngisdn_rcv_rst_cfm;
+       g_sngisdn_event_interface.cc.sng_srv_cfm        = sngisdn_rcv_srv_cfm;
        g_sngisdn_event_interface.cc.sng_rst_ind        = sngisdn_rcv_rst_ind;
-       g_sngisdn_event_interface.cc.sng_rst_cfm        = sngisdn_rcv_rst_cfm;
+       g_sngisdn_event_interface.cc.sng_rst_cfm        = sngisdn_rcv_rst_cfm;
 
        g_sngisdn_event_interface.lg.sng_log            = sngisdn_rcv_sng_log;
        g_sngisdn_event_interface.lg.sng_assert         = sngisdn_rcv_sng_assert;

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
index 8c8c8d51596c0725b46dd1d1281819b1bdf3f4be..31994c7c6eb671d73aad4725d96c9de68896d4c7 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
@@ -915,7 +915,7 @@ static ftdm_status_t sngisdn_map_call(sngisdn_span_data_t *signal_data, sngisdn_
                case PROT_Q931_MSGTYPE_USER_INFO:
                case PROT_Q931_MSGTYPE_DISCONNECT:
                case PROT_Q931_MSGTYPE_RELEASE:
-               case PROT_Q931_MSGTYPE_RELEASE_ACK:
+               case PROT_Q931_MSGTYPE_RESTART_ACK:
                case PROT_Q931_MSGTYPE_RELEASE_COMPLETE:
                case PROT_Q931_MSGTYPE_FACILITY:
                case PROT_Q931_MSGTYPE_NOTIFY:

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
index db33cf8083b617c41053a6446bf45bddeef3b403..ca6683d4e343570012f9984deebf4da6c0f38186 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
@@ -211,7 +211,7 @@ struct code2str dcodQ931CallRefLoTable[] = {
 #define PROT_Q931_MSGTYPE_DISCONNECT           69
 #define PROT_Q931_MSGTYPE_RESTART                      70
 #define PROT_Q931_MSGTYPE_RELEASE                      77
-#define PROT_Q931_MSGTYPE_RELEASE_ACK          78
+#define PROT_Q931_MSGTYPE_RESTART_ACK          78
 #define PROT_Q931_MSGTYPE_RELEASE_COMPLETE     90
 #define PROT_Q931_MSGTYPE_SEGMENT                      96
 #define PROT_Q931_MSGTYPE_FACILITY                     98
@@ -240,7 +240,7 @@ struct code2str dcodQ931MsgTypeTable[] = {
        {PROT_Q931_MSGTYPE_DISCONNECT, "DISCONNECT"},
        {PROT_Q931_MSGTYPE_RESTART, "RESTART"},
        {PROT_Q931_MSGTYPE_RELEASE, "RELEASE"},
-       {PROT_Q931_MSGTYPE_RELEASE_ACK, "RELEASR ACK"},
+       {PROT_Q931_MSGTYPE_RESTART_ACK, "RESTART ACK"},
        {PROT_Q931_MSGTYPE_RELEASE_COMPLETE, "RELEASE COMPLETE"},
        {PROT_Q931_MSGTYPE_SEGMENT, "SEGMENT"},
        {PROT_Q931_MSGTYPE_FACILITY, "FACILITY"},