September 2022 - gerrit-log - lists.osmocom.org

Change in meta-telephony[201705]: git clones: protocol=git -> protocol=https

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/29367 ) Change subject: git clones: protocol=git -> protocol=https ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/29367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I482f2eea21dce569b1d30e2e7be2e606cf969e0e Gerrit-Change-Number: 29367 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 15:47:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in meta-telephony[201705]: git clones: protocol=git -> protocol=https

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/29367 ) Change subject: git clones: protocol=git -> protocol=https ...................................................................... Patch Set 1: Verified-1 (1 comment) Patchset: PS1: Can't test whether this works yet due to SYS#6130 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/29367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I482f2eea21dce569b1d30e2e7be2e606cf969e0e Gerrit-Change-Number: 29367 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 13:27:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in meta-telephony[201705]: git clones: protocol=git -> protocol=https

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/29367 ) Change subject: git clones: protocol=git -> protocol=https ...................................................................... git clones: protocol=git -> protocol=https Also fix dead URLs pointing to git.misdn.eu and git.linphone.org. Related: SYS#6022 Change-Id: I482f2eea21dce569b1d30e2e7be2e606cf969e0e --- M recipes-isdn/lcr/lcr_git.bb M recipes-isdn/misdn/misdn-utils_git.bb M recipes-misc/bcg729/bcg729_git.bb M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 23 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/67/29367/1 diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 4bcf762..d50459f 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -8,7 +8,7 @@ PR = "r4" SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" -SRC_URI = "git://git.misdn.eu/lcr.git \ +SRC_URI = "git://github.com/fairwaves/lcr;protocol=https \ file://lcr-disable-gsmfr.diff \ file://0001-Fixed-compiler-warnings.patch \ file://lcr.init " diff --git a/recipes-isdn/misdn/misdn-utils_git.bb b/recipes-isdn/misdn/misdn-utils_git.bb index 74acc62..a1a3fc3 100644 --- a/recipes-isdn/misdn/misdn-utils_git.bb +++ b/recipes-isdn/misdn/misdn-utils_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" SRC_URI = "\ - git://git.misdn.eu/mISDNuser.git;branch=socket \ + git://github.com/ISDN4Linux/mISDNuser;protocol=https \ file://0001-mbuffer-data-size.patch \ " # Release v2.0.19 diff --git a/recipes-misc/bcg729/bcg729_git.bb b/recipes-misc/bcg729/bcg729_git.bb index 27b2b75..cfd5bec 100644 --- a/recipes-misc/bcg729/bcg729_git.bb +++ b/recipes-misc/bcg729/bcg729_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://git.linphone.org/bcg729.git" +SRC_URI = "git://gitlab.linphone.org/BC/public/bcg729.git;protocol=https" SRCREV = "2e36a5d4bc6e992c654eee6b0a8db729da7b1d31" PV = "0+gitr${SRCPV}" diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index c5394b3..8935aa0 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -7,7 +7,7 @@ S = "${WORKDIR}/git" SRCREV = "1.14.1" -SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.14.1+gitr${SRCPV}" PR = "r0" diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 1aeb49f..21014c4 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -7,7 +7,7 @@ file://COPYING.library;md5=2d5025d4aa3495befef8f17206a5b0a1 " # Fork with wavecom support -SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ +SRC_URI = "git://git.gnumonks.org/openmoko-gsmd;protocol=https;branch=master \ file://gsmd \ file://cell-log \ file://default" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 6be7086..9088640 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.9.34" -SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "0.9.34+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index b863e17..0c71e48 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.3.0" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=https;tag=${SRCREV};nobranc…" PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index abd28e8..2f6a53e 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.2.0" -SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git;tag=${SRCREV};nobranch…" +SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=https;tag=${SRCREV};nobran…" PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 0858ac9..756d6a2 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.6.0" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=https;tag=${SRCREV};nobranc…" PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index b721865..63ebb21 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/git" SRCREV = "1.7.0" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=https;tag=${SRCREV};nobranch…" PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 6b1d87e..91b3465 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -5,6 +5,6 @@ PR = "${INC_PR}.0" SRCREV = "21cebdfa29829975e5b94688f3fc8d0b10e3fa14" -SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" +SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=https" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index d556c06..e09f142 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb index 06800e8..eae7f65 100644 --- a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.3.0" -SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=https;tag=${SRCREV};nobranc…" PV = "0.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index ddfb9e3..7394277 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-ggsn;protocol=git;tag=${SRCREV};nobranch=1 \ +SRC_URI = "git://git.osmocom.org/osmo-ggsn;protocol=https;tag=${SRCREV};nobranch=1 \ file://0001-libgtp-set-PDP_MAX-to-128.patch \ " PV = "1.9.0+gitr${SRCPV}" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index b70366c..1cce2b8 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.5.0" -SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb index 4f312cd..9f501e6 100644 --- a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.3.0" -SRC_URI = "git://git.osmocom.org/osmo-hnbgw.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-hnbgw.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index aed46a6..e3d0598 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.3.0" -SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 4b04bf5..4793fd6 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.10.0" -SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.10.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index f6e857e..9da2a08 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index 79595dd..a59cc7b 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.4.0" -SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "0.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index e788fb4..7c5b09a 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=https;tag=${SRCREV};nobranch=1" PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index 6f123ff..107f933 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.6.1" -SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git;tag=${SRCREV};nob…" +SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=https;tag=${SRCREV};n…" PV = "1.6.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index 3b05360..2b48b7a 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.3.2" -SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git;tag=${SRCREV};nobranch=1" +SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=https;tag=${SRCREV};nobranch…" PV = "0.3.2+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/29367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I482f2eea21dce569b1d30e2e7be2e606cf969e0e Gerrit-Change-Number: 29367 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in meta-telephony[201705]: git clones: git.osmocom.org -> gerrit.osmocom.org

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/29368 ) Change subject: git clones: git.osmocom.org -> gerrit.osmocom.org ...................................................................... git clones: git.osmocom.org -> gerrit.osmocom.org Related: SYS#6022 Change-Id: I2b9640b542ed68b3f5abf63e774e4f878232211a --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif.inc M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 20 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/68/29368/1 diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 8935aa0..29acf53 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -7,7 +7,7 @@ S = "${WORKDIR}/git" SRCREV = "1.14.1" -SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/libsmpp34.git;protocol=https;tag=${SRCREV};nobranc…" PV = "1.14.1+gitr${SRCPV}" PR = "r0" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 9088640..021d190 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.9.34" -SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/libasn1c.git;protocol=https;tag=${SRCREV};nobranch…" PV = "0.9.34+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 0c71e48..f8d405f 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.3.0" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=https;tag=${SRCREV};nobranc…" +SRC_URI = "git://gerrit.osmocom.org/libosmo-abis.git;protocol=https;tag=${SRCREV};nobr…" PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index 7098c42..04025cf 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Osmocom network interface library" -HOMEPAGE = "http://git.osmocom.org" +HOMEPAGE = "http://gerrit.osmocom.org" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 2f6a53e..e230a84 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.2.0" -SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=https;tag=${SRCREV};nobran…" +SRC_URI = "git://gerrit.osmocom.org/libosmo-netif.git;protocol=https;tag=${SRCREV};nob…" PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 756d6a2..3350e60 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.6.0" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=https;tag=${SRCREV};nobranc…" +SRC_URI = "git://gerrit.osmocom.org/libosmo-sccp.git;protocol=https;tag=${SRCREV};nobr…" PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 63ebb21..e8ea327 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/git" SRCREV = "1.7.0" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=https;tag=${SRCREV};nobranch…" +SRC_URI = "git://gerrit.osmocom.org/libosmocore.git;protocol=https;tag=${SRCREV};nobra…" PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 91b3465..5f727d0 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -5,6 +5,6 @@ PR = "${INC_PR}.0" SRCREV = "21cebdfa29829975e5b94688f3fc8d0b10e3fa14" -SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=https" +SRC_URI += "git://gerrit.osmocom.org/openbsc.git;protocol=https" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index e09f142..221bd20 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-bsc.git;protocol=https;tag=${SRCREV};nobranch…" PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb index eae7f65..6dab676 100644 --- a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.3.0" -SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=https;tag=${SRCREV};nobranc…" +SRC_URI = "git://gerrit.osmocom.org/osmo-gbproxy.git;protocol=https;tag=${SRCREV};nobr…" PV = "0.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 7394277..72e3764 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-ggsn;protocol=https;tag=${SRCREV};nobranch=1 \ +SRC_URI = "git://gerrit.osmocom.org/osmo-ggsn;protocol=https;tag=${SRCREV};nobranch=1 \ file://0001-libgtp-set-PDP_MAX-to-128.patch \ " PV = "1.9.0+gitr${SRCPV}" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index 1cce2b8..4e0b5f8 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.5.0" -SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-hlr.git;protocol=https;tag=${SRCREV};nobranch…" PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb index 9f501e6..a3b79cb 100644 --- a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.3.0" -SRC_URI = "git://git.osmocom.org/osmo-hnbgw.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-hnbgw.git;protocol=https;tag=${SRCREV};nobran…" PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index e3d0598..b412319 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.3.0" -SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-iuh.git;protocol=https;tag=${SRCREV};nobranch…" PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 4793fd6..1362064 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.10.0" -SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-mgw.git;protocol=https;tag=${SRCREV};nobranch…" PV = "1.10.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 9da2a08..f92cc1d 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-msc.git;protocol=https;tag=${SRCREV};nobranch…" PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index a59cc7b..61ce378 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.4.0" -SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-pcap.git;protocol=https;tag=${SRCREV};nobranc…" PV = "0.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index 7c5b09a..df5e2f3 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.9.0" -SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=https;tag=${SRCREV};nobranch=1" +SRC_URI = "git://gerrit.osmocom.org/osmo-sgsn.git;protocol=https;tag=${SRCREV};nobranc…" PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index 107f933..45cf610 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "1.6.1" -SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=https;tag=${SRCREV};n…" +SRC_URI = "git://gerrit.osmocom.org/osmo-sip-connector.git;protocol=https;tag=${SRCREV…" PV = "1.6.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index 2b48b7a..708f783 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -2,6 +2,6 @@ S = "${WORKDIR}/git" SRCREV = "0.3.2" -SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=https;tag=${SRCREV};nobranch…" +SRC_URI = "git://gerrit.osmocom.org/osmo-sysmon.git;protocol=https;tag=${SRCREV};nobra…" PV = "0.3.2+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/29368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I2b9640b542ed68b3f5abf63e774e4f878232211a Gerrit-Change-Number: 29368 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-bts[master]: abis: Avoid TCP/IPA RSL sockets continue conn establishment while shu...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29366 ) Change subject: abis: Avoid TCP/IPA RSL sockets continue conn establishment while shutting down ...................................................................... abis: Avoid TCP/IPA RSL sockets continue conn establishment while shutting down when something fails in osmo-bts during startup and it goes into SHUTDOWN state, it is desirable to close new RSL links (sockets) which are in progress to connect, while it waits for a while to complete shutdown (power ramping down, etc.). This way we don't end up with new interactions and new state against a BSC if we are shutting down. The new libosmo-abis API is used since the higher layer struct e1inp_sign_link assigned to each struct gsm_bts_trx is not provided to the osmo-bts code layer by libosmo-abis API until the TCP+IPA handshake in the socket becomes fully established (sign_link_up() callback). Depends: libosmo-abis.git Ia6418321f3b6f1f7274efd414625a4b10a09a362 Change-Id: I599d074f51f490b43c9a89b105d1823391926947 --- M TODO-RELEASE M src/common/abis.c 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/29366/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index c91d81c..d981d15 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmocore >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT +libosmo-abis >1.3.0 e1inp_ipa_bts_rsl_close() diff --git a/src/common/abis.c b/src/common/abis.c index 4afe81a..8cb4878 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -230,6 +230,14 @@ trx->rsl_link = NULL; if (trx == trx->bts->c0) load_timer_stop(trx->bts); + } else { + /* If we have no rsl_link yet it may mean that lower + * layers are still establishing the socket (TCP, IPA). + * Let's tell it to stop connection establishment since + * we are shutting down. */ + struct e1inp_line *line = e1inp_line_find(0); + if (line) + e1inp_ipa_bts_rsl_close(line, trx->nr); } /* Note: Here we could send NM_EV_RSL_DOWN to each * trx->(bb_transc.)mo.fi, but we are starting shutdown of the -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I599d074f51f490b43c9a89b105d1823391926947 Gerrit-Change-Number: 29366 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-abis[master]: ipa: Allow users closing lower layer tcp/ipa connections

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/29365 ) Change subject: ipa: Allow users closing lower layer tcp/ipa connections ...................................................................... ipa: Allow users closing lower layer tcp/ipa connections This is useful for users to abort connections which are in "connecting" state, since the higher layer struct e1inp_sign_link is not provided to the user until the TCP+IPA handshake in the socket becomes fully established (sign_link_up() callback). This is intended for osmo-bts: when something fails and may enter into SHUTDOWN state, it is desirable to close new RSL links (sockets) which are in progress to connect, while it waits for a while to complete shutdown (power ramping down, etc.). Change-Id: Ia6418321f3b6f1f7274efd414625a4b10a09a362 --- M include/osmocom/abis/e1_input.h M src/input/ipaccess.c 2 files changed, 28 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/65/29365/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 9c3fe56..29cc942 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -336,7 +336,8 @@ int e1inp_ipa_bts_rsl_connect_n(struct e1inp_line *line, const char *rem_addr, uint16_t rem_port, - uint8_t trx_id); + uint8_t trx_nr); +int e1inp_ipa_bts_rsl_close(struct e1inp_line *line, uint8_t trx_nr); void e1inp_sign_link_destroy(struct e1inp_sign_link *link); int e1inp_line_update(struct e1inp_line *line); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 07fd814..9331d07 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -1149,7 +1149,6 @@ return ret; } - /* backwards compatibility */ int e1inp_ipa_bts_rsl_connect(struct e1inp_line *line, const char *rem_addr, uint16_t rem_port) @@ -1171,17 +1170,13 @@ return -EINVAL; } + /* Drop previous line */ + e1inp_ipa_bts_rsl_close(line, trx_nr); + if (!line->driver_data) line->driver_data = talloc_zero(line, struct ipaccess_line); il = line->driver_data; - /* Drop previous line */ - if (il->ipa_cli[1 + trx_nr]) { - ipa_client_conn_close(il->ipa_cli[1 + trx_nr]); - ipa_client_conn_destroy(il->ipa_cli[1 + trx_nr]); - il->ipa_cli[1 + trx_nr] = NULL; - } - rsl_link = ipa_client_conn_create2(tall_ipa_ctx, e1inp_line_ipa_rsl_ts(line, trx_nr), E1INP_SIGN_RSL+trx_nr, @@ -1210,6 +1205,29 @@ return 0; } +/* Close the underlaying IPA TCP socket of an RSL link */ +int e1inp_ipa_bts_rsl_close(struct e1inp_line *line, uint8_t trx_nr) +{ + struct ipaccess_line *il; + + if (E1INP_SIGN_RSL+trx_nr-1 >= NUM_E1_TS) { + LOGP(DLINP, LOGL_ERROR, "cannot close RSL BTS link: " + "trx_nr (%d) out of range\n", trx_nr); + return -EINVAL; + } + + il = line->driver_data; + if (!il) + return 0; /* Nothing to do, no lines created */ + + if (il->ipa_cli[1 + trx_nr]) { + ipa_client_conn_close(il->ipa_cli[1 + trx_nr]); + ipa_client_conn_destroy(il->ipa_cli[1 + trx_nr]); + il->ipa_cli[1 + trx_nr] = NULL; + } + return 0; +} + void e1inp_ipaccess_init(void) { tall_ipa_ctx = talloc_named_const(libosmo_abis_ctx, 1, "ipa"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/29365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia6418321f3b6f1f7274efd414625a4b10a09a362 Gerrit-Change-Number: 29365 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-gsm-manuals[master]: Document osmux use in Abis interface

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 ) Change subject: Document osmux use in Abis interface ...................................................................... Patch Set 3: (2 comments) File common/chapters/osmux/osmux.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354/comment/8f7ba109_f818… PS1, Line 22: so that the satellite link lays > maybe "traffic-volume-critical"? Done File common/chapters/osmux/osmux.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354/comment/e0eef4cc_8c35… PS2, Line 22: volume-critical > I've never heard that term. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic02d379f35f29f633d0fb14da3597481a0b8b8ba Gerrit-Change-Number: 29354 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 12:32:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: oml: Delay Tx of OPSTART(BBTRANSC) after rx of RSL CONNECT ACK

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29364 ) Change subject: oml: Delay Tx of OPSTART(BBTRANSC) after rx of RSL CONNECT ACK ...................................................................... oml: Delay Tx of OPSTART(BBTRANSC) after rx of RSL CONNECT ACK nanoBTS waits until receiving OPSTART in order to establish the RSL connection socket against BSC, hence we cannot wait until the socket is established at the BSC in order to send the OPSTART. Still this way we make sure the RSL CONNECT is acked before attempting an OPSTART at the BSC. Change-Id: Ief46bad5075b656c13d1f09a0724e33283148236 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/nm_common_fsm.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_common_fsm.c 6 files changed, 95 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/29364/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index cb64c4c..52b20a8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -447,6 +447,8 @@ bool get_attr_rep_received; bool set_attr_sent; bool set_attr_ack_received; + bool rsl_connect_sent; + bool rsl_connect_ack_received; bool force_rf_lock; }; diff --git a/include/osmocom/bsc/nm_common_fsm.h b/include/osmocom/bsc/nm_common_fsm.h index 1d56220..b41d24a 100644 --- a/include/osmocom/bsc/nm_common_fsm.h +++ b/include/osmocom/bsc/nm_common_fsm.h @@ -40,6 +40,8 @@ NM_EV_OML_DOWN, NM_EV_FORCE_LOCK, /* Only supported by RadioCarrier so far */ NM_EV_FEATURE_NEGOTIATED, /* Sent by BTS to NSVC MO */ + NM_EV_RSL_CONNECT_ACK, /* Sent by BTS to BBTRANSC MO */ + NM_EV_RSL_CONNECT_NACK, /* Sent by BTS to BBTRANSC MO */ }; extern const struct value_string nm_fsm_event_names[]; diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index b151f36..938f45d 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2966,6 +2966,7 @@ signal.foh = foh; osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal); break; + case NM_MT_IPACC_RSL_CONNECT_ACK: case NM_MT_IPACC_SET_NVATTR_ACK: case NM_MT_IPACC_SET_ATTR_ACK: signal.bts = bts; diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 0af5a28..3165944 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -443,12 +443,56 @@ } } +static void nm_rx_ipacc_rsl_connect_ack(struct ipacc_ack_signal_data *sig_data) +{ + struct gsm_bts *bts = sig_data->bts; + struct abis_om_fom_hdr *foh = sig_data->foh; + struct gsm_bts_trx *trx; + + if (foh->obj_class != NM_OC_BASEB_TRANSC) { + LOGPFOH(DNM, LOGL_ERROR, foh, "IPACC RSL Connect ACK received on incorrect object class %d!\n", foh->obj_class); + return; + } + + trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_RSL_CONNECT_ACK, NULL); +} + static void nm_rx_ipacc_ack(struct ipacc_ack_signal_data *sig_data) { switch (sig_data->foh->msg_type) { case NM_MT_IPACC_SET_ATTR_ACK: nm_rx_ipacc_set_attr_ack(sig_data); break; + case NM_MT_IPACC_RSL_CONNECT_ACK: + nm_rx_ipacc_rsl_connect_ack(sig_data); + break; + default: + break; + } +} + +static void nm_rx_ipacc_rsl_connect_nack(struct ipacc_ack_signal_data *sig_data) +{ + struct gsm_bts *bts = sig_data->bts; + struct abis_om_fom_hdr *foh = sig_data->foh; + struct gsm_bts_trx *trx; + + if (foh->obj_class != NM_OC_BASEB_TRANSC) { + LOGPFOH(DNM, LOGL_ERROR, foh, "IPACC RSL Connect NACK received on incorrect object class %d!\n", foh->obj_class); + return; + } + + trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_RSL_CONNECT_NACK, NULL); +} + +static void nm_rx_ipacc_nack(struct ipacc_ack_signal_data *sig_data) +{ + switch (sig_data->foh->msg_type) { + case NM_MT_IPACC_RSL_CONNECT_ACK: + nm_rx_ipacc_rsl_connect_nack(sig_data); + break; default: break; } @@ -487,6 +531,9 @@ case S_NM_IPACC_ACK: nm_rx_ipacc_ack(signal_data); return 0; + case S_NM_IPACC_NACK: + nm_rx_ipacc_nack(signal_data); + return 0; default: break; } diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index bf24691..3a8786b 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -32,6 +32,7 @@ #include <osmocom/bsc/signal.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/bsc/nm_common_fsm.h> #include <osmocom/bsc/debug.h> @@ -63,6 +64,8 @@ bb_transc->mo.get_attr_sent = false; bb_transc->mo.get_attr_rep_received = false; bb_transc->mo.adm_unlock_sent = false; + bb_transc->mo.rsl_connect_sent = false; + bb_transc->mo.rsl_connect_ack_received = false; bb_transc->mo.opstart_sent = false; } @@ -125,14 +128,22 @@ NM_STATE_UNLOCKED); } + /* Provision BTS with RSL IP addr & port to connect to: */ if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && - !bb_transc->mo.opstart_sent) { - bb_transc->mo.opstart_sent = true; - abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, trx->nr, 0xff); - /* TRX software is active, tell it to initiate RSL Link */ + !bb_transc->mo.rsl_connect_sent && !bb_transc->mo.rsl_connect_ack_received) { + bb_transc->mo.rsl_connect_sent = true; abis_nm_ipaccess_rsl_connect(trx, trx->bts->ip_access.rsl_ip, 3003, trx->rsl_tei_primary); } + + /* OPSTART after receiving RSL CONNECT ACK. We cannot delay until the + * RSL/IPA socket is connected to us because nanoBTS only attempts + * connection after receiving an OPSTART: */ + if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && + bb_transc->mo.rsl_connect_ack_received && !bb_transc->mo.opstart_sent) { + bb_transc->mo.opstart_sent = true; + abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, trx->nr, 0xff); + } } static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -150,6 +161,7 @@ static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc); struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; @@ -159,6 +171,14 @@ bb_transc->mo.get_attr_sent = false; configure_loop(bb_transc, &bb_transc->mo.nm_state, false); return; + case NM_EV_RSL_CONNECT_ACK: + bb_transc->mo.rsl_connect_ack_received = true; + bb_transc->mo.rsl_connect_sent = false; + configure_loop(bb_transc, &bb_transc->mo.nm_state, false); + break; + case NM_EV_RSL_CONNECT_NACK: + ipaccess_drop_oml_deferred(trx->bts); + break; case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; new_state = &nsd->new_state; @@ -207,6 +227,14 @@ bb_transc->mo.get_attr_sent = false; configure_loop(bb_transc, &bb_transc->mo.nm_state, true); return; + case NM_EV_RSL_CONNECT_ACK: + bb_transc->mo.rsl_connect_ack_received = true; + bb_transc->mo.rsl_connect_sent = false; + configure_loop(bb_transc, &bb_transc->mo.nm_state, true); + break; + case NM_EV_RSL_CONNECT_NACK: + ipaccess_drop_oml_deferred(trx->bts); + break; case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; new_state = &nsd->new_state; @@ -251,8 +279,10 @@ reused as soon as we move back to Disabled */ bb_transc->mo.get_attr_sent = false; bb_transc->mo.get_attr_rep_received = false; - bb_transc->mo.opstart_sent = false; bb_transc->mo.adm_unlock_sent = false; + bb_transc->mo.rsl_connect_ack_received = false; + bb_transc->mo.rsl_connect_sent = false; + bb_transc->mo.opstart_sent = false; nm_bb_transc_fsm_becomes_enabled(bb_transc); } @@ -330,7 +360,9 @@ [NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | - X(NM_EV_GET_ATTR_REP), + X(NM_EV_GET_ATTR_REP) | + X(NM_EV_RSL_CONNECT_ACK) | + X(NM_EV_RSL_CONNECT_NACK), .out_state_mask = X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) | X(NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE) | @@ -342,7 +374,9 @@ [NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | - X(NM_EV_GET_ATTR_REP), + X(NM_EV_GET_ATTR_REP) | + X(NM_EV_RSL_CONNECT_ACK) | + X(NM_EV_RSL_CONNECT_NACK), .out_state_mask = X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) | X(NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY) | diff --git a/src/osmo-bsc/nm_common_fsm.c b/src/osmo-bsc/nm_common_fsm.c index b0902b1..2bf38ac 100644 --- a/src/osmo-bsc/nm_common_fsm.c +++ b/src/osmo-bsc/nm_common_fsm.c @@ -33,6 +33,8 @@ { NM_EV_OML_DOWN, "OML_DOWN" }, { NM_EV_FORCE_LOCK, "FORCE_LOCK_CHG" }, { NM_EV_FEATURE_NEGOTIATED, "FEATURE_NEGOTIATED" }, + { NM_EV_RSL_CONNECT_ACK, "RSL_CONNECT_ACK" }, + { NM_EV_RSL_CONNECT_NACK, "RSL_CONNECT_NACK" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ief46bad5075b656c13d1f09a0724e33283148236 Gerrit-Change-Number: 29364 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-gsm-manuals[master]: Document osmux use in Abis interface

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 ) Change subject: Document osmux use in Abis interface ...................................................................... Document osmux use in Abis interface Related: SYS#5987 Change-Id: Ic02d379f35f29f633d0fb14da3597481a0b8b8ba --- A common/chapters/osmux/mo_call_osmux_abis.msc A common/chapters/osmux/network_osmux_abis.dot M common/chapters/osmux/osmux.adoc 3 files changed, 106 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/common/chapters/osmux/mo_call_osmux_abis.msc b/common/chapters/osmux/mo_call_osmux_abis.msc new file mode 100644 index 0000000..5c281a0 --- /dev/null +++ b/common/chapters/osmux/mo_call_osmux_abis.msc @@ -0,0 +1,54 @@ +# MO-call with Osmux enable on 3GPP AoIP +msc { + hscale=2; + ms [label="MS"], bts [label="OsmoBTS"], bsc[label="OsmoBSC"], mgw_bsc[label="OsmoMGW(bsc)"], m_sc[label="MSC"], mgw_msc[label="OsmoMGW(msc)"]; + + bsc <- m_sc [label="BSSMAP RESET (with extension IE: Osmux Support)"]; + bsc -> m_sc [label="BSSMAP RESET ACK (with extension IE: Osmux Support)"]; + ...; + ms box mgw_msc [label="We assume a SDCCH is already established"]; + ...; + + ms -> bsc [label="DTAP CM Service Request"]; + bsc -> m_sc [label="Complete Layer 3 Information DTAP CM Service Request"]; + + # Allocate MGW/MSC Osmux endpoint + m_sc -> mgw_msc [label="MGCP CRCX rtpbridge/*@mgw, X-Osmux: *"]; + mgw_msc box mgw_msc [label="Bind to MGW-local RTP Port (5000)\nAllocate new endpoint 1"]; + mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:5000)"]; + + bsc <- m_sc [label="BSSAP ASSGN REQ"]; + bts <- bsc [label="RSL CHAN ACT"]; + bts -> bsc [label="RSL CHAN ACT ACK"]; + ms <- bsc [label="Assignment Command"]; + ms -> bsc [label="Assignment Complete"]; + ...; + + # connect BTS RTP with BSC-MGW RTP + bsc -> mgw_bsc [label="MGCP CRCX rtpbridge/*@mgw, X-Osmux: *"]; + mgw_bsc box mgw_bsc [label="Bind to MGW-local Osmux Port (1984)\n\nAllocate new endpoint 2, MGW's local CID 5"]; + bsc <- mgw_bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:1984, X-Osmux: 5)"]; + bts <- bsc [label="IPA CRCX (Extension IE Osmux-CID 5)"]; + bts box bts [label="Bind to BTS-local Osmux Port (1985), Allocate new BTS's local CID 7"]; + bts -> bsc [label="IPA CRCX ACK (BTS:1985, Extension IE Osmux-CID 7)"]; + bsc -> mgw_bsc [label="MGCP MDCX rtpbridge/2@mgw (BTS:1985, X-Osmux: 7)"]; + mgw_bsc box mgw_bsc [label="\nConnect to BTS:1985 MGW's remote CID 7"]; + bsc <- mgw_bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:1984, X-Osmux: 5)"]; + ...; + + mgw_bsc <- bsc [label="MGCP CRCX rtpbridge/2@mgw (MSC:5000)"]; + mgw_bsc box mgw_bsc [label="Bind to MGW-local RTP Port (2000)\nConnect to MSC:5000"]; + mgw_bsc -> bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:2000)"]; + ...; + + bsc -> m_sc [label="BSSAP ASSGN CMPL (3GPP AoIP MGW:2000)"]; + m_sc box m_sc [label="Connect remote RTP to MGW addr from ASSGN CMPL"]; + m_sc -> mgw_msc [label="MGCP MDCX rtpbridge/1@mgw (MGW:2000)"]; + m_sc <- mgw_msc [label="MGCP MDCX rtpbridge/1@mgw OK"]; + ...; + + mgw_bsc <=> mgw_msc [label="RTP Audio MGW:2000 MSC:5000"]; + bts <=> mgw_bsc [label="Osmux Audio BTS:1985 MGW:1984, CID(uplink):5, CID(downlink):7"]; + ms <=> bts [label="Um Audio (bidirectional)"]; + ms <-> m_sc [label="DTAP CC ALERTING"]; +} diff --git a/common/chapters/osmux/network_osmux_abis.dot b/common/chapters/osmux/network_osmux_abis.dot new file mode 100644 index 0000000..578e0d1 --- /dev/null +++ b/common/chapters/osmux/network_osmux_abis.dot @@ -0,0 +1,32 @@ +digraph G { + rankdir = LR; + subgraph cluster_RAN { + OsmoBTS1 [label="OsmoBTS"]; + OsmoBTS2 [label="OsmoBTS"]; + OsmoBSC; + OsmoMGW [label="OsmoMGW\n(for BSC)"]; + + OsmoBTS1 -> OsmoBSC [label="Abis/IP", dir="both"]; + OsmoBTS2 -> OsmoBSC [label="Abis/IP", dir="both"]; + OsmoBSC -> OsmoMGW [label="MGCP", dir="both"]; + { rank = same; OsmoBSC; OsmoMGW } + + OsmoBTS1 -> OsmoMGW [label="Osmux", dir="both", color=red]; + OsmoBTS2 -> OsmoMGW [label="RTP", dir="both"]; + + label = "RAN"; + } + subgraph cluster_CN { + OsmoMGW1 [label="OsmoMGW\n(for MSC)"]; + OsmoMSC [label="MSC\ne.g. OsmoMSC"]; + Core [label="Other CN Elements"]; + OsmoMSC -> Core [label="MAP/ISUP/SIP/GSUP", dir="both"]; + OsmoMSC -> OsmoMGW1 [label="MGCP", dir="both"]; + { rank = same; OsmoMSC; OsmoMGW1 } + OsmoMGW -> OsmoMGW1 [label="RTP", dir="both"]; + OsmoMGW1 -> Core [label="RTP", dir="both"]; + label = "CN"; + } + + OsmoBSC -> OsmoMSC [label="3GPP AoIP\nvia SIGTRAN/STP", dir="both"]; +} diff --git a/common/chapters/osmux/osmux.adoc b/common/chapters/osmux/osmux.adoc index ca1acd5..24dc446 100644 --- a/common/chapters/osmux/osmux.adoc +++ b/common/chapters/osmux/osmux.adoc @@ -18,6 +18,11 @@ OsmoBSCNAT). The MGW attached those components need of course also be aware of `Osmux` existence in order to properly set up the audio data plane. +Under some specific circumstances, the operator may decide to set up the network +with a bandwidth-limited (e.g. satellite) link between BTS and BSC. Hence, use of +the `Osmux` protocol is also possible between an Osmux capable BTS (like +OsmoBTS) and OsmoBSC (and its co-located MGW). + === Osmux and NAT It is quite usual for satellite based links to use NATs, which means any or both @@ -139,3 +144,18 @@ ---- include::mgcp_extension_osmux.adoc[] + +=== Abis setup with Osmux + +[[fig-network-osmux-aoip]] +.Sample node diagram of Osmux enabled in the Abis interface +[graphviz] +---- +include::network_osmux_abis.dot[] +---- + +.MO-call with Osmux enabled on Abis +[mscgen] +---- +include::mo_call_osmux_abis.msc[] +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic02d379f35f29f633d0fb14da3597481a0b8b8ba Gerrit-Change-Number: 29354 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-gsm-manuals[master]: osmux: Use local/remote CID terminology

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 ) Change subject: osmux: Use local/remote CID terminology ...................................................................... osmux: Use local/remote CID terminology This terminology is much more common and used in other protocols, like PFCP. Related: SYS#5987 Change-Id: Ia5eb833c296c504555f273a7fc3af5d746af19c0 --- M common/chapters/osmux/mgcp_extension_osmux.adoc M common/chapters/osmux/mo_call_osmux_aoip.msc M common/chapters/osmux/mo_call_osmux_sccplite.msc M common/chapters/osmux/mo_call_osmux_sccplite_nat.msc M common/chapters/osmux/osmux.adoc 5 files changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/osmux/mgcp_extension_osmux.adoc b/common/chapters/osmux/mgcp_extension_osmux.adoc index e2b0947..45e95e7 100644 --- a/common/chapters/osmux/mgcp_extension_osmux.adoc +++ b/common/chapters/osmux/mgcp_extension_osmux.adoc @@ -19,11 +19,11 @@ In request messages, the value part of `X-Osmux` specifies the CID to be used by OsmoMGW to _send_ Osmux frames to the remote peer for that connection, also -known as _sendCID_. +known as the MGW's _remote CID_ or the peer's _local CID_. In response messages, the value part of `X-Osmux` specifies the CID where OsmoMGW expect to _receive_ Osmux frames from the remote peer for that -connection, also known as _recvCID_. +connection, also known as the MGW's _local CID_ or the peer's _remote CID_. .Example: `X-Osmux` format with a known CID 3. ---- @@ -39,12 +39,12 @@ If the MGCP client is willing to use Osmux for a given connection, it shall specify so during `CRCX` time, and not later. If at `CRCX` time the MGCP client -doesn't yet know the _sendCID_, it can use an astersik (*) and provide -_sendCID_ later within `MDCX` messages. +doesn't yet know the MGW's _remote CID_, it can use an astersik (*) and provide +_remote CID_ later within `MDCX` messages. All subsequent `MDCX` messages sent towards an Osmux connection must contain the -original _sendCID_ sent during `CRCX`. The same way, all `MDCX` response shall -contain the _recvCID_ sent during `CRCX`. +original MGW's _remote CID_ sent during `CRCX`. The same way, all `MDCX` response shall +contain the _local CID_ sent during `CRCX`. The other required connection address parameters, such as IP address, port, and codecs, are negotiated through MGCP and SDP as usual, but in this case the IP @@ -72,7 +72,7 @@ a=ptime:20 ---- -.Example: response to `CRCX` containing the <<recvCID>> +.Example: response to `CRCX` containing the MGW's _local CID_ ---- 200 189 OK I: 07E41584 diff --git a/common/chapters/osmux/mo_call_osmux_aoip.msc b/common/chapters/osmux/mo_call_osmux_aoip.msc index 9cb2e50..27e79ba 100644 --- a/common/chapters/osmux/mo_call_osmux_aoip.msc +++ b/common/chapters/osmux/mo_call_osmux_aoip.msc @@ -14,7 +14,7 @@ # Allocate MGW/MSC Osmux endpoint m_sc -> mgw_msc [label="MGCP CRCX rtpbridge/*@mgw, X-Osmux: *"]; - mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, recvCID 5"]; + mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, MGW's local CID 5"]; mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:1984, X-Osmux: 5)"]; bsc <- m_sc [label="BSSAP ASSGN REQ (3GPP AoIP, extension IE: Osmux CID 5)"]; @@ -37,7 +37,7 @@ ...; mgw_bsc <- bsc [label="MGCP CRCX rtpbridge/2@mgw (MSC:1984, X-Osmux: 5)"]; - mgw_bsc box mgw_bsc [label="Bind to MGW-local Osmux Port (1985)\nConnect to MSC:1984\nAllocate new recvCID 7"]; + mgw_bsc box mgw_bsc [label="Bind to MGW-local Osmux Port (1985)\nConnect to MSC:1984\nAllocate new MGW's local CID 7"]; mgw_bsc -> bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:1985, X-Osmux: 7)"]; ...; diff --git a/common/chapters/osmux/mo_call_osmux_sccplite.msc b/common/chapters/osmux/mo_call_osmux_sccplite.msc index 903da46..037805b 100644 --- a/common/chapters/osmux/mo_call_osmux_sccplite.msc +++ b/common/chapters/osmux/mo_call_osmux_sccplite.msc @@ -12,7 +12,7 @@ # Allocate MGW/MSC Osmux endpoint m_sc -> mgw_msc [label="MGCP CRCX *@mgw, X-Osmux: *"]; - mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, recvCID 5"]; + mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, MGW's local CID 5"]; mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:1984, X-Osmux: 5)"]; bsc <- m_sc [label="BSSAP ASSGN REQ (CIC:1)"]; @@ -39,7 +39,7 @@ # MSC configures BSC-MGW MSC-side of the endpoint through MGCP UDP forwarding mgw_bsc <- m_sc [label="MGCP CRCX 1@mgw (MSC:1984, X-Osmux: 5)"]; - mgw_bsc box mgw_bsc [label="Bind to BTS-local Osmux Port (1985)\nAllocate new recvCID 7"]; + mgw_bsc box mgw_bsc [label="Bind to BTS-local Osmux Port (1985)\nAllocate new MGW's local CID 7"]; mgw_bsc -> m_sc [label="MGCP CRCX 1@mgw OK (MGW:1985, X-Osmux: 7)"]; mgw_bsc <- m_sc [label="MGCP MDCX 1@mgw (recvonly) "]; mgw_bsc box mgw_bsc [label="Connect Osmux socket to remote (MSC) Osmux Port"]; diff --git a/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc b/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc index 2aa8105..d309ebb 100644 --- a/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc +++ b/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc @@ -18,7 +18,7 @@ # NAT: MGW/MSC Osmux endpoint #bscnat -> bscnat [label="MGCP CRCX *@mgw, X-Osmux: *"]; - mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 2, recvCID 5"]; + mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 2, MGW's local CID 5"]; #mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:1984, X-Osmux: 5)"]; bsc <- bscnat [label="BSSAP ASSGN REQ (CIC:2)"]; @@ -48,7 +48,7 @@ # MSC configures BSC-MGW MSC-side of the endpoint through MGCP UDP forwarding bscnat <- m_sc [label="MGCP CRCX 1@mgw (MSC:3000)"]; - bscnat box bscnat [label="Allocate new endpoint 2\nAllocate new recvCID 5\nBind to local Osmux Port (1984)\nBind to local RTP port 4000"]; + bscnat box bscnat [label="Allocate new endpoint 2\nAllocate new MGW's local CID 5\nBind to local Osmux Port (1984)\nBind to local RTP port 4000"]; mgw_bsc <- bscnat [label="MGCP CRCX 2@mgw (MSC:1984, X-Osmux: 5)"]; mgw_bsc -> bscnat [label="MGCP CRCX 2@mgw OK (MGW:1985, X-Osmux: 7)"]; bscnat -> m_sc [label="MGCP CRCX 1@mgw OK (MGW:4000)"]; diff --git a/common/chapters/osmux/osmux.adoc b/common/chapters/osmux/osmux.adoc index 5e53b60..ca1acd5 100644 --- a/common/chapters/osmux/osmux.adoc +++ b/common/chapters/osmux/osmux.adoc @@ -50,13 +50,13 @@ === CID allocation -Each peer (BSC/MGW and MSC/MGW) allocates its own _recvCID_, and receives from -the peer through the used GSM protocol the peer's _recvCID_, which becomes -the local _sendCID_ for that connection. +Each peer (BSC/MGW and MSC/MGW) allocates its own _local CID_, and receives from +its peer a _remote CID_ (aka the peer's _local CID_) through the used GSM +protocol. This _remote CID_ is then used to send Osmux frames to that peer. ---- -BSC/MGW(recvCID=Y,sendCID=?)<-X--MSC/MGW(recvCID=X,sendCID=?) -BSC/MGW(recvCID=Y,sendCID=X)--Y->MSC/MGW(recvCID=X,sendCID=Y) +BSC/MGW(localCID=Y,remoteCID=?)<-X--MSC/MGW(localCID=X,remoteCID=?) +BSC/MGW(localCID=Y,remoteCID=X)--Y->MSC/MGW(localCID=X,remoteCID=Y) ---- This way each peer is responsible for allocating and managing their own local @@ -75,13 +75,13 @@ BSC. Each of the peers could actually have more than one Osmux socket towards the other peer, by using a pool of ports or IP addresses, so there's really not limit if required as long as there's a way to infer the initially negotiated -`<srcIP, srcPort, dstIP, dstPort, sendCID>` tuple from the received audio +`<srcIP, srcPort, dstIP, dstPort, remoteCID>` tuple from the received audio packets. However, due to some constrains from in between NATs explained in section above, BSC/MGW IP address and port are not a priory known, and could change between different connections coming from it. As a result, it is difficult to infer the -entire tuple, so for now MGW needs to allocate its Osmux _recvCID_ in a clever +entire tuple, so for now MGW needs to allocate its Osmux _local CID_ in a clever way, in order to be able to identify the full tuple from it. Hence, currently OsmoMGW CID allocation implementation shares CID between all -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia5eb833c296c504555f273a7fc3af5d746af19c0 Gerrit-Change-Number: 29353 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022