make sure we don't have namespace clashes between libraries and apps

* All loging prefixes in libraries should be DL like DLINP
* All signals / subsystems should be called S_L_* SS_L_*
* All command nodes should be called L_*_NODE

This makes sure existinc code still compiles as expected

diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index 04692d3..20c1254 100644 (file)
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -39,12 +39,12 @@ void logp(int subsys, char *file, int line, int cont, const char *format, ...) _
 /* logging levels defined by the library itself */
 #define DLGLOBAL       -1
 #define DLLAPDM                -2
-#define DINP           -3
-#define DMUX           -4
-#define DMI            -5
-#define DMIB           -6
-#define DRSL           -7
-#define DNM            -8
+#define DLINP          -3
+#define DLMUX          -4
+#define DLMI           -5
+#define DLMIB          -6
+#define DLRSL          -7
+#define DLNM           -8
 #define OSMO_NUM_DLIB  9
 
 struct log_category {

diff --git a/include/osmocom/core/signal.h b/include/osmocom/core/signal.h
index 7c32c77..2442e51 100644 (file)
--- a/include/osmocom/core/signal.h
+++ b/include/osmocom/core/signal.h
@@ -11,8 +11,8 @@
 
 /* signal subsystems. */
 enum {
-       SS_GLOBAL               = OSMO_SIGNAL_SS_RESERVED,
-       SS_INPUT,
+       SS_L_GLOBAL             = OSMO_SIGNAL_SS_RESERVED,
+       SS_L_INPUT,
 };
 
 /* application-defined signal types. */
@@ -21,7 +21,7 @@ enum {
 
 /* signal types. */
 enum {
-       S_GLOBAL_SHUTDOWN       = OSMO_SIGNAL_T_RESERVED,
+       S_L_GLOBAL_SHUTDOWN     = OSMO_SIGNAL_T_RESERVED,
 };
 
 typedef int osmo_signal_cbfn(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data);

diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h
index 4104d76..a6c2c5c 100644 (file)
--- a/include/osmocom/vty/command.h
+++ b/include/osmocom/vty/command.h
@@ -74,8 +74,8 @@ enum node_type {
 
        VTY_NODE,               /* Vty node. */
 
-       E1INP_NODE,             /* E1 line in libosmo-abis. */
-       IPA_NODE,               /* IPA proxying commands in libosmo-abis. */
+       L_E1INP_NODE,           /* E1 line in libosmo-abis. */
+       L_IPA_NODE,             /* IPA proxying commands in libosmo-abis. */
 
        _LAST_OSMOVTY_NODE
 };

diff --git a/src/logging.c b/src/logging.c
index 6aad6e1..52f401c 100644 (file)
--- a/src/logging.c
+++ b/src/logging.c
@@ -72,35 +72,35 @@ static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = {
                .loglevel = LOGL_NOTICE,
                .enabled = 1,
        },
-       [INT2IDX(DINP)] = {
+       [INT2IDX(DLINP)] = {
                .name = "DINP",
                .description = "A-bis Intput Subsystem",
                .loglevel = LOGL_NOTICE,
                .enabled = 1,
        },
-       [INT2IDX(DMUX)] = {
+       [INT2IDX(DLMUX)] = {
                .name = "DMUX",
                .description = "A-bis B-Subchannel TRAU Frame Multiplex",
                .loglevel = LOGL_NOTICE,
                .enabled = 1,
        },
-       [INT2IDX(DMI)] = {
+       [INT2IDX(DLMI)] = {
                .name = "DMI",
                .description = "A-bis Input Driver for Signalling",
                .enabled = 0, .loglevel = LOGL_NOTICE,
        },
-       [INT2IDX(DMIB)] = {
+       [INT2IDX(DLMIB)] = {
                .name = "DMIB",
                .description = "A-bis Input Driver for B-Channels (voice)",
                .enabled = 0, .loglevel = LOGL_NOTICE,
        },
-       [INT2IDX(DRSL)] = {
+       [INT2IDX(DLRSL)] = {
                .name = "DRSL",
                .description = "A-bis Radio Siganlling Link (RSL)",
                .color = "\033[1;35m",
                .enabled = 1, .loglevel = LOGL_NOTICE,
        },
-       [INT2IDX(DNM)] = {
+       [INT2IDX(DLNM)] = {
                .name = "DNM",
                .description = "A-bis Network Management / O&M (NM/OML)",
                .color = "\033[1;36m",