pespin has uploaded this change for review. ( 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 2 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/41/38641/1
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 6fbe76c..d558014 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -402,15 +402,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)