Change in libosmocore[master]: ns2: vty: allow the users (pcu/sgsn) to set a default bind

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20388 )

Change subject: ns2: vty: allow the users (pcu/sgsn) to set a default bind
......................................................................

ns2: vty: allow the users (pcu/sgsn) to set a default bind

The SGSN will always bind to 0.0.0.0 in difference the PCU bind is depending
on the info indication. Allow to the user to define a default bind
address.

Change-Id: I2a9dcd14f4ad16211c0f6d98812ad4a13e910c2a
---
M include/osmocom/gprs/gprs_ns2.h
M src/gb/gprs_ns2_vty.c
2 files changed, 11 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h
index 036c594..5cebf27 100644
--- a/include/osmocom/gprs/gprs_ns2.h
+++ b/include/osmocom/gprs/gprs_ns2.h
@@ -9,6 +9,7 @@
 #include <osmocom/core/prim.h>
 
 struct osmo_sockaddr;
+struct osmo_sockaddr_str;
 
 struct gprs_ns2_inst;
 struct gprs_ns2_nse;
@@ -157,7 +158,7 @@
 char *gprs_ns2_ll_str_c(const void *ctx, struct gprs_ns2_vc *nsvc);
 
 /* vty */
-int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi);
+int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi, struct osmo_sockaddr_str *default_bind);
 int gprs_ns2_vty_create();
 void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, const char *reason);
 
diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c
index 321b23f..824466b 100644
--- a/src/gb/gprs_ns2_vty.c
+++ b/src/gb/gprs_ns2_vty.c
@@ -690,7 +690,13 @@
 	return CMD_SUCCESS;
 }
 
-int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi)
+/**
+ * gprs_ns2_vty_init initialize the vty
+ * \param[inout] nsi
+ * \param[in] default_bind set the default address to bind to. Can be NULL.
+ * \return 0 on success
+ */
+int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi, struct osmo_sockaddr_str *default_bind)
 {
 	static bool vty_elements_installed = false;
 
@@ -698,6 +704,8 @@
 	memset(&priv, 0, sizeof(struct ns2_vty_priv));
 	INIT_LLIST_HEAD(&priv.vtyvc);
 	priv.vc_mode = NS2_VC_MODE_BLOCKRESET;
+	if (default_bind)
+		memcpy(&priv.udp, default_bind, sizeof(*default_bind));
 
 	/* Regression test code may call this function repeatedly, so make sure
 	 * that VTY elements are not duplicated, which would assert. */

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20388
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2a9dcd14f4ad16211c0f6d98812ad4a13e910c2a
Gerrit-Change-Number: 20388
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201005/dcbc4dd8/attachment.htm>