diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-07-19 00:32:36 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-07-19 00:32:36 +0200 |
| commit | ef9ee6116ba145f8a09ecc614bb000004a302145 (patch) | |
| tree | e11a5df7da48a5fe348a10ab9695581a2a3b766b | |
| parent | 7b6071208eb98bb1eaeb667e2fc3869896ed7123 (diff) | |
VIRT-PHY: Don't redefine GSMTAP port number, use libosmocore
Change-Id: I11d04d76292c52ec5ab70893e8c6a2e55586b2ec
| -rw-r--r-- | src/host/virt_phy/include/virtphy/virtual_um.h | 2 | ||||
| -rw-r--r-- | src/host/virt_phy/src/virtphy.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/host/virt_phy/include/virtphy/virtual_um.h b/src/host/virt_phy/include/virtphy/virtual_um.h index 79d74a59..52f2df64 100644 --- a/src/host/virt_phy/include/virtphy/virtual_um.h +++ b/src/host/virt_phy/include/virtphy/virtual_um.h @@ -17,9 +17,7 @@ #define VIRT_UM_MSGB_SIZE 256 #define DEFAULT_MS_MCAST_GROUP "239.193.23.1" -#define DEFAULT_MS_MCAST_PORT 4729 /* IANA-registered port for GSMTAP */ #define DEFAULT_BTS_MCAST_GROUP "239.193.23.2" -#define DEFAULT_BTS_MCAST_PORT 4729 /* IANA-registered port for GSMTAP */ struct virt_um_inst { void *priv; diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c index 43346ed4..28dd685b 100644 --- a/src/host/virt_phy/src/virtphy.c +++ b/src/host/virt_phy/src/virtphy.c @@ -21,6 +21,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> +#include <osmocom/core/gsmtap.h> #include <stdint.h> #include <string.h> #include <stdio.h> @@ -34,12 +35,11 @@ #include <virtphy/logging.h> #include <virtphy/virt_l1_sched.h> -#define DEFAULT_MCAST_PORT 4729 /* IANA-registered port for GSMTAP */ #define DEFAULT_LOG_MASK "DL1C,1:DVIRPHY,1" static char *dl_rx_grp = DEFAULT_MS_MCAST_GROUP; static char *ul_tx_grp = DEFAULT_BTS_MCAST_GROUP; -static int port = DEFAULT_MCAST_PORT; +static int port = GSMTAP_UDP_PORT; static char *log_mask = DEFAULT_LOG_MASK; static char *l1ctl_sock_path = L1CTL_SOCK_PATH; static char *arfcn_sig_lev_red_mask = NULL; |