osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

PFCP: add DLPFCP and osmo-upf port numbers 

Related: SYS#5599
Change-Id: I0a46b147ec6a76d909df28136cfd2b764b2c75ea
This commit is contained in:
Neels Hofmeyr 2021-11-26 11:02:47 +01:00
parent bdd7df3c83
commit 13fa00e183
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osmocom/core/logging.h
View File

@ -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 DLNSDATA -22 /*!< Osmocom NS layer data pdus */
#define DLNSSIGNAL -23 /*!< Osmocom NS layer signal pdus */ #define DLNSSIGNAL -23 /*!< Osmocom NS layer signal pdus */
#define DLIUUP -24 /*!< Osmocom IuUP layer */ #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 */ /* Colors that can be used in log_info_cat.color */
#define OSMO_LOGCOLOR_NORMAL NULL #define OSMO_LOGCOLOR_NORMAL NULL

2
include/osmocom/ctrl/ports.h
View File

@ -30,4 +30,6 @@
#define OSMO_CTRL_PORT_SMLC 4272 #define OSMO_CTRL_PORT_SMLC 4272
/* 4273 used by VTY interface */ /* 4273 used by VTY interface */
#define OSMO_CTRL_PORT_HNODEB 4274 #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. */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */

2
include/osmocom/vty/ports.h
View File

@ -42,4 +42,6 @@
/* 4272 used by control interface */ /* 4272 used by control interface */
#define OSMO_VTY_PORT_HNODEB 4273 #define OSMO_VTY_PORT_HNODEB 4273
/* 4274 used by control interface */ /* 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. */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */

6
src/logging.c
View File

@ -301,6 +301,12 @@ static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = {
.enabled = 1, .loglevel = LOGL_NOTICE, .enabled = 1, .loglevel = LOGL_NOTICE,
.color = "\033[38;5;65m", .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) void assert_loginfo(const char *src)

5
tests/logging/logging_vty_test.vty
View File

@ -54,7 +54,7 @@ logging_vty_test# list
logging print level (0|1) logging print level (0|1)
logging print file (0|1|basename) [last] logging print file (0|1|basename) [last]
logging set-log-mask MASK 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 set-all (debug|info|notice|error|fatal)
logging level force-all (debug|info|notice|error|fatal) logging level force-all (debug|info|notice|error|fatal)
no logging level force-all no logging level force-all
@ -472,7 +472,7 @@ DEEE FATAL Log message for DEEE on level LOGL_FATAL
logging_vty_test# list 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? logging_vty_test# logp?
@ -508,6 +508,7 @@ logging_vty_test# logp ?
lnsdata GPRS NS layer data PDU lnsdata GPRS NS layer data PDU
lnssignal GPRS NS layer signal PDU lnssignal GPRS NS layer signal PDU
liuup Iu UP layer liuup Iu UP layer
lpfcp libosmo-pfcp Packet Forwarding Control Protocol
logging_vty_test# logp lglobal ? logging_vty_test# logp lglobal ?
debug Log debug messages and higher levels debug Log debug messages and higher levels