Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated .. Patch Set 1: Code-Review+1 the API becomes even more awkward than it alrady is with that. Might be worth investigating a method where we could simply push those fields to the frong of the msgb, and/or possibly even recycle the msgb and elimiate the memcpy to another msgb altogether. Yes, that's more like a separte patch, just noticing that it's really odd that we store two bytes extra somewhere else when we actually have a msgb that can hold all of this... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 07:45:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22889 )
Change subject: bssgp_bvc_fsm: Consistent naming
..
bssgp_bvc_fsm: Consistent naming
bssgp_bvc_get_features_* are fsm "methods" and the name should indicate
that just lika all other function names in bssgp_bvc_fsm.h
Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39
---
M include/osmocom/gprs/bssgp_bvc_fsm.h
M src/gb/bssgp_bvc_fsm.c
M src/gb/libosmogb.map
3 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h
b/include/osmocom/gprs/bssgp_bvc_fsm.h
index 824cdec..446dda8 100644
--- a/include/osmocom/gprs/bssgp_bvc_fsm.h
+++ b/include/osmocom/gprs/bssgp_bvc_fsm.h
@@ -61,9 +61,9 @@
uint8_t bssgp_bvc_fsm_get_block_cause(struct osmo_fsm_inst *fi);
-uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi);
-uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi);
-uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi);
+uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi);
+uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi);
+uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi);
void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t
max_pdu_len);
uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi);
\ No newline at end of file
diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c
index a035938..8d284d1 100644
--- a/src/gb/bssgp_bvc_fsm.c
+++ b/src/gb/bssgp_bvc_fsm.c
@@ -794,7 +794,7 @@
}
/*! Return the advertised features / extended features. */
-uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi)
+uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi)
{
struct bvc_fsm_priv *bfp = fi->priv;
@@ -803,7 +803,7 @@
}
/*! Return the received features / extended features. */
-uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi)
+uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi)
{
struct bvc_fsm_priv *bfp = fi->priv;
@@ -812,7 +812,7 @@
}
/*! Return the negotiated features / extended features. */
-uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi)
+uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi)
{
struct bvc_fsm_priv *bfp = fi->priv;
diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map
index 2327815..699ed1b 100644
--- a/src/gb/libosmogb.map
+++ b/src/gb/libosmogb.map
@@ -93,9 +93,9 @@
bssgp_bvc_fsm_set_ops;
bssgp_bvc_fsm_is_unblocked;
bssgp_bvc_fsm_get_block_cause;
-bssgp_bvc_get_features_advertised;
-bssgp_bvc_get_features_received;
-bssgp_bvc_get_features_negotiated;
+bssgp_bvc_fsm_get_features_advertised;
+bssgp_bvc_fsm_get_features_received;
+bssgp_bvc_fsm_get_features_negotiated;
bssgp_bvc_fsm_set_max_pdu_len;
bssgp_bvc_fsm_get_max_pdu_len;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39
Gerrit-Change-Number: 22889
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22889 ) Change subject: bssgp_bvc_fsm: Consistent naming .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 Gerrit-Change-Number: 22889 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 13 Feb 2021 07:41:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts'
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22893 ) Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 Gerrit-Change-Number: 22893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 07:40:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: main: cosmetic: tweak deprecation warning messages
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22890 ) Change subject: main: cosmetic: tweak deprecation warning messages .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 Gerrit-Change-Number: 22890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 07:39:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22891 ) Change subject: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c Gerrit-Change-Number: 22891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 07:39:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: GSMTAP: fix wrong naming of per-BTS SAPI commands
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22892 ) Change subject: GSMTAP: fix wrong naming of per-BTS SAPI commands .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 Gerrit-Change-Number: 22892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 07:39:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights .. TRXD: more information on PDU versioning and some highlights Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 41 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index ef2740b..d1aa566 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -311,15 +311,16 @@ NOTE: In the example for `HVHH`, legacy TCH/H0 does not belong to a _VAMOS pair_, so it can be configured to use any Training Sequence Code without restrictions. +[[trx_if_pdu_version_nego]] TRXD header version negotiation -Messages on DATA interface may have different header formats, defined by a -version number, which can be negotiated on the control interface. By default, -the Transceiver will use the legacy header version (0). +Messages on DATA interface may have different formats, defined by a version number, +which can be negotiated on the control interface. By default, the Transceiver will +use the legacy header version (0). See <>. -The header format negotiation can be initiated by the BTS using `SETFORMAT` -command. If the requested version is not supported by the transceiver, status -code of the response message should indicate a preferred (basically, the latest) +The format negotiation can be initiated by the BTS using `SETFORMAT` command. +If the requested version is not supported by the transceiver, status code of +the response message should indicate a preferred (basically, the latest) version. The format of this message is the following: CMD SETFORMAT @@ -353,7 +354,38 @@ === TRXD protocol -Messages on the data interface carry one radio burst per UDP message. +PDUs on the data interface carry one radio burst per one UDP packet. +Two kinds of TRXD PDU exist: + +* `TRX -> L1` (from transceiver to the L1): Uplink messages received from the MS, +* `L1 -> TRX` (from the L1 to transceiver): Downlink messages sent to the MS. + +Depending on the origin and the version indicator, PDUs may have different structure. + +[[trx_if_pdu_versioning]] + PDU versioning + +The format of a PDU, i.e. presence and ordering of certain fields, is determined by +the version number indicated in the first octet. This is usually referred as +`TRXDvN`, where `N` is the version number (e.g. TRXDv0 or TRXDv1). A version number +indicates the message format to be used for both directions: `TRX -> L1` and +`L1 -> TRX`. The same version shall be used for all messages in both directions, +mixing in any way is not permitted. + +The version negotiation is optionally initiated by the `L1` on the control interface, +and expected to be performed before starting the transceiver (i.e. sending `POWERON` +command). See <>. + +The current header allows to distinguish up to 16 different versions. +The following versions are defined so far: + +* TRXDv0 - initial version of TRXD protocol, inherited as-is from OpenBTS project. +* TRXDv1 (proposed in July 2019): +** Introduced the concept of protocol versioning; +** Introduced NOPE / IDLE indications; +** New field: MTS (Modulation and Training Sequence); +** New field: C/I (Carrier-to-interface) ratio; +** Downlink messages mostly unchanged. Uplink Data Burst @@ -417,7 +449,7 @@ VER: 4 bits:: -TRXD header version, v0 and v1 are specified so far. +TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. TN: 3 bits:: Timeslot number. @@ -542,7 +574,7 @@ VER: 4 bits:: -TRXD header version, v0 and v1 are specified so far. +TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. TN: 3 bits:: Timeslot number. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 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: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: clarify description of NOPE / IDLE indications
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 )
Change subject: TRXD: clarify description of NOPE / IDLE indications
..
TRXD: clarify description of NOPE / IDLE indications
Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95
Related: SYS#4895, OS#4941, OS#4006
---
M common/chapters/trx_if.adoc
1 file changed, 22 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc
index e1aef4a..ef2740b 100644
--- a/common/chapters/trx_if.adoc
+++ b/common/chapters/trx_if.adoc
@@ -398,6 +398,24 @@
}
+.TRXDv1 NOPE / IDLE indication message structure
+[packetdiag]
+
+{
+ colwidth = 32
+ node_height = 40
+
+ 0-3:VER(1)
+ 4: RES
+ 5-7:TN
+ 8-39: FN
+ 40-47: RSSI
+ 48-63: TOA256
+ 64-71: MTS (NOPE.ind)
+ 72-87: C/I
+}
+
+
VER: 4 bits::
TRXD header version, v0 and v1 are specified so far.
@@ -463,10 +481,10 @@
IDLE / nope frame indication::
-The bit number 7 (MSB) is set to high when either nothing has been detected, or
-during IDLE frames, so noise levels can be delivered, and avoid clock gaps on
-the BTS side. Other bits are ignored, and should be set to low (`0`) in this
-case.
+The bit number 7 (MSB) is set to high when either nothing has been detected, so
+the BTS scheduler keeps processing bursts without gaps, or during IDLE frames,
+so the current noise levels can be delivered. Other bits are ignored, and
should
+be set to low (`0`) in this case. The field "Soft-bits" is omited.
Modulation and TS set number::
GMSK has 4 sets of training sequences (see tables 5.2.3a-d), while 8-PSK (see
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619
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: Idaa1c597cbfd198a0f1802ac01b210d42369ee95
Gerrit-Change-Number: 22619
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field .. TRXD: rework description of the 'Training Sequence Code' field The way how the indicated Training Sequence Code is supposed to be used by the BTS is behind the scope of this protocol specification. Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index ce90948..e1aef4a 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -500,8 +500,10 @@ transceiver shall use `0110` as the modulation type to indicate that. Training Sequence Code:: -The Training Sequence Code used to decode an Access or a Synchronization burst. -This field hence doesn't apply for Normal bursts. +The Training Sequence Code identifies the Training Sequence of a received +burst. The value of this field corresponds to one of the sequences defined +in 3GPP TS 45.002, section 5.2, and depends on the actual modulation and +the TSC set indicated by the preceding bits. Downlink Data Burst -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 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: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH .. TRXD: reserve a combination for Access Bursts on PACCH Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index b223151..ce90948 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -482,7 +482,9 @@ +-+---+ | . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) | +-+---+ -| . 0 1 1 X . . . | RFU (Reserved for Future Use) | +| . 0 1 1 0 . . . | GMSK, Access Burst (see note) | ++-+---+ +| . 0 1 1 1 . . . | RFU (Reserved for Future Use) | +-+---+ | . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) | +-+---+ @@ -492,6 +494,11 @@ +-+---+ +NOTE: A radio block on PDCH is carried by the sequence of four Normal Bursts. +The one exception is a special radio block occasionally used on the Uplink +consisting of a sequence of four Access Bursts (see 3GPP TS 44.060). The +transceiver shall use `0110` as the modulation type to indicate that. + Training Sequence Code:: The Training Sequence Code used to decode an Access or a Synchronization burst. This field hence doesn't apply for Normal bursts. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 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: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field .. TRXD: use different coding for AQPSK in the 'MTC' field AQPSK is used exclusively on Downlink in VAMOS mode. An AQPSK burst is basically a combination of two Normal Bursts. Each of these two bursts has the same length as defined for GMSK, while both must be using Training Sequences from different sets. Four different sets are defined in 3GPP 45.002, section 5.2.3.1. Therefore we need *two* bits to encode all possible values. Let's rearrange the existing combinations and use '11XX'B for AQPSK. The old combination '011X'B becomes reserved and can be re-purposed. This change is considered to be safe, given that no implementations are known to support AQPSK at the moment of making this change. Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 7bb8c77..b223151 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -482,13 +482,13 @@ +-+---+ | . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) | +-+---+ -| . 0 1 1 X . . . | AQPSK, 2 TS sets (0..1) | +| . 0 1 1 X . . . | RFU (Reserved for Future Use) | +-+---+ | . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) | +-+---+ | . 1 0 1 X . . . | 32QAM, 2 TS sets (0..1) | +-+---+ -| . 1 1 X X . . . | RESERVED (0) | +| . 1 1 X X . . . | AQPSK (Downlink), 4 TS sets (0..3)| +-+---+ -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 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: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages .. TRXD: clarify the meaning of field 'PWR' in Downlink messages Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 7ef95a8..7bb8c77 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -528,8 +528,9 @@ GSM frame number, big endian. PWR: 8 bits (1 byte):: -Contains the relative (to the full-scale amplitude) transmit power level in dB. -The absolute value is set on the control interface. +Contains the relative (to the full-scale amplitude) transmit power *reduction* +in dB. The absolute value is set on the control interface, so the resulting +power is calculated as follows: `full_scale - (absolute_red + relative_red)`. Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 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: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 ) Change subject: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams .. TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index bbee62c..7ef95a8 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -374,7 +374,7 @@ 8-39: FN 40-47: RSSI 48-63: TOA256 - 64-95: ...Payload... + 64-95: Soft-bits 96-111: PAD } @@ -394,7 +394,7 @@ 48-63: TOA256 64-71: MTS 72-87: C/I - 88-127: ...Payload... + 88-127: Soft-bits } @@ -427,7 +427,7 @@ training sequence is compared to the actual training sequence and the result expressed in centiBels. -Payload: 148 bytes for GSM, 444 bytes for EDGE:: +Soft-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the uplink burst. Unlike the downlink bursts, the uplink bursts are designated using the soft-bits notation, so the receiver can indicate its assurance from 0 to -127 that a given bit is 1, and from 0 to +127 that a given @@ -510,7 +510,7 @@ 5-7:TN 8-39: FN 40-47: PWR - 48-95: ...Payload... + 48-95: Hard-bits } @@ -531,6 +531,6 @@ Contains the relative (to the full-scale amplitude) transmit power level in dB. The absolute value is set on the control interface. -Payload: 148 bytes for GSM, 444 bytes for EDGE:: +Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented using one byte (0x01 or 0x00 respectively). -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 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: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Gerrit-Change-Number: 22614 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes .. TRXD: fix optional padding length: bits vs bytes Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index ad37224..bbee62c 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -375,7 +375,7 @@ 40-47: RSSI 48-63: TOA256 64-95: ...Payload... - 96-97: PAD + 96-111: PAD } @@ -438,7 +438,7 @@ * 0 -> definite "0" * 255 -> definite "1". -PAD: 2 bits (optional):: +PAD: 2 bytes (optional):: Padding at the end, historical reasons (OpenBTS inheritance). Bits can take any value, but 0 is preferred. Only expected on TRXDv0 headers. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 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: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations .. TRXC: introduce VAMOS enabled channel combinations Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 111 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 05c56a5..ad37224 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -200,6 +200,117 @@ Unless explicitly configured as described above, all timeslots will be using the default Training Sequence Code and set configured with the `SETTSC` command. += VAMOS enabled channel combinations (optional) + +The BTS may at any time re-configure channel combination of a timeslot (primarily +during channel activation) to activate or deactivate VAMOS mode in the transceiver. +For this purpose, the following additional channel combinations shall be used: + +.List of VAMOS enabled channel combinations and related values +[options="header"] +|=== +| value | Channel Combination +|VFF| V0(TCH/F) & V1(TCH/F), 2 channels total +|VHH| V0(TCH/H0) & V1(TCH/H0) + V0(TCH/H1) & V1(TCH/H1), 4 channels total +|VFH| V0(TCH/F) & V1(TCH/H0) + V0(TCH/F) & V1(TCH/H1), 3 channels total +|HVHH| TCH/H0 + V0(TCH/H1) & V1(TCH/H1), 3 channels total (mixed) +|=== + +where both `V0` and `V1` define a _VAMOS pair_. Symbols `&` and `+` indicate +simultaneous and sequential transmission in the TDMA domain respectively. +Therefore a combination `V0(a) & V1(b)` indicates that both channels `a` +and `b` are simultaneously active during a timeslot period. + +.Example: `VFF` in time domain (2 channels) + + MS1: | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | ... + -+---+---+---+---+> TDMA frames + MS2: | V1(TCH/F) | V1(TCH/F) | V1(TCH/F) | V1(TCH/F) | ... + + +.Example: `VHH` in time domain (4 channels) + + MS1: | V0(TCH/H0) || V0(TCH/H0) || ... + MS2: || V0(TCH/H1) || V0(TCH/H1) | ... + -+++++> TDMA frames + MS3: | V1(TCH/H0) || V1(TCH/H0) || ... + MS4: || V1(TCH/H1) || V1(TCH/H1) | ... + + +.Example: `VFH` in time domain (3 channels) + + MS1: | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | ... + -+++++> TDMA frames + MS2: | V1(TCH/H0) || V1(TCH/H0) || ... + MS3: || V1(TCH/H1) || V1(TCH/H1) | ... + + +.Example: `HVHH` in time domain (3 channels) + + MS1: |TCH/H0 ||TCH/H0 || ... + MS2: || V0(TCH/H1) || V0(TCH/H1) | ... + -+++++> TDMA frames + MS3: || V1(TCH/H1) || V1(TCH/H1) | ... + + +NOTE: Combination `HVHH` is special, because it allows the network to multiplex +a legacy user device (`MS1`) with a pair of VAMOS capable devices (`MS2` and `MS3`) +on the same timeslot, so the former (`MS1`) is neither required to support the new +orthogonal TSC sets nor conform to DARP phase I or II (SAIC support). + +For all VAMOS enabled channel combinations, it's *required* to specify Training +Sequence Code and the TSC set values for all multiplexed subscribers. See 3GPP +TS 45.002, table 5.2.3e for more details on TSC set selection. + +.Example: configuring a timeslot to use `VFF` combination + +CMD SETSLOT VFF C0/S1 <1> C0/S2 <2> +RSP SETSLOT VFF C0/S1 C0/S2 + +<1> V0(TCH/F) is configured to use TSC 0 from set 1 (table 5.2.3a). +<2> V1(TCH/F) is configured to use TSC 0 from set 2 (table 5.2.3b). + +.Example: configuring a timeslot to use `VFF` combination (legacy MS) + +CMD SETSLOT VFF C7/S1 <1> C4/S1 <2> +RSP SETSLOT VFF C7/S1 C4/S1 + +<1> V0(TCH/F) is configured to use TSC 7 from set 1 (table 5.2.3a). +<2> V1(TCH/F) is configured to use TSC 4 from set 1 (table 5.2.3a). + +NOTE: Using Training Sequences from the same set for a _VAMOS pair_ (in this example, +`C7/S1 C4/S1`) is not recommended because of their bad cross-correlation properties. +The only exception is when two legacy non-VAMOS capable phones are paired together +and neither of them does support additional TSC sets. + +.Example: configuring a timeslot to use `VHH` combination + +CMD SETSLOT VHH C1/S3 <1> C1/S4 <2> +RSP SETSLOT VHH C1/S3 C1/S4 + +<1> V0(TCH/H0) and V0(TCH/H1) are configured to use TSC 1 from set 3 (table 5.2.3c). +<2> V1(TCH/H0) and V1(TCH/H1) are configured
Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences .. TRXC: add proposal for multiple Training Sequences Change-Id: I621e46edac5d748472fd645f81876116904e260c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 65fb569..05c56a5 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -174,6 +174,32 @@ |13| PDTCH+PACCH+PTCCH |=== += Multiple Training Sequences (optional) + +For some setups it's insufficient to have a single Training Sequence Code assigned +to all timeslots of a transceiver. It may be required to use different TSCs for +some (or even all) timeslots. This can be achieved by sending `SETSLOT` command +with additional arguments: + +CMD SETSLOT [ C/S ] +RSP SETSLOT[ C/S ] + + +where `` is a Training Sequence Code from TSC set ``. + +NOTE: The numbering of both Training Sequence Code and set shall be the same as in +3GPP TS 45.002, e.g. `C0S1` corresponds to the first sequence in the first TSC set +for a chosen modulation type. TSC Set number 0 (`S0`) does not exist in the specs. + +.Example: configuring timeslot 4 to use TCH/F and TSC 7 from set 1 + +CMD SETSLOT 4 1 C7/S1 +RSP SETSLOT 0 4 1 C7/S1 + + +Unless explicitly configured as described above, all timeslots will be using the +default Training Sequence Code and set configured with the `SETTSC` command. + TRXD header version negotiation Messages on DATA interface may have different header formats, defined by a -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 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: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command .. TRXC: add missing description of the 'SETTSC' command Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 3c19da0..65fb569 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -127,6 +127,20 @@ RSP TXTUNE + Training Sequence configuration + +The usual way to configure all timeslots at once involves sending of the `SETTSC` +command with a desired Training Sequence Code ``: + +CMD SETTSC +CMD SETTSC + + +This command instructs the transceiver to use the given Training Sequence Code +from the TSC set 1 (see 3GPP TS 45.002, table 5.2.3a) for Normal Burst detection +on the receive path. It does not affect the transmit path because bursts coming +from the BTS do contain the Training Sequence bits. + Timeslot Control `SETSLOT` sets the format of a given uplink timeslot in the ARFCN. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 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: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXC: use monospace formatting (the backticks) for 'SETFORMAT'
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 ) Change subject: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' .. TRXC: use monospace formatting (the backticks) for 'SETFORMAT' Change-Id: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index f15ed7b..3c19da0 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -166,7 +166,7 @@ version number, which can be negotiated on the control interface. By default, the Transceiver will use the legacy header version (0). -The header format negotiation can be initiated by the BTS using 'SETFORMAT' +The header format negotiation can be initiated by the BTS using `SETFORMAT` command. If the requested version is not supported by the transceiver, status code of the response message should indicate a preferred (basically, the latest) version. The format of this message is the following: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 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: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Gerrit-Change-Number: 22866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 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: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 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: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 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: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 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: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/22747 )
Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request
..
fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request
Calling gsm48_cc_tx_release() before mncc_release_ind() has a side
effect: the former may change CC state to GSM_CSTATE_RELEASE_REQ.
This makes the later send MNCC_REL_CNF instead of MNCC_REL_IND, so
if one of the call leg disconnects due to RF failure, the other one
will not be terminated correctly.
Makes both TC_{mo,mt}_call_clear_request TTCN-3 test cases pass.
Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1
Related: Id16969fe0de04445d1320a96d35cf1d48cc8cf09
Related: SYS#5340
---
M src/libmsc/gsm_04_08_cc.c
M tests/msc_vlr/msc_vlr_test_call.c
M tests/msc_vlr/msc_vlr_test_call.err
3 files changed, 10 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index ed29e84..704e596 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -272,6 +272,13 @@
/* send release to L4, if callref still exists */
if (trans->callref) {
+ /* Send MNCC REL.ind (cause='Resource unavailable') */
+ if (trans->cc.mncc_initiated) {
+ mncc_release_ind(trans->net, trans, trans->callref,
+GSM48_CAUSE_LOC_PRN_S_LU,
+GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
+ }
+
/* FIXME: currently, a CC trans that would not yet be in state
GSM_CSTATE_RELEASE_REQ fails to send a
* CC Release to the MS if it gets freed here. Hack it to do
so. */
if (trans->cc.state != GSM_CSTATE_RELEASE_REQ) {
@@ -280,11 +287,6 @@
mncc_set_cause(, GSM48_CAUSE_LOC_PRN_S_LU,
GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
gsm48_cc_tx_release(trans, );
}
- /* Resource unavailable */
- if (trans->cc.mncc_initiated)
- mncc_release_ind(trans->net, trans, trans->callref,
-GSM48_CAUSE_LOC_PRN_S_LU,
-GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
/* This is a final freeing of the transaction. The MNCC release
may have triggered the
* T308 release timer, but we don't have the luxury of graceful
CC Release here. */
gsm48_stop_cc_timer(trans);
diff --git a/tests/msc_vlr/msc_vlr_test_call.c
b/tests/msc_vlr/msc_vlr_test_call.c
index b4e20be..9ab1066 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -457,11 +457,7 @@
fake_time_passes(15, 23);
btw("The call failed, the BSC sends a BSSMAP Clear Request");
- /* FIXME: in this scenario, we send an MNCC_REL_CNF even though MNCC
never asked us to MNCC_REL_REQ. Legacy
-* behavior did get to both MNCC_REL_IND, then an MNCC_REL_REQ from
MNCC as well as a final MNCC_REL_CNF, but
-* this only worked synchronously, i.e. only with internal MNCC.
Instead of mimicking that, we need a proper
-* async solution that also works with a PBX. */
- cc_to_mncc_expect_tx("", MNCC_REL_CNF);
+ cc_to_mncc_expect_tx("", MNCC_REL_IND);
dtap_expect_tx("032d0802e1af"); /* CC: Release */
expect_iu_release();
msc_a_release_cn(msub_msc_a(g_msub));
diff --git a/tests/msc_vlr/msc_vlr_test_call.err
b/tests/msc_vlr/msc_vlr_test_call.err
index 1bcc489..e8e3880 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -1302,6 +1302,8 @@
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 -
vlr_subscr_cancel_attach_fsm: now used by 4
(attached,CC,active-conn,msc_a_fsm_releasing_onenter)
DCC trans(CC:CALL_RECEIVED
IMSI-90170010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP
callref-0x423 tid-0) Freeing transaction
DCC trans(CC:CALL_RECEIVED
IMSI-90170010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP
callref-0x423 tid-0) stopping pending timer T301
+DMNCC trans(CC:CALL_RECEIVED
IMSI-90170010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP
callref-0x423 tid-0) tx MNCC_REL_IND
+ MSC --> MNCC: callref 0x423: MNCC_REL_IND
DCC trans(CC:CALL_RECEIVED
IMSI-90170010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP
callref-0x423 tid-0) starting timer T308 with 10 seconds
DCC trans(CC:CALL_RECEIVED
IMSI-90170010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP
callref-0x423 tid-0) new state CALL_RECEIVED -> RELEASE_REQ
DIUCS
Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22747 ) Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request .. Patch Set 3: Code-Review+2 Let's get this merged. 1 + 1 = 2. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:03:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22880 ) Change subject: gsm: Fix bitfield order in dtap_header .. Patch Set 1: Code-Review+2 ... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 Gerrit-Change-Number: 22880 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 13 Feb 2021 04:48:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: main: cosmetic: tweak deprecation warning messages
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22890 ) Change subject: main: cosmetic: tweak deprecation warning messages .. main: cosmetic: tweak deprecation warning messages Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 --- M src/common/main.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/22890/1 diff --git a/src/common/main.c b/src/common/main.c index f54a5ca..76e0d43 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -181,15 +181,15 @@ break; case 'r': rt_prio = atoi(optarg); - fprintf(stderr, "Parameter -r is deprecated, use VTY cpu-sched " - "node setting 'policy rr %d' instead\n", rt_prio); + fprintf(stderr, "Command line argument '-r' is deprecated, use VTY " + "cpu-sched node setting 'policy rr %d' instead.\n", rt_prio); break; case 'i': gsmtap_ip = optarg; break; case 't': - fprintf(stderr, "Parameter -t is deprecated and does nothing, " - "TRX num is calculated from VTY\n"); + fprintf(stderr, "Command line argument '-t' is deprecated and does nothing, " + "TRX number is calculated from the VTY automatically.\n"); break; case '?': case 1: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 Gerrit-Change-Number: 22890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts'
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22893 )
Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts'
..
GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts'
Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481
---
M include/osmo-bts/bts.h
M include/osmo-bts/l1sap.h
M src/common/l1sap.c
M src/common/main.c
M src/common/vty.c
5 files changed, 29 insertions(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/22893/1
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h
index f6389ad..3adafcc 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -343,6 +343,13 @@
char *sock_path;
} pcu;
+ /* GSMTAP Um logging (disabled by default) */
+ struct {
+ struct gsmtap_inst *inst;
+ uint32_t sapi_mask;
+ uint8_t sapi_acch;
+ } gsmtap;
+
struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown
procedure during process exit */
struct osmo_tdef *T_defs; /* Timer defines */
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index af58d5e..fe77431 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -127,10 +127,6 @@
extern uint16_t l1sap_log_ctx_sapi;
extern const struct value_string l1sap_common_sapi_names[];
-extern struct gsmtap_inst *gsmtap;
-extern uint32_t gsmtap_sapi_mask;
-extern uint8_t gsmtap_sapi_acch;
-
int add_l1sap_header(struct gsm_bts_trx *trx, struct msgb *rmsg,
struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,
uint16_t ber10k, int16_t lqual_cb, int8_t rssi,
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 9b3b087..eb652db 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -346,10 +346,6 @@
}
}
-struct gsmtap_inst *gsmtap = NULL;
-uint32_t gsmtap_sapi_mask = 0;
-uint8_t gsmtap_sapi_acch = 0;
-
/* send primitive as gsmtap */
static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap,
uint8_t *chan_type, uint8_t *ss, uint32_t fn,
@@ -491,7 +487,8 @@
int8_t signal_dbm;
int rc;
- if (!gsmtap)
+ struct gsmtap_inst *inst = trx->bts->gsmtap.inst;
+ if (!inst)
return 0;
switch (OSMO_PRIM_HDR(>oph)) {
@@ -524,10 +521,10 @@
if (len == 0)
return 0;
if ((chan_type & GSMTAP_CHANNEL_ACCH)) {
- if (!gsmtap_sapi_acch)
+ if (!trx->bts->gsmtap.sapi_acch)
return 0;
} else {
- if (!((1 << (chan_type & 31)) & gsmtap_sapi_mask))
+ if (!((1 << (chan_type & 31)) & trx->bts->gsmtap.sapi_mask))
return 0;
}
@@ -536,7 +533,7 @@
if (is_fill_frame(chan_type, data, len))
return 0;
- gsmtap_send(gsmtap, trx->arfcn | uplink, tn, chan_type, ss, fn,
+ gsmtap_send(inst, trx->arfcn | uplink, tn, chan_type, ss, fn,
signal_dbm, 0 /* TODO: SNR */, data, len);
return 0;
diff --git a/src/common/main.c b/src/common/main.c
index 76e0d43..38f517c 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -321,12 +321,12 @@
}
if (gsmtap_ip) {
- gsmtap = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);
- if (!gsmtap) {
+ g_bts->gsmtap.inst = gsmtap_source_init(gsmtap_ip,
GSMTAP_UDP_PORT, 1);
+ if (g_bts->gsmtap.inst == NULL) {
fprintf(stderr, "Failed during gsmtap_init()\n");
exit(1);
}
- gsmtap_source_add_sink(gsmtap);
+ gsmtap_source_add_sink(g_bts->gsmtap.inst);
}
if (bts_init(g_bts) < 0) {
diff --git a/src/common/vty.c b/src/common/vty.c
index 976ccfa..f2c7954 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -316,7 +316,7 @@
bts->agch_queue.high_level, VTY_NEWLINE);
for (i = 0; i < sizeof(uint32_t) * 8; i++) {
- if (gsmtap_sapi_mask & ((uint32_t) 1 << i)) {
+ if (bts->gsmtap.sapi_mask & ((uint32_t) 1 << i)) {
sapi_buf = get_value_string_or_null(gsmtap_sapi_names,
i);
if (sapi_buf == NULL)
continue;
@@ -324,7 +324,7 @@
vty_out(vty, " gsmtap-sapi %s%s", sapi_buf,
VTY_NEWLINE);
}
}
- if (gsmtap_sapi_acch) {
+ if (bts->gsmtap.sapi_acch) {
sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names,
GSMTAP_CHANNEL_ACCH));
vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE);
}
@@ -1832,12 +1832,14 @@
"Enable all kinds of messages (all SAPI)\n"
"Disable all
Change in osmo-bts[master]: GSMTAP: fix wrong naming of per-BTS SAPI commands
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22892 )
Change subject: GSMTAP: fix wrong naming of per-BTS SAPI commands
..
GSMTAP: fix wrong naming of per-BTS SAPI commands
Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8
---
M src/common/vty.c
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/22892/1
diff --git a/src/common/vty.c b/src/common/vty.c
index 84e3968..976ccfa 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1826,7 +1826,7 @@
"logical channel commands\n"\
"logical channel number\n"
-DEFUN(cfg_trx_gsmtap_sapi_all, cfg_trx_gsmtap_sapi_all_cmd,
+DEFUN(cfg_bts_gsmtap_sapi_all, cfg_bts_gsmtap_sapi_all_cmd,
"gsmtap-sapi (enable-all|disable-all)",
"Enable/disable sending of UL/DL messages over GSMTAP\n"
"Enable all kinds of messages (all SAPI)\n"
@@ -1843,7 +1843,7 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_trx_gsmtap_sapi, cfg_trx_gsmtap_sapi_cmd,
+DEFUN(cfg_bts_gsmtap_sapi, cfg_bts_gsmtap_sapi_cmd,
"HIDDEN", "HIDDEN")
{
int sapi;
@@ -1859,7 +1859,7 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_trx_no_gsmtap_sapi, cfg_trx_no_gsmtap_sapi_cmd,
+DEFUN(cfg_trx_no_gsmtap_sapi, cfg_bts_no_gsmtap_sapi_cmd,
"HIDDEN", "HIDDEN")
{
int sapi;
@@ -2165,17 +2165,17 @@
int bts_vty_init(void *ctx)
{
- cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
+ cfg_bts_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
"gsmtap-sapi (",
"|",")", VTY_DO_LOWER);
- cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
+ cfg_bts_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
"Enable sending of UL/DL
messages over GSMTAP\n",
"\n", "", 0);
- cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
+ cfg_bts_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
"no gsmtap-sapi (",
"|",")", VTY_DO_LOWER);
- cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
+ cfg_bts_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
NO_STR "Disable sending of
UL/DL messages over GSMTAP\n",
"\n", "", 0);
@@ -2233,9 +2233,9 @@
install_element(BTS_NODE, _bts_smscb_tgt_qlen_cmd);
install_element(BTS_NODE, _bts_smscb_qhyst_cmd);
- install_element(BTS_NODE, _trx_gsmtap_sapi_all_cmd);
- install_element(BTS_NODE, _trx_gsmtap_sapi_cmd);
- install_element(BTS_NODE, _trx_no_gsmtap_sapi_cmd);
+ install_element(BTS_NODE, _bts_gsmtap_sapi_all_cmd);
+ install_element(BTS_NODE, _bts_gsmtap_sapi_cmd);
+ install_element(BTS_NODE, _bts_no_gsmtap_sapi_cmd);
/* add and link to TRX config node */
install_element(BTS_NODE, _bts_trx_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22892
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8
Gerrit-Change-Number: 22892
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22891 )
Change subject: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c
..
GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c
There is no point in having it there, as VTY is the only user.
Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c
---
M include/osmo-bts/l1sap.h
M src/common/l1sap.c
M src/common/vty.c
3 files changed, 17 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/22891/1
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 85fe548..af58d5e 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -127,7 +127,6 @@
extern uint16_t l1sap_log_ctx_sapi;
extern const struct value_string l1sap_common_sapi_names[];
-extern const struct value_string gsmtap_sapi_names[];
extern struct gsmtap_inst *gsmtap;
extern uint32_t gsmtap_sapi_mask;
extern uint8_t gsmtap_sapi_acch;
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 97dd661..9b3b087 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -350,23 +350,6 @@
uint32_t gsmtap_sapi_mask = 0;
uint8_t gsmtap_sapi_acch = 0;
-const struct value_string gsmtap_sapi_names[] = {
- { GSMTAP_CHANNEL_BCCH, "BCCH" },
- { GSMTAP_CHANNEL_CCCH, "CCCH" },
- { GSMTAP_CHANNEL_RACH, "RACH" },
- { GSMTAP_CHANNEL_AGCH, "AGCH" },
- { GSMTAP_CHANNEL_PCH, "PCH" },
- { GSMTAP_CHANNEL_SDCCH, "SDCCH" },
- { GSMTAP_CHANNEL_TCH_F, "TCH/F" },
- { GSMTAP_CHANNEL_TCH_H, "TCH/H" },
- { GSMTAP_CHANNEL_PACCH, "PACCH" },
- { GSMTAP_CHANNEL_PDCH, "PDTCH" },
- { GSMTAP_CHANNEL_PTCCH, "PTCCH" },
- { GSMTAP_CHANNEL_CBCH51,"CBCH" },
- { GSMTAP_CHANNEL_ACCH, "SACCH" },
- { 0, NULL }
-};
-
/* send primitive as gsmtap */
static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap,
uint8_t *chan_type, uint8_t *ss, uint32_t fn,
diff --git a/src/common/vty.c b/src/common/vty.c
index f36c09e..84e3968 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -71,6 +71,23 @@
int g_vty_port_num = OSMO_VTY_PORT_BTS;
+static const struct value_string gsmtap_sapi_names[] = {
+ { GSMTAP_CHANNEL_BCCH, "BCCH" },
+ { GSMTAP_CHANNEL_CCCH, "CCCH" },
+ { GSMTAP_CHANNEL_RACH, "RACH" },
+ { GSMTAP_CHANNEL_AGCH, "AGCH" },
+ { GSMTAP_CHANNEL_PCH, "PCH" },
+ { GSMTAP_CHANNEL_SDCCH, "SDCCH" },
+ { GSMTAP_CHANNEL_TCH_F, "TCH/F" },
+ { GSMTAP_CHANNEL_TCH_H, "TCH/H" },
+ { GSMTAP_CHANNEL_PACCH, "PACCH" },
+ { GSMTAP_CHANNEL_PDCH, "PDTCH" },
+ { GSMTAP_CHANNEL_PTCCH, "PTCCH" },
+ { GSMTAP_CHANNEL_CBCH51,"CBCH" },
+ { GSMTAP_CHANNEL_ACCH, "SACCH" },
+ { 0, NULL }
+};
+
struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int
inst_nr)
{
struct phy_link *plink = phy_link_by_num(phy_nr);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22891
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c
Gerrit-Change-Number: 22891
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 166s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 166s] [COMPILING libboard/qmod/source/card_pres.c] [ 166s] [COMPILING libboard/qmod/source/wwan_led.c] [ 167s] [COMPILING libboard/qmod/source/i2c.c] [ 167s] [COMPILING libboard/qmod/source/board_qmod.c] [ 167s] [COMPILING apps/dfu/main.c] [ 167s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 167s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 167s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 168s] Memory region Used Size Region Size %age Used [ 168s] rom: 16588 B16 KB101.25% [ 168s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 168s] collect2: error: ld returned 1 exit status [ 168s] % [ 168s] make[2]: *** [Makefile:234: flash] Error 1 [ 168s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 168s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 168s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 168s] dh_auto_build: error: make -j1 returned exit code 2 [ 168s] make: *** [debian/rules:16: build] Error 25 [ 168s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 168s] ### VM INTERACTION START ### [ 171s] [ 158.915191] sysrq: Power Off [ 171s] [ 158.918258] reboot: Power down [ 171s] ### VM INTERACTION END ### [ 171s] [ 171s] old-atreju3 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 13 02:25:18 UTC 2021. [ 171s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] [COMPILING apps/dfu/main.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 161s] Memory region Used Size Region Size %age Used [ 161s] rom: 16580 B16 KB101.20% [ 161s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 161s] collect2: error: ld returned 1 exit status [ 161s] % [ 161s] make[2]: *** [Makefile:234: flash] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 161s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: error: make -j1 returned exit code 2 [ 161s] make: *** [debian/rules:16: build] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 150.796290] sysrq: Power Off [ 164s] [ 150.803898] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb57 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 13 02:21:39 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated .. Patch Set 1: > Patch Set 1: > > Are you sure the lower layers will not override the L1 SACCH header? I am > afraid they (most likely) will. Nevermind. This only applies to DSP based models and when DSP based power control is enabled. The L1 SACCH header is composed in l1sap.c regardless of the model, and may be overwritten by DSP based models. Since they do not support ACCH repetition, this is not a problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 23:39:53 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: add logging for ACCH repetition
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/22888 )
Change subject: l1sap: add logging for ACCH repetition
..
Patch Set 1:
(9 comments)
IMHO, this amount of logging is only suitable for development stage. For a
regular user/customer trying to understand what's going on it's too verbose.
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@938
PS1, Line 938: DL1C
Pau was complaining about unreadable DL1C (https://osmocom.org/issues/5007),
maybe DL1P?
The 'L1C' stands for "Layer 1 Control", 'DL1P' stands for "Layer 1 Primitives".
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@938
PS1, Line 938: DL-FACCH repetition: repeating FACCH channel
How can you 'repeat FACCH channel'? You actually repeat a 'FACCH block', or
more precisely 'retransmit' it.
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@943
PS1, Line 943: channel
Same here.
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@994
PS1, Line 994: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH
repetition: disabled by BSC\n");
This looks redundant to me, if it's disabled that I would not expect any
logging.
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@1044
PS1, Line 1044: if (rxqual >= upper) {
How about storing the current 'repeated_dl_facch_active' value and logging only
if it changes from true to false and vice versa?
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@1066
PS1, Line 1066: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH
repetition: MS does not request DL-SACCH repetition (SRR=0)\n");
This also looks redundant, and would probably make 'DL1C' unreadable.
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@1083
PS1, Line 1083: channel
block
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@1091
PS1, Line 1091:
ws, unrelated
https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c@1468
PS1, Line 1468: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH
repetition: disabled by BSC\n");
Same here.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e
Gerrit-Change-Number: 22888
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: fixeria
Gerrit-Comment-Date: Fri, 12 Feb 2021 22:39:42 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22889 ) Change subject: bssgp_bvc_fsm: Consistent naming .. Patch Set 1: These functions don't seem to be used by any of our programs (according to grep) so this commit doesn't depend on anything. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 Gerrit-Change-Number: 22889 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 12 Feb 2021 21:32:40 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22889 )
Change subject: bssgp_bvc_fsm: Consistent naming
..
bssgp_bvc_fsm: Consistent naming
bssgp_bvc_get_features_* are fsm "methods" and the name should indicate
that just lika all other function names in bssgp_bvc_fsm.h
Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39
---
M include/osmocom/gprs/bssgp_bvc_fsm.h
M src/gb/bssgp_bvc_fsm.c
M src/gb/libosmogb.map
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/22889/1
diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h
b/include/osmocom/gprs/bssgp_bvc_fsm.h
index 824cdec..446dda8 100644
--- a/include/osmocom/gprs/bssgp_bvc_fsm.h
+++ b/include/osmocom/gprs/bssgp_bvc_fsm.h
@@ -61,9 +61,9 @@
uint8_t bssgp_bvc_fsm_get_block_cause(struct osmo_fsm_inst *fi);
-uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi);
-uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi);
-uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi);
+uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi);
+uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi);
+uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi);
void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t
max_pdu_len);
uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi);
\ No newline at end of file
diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c
index a035938..8d284d1 100644
--- a/src/gb/bssgp_bvc_fsm.c
+++ b/src/gb/bssgp_bvc_fsm.c
@@ -794,7 +794,7 @@
}
/*! Return the advertised features / extended features. */
-uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi)
+uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi)
{
struct bvc_fsm_priv *bfp = fi->priv;
@@ -803,7 +803,7 @@
}
/*! Return the received features / extended features. */
-uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi)
+uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi)
{
struct bvc_fsm_priv *bfp = fi->priv;
@@ -812,7 +812,7 @@
}
/*! Return the negotiated features / extended features. */
-uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi)
+uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi)
{
struct bvc_fsm_priv *bfp = fi->priv;
diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map
index 2327815..699ed1b 100644
--- a/src/gb/libosmogb.map
+++ b/src/gb/libosmogb.map
@@ -93,9 +93,9 @@
bssgp_bvc_fsm_set_ops;
bssgp_bvc_fsm_is_unblocked;
bssgp_bvc_fsm_get_block_cause;
-bssgp_bvc_get_features_advertised;
-bssgp_bvc_get_features_received;
-bssgp_bvc_get_features_negotiated;
+bssgp_bvc_fsm_get_features_advertised;
+bssgp_bvc_fsm_get_features_received;
+bssgp_bvc_fsm_get_features_negotiated;
bssgp_bvc_fsm_set_max_pdu_len;
bssgp_bvc_fsm_get_max_pdu_len;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39
Gerrit-Change-Number: 22889
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated .. Patch Set 1: Are you sure the lower layers will not override the L1 SACCH header? I am afraid they (most likely) will. Not sure if I already mentioned or not, but ACCH repetition in general seems to lack proper unit/conformance test coverage. If there were tests, I would not even ask this question... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 21:20:00 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: fix comment: sapi number is missing
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22886 ) Change subject: l1sap: fix comment: sapi number is missing .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 Gerrit-Change-Number: 22886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 12 Feb 2021 21:11:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22873/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22873/1//COMMIT_MSG@5 PS1, Line 5: CommitDate: 2021-02-12 03:33:30 +0100 > I think we should somehow specify what it means specifically. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 20:58:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced...
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22859 ) Change subject: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 Gerrit-Change-Number: 22859 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 20:57:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state...
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22828 ) Change subject: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 Gerrit-Change-Number: 22828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 20:52:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESO...
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22827 ) Change subject: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2ed2580bbbdd6d3464833257b0dcb8ec6f8d699 Gerrit-Change-Number: 22827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 20:47:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: add logging for ACCH repetition
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22888 )
Change subject: l1sap: add logging for ACCH repetition
..
l1sap: add logging for ACCH repetition
At the moment osmo-bts is not looging much ACCH repetition related
information. This makes testing ACCH repetition difficult. Lets add some
debug output that informs the user when ACCH repetition is turned on or
off. Also log when a repetition candidate is stored or when a channel is
repeated.
Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e
Related: SYS#5114
---
M src/common/l1sap.c
1 file changed, 44 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/22888/1
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 025982a..05c4f08 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -935,10 +935,12 @@
/* Re-use stored FACCH message buffer from SLOT #0 for
repetition. */
msg = lchan->tch.rep_facch[0].msg;
lchan->tch.rep_facch[0].msg = NULL;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition:
repeating FACCH channel\n");
} else if (lchan->tch.rep_facch[1].msg && GSM_TDMA_FN_SUB(fn,
lchan->tch.rep_facch[1].fn) >= 8) {
/* Re-use stored FACCH message buffer from SLOT #1 for
repetition. */
msg = lchan->tch.rep_facch[1].msg;
lchan->tch.rep_facch[1].msg = NULL;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition:
repeating FACCH channel\n");
} else {
/* Fetch new FACCH from queue ... */
if (lapdm_phsap_dequeue_prim(le, ) < 0)
@@ -957,9 +959,11 @@
if (lchan->tch.rep_facch[0].msg == NULL) {
lchan->tch.rep_facch[0].msg = msgb_copy(msg,
"rep_facch_0");
lchan->tch.rep_facch[0].fn = fn;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH
repetition: stored repetition candidate\n");
} else if (lchan->tch.rep_facch[1].msg == NULL) {
lchan->tch.rep_facch[1].msg = msgb_copy(msg,
"rep_facch_1");
lchan->tch.rep_facch[1].fn = fn;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH
repetition: stored repetition candidate\n");
} else {
/* By definition 3GPP TS 05.02 does not allow more than
two (for TCH/H only one) FACCH blocks
* to be transmitted simultaniously. */
@@ -987,12 +991,19 @@
if (!lchan->repeated_acch_capability.dl_facch_cmd
&& !lchan->repeated_acch_capability.dl_facch_all) {
lchan->repeated_dl_facch_active = false;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition:
disabled by BSC\n");
return;
}
+ if (lchan->repeated_dl_facch_active)
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition:
active\n");
+ else
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition:
inactive\n");
+
/* Threshold disabled (always on) */
if (lchan->repeated_acch_capability.rxqual == 0) {
lchan->repeated_dl_facch_active = true;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: no
threshold => DL-FACCH repetition active\n");
return;
}
@@ -1000,6 +1011,7 @@
* (repeated SACCH requested) then it makes sense to enable
* FACCH repetition too. */
if ((lchan->meas.l1_info[0] >> 1) & 1) {
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: MS
requests DL-SACCH repetition => DL-FACCH repetition also active\n");
lchan->repeated_dl_facch_active = true;
return;
}
@@ -1029,10 +1041,15 @@
else
rxqual = meas_res->rxqual_full;
- if (rxqual >= upper)
+ if (rxqual >= upper) {
lchan->repeated_dl_facch_active = true;
- else if (rxqual <= lower)
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: rxqual
(%u) >= upper rxqual threshold (%u) => DL-FACCH repetition active\n",
+ rxqual, upper);
+ } else if (rxqual <= lower) {
lchan->repeated_dl_facch_active = false;
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: rxqual
(%u) <= lower rxqual threshold (%u) => DL-FACCH repetition inactive\n",
+ rxqual, lower);
+ }
}
@@ -1043,6 +1060,11 @@
struct msgb *msg;
uint8_t sapi;
+ if ((lchan->meas.l1_info[0] >> 1) & 1)
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: MS
requests DL-SACCH repetition (SRR=1)\n");
+ else
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: MS
does not
Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22887 )
Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated
..
l1sap: be sure that the DL-SACCH l1 header is also repeated
When the MS requests DL-SACCH repetition, an exact copy of the
previously transmitted SACCH block is expected. At the moment osmo-bts
does only save the payload of the DL-SACCH without the two byte L1
header for repetition.
Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9
Related: SYS#5114
---
M include/osmo-bts/gsm_data.h
M src/common/l1sap.c
2 files changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/22887/1
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index 05b6cf2..22099a1 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -409,6 +409,7 @@
/* Message buffer to store DL-SACCH repeation candidate */
struct msgb *rep_sacch;
+uint8_t rep_sacch_l1_hdr[2];
};
static inline uint8_t lchan_get_ta(const struct gsm_lchan *lchan)
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index be50ed2..025982a 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1037,7 +1037,7 @@
}
/* Special dequeueing function with SACCH repetition (3GPP TS 44.006, section
11) */
-static inline struct msgb *lapdm_phsap_dequeue_msg_sacch(struct gsm_lchan
*lchan, struct lapdm_entity *le)
+static inline struct msgb *lapdm_phsap_dequeue_msg_sacch(struct gsm_lchan
*lchan, struct lapdm_entity *le, uint8_t *p)
{
struct osmo_phsap_prim pp;
struct msgb *msg;
@@ -1056,6 +1056,8 @@
/* Use previous repetition candidate */
msg = lchan->rep_sacch;
lchan->rep_sacch = NULL;
+ p[0] = lchan->rep_sacch_l1_hdr[0];
+ p[1] = lchan->rep_sacch_l1_hdr[1];
return msg;
}
}
@@ -1068,8 +1070,11 @@
/* Only LAPDm frames for SAPI 0 may become a repetition
* candidate. */
- if (sapi == 0)
+ if (sapi == 0) {
lchan->rep_sacch = msgb_copy(msg, "rep_sacch");
+ lchan->rep_sacch_l1_hdr[0] = p[0];
+ lchan->rep_sacch_l1_hdr[1] = p[1];
+ }
return msg;
}
@@ -1158,7 +1163,7 @@
p[1] = lchan->rqd_ta;
le = >lapdm_ch.lapdm_acch;
if (lchan->repeated_acch_capability.dl_sacch)
- pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan,
le);
+ pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan,
le, p);
else
pp_msg = lapdm_phsap_dequeue_msg(le);
} else {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9
Gerrit-Change-Number: 22887
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in osmo-bts[master]: l1sap: fix comment: sapi number is missing
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22886 ) Change subject: l1sap: fix comment: sapi number is missing .. l1sap: fix comment: sapi number is missing Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/22886/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 97dd661..be50ed2 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1066,7 +1066,7 @@ msg = pp.oph.msg; sapi = (msg->data[0] >> 2) & 0x07; - /* Only LAPDm frames for SAPI may become a repetition + /* Only LAPDm frames for SAPI 0 may become a repetition * candidate. */ if (sapi == 0) lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 Gerrit-Change-Number: 22886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_process_attach_accept on ran_index != 0
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 )
Change subject: sgsn: Fix f_process_attach_accept on ran_index != 0
..
sgsn: Fix f_process_attach_accept on ran_index != 0
Change-Id: I7d859fd710dba96eb9b46c428243281183e1be12
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/84/22884/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 4c0a8ab..4e35144 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -765,12 +765,12 @@
}
}
-function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on
BSSGP_ConnHdlr {
+function f_process_attach_accept(PDU_GMM_AttachAccept aa, integer ran_index :=
0) runs on BSSGP_ConnHdlr {
/* mandatory IE */
var hexstring aa_plmn :=
f_RAI_to_plmn_hexstr(aa.routingAreaIdentification);
- if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) {
+ if (not (g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc == aa_plmn))
{
setverdict(fail, "mismatching PLMN in Attach Accept: " &
hex2str(aa_plmn)
- & "; expected " &
hex2str(g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc));
+ & "; expected " &
hex2str(g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc));
mtc.stop;
}
g_pars.ra := aa.routingAreaIdentification;
@@ -779,7 +779,8 @@
setverdict(fail, "unexpected P-TMSI allocation");
mtc.stop;
}
-
f_upd_ptmsi_and_tlli(aa.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets);
+
f_upd_ptmsi_and_tlli(aa.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets,
+ran_index);
}
if (ispresent(aa.msIdentity)) {
setverdict(fail, "unexpected TMSI allocation in non-combined
attach");
@@ -802,7 +803,8 @@
setverdict(fail, "unexpected P-TMSI allocation");
mtc.stop;
}
-
f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets,
ran_index);
+
f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets,
+ran_index);
}
if (ispresent(ra.msIdentity)) {
setverdict(fail, "unexpected TMSI allocation in non-combined
attach");
@@ -860,7 +862,7 @@
f_gmm_gsup_lu_isd();
l3_mt := f_receive_l3(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?), ran_index);
- f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept);
+ f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept, ran_index);
/* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */
f_send_l3(ts_GMM_ATTACH_COMPL, ran_index);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I7d859fd710dba96eb9b46c428243281183e1be12
Gerrit-Change-Number: 22884
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases"
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 18:53:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22883 ) Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 Gerrit-Change-Number: 22883 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 18:39:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 18:39:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases"
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/22882 )
Change subject: Revert "RFC: allow to set configuration and/or specific
testcases"
..
Revert "RFC: allow to set configuration and/or specific testcases"
Fix error message reported by Pau:
docker: invalid reference format: repository name must be lowercase.
This happens in the "docker run" command after the "Starting container
to merge logs" message, because the arguments to --entrypoint are not in
quotation marks. The command fails.
Logs were merged anyway, because
If03422bb8fb126fe6f204a4f8bc6edf0cbb7f194 had already reverted half the
patch and added the log merging back to the Dockerfile.
This reverts commit 73663b01f21e9a01cf3e5048d802270c482852cf.
Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad
---
M ttcn3-sgsn-test/jenkins.sh
1 file changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/82/22882/1
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 623f468..35eaf2e 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -56,17 +56,6 @@
-v $VOL_BASE_DIR/sgsn-tester:/data \
--name ${BUILD_TAG}-ttcn3-sgsn-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-sgsn-test $@
-
-echo Starting container to merge logs
-docker run --rm \
- $(docker_network_params $SUBNET 103) \
- --ulimit core=-1 \
- -e "TTCN3_PCAP_PATH=/data" \
- -v $VOL_BASE_DIR/sgsn-tester:/data \
- --name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \
- --entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \
- $DOCKER_ARGS \
$REPO_USER/ttcn3-sgsn-test
echo Stopping containers
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad
Gerrit-Change-Number: 22882
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/22883 )
Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd
..
ttcn3-gbproxy-test: remove broken merge logs cmd
Remove commands that result in a docker error message, like in
Ie6f8270230e1f0372b63d610b7868ea8719b18ad.
Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9
---
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-gbproxy-test/jenkins.sh
2 files changed, 0 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/83/22883/1
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 863e8ef..4ef2ace 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -78,18 +78,6 @@
# must shift the net-devices into the container _after_ it is started
docker logs-f ${BUILD_TAG}-ttcn3-gbproxy-test
-
-echo Starting container to merge logs
-docker run --rm \
- $(docker_network_params $SUBNET 103) \
- --ulimit core=-1 \
- -e "TTCN3_PCAP_PATH=/data" \
- -v $VOL_BASE_DIR/gbproxy-tester:/data \
- --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \
- --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \
- $DOCKER_ARGS \
- $REPO_USER/ttcn3-gbproxy-test
-
echo Stopping containers
docker container kill ${BUILD_TAG}-gbproxy
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index 9605608..b063c7f 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -45,17 +45,6 @@
$DOCKER_ARGS \
$REPO_USER/ttcn3-gbproxy-test $@
-echo Starting container to merge logs
-docker run --rm \
- $(docker_network_params $SUBNET 103) \
- --ulimit core=-1 \
- -e "TTCN3_PCAP_PATH=/data" \
- -v $VOL_BASE_DIR/gbproxy-tester:/data \
- --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \
- --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \
- $DOCKER_ARGS \
- $REPO_USER/ttcn3-gbproxy-test
-
echo Stopping containers
docker container kill ${BUILD_TAG}-gbproxy
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9
Gerrit-Change-Number: 22883
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_cellid_to_RAI
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 ) Change subject: sgsn: Fix f_cellid_to_RAI .. sgsn: Fix f_cellid_to_RAI Change-Id: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/22881/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 7d47a1f..4c0a8ab 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -236,8 +236,8 @@ mncDigit3 := mcc_mnc[3], mncDigit1 := mcc_mnc[4], mncDigit2 := mcc_mnc[5], -lac := int2oct(cell_id.ra_id.lai.lac, 16), -rac := int2oct(cell_id.ra_id.rac, 8) +lac := int2oct(cell_id.ra_id.lai.lac, 2), +rac := int2oct(cell_id.ra_id.rac, 1) } return ret; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 Gerrit-Change-Number: 22881 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice*
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42908a00f8d076e3559efde298a739d6b26d090e Gerrit-Change-Number: 22858 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 16:17:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup*
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* .. Patch Set 2: Code-Review+1 I agree that it would probably be much easier to review if there was less duplicate code. But you already stated your reasons. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 16:13:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22880 )
Change subject: gsm: Fix bitfield order in dtap_header
..
gsm: Fix bitfield order in dtap_header
This bitfield was added later and all osmocom code still uses the old
field contain 1 byte "link_id". There's only one known user of the new
bitfield which only uses it to log the SAPI name in osmocom, so no
logical breakage is expected with this change (other than fixing a log
line).
While at it, fix a typo in comment describing related enum.
Related: SYS#4909
Fixes: 392f607f2d42eb2839ccfc4c1b9e2c7cfaf3bcc2
Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67
---
M include/osmocom/gsm/protocol/gsm_08_08.h
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/22880/1
diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h
b/include/osmocom/gsm/protocol/gsm_08_08.h
index fe7776b..7ef7a29 100644
--- a/include/osmocom/gsm/protocol/gsm_08_08.h
+++ b/include/osmocom/gsm/protocol/gsm_08_08.h
@@ -49,12 +49,12 @@
uint8_t link_id; /* Backward compatibility */
struct {
#if OSMO_IS_LITTLE_ENDIAN
- uint8_t dlci_cc:2,
+ uint8_t dlci_sapi:3, /* enum gsm0406_dlci_sapi */
dlci_spare:3,
- dlci_sapi:3; /* enum gsm0406_dlc_sapi */
+ dlci_cc:2;
#elif OSMO_IS_BIG_ENDIAN
/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
- uint8_t dlci_sapi:3, dlci_spare:3, dlci_cc:2;
+ uint8_t dlci_cc:2, dlci_spare:3, dlci_sapi:3;
#endif
};
};
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67
Gerrit-Change-Number: 22880
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup*
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* .. Patch Set 2: -Code-Review (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn@4285 PS1, Line 4285: cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); > I already thought about it but in general most of the stuf above is already > test specific stuff like […] Well, ok, but from a review perspective as someone who dislikes reading TTCN3 and is not really familiar with NACC reading these lines over and over and figuring out what if any is the difference and if it makes sense or not is quite straining. Could be just me an my (love-) hate relationship with ttcn3, though. :-) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 15:38:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS
Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 to look at the new patch set (#3). Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS .. gbproxy: Use bssgp2_enc_status when sending STATUS bssgp_tx_status() is not aware of the MTU and cannot truncate the PDU if needed. Use the newer bssgp2_enc_status() which supports truncating the PDU. Related: OS#4889 Depends: Ic39d918c56399ceb0431299ce938e3bf276f678a (libosmocore.git) Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 --- M src/gb_proxy.c 1 file changed, 66 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/76/22876/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in osmo-gbproxy[master]: Add MTU field for BSSGP
Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 to look at the new patch set (#3). Change subject: Add MTU field for BSSGP .. Add MTU field for BSSGP Prepare tracking the MTU from NS. Initialize the MTU with a conservative default. The MTU is not yet updated, that will happen in a later patch. Related: OS#4889 Depends: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 (libosmocore.git) Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c M src/gb_proxy_vty.c 4 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/77/22877/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-gbproxy[master]: Add MTU field for BSSGP
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add MTU field for BSSGP .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/2/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/2/include/osmocom/sgsn/gb_proxy.h@25 PS2, Line 25: DEFAULT_NSE_MTU > see my feedback to lynxis' patches. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 15:28:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 )
Change subject: Move vty node into gbproxy_vty.c
..
Patch Set 4:
(1 comment)
https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864/2/src/gb_proxy_vty.c
File src/gb_proxy_vty.c:
https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864/2/src/gb_proxy_vty.c@67
PS2, Line 67: enum bsc_vty_node {
> bsc? I think we could probably rename it, too.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181
Gerrit-Change-Number: 22864
Gerrit-PatchSet: 4
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Comment-Date: Fri, 12 Feb 2021 15:27:14 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 to look at the new patch set (#4). Change subject: Move vty node into gbproxy_vty.c .. Move vty node into gbproxy_vty.c This is no longer shared with osmo-sgsn and osmo-gtphub Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 --- M src/Makefile.am M src/gb_proxy_main.c M src/gb_proxy_vty.c D src/vty.h 4 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/64/22864/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 15:25:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gbproxy[master]: Remove unused log categories
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 )
Change subject: Remove unused log categories
..
Remove unused log categories
Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45
---
M src/debug.h
M src/gb_proxy_main.c
2 files changed, 0 insertions(+), 22 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/debug.h b/src/debug.h
index 9a686cb..b3c978d 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -8,24 +8,7 @@
/* Debug Areas of the code */
enum {
- DMM,
- DPAG,
- DMEAS,
- DREF,
DGPRS,
- DNS,
- DLLC,
- DSNDCP,
- DSLHC,
- DCTRL,
- DFILTER,
- DGTPHUB,
- DRANAP,
- DSUA,
- DV42BIS,
- DIUCS,
- DSIGTRAN,
- DGTP,
DOBJ,
Debug_LastEntry,
};
diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c
index 2e9ff79..0e36c06 100644
--- a/src/gb_proxy_main.c
+++ b/src/gb_proxy_main.c
@@ -239,11 +239,6 @@
.description = "GPRS Packet Service",
.enabled = 1, .loglevel = LOGL_DEBUG,
},
- [DNS] = {
- .name = "DNS",
- .description = "GPRS Network Service (NS)",
- .enabled = 1, .loglevel = LOGL_INFO,
- },
[DOBJ] = {
.name = "DOBJ",
.description = "GbProxy object allocation/release",
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45
Gerrit-Change-Number: 22863
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gbproxy[master]: Remove unused log categories
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863/1/src/debug.h File src/debug.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863/1/src/debug.h@a12 PS1, Line 12: DPAG > we could use DPAG for paging related handling ing gbproxy, but not sure if > it's worth it? We can (re)-add it if it seems useful. DPAG was never usable because it wasn't defined in gprs_categories -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 15:23:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3: use REGISTRY arg with debian-stretch-titan
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22854 ) Change subject: ttcn3: use REGISTRY arg with debian-stretch-titan .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c Gerrit-Change-Number: 22854 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 14:56:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3: use REGISTRY arg with debian-stretch-titan
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22854 ) Change subject: ttcn3: use REGISTRY arg with debian-stretch-titan .. ttcn3: use REGISTRY arg with debian-stretch-titan Allow jenkins to fetch the image from our private docker registry. Outside of jenkins, the image is built locally just like before. Related: OS#5017 Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c --- M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 34 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 10b7267..1923c38 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index d970482..50ca926 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 7abf1a9..8ac7cb8 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index ae355d7..4a70c12 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index aee22ff..71494d9 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index e67dc9f..d42ac3e 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 36761a7..8480288 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index bd74f79..087dc09 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 8ce9828..05610a4 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,5 +1,6 @@ +ARGREGISTRY ARGUSER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARGOSMO_TTCN3_BRANCH="master" ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 026a465..45bf69e 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++
Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 )
Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg
retrans
..
pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans
Tests verify MS retransmitting a Pkt cell Chg Notif with different
target cell (hence a different NACC procedure) will be handled correctly
if PCU state was in the middle of handling a different NACC request.
Related: SYS#4909
Change-Id: I68c749aaabe9fe8272fc43045be09a46852359e5
---
M pcu/PCU_Tests.ttcn
1 file changed, 170 insertions(+), 0 deletions(-)
Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index f7687f5..cd7a4ec 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -4313,6 +4313,174 @@
f_shutdown(__BFILE__, __LINE__, final := true);
}
+/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time)
+ * while waiting for CTRL resolution */
+testcase TC_nacc_outbound_pkt_cell_chg_notif_twice() runs on RAW_PCU_Test_CT {
+ var PollFnCtx pollctx;
+ var GprsMS ms;
+ var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
+ var template (value) RlcmacUlCtrlMsg cell_chf_notif;
+ var RlcmacDlBlock dl_block;
+ var uint32_t sched_fn;
+ var CtrlMessage rx_ctrl;
+ var GsmArfcn req_arfcn := 862;
+ var uint6_t req_bsic := 43;
+
+ /* Initialize osmo-bsc emulation neighbor resolution CTRL port */
+ f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port);
+
+ /* Initialize NS/BSSGP side */
+ f_init_bssgp();
+ /* Initialize GPRS MS side */
+ f_init_gprs_ms();
+ ms := g_ms[0]; /* We only use first MS in this test */
+
+ /* Initialize the PCU interface abstraction */
+ f_init_raw(testcasename(), info_ind);
+
+ /* Make sure we are not affected by full cache from previous tests */
+ f_pcuvty_flush_neigh_caches();
+
+ /* Establish BSSGP connection to the PCU */
+ f_bssgp_establish();
+ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
+
+ /* Send PACKET RESOURCE REQUEST */
+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms,
ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
+ /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL
ACK */
+ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr :=
pollctx.tstrxbts);
+
+ /* Start NACC from MS side */
+ cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi,
req_arfcn, req_bsic);
+ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr :=
f_ms_tx_TsTrxBtsNum(ms));
+
+ /* osmo-pcu should now ask for resolution: */
+ f_ipa_ctrl_wait_link_up();
+ var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." &
+ int2str(info_ind.lac) & "." &
+ int2str(info_ind.cell_id) & "." &
+ int2str(req_arfcn) & "." &
+ int2str(req_bsic);
+ IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl;
+ /* Before receiving CTRL response, MS retransmits Pkt cell Chg Notif
with different tgt arfcn */
+ cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi,
req_arfcn + 1, req_bsic + 1);
+ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr :=
f_ms_tx_TsTrxBtsNum(ms));
+ f_sleep(0.2); /* let some time to avoid race conditons between CTRL and
RLCMAC */
+ IPA_CTRL.send(ts_CtrlMsgGetRepl(rx_ctrl.cmd.id, valueof(ctrl_var),
valueof("023-43-423-2-5")));
+ /* We should now receive a 2nd CTRL request with the new ARFCN+BSIC */
+ ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." &
+ int2str(info_ind.lac) & "." &
+ int2str(info_ind.cell_id) & "." &
+ int2str(req_arfcn + 1) & "." &
+ int2str(req_bsic + 1);
+ f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5");
+
+ /* And finally everything continues as usual with RIN procedure */
+ as_outbound_nacc_rim_resolve(info_ind);
+
+ /* Announce SI back to MS, continue NACC procedure */
+ f_handle_pkt_neighbor_cell_data(ms, si_default);
+
+ /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue
*/
+ f_rx_rlcmac_dl_block(dl_block, sched_fn);
+ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?,
tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) {
+ setverdict(fail, "Rx unexpected DL block: ", dl_block);
+ f_shutdown(__BFILE__, __LINE__);
+ }
+ /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET
CONTROL ACK */
+ if (dl_block.ctrl.mac_hdr.rrbp_valid) {
+
Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 )
Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans
..
pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans
Tests verify dup retrans triggered by MS timer are ignored if the target
cell is still the same (and hence no logic/behavior change is required,
current process can proceed onwards).
Related: SYS#4909
Change-Id: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529
---
M pcu/PCU_Tests.ttcn
1 file changed, 219 insertions(+), 23 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 0b887db..f7687f5 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -57,6 +57,7 @@
import from StatsD_Checker all;
import from IPA_Emulation all;
+import from Osmocom_CTRL_Types all;
import from Osmocom_CTRL_Adapter all;
import from Osmocom_CTRL_Functions all;
@@ -3611,6 +3612,55 @@
return;
}
+private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind)
+runs on RAW_PCU_Test_CT {
+ var BssgpCellId src :=
valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc,
info_ind.mnc, info_ind.mnc_3_digits == 1),
+
info_ind.lac),
+info_ind.rac),
+ info_ind.cell_id));
+ var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H,
/* Decided by test itself (emulating BSC) */
+ 423),
+2),
+ 5));
+ var RIM_Routing_Address src_addr :=
valueof(t_RIM_Routing_Address_cid(src));
+ var RIM_Routing_Address dst_addr :=
valueof(t_RIM_Routing_Address_cid(dst));
+ var template (value) RAN_Information_RIM_Container res_cont :=
+
ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC),
+ts_RIM_Sequence_Number(2),
+ts_RIM_PDU_Indications(false,
RIM_PDU_TYPE_SING_REP),
+
ts_RIM_Protocol_Version_Number(1),
+
tsu_ApplContainer_or_ApplErrContainer_NACC(tsu_ApplContainer_NACC(dst, false,
3, si_default)),
+omit);
+
RIM.send(ts_PDU_BSSGP_RAN_INFORMATION(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID,
src_addr),
+
ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr),
+ res_cont));
+}
+
+altstep as_outbound_nacc_rim_resolve(PCUIF_info_ind info_ind, boolean
do_answer := true, boolean do_repeat := false)
+runs on RAW_PCU_Test_CT {
+ /* RIM procedure: */
+ var BssgpCellId src :=
valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc,
info_ind.mnc, info_ind.mnc_3_digits == 1),
+
info_ind.lac),
+info_ind.rac),
+ info_ind.cell_id));
+ var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H,
/* Decided by test itself (emulating BSC) */
+ 423),
+2),
+ 5));
+ var RIM_Routing_Address src_addr :=
valueof(t_RIM_Routing_Address_cid(src));
+ var RIM_Routing_Address dst_addr :=
valueof(t_RIM_Routing_Address_cid(dst));
+ []
RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID,
dst_addr),
+
tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr),
+
tr_RAN_Information_Request_RIM_Container)) {
+ if (do_answer) {
+ f_outbound_nacc_rim_tx_resp(info_ind);
+ }
+ if (do_repeat) {
+ repeat;
+ }
+ }
+}
+
/* Start NACC from MS side */
private function f_outbound_nacc_success(inout GprsMS ms, PCUIF_info_ind
info_ind,
boolean exp_rac_ci_query := true,
boolean exp_si_query := true,
@@ -3639,29 +3689,7 @@
if (exp_si_query == true) {
/* RIM procedure: */
- var BssgpCellId src :=
Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup*
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn@4285 PS1, Line 4285: cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); > I know next to nothing of NACC but it seems to me like you could refactor the > code above into a sepa […] I already thought about it but in general most of the stuf above is already test specific stuff like initing different parts for the test (RLCMAC, BSSGP, etc.) and hence it's not something really to be applied for this bunch of new tests but to most of the tests, so I'd leave it for a different patch. Moreover, one finds that some variables here are later on used by the code below, so it also makes some stuff more complex because then one needs to retrieve the variable back from the new propose _nacc_init function. Also some nacc test have slight differences here since for instance the neigh cache is initialized differently on some tests. So I'm not sure it's a super benefit, and in any case I think it can be done at a later step for all tests in general if required. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 14:40:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length
daniel has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22874 )
Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length
..
bssgp2_enc_status: Truncate STATUS message to maximum PDU length
Related: OS#4889
Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a
---
M include/osmocom/gprs/gprs_bssgp2.h
M src/gb/bssgp_bvc_fsm.c
M src/gb/gprs_bssgp2.c
3 files changed, 17 insertions(+), 6 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/gprs/gprs_bssgp2.h
b/include/osmocom/gprs/gprs_bssgp2.h
index bf814cb..3b5b6e8 100644
--- a/include/osmocom/gprs/gprs_bssgp2.h
+++ b/include/osmocom/gprs/gprs_bssgp2.h
@@ -59,7 +59,7 @@
struct msgb *bssgp2_enc_bvc_reset_ack(uint16_t bvci, const struct gprs_ra_id
*ra_id, uint16_t cell_id,
const uint8_t *feat_bm, const uint8_t
*ext_feat_bm);
-struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const
struct msgb *orig_msg);
+struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const
struct msgb *orig_msg, uint16_t max_pdu_len);
int bssgp2_dec_fc_bvc(struct bssgp2_flow_ctrl *fc, const struct tlv_parsed
*tp);
diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c
index d2ee146..a035938 100644
--- a/src/gb/bssgp_bvc_fsm.c
+++ b/src/gb/bssgp_bvc_fsm.c
@@ -238,7 +238,7 @@
if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause ==
BSSGP_CAUSE_BVCI_BLOCKED)
bvci = >bvci;
- tx = bssgp2_enc_status(cause, bvci, rx);
+ tx = bssgp2_enc_status(cause, bvci, rx, bfp->max_pdu_len);
if (msgb_bvci(rx) == 0)
fi_tx_sig(fi, tx);
diff --git a/src/gb/gprs_bssgp2.c b/src/gb/gprs_bssgp2.c
index 0f519ad..8e2ba66 100644
--- a/src/gb/gprs_bssgp2.c
+++ b/src/gb/gprs_bssgp2.c
@@ -217,8 +217,9 @@
/*! Encode BSSGP STATUS PDU as per TS 48.018 Section 10.4.14.
* \param[in] cause BSSGP Cause value
* \param[in] bvci optional BVCI - only encoded if non-NULL
- * \param[in] msg optional message buffer containing PDU in error - only
encoded if non-NULL */
-struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const
struct msgb *orig_msg)
+ * \param[in] msg optional message buffer containing PDU in error - only
encoded if non-NULL
+ * \param[in] max_pdu_len Maximum BSSGP PDU size the NS layer accepts */
+struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const
struct msgb *orig_msg, uint16_t max_pdu_len)
{
struct msgb *msg = bssgp_msgb_alloc();
struct bssgp_normal_hdr *bgph;
@@ -229,12 +230,22 @@
bgph = (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));
bgph->pdu_type = BSSGP_PDUT_STATUS;
msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, );
+ /* FIXME: Require/encode BVCI only if cause is BVCI unknown/blocked
+* See 3GPP TS 48.018 Ch. 10.4.14 */
if (bvci) {
uint16_t _bvci = osmo_htons(*bvci);
msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci);
}
- if (orig_msg)
- msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR,
msgb_bssgp_len(orig_msg), msgb_bssgph(orig_msg));
+ if (orig_msg) {
+ uint32_t orig_len, max_orig_len;
+ /* Calculate how big the reply would be: the BSSGP msg so far +
size of the PDU IN ERROR including tvl */
+ orig_len = msgb_bssgp_len(orig_msg);
+ max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(orig_len);
+ /* Truncate the difference between max_orig_len and mtu */
+ if (max_orig_len > max_pdu_len)
+ orig_len -= max_orig_len - max_pdu_len;
+ msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR, orig_len,
msgb_bssgph(orig_msg));
+ }
return msg;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a
Gerrit-Change-Number: 22874
Gerrit-PatchSet: 3
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length
daniel has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22873 )
Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length
..
bssgp_bvc_fsm: Set/get maximum BSSGP PDU length
Add functions to get/set the maximum supported BSSGP PDU size by the NS
layer.
IPv4 and IPv6 should not matter since we can just enable IP
fragmentation and send NS PDUs up to 2**16 + bytes. Frame relay does not
support fragmentation and this is the reason we need to be aware of the
maximum PDU size. Luckily with 1600 bytes the MTU in frame relay can hold a
regular IP packet including NS/BSSGP overhead.
On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA
(3GPP TS 48.016 Ch. 9.2.10)
Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0
Related: OS#4889
---
M include/osmocom/gprs/bssgp_bvc_fsm.h
M src/gb/bssgp_bvc_fsm.c
M src/gb/libosmogb.map
3 files changed, 28 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h
b/include/osmocom/gprs/bssgp_bvc_fsm.h
index e69c205..824cdec 100644
--- a/include/osmocom/gprs/bssgp_bvc_fsm.h
+++ b/include/osmocom/gprs/bssgp_bvc_fsm.h
@@ -64,3 +64,6 @@
uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi);
uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi);
uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi);
+
+void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t
max_pdu_len);
+uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi);
\ No newline at end of file
diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c
index 6b8bd14..d2ee146 100644
--- a/src/gb/bssgp_bvc_fsm.c
+++ b/src/gb/bssgp_bvc_fsm.c
@@ -116,6 +116,8 @@
/* NSEI of the underlying NS Entity */
uint16_t nsei;
+ /* Maximum size of the BSSGP PDU */
+ uint16_t max_pdu_len;
/* BVCI of this BVC */
uint16_t bvci;
@@ -666,6 +668,7 @@
bfp->role_sgsn = role_sgsn;
bfp->nsei = nsei;
bfp->bvci = bvci;
+ bfp->max_pdu_len = UINT16_MAX;
return fi;
}
@@ -817,6 +820,26 @@
return bfp->features.negotiated;
}
+/*! Set the maximum size of a BSSGP PDU.
+ *! On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA
(3GPP TS 48.016 Ch. 9.2.10) */
+void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t
max_pdu_len) {
+ struct bvc_fsm_priv *bfp = fi->priv;
+
+ OSMO_ASSERT(fi->fsm == _bvc_fsm);
+ bfp->max_pdu_len = max_pdu_len;
+}
+
+/*! Return the maximum size of a BSSGP PDU
+ *! On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA
(3GPP TS 48.016 Ch. 9.2.10) */
+uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi)
+{
+ const struct bvc_fsm_priv *bfp = fi->priv;
+
+ OSMO_ASSERT(fi->fsm == _bvc_fsm);
+ return bfp->max_pdu_len;
+}
+
+
static __attribute__((constructor)) void on_dso_load_bvc_fsm(void)
{
OSMO_ASSERT(osmo_fsm_register(_bvc_fsm) == 0);
diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map
index 7da11cd..2327815 100644
--- a/src/gb/libosmogb.map
+++ b/src/gb/libosmogb.map
@@ -96,6 +96,8 @@
bssgp_bvc_get_features_advertised;
bssgp_bvc_get_features_received;
bssgp_bvc_get_features_negotiated;
+bssgp_bvc_fsm_set_max_pdu_len;
+bssgp_bvc_fsm_get_max_pdu_len;
osmo_fr_network_alloc;
osmo_fr_link_alloc;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0
Gerrit-Change-Number: 22873
Gerrit-PatchSet: 3
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gbproxy[master]: Remove trailing whitespace
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 ) Change subject: Remove trailing whitespace .. Remove trailing whitespace Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 --- M src/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 43d819d..34e63e3 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 Gerrit-Change-Number: 22865 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 )
Change subject: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse
..
gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse
Use the function provided by bssgp2 instead of setting up the ns2 prim
request ourself.
Related: OS#4889
Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564
---
M src/gb_proxy.c
1 file changed, 3 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gb_proxy.c b/src/gb_proxy.c
index 34e63e3..8b57315 100644
--- a/src/gb_proxy.c
+++ b/src/gb_proxy.c
@@ -185,17 +185,13 @@
/* create a copy of the message so the old one can
* be free()d safely when we return from gbprox_rcvmsg() */
struct gprs_ns2_inst *nsi = nse->cfg->nsi;
- struct osmo_gprs_ns2_prim nsp = {};
struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2nse");
- uint32_t tlli;
+ uint32_t tlli = 0;
int rc;
DEBUGP(DGPRS, "NSE(%05u/%s)-BVC(%05u/??) proxying to NSE(%05u/%s)\n",
msgb_nsei(msg),
!nse->sgsn_facing ? "SGSN" : "BSS", ns_bvci, nse->nsei,
nse->sgsn_facing ? "SGSN" : "BSS");
- nsp.bvci = ns_bvci;
- nsp.nsei = nse->nsei;
-
/* Strip the old NS header, it will be replaced with a new one */
strip_ns_hdr(msg);
@@ -204,12 +200,9 @@
* all BSSGP UNITDATA PDUs related to an MS shall be passed with
* the same LSP, e.g. the LSP contains the MS's TLLI, to the
* underlying network service. */
- if (gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), ) == 1)
- nsp.u.unitdata.link_selector = tlli;
+ gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), );
- osmo_prim_init(, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA,
- PRIM_OP_REQUEST, msg);
- rc = gprs_ns2_recv_prim(nsi, );
+ rc = bssgp2_nsi_tx_ptp(nsi, nse->nsei, ns_bvci, msg, tlli);
/* FIXME: We need a counter group for gbproxy_nse */
//if (rc < 0)
// rate_ctr_inc(>ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]);
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564
Gerrit-Change-Number: 22875
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup*
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn@4285 PS1, Line 4285: cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); I know next to nothing of NACC but it seems to me like you could refactor the code above into a separate nacc_init function or similar. The tests in the following commit could also use it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 14:17:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 14:10:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68c749aaabe9fe8272fc43045be09a46852359e5 Gerrit-Change-Number: 22842 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 14:04:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 Gerrit-Change-Number: 22829 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 14:00:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22814 ) Change subject: Fix neigh resolution service on local neighbours .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 13:47:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: Move bts_ident_key to neighbor_ident.c
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to neighbor_ident.c .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 13:44:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences .. Patch Set 2: > Patch Set 2: > > I think using the params you suggest is inconsistent with most of the other > protocol commands, but feel free to merge if you still consider this is > better, I'm not going to block it. I also find it inconsistent with the existing commands, but similarly don't think it's an absolute blocker -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 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: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 13:17:34 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg .. tests/gb: Add more complex osmo-ns-dummy.cfg write config will not print out any configuration for bind/nse unless we configure some. This way we can catch more issues with incompatible configs such as https://gerrit.osmocom.org/c/libosmocore/+/22878 Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Related: OS#4887 --- M tests/gb/osmo-ns-dummy.cfg 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/gb/osmo-ns-dummy.cfg b/tests/gb/osmo-ns-dummy.cfg index e69de29..1e6dc76 100644 --- a/tests/gb/osmo-ns-dummy.cfg +++ b/tests/gb/osmo-ns-dummy.cfg @@ -0,0 +1,24 @@ +! +! OsmoNSdummy (1.4.0.495-64db) configuration saved from vty +!! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 + bind udp local + listen 127.0.0.1 2158 + accept-ipaccess + ip-sns signalling-weight 1 data-weight 1 + nse 1236 + nsvc ipa local 127.0.0.4 23000 nsvci 101 + nse 1235 + nsvc udp local 127.0.0.3 23000 + nse 1234 + ip-sns-remote 127.0.0.2 2158 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 13:02:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 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: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:52:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 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: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:49:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:05:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:04:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:03:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 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: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:59:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations .. Patch Set 2: letting Hoernchen add the +2 here -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 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: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:57:18 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 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: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:56:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences .. Patch Set 2: I think using the params you suggest is inconsistent with most of the other protocol commands, but feel free to merge if you still consider this is better, I'm not going to block it. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 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: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:55:25 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Fix incompatible VTY configs when writing config
daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22878 ) Change subject: ns2: Fix incompatible VTY configs when writing config .. ns2: Fix incompatible VTY configs when writing config It seems like we still don't have NS2 VTY tests running in libosmocore so this only got caught once osmo-sgsn/osmo-gbproxy builds failed. Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Related: OS#4887 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 0a0a5d3..7a6b3ba 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -332,7 +332,7 @@ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); - vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", + vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE); break; default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Gerrit-Change-Number: 22878 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: merged
Change in libosmocore[master]: ns2: Fix incompatible VTY configs when writing config
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22878 ) Change subject: ns2: Fix incompatible VTY configs when writing config .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Gerrit-Change-Number: 22878 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 11:54:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg .. tests/gb: Add more complex osmo-ns-dummy.cfg write config will not print out any configuration for bind/nse unless we configure some. This way we can catch more issues with incompatible configs such as https://gerrit.osmocom.org/c/libosmocore/+/22878 Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Related: OS#4887 --- M tests/gb/osmo-ns-dummy.cfg 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/22879/1 diff --git a/tests/gb/osmo-ns-dummy.cfg b/tests/gb/osmo-ns-dummy.cfg index e69de29..1e6dc76 100644 --- a/tests/gb/osmo-ns-dummy.cfg +++ b/tests/gb/osmo-ns-dummy.cfg @@ -0,0 +1,24 @@ +! +! OsmoNSdummy (1.4.0.495-64db) configuration saved from vty +!! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 + bind udp local + listen 127.0.0.1 2158 + accept-ipaccess + ip-sns signalling-weight 1 data-weight 1 + nse 1236 + nsvc ipa local 127.0.0.4 23000 nsvci 101 + nse 1235 + nsvc udp local 127.0.0.3 23000 + nse 1234 + ip-sns-remote 127.0.0.2 2158 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 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: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:53:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gbproxy[master]: Remove unused log categories
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:51:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libgtpnl/+/22843 )
Change subject: install gtp-tunnel and gtp-link tools
..
install gtp-tunnel and gtp-link tools
This eases quick setup for demonstration purposes.
Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df
---
M contrib/libgtpnl.spec.in
M debian/control
A debian/libgtpnl-tools.install
M tools/Makefile.am
4 files changed, 28 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/contrib/libgtpnl.spec.in b/contrib/libgtpnl.spec.in
index 8453612..0399d5d 100644
--- a/contrib/libgtpnl.spec.in
+++ b/contrib/libgtpnl.spec.in
@@ -51,6 +51,18 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libgtpnl.
+%package tools
+Summary:Libgtpnl user tools
+License:GPL-2.0-or-later AND LGPL-2.1-or-later
+Group: Applications/System
+Requires: libgtpnl0 = %{version}
+
+%description tools
+libgtpnl wraps the genetlink-based GPRS tunnel configuration of the
+Linux kernel into a C API.
+
+This subpackage contains sample tools to manage gtp interfaces and tunnels.
+
%prep
%setup -q
@@ -79,4 +91,8 @@
%{_libdir}/libgtpnl.so
%{_libdir}/pkgconfig/*.pc
+%files tools
+%{_bindir}/gtp-link
+%{_bindir}/gtp-tunnel
+
%changelog
diff --git a/debian/control b/debian/control
index 3128f3e..5c8ed03 100644
--- a/debian/control
+++ b/debian/control
@@ -43,3 +43,12 @@
Depends: libgtpnl0 (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Linux kernel GTP-U netlink library
+
+Package: libgtpnl-tools
+Architecture: any
+Multi-Arch: same
+Section: net
+Priority: extra
+Depends: libgtpnl0 (= ${binary:Version}),
+ ${misc:Depends}
+Description: Tools to manage gtp interfaces and tunnels.
diff --git a/debian/libgtpnl-tools.install b/debian/libgtpnl-tools.install
new file mode 100644
index 000..49983e4
--- /dev/null
+++ b/debian/libgtpnl-tools.install
@@ -0,0 +1,2 @@
+/usr/bin/gtp-link
+/usr/bin/gtp-tunnel
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ec2eb66..7beae57 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Make_global.am
-noinst_PROGRAMS = gtp-link \
+bin_PROGRAMS = gtp-link\
gtp-tunnel
gtp_link_SOURCES = gtp-link.c
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df
Gerrit-Change-Number: 22843
Gerrit-PatchSet: 2
Gerrit-Owner: Gabriel Ganne
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 2 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:51:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Fix incompatible VTY configs when writing config
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22878 ) Change subject: ns2: Fix incompatible VTY configs when writing config .. ns2: Fix incompatible VTY configs when writing config It seems like we still don't have NS2 VTY tests running in libosmocore so this only got caught once osmo-sgsn/osmo-gbproxy builds failed. Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Related: OS#4887 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/22878/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 0a0a5d3..7a6b3ba 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -332,7 +332,7 @@ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); - vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", + vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE); break; default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Gerrit-Change-Number: 22878 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 11:18:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
