[MERGED] osmo-pcap[master]: Use TCP port numbers for VTY that don't overlap with other O...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Use TCP port numbers for VTY that don't overlap with other Osmocom Software
......................................................................


Use TCP port numbers for VTY that don't overlap with other Osmocom Software

osmo-pcap for historical reasons uses the same port numbers as
OsmoPCU and OsmoBTS.  This leads to problems when wanting to run related
software together on one system.  Let's break the historical assumptions
and start with non-overlapping port numbers that are allocated/assigned
from https://osmocom.org/projects/cellular-infrastructure/wiki/Port_Numbers

Change-Id: I638ac0534517931d0987ce9f72f5db4f5b6c16b7
---
M include/osmo-pcap/common.h
M osmoappdesc.py
M src/osmo_client_main.c
M src/osmo_server_main.c
4 files changed, 13 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved



diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h
index 13c76e1..27fd514 100644
--- a/include/osmo-pcap/common.h
+++ b/include/osmo-pcap/common.h
@@ -28,6 +28,15 @@
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/buffer.h>
 #include <osmocom/vty/command.h>
+#include <osmocom/vty/ports.h>
+
+/* support old versions of libosmocore */
+#ifndef OSMO_VTY_PORT_PCAP_CLIENT
+#define OSMO_VTY_PORT_PCAP_CLIENT	4237
+#endif
+#ifndef OSMO_VTY_PORT_PCAP_SERVER
+#define OSMO_VTY_PORT_PCAP_SERVER	4238
+#endif
 
 enum {
 	DPCAP,
diff --git a/osmoappdesc.py b/osmoappdesc.py
index 39928eb..6f66702 100644
--- a/osmoappdesc.py
+++ b/osmoappdesc.py
@@ -20,8 +20,8 @@
 }
 
 apps = [
-    (4241, "src/osmo_pcap_server", "OsmoPCAPServer", "osmo-pcap-server"),
-    (4240, "src/osmo_pcap_client", "OsmoPCAPClient", "osmo-pcap-client"),
+    (4238, "src/osmo_pcap_server", "OsmoPCAPServer", "osmo-pcap-server"),
+    (4237, "src/osmo_pcap_client", "OsmoPCAPClient", "osmo-pcap-client"),
         ]
 
 vty_command = ["src/osmo_pcap_server", "-c", "contrib/osmo-pcap-server.cfg"]
diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c
index 89d7e04..46a49b5 100644
--- a/src/osmo_client_main.c
+++ b/src/osmo_client_main.c
@@ -206,7 +206,7 @@
 
 	osmo_tls_init();
 
-	rc = telnet_init(tall_bsc_ctx, NULL, 4240);
+	rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT);
 	if (rc < 0) {
 		LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");
 		exit(1);
diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c
index 37a9632..95f3ce1 100644
--- a/src/osmo_server_main.c
+++ b/src/osmo_server_main.c
@@ -219,7 +219,7 @@
 
 	osmo_tls_init();
 
-	rc = telnet_init(tall_bsc_ctx, NULL, 4241);
+	rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_SERVER);
 	if (rc < 0) {
 		LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");
 		exit(1);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I638ac0534517931d0987ce9f72f5db4f5b6c16b7
Gerrit-PatchSet: 3
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder