rlm_sigtran/bsc_sccp: remove duplicate include and fix sls_for_src_ref return type

diff --git a/src/modules/rlm_sigtran/libosmo-m3ua/bsc_sccp.c b/src/modules/rlm_sigtran/libosmo-m3ua/bsc_sccp.c
index 710f850a5e5675b6ef1c93a6c4a78eecc185e9ca..2503e1586dc3565d366c6f5a475e40feaeb62fe8 100644 (file)
--- a/src/modules/rlm_sigtran/libosmo-m3ua/bsc_sccp.c
+++ b/src/modules/rlm_sigtran/libosmo-m3ua/bsc_sccp.c
@@ -24,7 +24,6 @@
 
 #include <cellmgr_debug.h>
 #include <ss7_application.h>
-#include <ss7_application.h>
 
 #include <osmocom/core/talloc.h>
 
@@ -81,7 +80,7 @@ struct active_sccp_con *find_con_by_src_dest_ref(struct ss7_application *fw,
        return NULL;
 }
 
-unsigned int sls_for_src_ref(struct ss7_application *fw, struct sccp_source_reference *ref)
+int sls_for_src_ref(struct ss7_application *fw, struct sccp_source_reference *ref)
 {
        struct active_sccp_con *con;
 

diff --git a/src/modules/rlm_sigtran/libosmo-m3ua/include/bsc_sccp.h b/src/modules/rlm_sigtran/libosmo-m3ua/include/bsc_sccp.h
index 0a1adb06b5bf4c4b656810730ba6bece8aa19718..b9293b71db3f700323039690010e0d9c3b37cb8d 100644 (file)
--- a/src/modules/rlm_sigtran/libosmo-m3ua/include/bsc_sccp.h
+++ b/src/modules/rlm_sigtran/libosmo-m3ua/include/bsc_sccp.h
@@ -67,7 +67,7 @@ struct active_sccp_con *find_con_by_dest_ref(struct ss7_application *, struct sc
 struct active_sccp_con *find_con_by_src_ref(struct ss7_application *,struct sccp_source_reference *src_ref);
 struct active_sccp_con *find_con_by_src_dest_ref(struct ss7_application *, struct sccp_source_reference *src_ref,
                                                 struct sccp_source_reference *dst_ref);
-unsigned int sls_for_src_ref(struct ss7_application *, struct sccp_source_reference *ref);
+int sls_for_src_ref(struct ss7_application *, struct sccp_source_reference *ref);
 
 void app_resources_released(struct ss7_application *ss7);
 void app_clear_connections(struct ss7_application *ss7);

diff --git a/src/modules/rlm_sigtran/libosmo-m3ua/sccp_state.c b/src/modules/rlm_sigtran/libosmo-m3ua/sccp_state.c
index e873a40ffe6ccb137b1b8af0def25d10bfaef0aa..017cb5376d1372a4224ba1b0e49c4f319d76a3d4 100644 (file)
--- a/src/modules/rlm_sigtran/libosmo-m3ua/sccp_state.c
+++ b/src/modules/rlm_sigtran/libosmo-m3ua/sccp_state.c
@@ -345,7 +345,7 @@ static void handle_rlsd(struct ss7_application *app, struct sccp_connection_rele
                                 &rlsd->source_local_reference);
                }
        } else {
-               unsigned int sls = -1;
+               int sls = -1;
                con = find_con_by_src_dest_ref(app, &rlsd->source_local_reference,
                                               &rlsd->destination_local_reference);
                if (con) {
@@ -575,7 +575,7 @@ void msc_dispatch_sccp(struct msc_connection *msc, struct msgb *msg)
                } else if (rc == BSS_FILTER_CLEAR_COMPL) {
                        LOGP(DMSC, LOGL_ERROR, "Clear Complete from the network.\n");
                } else if (set->sccp_up) {
-                       unsigned int sls;
+                       int sls;
 
                        update_con_state(msc->app, rc, &result, msg, 1, 0);
                        sls = sls_for_src_ref(msc->app, result.destination_local_reference);