laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29064 ) Change subject: Use Osmux default port define from libosmo-netif ...................................................................... Use Osmux default port define from libosmo-netif Change-Id: Ibf5fbec591307232be98cad914c0df4b2993db15 Requires: libosmo-netif.git Ibfd058bceeeaa1384a00d8fcd6d6268b445e19bd --- M TODO-RELEASE M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index c5a3b36..746808e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,3 +24,4 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line +libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index 99b44d1..f138901 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -4,9 +4,6 @@ #include <osmocom/netif/osmux.h> struct mgcp_conn_rtp; - -#define OSMUX_PORT 1984 - enum { OSMUX_ROLE_BSC = 0, OSMUX_ROLE_BSC_NAT, diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index a05733f..796db85 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -1734,7 +1734,7 @@ int rc; struct mgcp_trunk *trunk; - cfg->osmux_port = OSMUX_PORT; + cfg->osmux_port = OSMUX_DEFAULT_PORT; cfg->osmux_batch = 4; cfg->osmux_batch_size = OSMUX_BATCH_DEFAULT_MAX; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibf5fbec591307232be98cad914c0df4b2993db15 Gerrit-Change-Number: 29064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-MessageType: merged