pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sigtran/+/38641?usp=email )
Change subject: sigtran: Make LOG SS7 macros private
......................................................................
sigtran: Make LOG SS7 macros private
Those macros are intended for internal use only, since they access
private headers of the objects. They are currently not used outside of
libosmo-sigtran, so its safe making them private.
Change-Id: I9cb852d92086fd04aafe512545553601effe7308
---
M include/osmocom/sigtran/osmo_ss7.h
M src/ss7_internal.h
M src/xua_asp_fsm.c
M src/xua_rkm.c
M src/xua_shared.c
M src/xua_snm.c
6 files changed, 14 insertions(+), 9 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/sigtran/osmo_ss7.h
b/include/osmocom/sigtran/osmo_ss7.h
index 9a754cd..4aa1e1c 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -423,15 +423,6 @@
void osmo_ss7_register_rx_unknown_cb(osmo_ss7_asp_rx_unknown_cb *cb);
-#define _LOGSS7(inst, subsys, level, fmt, args ...) \
- LOGP(subsys, level, "%u: " fmt, inst ? (inst)->cfg.id : 0, ## args)
-#define LOGSS7(inst, level, fmt, args ...) _LOGSS7(inst, DLSS7, level,
fmt, ## args)
-
-#define LOGPASP(asp, subsys, level, fmt, args ...) \
- _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ##
args)
-#define LOGPAS(as, subsys, level, fmt, args ...) \
- _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ##
args)
-
/***********************************************************************
* xUA Servers
***********************************************************************/
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index dcc2ef1..9a10fab 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -50,3 +50,13 @@
SS7_ASP_CTR_PKT_RX_UNKNOWN,
SS7_ASP_CTR_PKT_TX_TOTAL,
};
+
+#define _LOGSS7(inst, subsys, level, fmt, args ...) \
+ LOGP(subsys, level, "%u: " fmt, inst ? (inst)->cfg.id : 0, ## args)
+#define LOGSS7(inst, level, fmt, args ...) \
+ _LOGSS7(inst, DLSS7, level, fmt, ## args)
+
+#define LOGPASP(asp, subsys, level, fmt, args ...) \
+ _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ##
args)
+#define LOGPAS(as, subsys, level, fmt, args ...) \
+ _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ##
args)
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index ec4edb0..3a9be3f 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -27,6 +27,7 @@
#include "xua_msg.h"
#include <osmocom/sigtran/protocol/sua.h>
+#include "ss7_internal.h"
#include "xua_asp_fsm.h"
#include "xua_as_fsm.h"
#include "xua_internal.h"
diff --git a/src/xua_rkm.c b/src/xua_rkm.c
index 38fb903..5a7bc2e 100644
--- a/src/xua_rkm.c
+++ b/src/xua_rkm.c
@@ -28,6 +28,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/protocol/m3ua.h>
+#include "ss7_internal.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "xua_internal.h"
diff --git a/src/xua_shared.c b/src/xua_shared.c
index 45f78d4..15b9b52 100644
--- a/src/xua_shared.c
+++ b/src/xua_shared.c
@@ -34,6 +34,7 @@
#include <osmocom/sigtran/protocol/m3ua.h>
#include <osmocom/sigtran/protocol/sua.h>
+#include "ss7_internal.h"
#include "xua_internal.h"
/* if given ASP only has one AS, return that AS */
diff --git a/src/xua_snm.c b/src/xua_snm.c
index c7d0d2e..b5737cd 100644
--- a/src/xua_snm.c
+++ b/src/xua_snm.c
@@ -31,6 +31,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include <osmocom/sigtran/protocol/mtp.h>
+#include "ss7_internal.h"
#include "xua_internal.h"
#include "sccp_internal.h"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38641?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I9cb852d92086fd04aafe512545553601effe7308
Gerrit-Change-Number: 38641
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
