[MERGED] osmocom-bb[master]: VIRT-PHY: Don't redefine GSMTAP port number, use libosmocore

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: VIRT-PHY: Don't redefine GSMTAP port number, use libosmocore
......................................................................


VIRT-PHY: Don't redefine GSMTAP port number, use libosmocore

Change-Id: I11d04d76292c52ec5ab70893e8c6a2e55586b2ec
---
M src/host/virt_phy/include/virtphy/virtual_um.h
M src/host/virt_phy/src/virtphy.c
2 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/host/virt_phy/include/virtphy/virtual_um.h b/src/host/virt_phy/include/virtphy/virtual_um.h
index 79d74a5..52f2df6 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 43346ed..28dd685 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;

-- 
To view, visit https://gerrit.osmocom.org/3285
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I11d04d76292c52ec5ab70893e8c6a2e55586b2ec
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder