diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 4a34c7d65..9c498761e 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -137,7 +137,8 @@ void logp(int subsys, const char *file, int line, int cont, const char *format, #define DLNSDATA -22 /*!< Osmocom NS layer data pdus */ #define DLNSSIGNAL -23 /*!< Osmocom NS layer signal pdus */ #define DLIUUP -24 /*!< Osmocom IuUP layer */ -#define OSMO_NUM_DLIB 24 /*!< Number of logging sub-systems in libraries */ +#define DLPFCP -25 /*!< Osmocom Packet Forwarding Control Protocol */ +#define OSMO_NUM_DLIB 25 /*!< Number of logging sub-systems in libraries */ /* Colors that can be used in log_info_cat.color */ #define OSMO_LOGCOLOR_NORMAL NULL diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index 56d663a6f..d2879402d 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -30,4 +30,6 @@ #define OSMO_CTRL_PORT_SMLC 4272 /* 4273 used by VTY interface */ #define OSMO_CTRL_PORT_HNODEB 4274 +/* 4275: OSMO_VTY_PORT_UPF */ +#define OSMO_CTRL_PORT_UPF 4276 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index cfefaa8cb..75ff86f89 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -42,4 +42,6 @@ /* 4272 used by control interface */ #define OSMO_VTY_PORT_HNODEB 4273 /* 4274 used by control interface */ +#define OSMO_VTY_PORT_UPF 4275 +/* 4276: OSMO_CTRL_PORT_UPF */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/src/logging.c b/src/logging.c index 9d2a0651a..94d183fee 100644 --- a/src/logging.c +++ b/src/logging.c @@ -301,6 +301,12 @@ static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = { .enabled = 1, .loglevel = LOGL_NOTICE, .color = "\033[38;5;65m", }, + [INT2IDX(DLPFCP)] = { + .name = "DLPFCP", + .description = "libosmo-pfcp Packet Forwarding Control Protocol", + .enabled = 1, .loglevel = LOGL_NOTICE, + .color = "\033[38;5;51m", + }, }; void assert_loginfo(const char *src) diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index c74accda6..860f5c5c5 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -54,7 +54,7 @@ logging_vty_test# list logging print level (0|1) logging print file (0|1|basename) [last] logging set-log-mask MASK - logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup) (debug|info|notice|error|fatal) + logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup|lpfcp) (debug|info|notice|error|fatal) logging level set-all (debug|info|notice|error|fatal) logging level force-all (debug|info|notice|error|fatal) no logging level force-all @@ -472,7 +472,7 @@ DEEE FATAL Log message for DEEE on level LOGL_FATAL logging_vty_test# list ... - logp (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup) (debug|info|notice|error|fatal) .LOGMESSAGE + logp (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp|lnsdata|lnssignal|liuup|lpfcp) (debug|info|notice|error|fatal) .LOGMESSAGE ... logging_vty_test# logp? @@ -508,6 +508,7 @@ logging_vty_test# logp ? lnsdata GPRS NS layer data PDU lnssignal GPRS NS layer signal PDU liuup Iu UP layer + lpfcp libosmo-pfcp Packet Forwarding Control Protocol logging_vty_test# logp lglobal ? debug Log debug messages and higher levels