summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-21 16:25:47 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-22 21:25:08 +0200
commite40a123bdf030a5691f01140c6e632de03bcfaf6 (patch)
treee3c3586df957383a13dcb9defd62a04cb50c1ff1
parentfd60925358a5daf08d7f3b509521b3c922527a7d (diff)
MSC,SGSN: use OSMO_GSUP_PORT == 4222 instead of 2222
In SGSN, actually place the port in the SGSN config by default, so that the gsup port may now be omitted in the VTY config (the IP address suffices). Adjust the osmo-sgsn.cfg example. Depends: I4222e21686c823985be8ff1f16b1182be8ad6175 (libosmocore) Change-Id: I50f2040e2eb0baacb43849e93cfed10cbc2fc156
-rw-r--r--openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg2
-rw-r--r--openbsc/include/openbsc/osmo_msc.h3
-rw-r--r--openbsc/src/gprs/sgsn_main.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg
index 01be51381..4189adc9c 100644
--- a/openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg
+++ b/openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg
@@ -11,7 +11,7 @@ sgsn
ggsn 0 gtp-version 1
auth-policy remote
gsup remote-ip 127.0.0.1
- gsup remote-port 2222
+ gsup remote-port 4222
!
ns
timer tns-block 3
diff --git a/openbsc/include/openbsc/osmo_msc.h b/openbsc/include/openbsc/osmo_msc.h
index 88b5f7153..cdfd27f11 100644
--- a/openbsc/include/openbsc/osmo_msc.h
+++ b/openbsc/include/openbsc/osmo_msc.h
@@ -4,13 +4,14 @@
#define OSMO_MSC_H
#include <osmocom/core/fsm.h>
+#include <osmocom/gsm/gsup.h>
#include <openbsc/gsm_data.h>
#include "bsc_api.h"
#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1"
-#define MSC_HLR_REMOTE_PORT_DEFAULT 2222
+#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT
enum subscr_conn_fsm_event {
/* Mark 0 as invalid to catch uninitialized vars */
diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c
index 52c300cee..95b81bf2c 100644
--- a/openbsc/src/gprs/sgsn_main.c
+++ b/openbsc/src/gprs/sgsn_main.c
@@ -40,6 +40,8 @@
#include <osmocom/core/logging.h>
#include <osmocom/core/stats.h>
+#include <osmocom/gsm/gsup.h>
+
#include <osmocom/gprs/gprs_ns.h>
#include <osmocom/gprs/gprs_bssgp.h>
@@ -85,6 +87,7 @@ static struct sgsn_instance sgsn_inst = {
.cfg = {
.gtp_statedir = "./",
.auth_policy = SGSN_AUTH_POLICY_CLOSED,
+ .gsup_server_port = OSMO_GSUP_PORT,
},
};
struct sgsn_instance *sgsn = &sgsn_inst;