Attention is currently required from: laforge.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/29285
to look at the new patch set (#2).
Change subject: Introduce Osmux support
......................................................................
Introduce Osmux support
Related: SYS#5987
Requires: libosmo-netif.git Change-Id I632654221826340423e1e97b0f8ed9a2baf6c6c3
Change-Id: Ib80be434c06d07b3611bd18ae25dff8b14a7aad9
---
M TODO-RELEASE
M configure.ac
A doc/manuals/chapters/osmux_bts.adoc
M doc/manuals/osmobts-usermanual.adoc
M include/osmo-bts/Makefile.am
M include/osmo-bts/bts.h
M include/osmo-bts/l1sap.h
M include/osmo-bts/lchan.h
M include/osmo-bts/logging.h
A include/osmo-bts/osmux.h
M include/osmo-bts/vty.h
M src/common/Makefile.am
M src/common/bts.c
M src/common/l1sap.c
M src/common/lchan.c
M src/common/logging.c
M src/common/main.c
A src/common/osmux.c
M src/common/rsl.c
M src/common/vty.c
20 files changed, 883 insertions(+), 46 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/29285/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29285
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib80be434c06d07b3611bd18ae25dff8b14a7aad9
Gerrit-Change-Number: 29285
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29292 )
Change subject: utils.h: protect param with parenthesis in OSMO_BYTES_FOR_BITS()
......................................................................
utils.h: protect param with parenthesis in OSMO_BYTES_FOR_BITS()
While at it, drop 8-1 i nfavour of 7. I don't think it is really more
understandable for readers to see some subtraction there...
Change-Id: I8b21eba9b9aa952f86abe7a6d4cdb1d1a61d9deb
---
M include/osmocom/core/utils.h
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/29292/1
diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index ba2cafb..d0e2e9b 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -33,7 +33,7 @@
/*! Make a value_string entry from an enum value name */
#define OSMO_VALUE_STRING(x) { x, #x }
/*! Number of bytes necessary to store given BITS */
-#define OSMO_BYTES_FOR_BITS(BITS) ((BITS + 8 - 1) / 8)
+#define OSMO_BYTES_FOR_BITS(BITS) (((BITS) + 7) / 8)
/*! Copy a C-string into a sized buffer using sizeof to detect buffer's size */
#define OSMO_STRLCPY_ARRAY(array, src) osmo_strlcpy(array, src, sizeof(array))
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29292
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I8b21eba9b9aa952f86abe7a6d4cdb1d1a61d9deb
Gerrit-Change-Number: 29292
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29288 )
Change subject: mgw: Fix osmux conn local IP selection
......................................................................
mgw: Fix osmux conn local IP selection
The local Osmux IP address (cfg->osmux_addr) was never applied in
generated MGCP messages. Instead, the RTP one was written into the
MGCP message.
Related: SYS#5987
Change-Id: I305f2501221e86d1eb0140446c03f36698f3194a
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index bcc6652..70193e9 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -111,6 +111,17 @@
bool rem_addr_set = !addr_is_any(&conn->end.addr);
char *bind_addr;
+ /* Osmux: No smart IP addresses allocation is supported yet. Simply
+ * return the one set in VTY config: */
+ if (mgcp_conn_rtp_is_osmux(conn)) {
+ bind_addr = conn->conn->endp->trunk->cfg->osmux_addr;
+ LOGPCONN(conn->conn, DRTP, LOGL_DEBUG,
+ "using configured osmux bind ip as local bind ip %s\n",
+ bind_addr);
+ osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN);
+ return;
+ }
+
/* Try probing the local IP-Address */
if (endp->trunk->cfg->net_ports.bind_addr_probe && rem_addr_set) {
rc = osmo_sock_local_ip(addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf));
@@ -125,7 +136,7 @@
}
}
- /* Select from preconfigured IP-Addresses. We don't have bind_addr for Osmux (yet?). */
+ /* Select from preconfigured IP-Addresses. */
if (rem_addr_set) {
/* Check there is a bind IP for the RTP traffic configured,
* if so, use that IP-Address */
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29288
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I305f2501221e86d1eb0140446c03f36698f3194a
Gerrit-Change-Number: 29288
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged