From gerrit-no-reply at lists.osmocom.org Thu Aug 1 07:45:58 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 07:45:58 +0000 Subject: Change in ...osmo-sip-connector[master]: Add media mode parameter to sdp_create_file() In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 to look at the new patch set (#3). Change subject: Add media mode parameter to sdp_create_file() ...................................................................... Add media mode parameter to sdp_create_file() This enables call hold implemented by subsequent commits Prior to this commit, osmo-sip-connector would not send any media mode attribute in the sdp. After this commit we will by default always include a=sendrecv. Given that a media mode attribute of "sendrecv" is default and implicit it its absense, this does not represent any functional change. Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 --- M src/sdp.c M src/sdp.h M src/sip.c 3 files changed, 29 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/93/14993/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 Gerrit-Change-Number: 14993 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 07:47:33 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 07:47:33 +0000 Subject: Change in ...osmo-sip-connector[master]: Add media mode parameter to sdp_create_file() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 ) Change subject: Add media mode parameter to sdp_create_file() ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/14993/2/src/sdp.c File src/sdp.c: https://gerrit.osmocom.org/#/c/14993/2/src/sdp.c at 191 PS2, Line 191: mode_attribute = ""; > full ACK here to both comments. Done https://gerrit.osmocom.org/#/c/14993/2/src/sdp.c at 191 PS2, Line 191: mode_attribute = ""; > (I'm not sure why, but at least by convention) end each case in 'break;' [?] Done https://gerrit.osmocom.org/#/c/14993/2/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14993/2/src/sip.c at 389 PS2, Line 389: sdp = sdp_create_file(leg, other, sdp_sendrecv); > I also agree that a=sendrecv is implicit if absent. [?] Done https://gerrit.osmocom.org/#/c/14993/2/src/sip.c at 389 PS2, Line 389: sdp = sdp_create_file(leg, other, sdp_sendrecv); > before, this would send no "a=sendrecv", now it always does. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 Gerrit-Change-Number: 14993 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 01 Aug 2019 07:47:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 08:07:12 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 08:07:12 +0000 Subject: Change in ...osmo-sip-connector[master]: Add media mode parameter to sdp_create_file() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 ) Change subject: Add media mode parameter to sdp_create_file() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14993/2/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14993/2/src/sip.c at 389 PS2, Line 389: sdp = sdp_create_file(leg, other, sdp_sendrecv); > I also agree that a=sendrecv is implicit if absent. [?] I feel it would be overkill to include https://tools.ietf.org/html/rfc3264#section-5.1 in the commit msg. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 Gerrit-Change-Number: 14993 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 01 Aug 2019 08:07:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 08:21:19 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Aug 2019 08:21:19 +0000 Subject: Change in ...osmo-trx[master]: Drop old README information, provide new updated README In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14985 ) Change subject: Drop old README information, provide new updated README ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3df00799ce80aa4af43225e69a408ba2cbc444db Gerrit-Change-Number: 14985 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 08:21:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 08:24:36 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 08:24:36 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/14994/3/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14994/3/src/sip.c at 183 PS3, Line 183: // TODO: Tell osmo-bts to stop sending RTP ? > well, the "correct" approach is probably to instruct the MSC-colocated MGW to put the SIP-side RTP c [?] One way to make it work via MNCC might be to have the msc/mgw treat a media address of 0.0.0.0 as meaning: "sendonly" as is convention in SIP. (Maybe more than convention, i don't know) -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 08:24:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 08:26:36 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 08:26:36 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/14994/3/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14994/3/src/sip.c at 189 PS3, Line 189: LOGP(DSIP, LOGL_DEBUG, "Sending 200 response to re-INVITE for mode(%u)\n", mode); > (looks like we could use a value_string array translating the modes to human-readable strings... [?] The osmo-sip-connector log is almost entirely outputting non human readable values. In a future commit, I may deal with this en mass. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 08:26:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 09:31:12 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 1 Aug 2019 09:31:12 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: make function mncc_tx_to_gsm_cc static Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15008 Change subject: cosmetic: make function mncc_tx_to_gsm_cc static ...................................................................... cosmetic: make function mncc_tx_to_gsm_cc static The function mncc_tx_to_gsm_cc() is declared as non static but only used from within gsm_04_08_cc.c. Lets declare it as static to increase readability of the code Change-Id: Icd02c669cfee6dd7e6b154e303cd0f4c148c83c4 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/15008/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 03830de..34d95f6 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1798,7 +1798,7 @@ (sizeof(downstatelist) / sizeof(struct downstate)) -int mncc_tx_to_gsm_cc(struct gsm_network *net, const union mncc_msg *msg) +static int mncc_tx_to_gsm_cc(struct gsm_network *net, const union mncc_msg *msg) { int i, rc = 0; struct msc_a *msc_a = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd02c669cfee6dd7e6b154e303cd0f4c148c83c4 Gerrit-Change-Number: 15008 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 10:21:52 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 10:21:52 +0000 Subject: Change in ...osmo-msc[master]: Set coding in mncc_set_cause() Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15009 Change subject: Set coding in mncc_set_cause() ...................................................................... Set coding in mncc_set_cause() GSM 04.08 10.5.4.11 The Release indication needs to have the Coding Standard set. For phones that would display a message on screen, such as "Number not in use", if the coding standard is not defined, the display may show "Error in Connection" Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 --- M src/libmsc/mncc.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/09/15009/1 diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c index 8c95ecb..d0b2ff2 100644 --- a/src/libmsc/mncc.c +++ b/src/libmsc/mncc.c @@ -100,6 +100,7 @@ void mncc_set_cause(struct gsm_mncc *data, int loc, int val) { data->fields |= MNCC_F_CAUSE; + data->cause.coding = GSM48_CAUSE_CODING_GSM; data->cause.location = loc; data->cause.value = val; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 Gerrit-Change-Number: 15009 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 10:29:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 10:29:41 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: make function mncc_tx_to_gsm_cc static In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15008 ) Change subject: cosmetic: make function mncc_tx_to_gsm_cc static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd02c669cfee6dd7e6b154e303cd0f4c148c83c4 Gerrit-Change-Number: 15008 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 10:29:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 10:31:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 10:31:19 +0000 Subject: Change in ...osmo-msc[master]: Set coding in mncc_set_cause() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15009 ) Change subject: Set coding in mncc_set_cause() ...................................................................... Patch Set 1: Looks like you need to update unit tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 Gerrit-Change-Number: 15009 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 10:31:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 10:45:36 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 10:45:36 +0000 Subject: Change in ...osmo-msc[master]: Set coding in mncc_set_cause() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 to look at the new patch set (#2). Change subject: Set coding in mncc_set_cause() ...................................................................... Set coding in mncc_set_cause() GSM 04.08 10.5.4.11 The Release indication needs to have the Coding Standard set. For phones that would display a message on screen, such as "Number not in use", if the coding standard is not defined, the display may show "Error in Connection" Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 --- M src/libmsc/mncc.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 3 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/09/15009/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 Gerrit-Change-Number: 15009 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 10:53:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 10:53:04 +0000 Subject: Change in ...osmo-msc[master]: Set coding in mncc_set_cause() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15009 ) Change subject: Set coding in mncc_set_cause() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 Gerrit-Change-Number: 15009 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 10:53:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 11:23:06 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Aug 2019 11:23:06 +0000 Subject: Change in ...osmo-trx[master]: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14989 ) Change subject: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/14989/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/14989/2/Transceiver52M/device/lms/LMSDevice.cpp at 767 PS2, Line 767: update_stream_stats_rx(i, underrun); This should be update_stream_stats_tx(), no? I don't see it called anywhere. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d Gerrit-Change-Number: 14989 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 11:23:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 11:34:22 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Aug 2019 11:34:22 +0000 Subject: Change in ...osmo-trx[master]: radioInterface: Clarify how underruns are handled driving a radioDevice In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14987 ) Change subject: radioInterface: Clarify how underruns are handled driving a radioDevice ...................................................................... Patch Set 1: Code-Review+1 I don't know this code at all, but the change looks okay, and your explanation makes sense. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id549489fc1485e0d762818c8e682aaddd5041f1c Gerrit-Change-Number: 14987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 11:34:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 11:44:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 11:44:24 +0000 Subject: Change in ...osmo-trx[master]: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14989 ) Change subject: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14989/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/14989/2/Transceiver52M/device/lms/LMSDevice.cpp at 767 PS2, Line 767: update_stream_stats_rx(i, underrun); > This should be update_stream_stats_tx(), no? [?] Yes, good catch, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d Gerrit-Change-Number: 14989 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 11:44:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 11:46:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 11:46:08 +0000 Subject: Change in ...osmo-trx[master]: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 to look at the new patch set (#3). Change subject: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr ...................................................................... lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr After discussion in [1] and further look at the code, it became obvios rx_underrun events are not happening in general for any SDR (don't exist), so let's drop that counter. Instead, add Tx Dropped Packet counters, which were not accounted prior to this commit. [1] https://github.com/osmocom/osmo-trx/commit/bde55afd29fc9aae10eb11f6515821afa39b772d Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M doc/manuals/chapters/counters_generated.adoc M doc/manuals/vty/trx_vty_reference.xml 8 files changed, 105 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/14989/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d Gerrit-Change-Number: 14989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 11:51:00 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Aug 2019 11:51:00 +0000 Subject: Change in ...osmo-trx[master]: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14989 ) Change subject: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14989/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/14989/2/Transceiver52M/device/lms/LMSDevice.cpp at 767 PS2, Line 767: update_stream_stats_rx(i, underrun); > Yes, good catch, thanks! Done -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d Gerrit-Change-Number: 14989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 11:51:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:02:38 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:02:38 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 to look at the new patch set (#4). Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 156 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/14994/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:03:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:03:46 +0000 Subject: Change in ...osmo-trx[master]: radioInterface: Clarify how underruns are handled driving a radioDevice In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14987 ) Change subject: radioInterface: Clarify how underruns are handled driving a radioDevice ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id549489fc1485e0d762818c8e682aaddd5041f1c Gerrit-Change-Number: 14987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 12:03:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:07 +0000 Subject: Change in ...osmo-trx[master]: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14989 ) Change subject: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr ...................................................................... Patch Set 3: Code-Review+2 RE-adding laforge's +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d Gerrit-Change-Number: 14989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 12:04:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:20 +0000 Subject: Change in ...osmo-trx[master]: radioInterface: Clarify how underruns are handled driving a radioDevice In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14987 ) Change subject: radioInterface: Clarify how underruns are handled driving a radioDevice ...................................................................... radioInterface: Clarify how underruns are handled driving a radioDevice The underrun parameter in radioDevice's readSamples() is not a "Rx Underrun" event, but rather it's used to retrieve a "Tx Underrun" which on some SDRs (like USRP1) seems to be (so far) available only at readSamples() times. Thus, underrun parameter for both readSamples() and writeSamples() is actually flagging the same event, and should be ORed in pushBuffer() as it's already done in pullBuffer(). Otherwise if implementation is setting the underrun pointer to false, it could erase the flag being marked by the counterpart function before isUnderrun() is called (which is the one responsible to clear the flag). Change-Id: Id549489fc1485e0d762818c8e682aaddd5041f1c --- M Transceiver52M/radioInterface.cpp 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index e32848e..0d33f22 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -348,6 +348,7 @@ /* Send timestamped chunk to the device with arbitrary size */ bool RadioInterface::pushBuffer() { + bool local_underrun; size_t numSent, segmentLen = sendBuffer[0]->getSegmentLen(); if (sendBuffer[0]->getAvailSegments() < 1) @@ -363,8 +364,9 @@ /* Send the all samples in the send buffer */ numSent = mRadio->writeSamples(convertSendBuffer, segmentLen, - &underrun, + &local_underrun, writeTimestamp); + underrun |= local_underrun; writeTimestamp += numSent; return true; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id549489fc1485e0d762818c8e682aaddd5041f1c Gerrit-Change-Number: 14987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:20 +0000 Subject: Change in ...osmo-trx[master]: usrp1: don't check for non-null underrun pointer In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14988 ) Change subject: usrp1: don't check for non-null underrun pointer ...................................................................... usrp1: don't check for non-null underrun pointer The pointer can't never be null, so avoid checking it. Change-Id: I12e14641713a6494bc89570f02cecfc6f8fd4b5e --- M Transceiver52M/device/usrp1/USRPDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index af0b3de..63debee 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -377,7 +377,7 @@ return len; } - if (underrun) *underrun = false; + *underrun = false; uint32_t readBuf[2000]; @@ -427,7 +427,7 @@ continue; } if ((word0 >> 28) & 0x04) { - if (underrun) *underrun = true; + *underrun = true; LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface"; } if (RSSI) *RSSI = (word0 >> 21) & 0x3f; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I12e14641713a6494bc89570f02cecfc6f8fd4b5e Gerrit-Change-Number: 14988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:21 +0000 Subject: Change in ...osmo-trx[master]: jenkins.sh: Workaround libusrp build race conditon In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14990 ) Change subject: jenkins.sh: Workaround libusrp build race conditon ...................................................................... jenkins.sh: Workaround libusrp build race conditon When submitting patches to osmo-trx in gerrit, sometimes the jenkins job fails due to libusrp failing to build. I never have this issue in on my workstation. Let's disable parallel make and see if we can avoid it for now. Related: OS#3970 Change-Id: I24bc54f5872e8edb9fab5b88055a00cebe1a6911 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1dd8478..f3f5ed9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -72,7 +72,7 @@ mkdir "$deps" || true osmo-build-dep.sh libosmocore "" "--enable-sanitize --disable-doxygen --disable-pcsc" -osmo-build-dep.sh libusrp +PARALLEL_MAKE="" osmo-build-dep.sh libusrp export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I24bc54f5872e8edb9fab5b88055a00cebe1a6911 Gerrit-Change-Number: 14990 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:21 +0000 Subject: Change in ...osmo-trx[master]: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14989 ) Change subject: lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr ...................................................................... lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr After discussion in [1] and further look at the code, it became obvios rx_underrun events are not happening in general for any SDR (don't exist), so let's drop that counter. Instead, add Tx Dropped Packet counters, which were not accounted prior to this commit. [1] https://github.com/osmocom/osmo-trx/commit/bde55afd29fc9aae10eb11f6515821afa39b772d Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M doc/manuals/chapters/counters_generated.adoc M doc/manuals/vty/trx_vty_reference.xml 8 files changed, 105 insertions(+), 54 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index ee7e2a4..ceb7d6f 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -48,9 +48,10 @@ /* signal cb for signal */ struct device_counters { size_t chan; - unsigned int rx_underruns; unsigned int rx_overruns; unsigned int tx_underruns; unsigned int rx_dropped_events; unsigned int rx_dropped_samples; + unsigned int tx_dropped_events; + unsigned int tx_dropped_samples; }; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 43e4189..a9ef88c 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -93,20 +93,22 @@ }; const struct value_string trx_chan_ctr_names[] = { - { TRX_CTR_RX_UNDERRUNS, "rx_underruns" }, { TRX_CTR_RX_OVERRUNS, "rx_overruns" }, { TRX_CTR_TX_UNDERRUNS, "tx_underruns" }, { TRX_CTR_RX_DROP_EV, "rx_drop_events" }, { TRX_CTR_RX_DROP_SMPL, "rx_drop_samples" }, + { TRX_CTR_TX_DROP_EV, "tx_drop_events" }, + { TRX_CTR_TX_DROP_SMPL, "tx_drop_samples" }, { 0, NULL } }; static const struct rate_ctr_desc trx_chan_ctr_desc[] = { - [TRX_CTR_RX_UNDERRUNS] = { "device:rx_underruns", "Number of Rx underruns" }, - [TRX_CTR_RX_OVERRUNS] = { "device:rx_overruns", "Number of Rx overruns" }, - [TRX_CTR_TX_UNDERRUNS] = { "device:tx_underruns", "Number of Tx underruns" }, + [TRX_CTR_RX_OVERRUNS] = { "device:rx_overruns", "Number of Rx overruns in FIFO queue" }, + [TRX_CTR_TX_UNDERRUNS] = { "device:tx_underruns", "Number of Tx underruns in FIFO queue" }, [TRX_CTR_RX_DROP_EV] = { "device:rx_drop_events", "Number of times Rx samples were dropped by HW" }, [TRX_CTR_RX_DROP_SMPL] = { "device:rx_drop_samples", "Number of Rx samples dropped by HW" }, + [TRX_CTR_TX_DROP_EV] = { "device:tx_drop_events", "Number of times Tx samples were dropped by HW" }, + [TRX_CTR_TX_DROP_SMPL] = { "device:tx_drop_samples", "Number of Tx samples dropped by HW" } }; static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = { @@ -126,8 +128,6 @@ if (ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; - ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_UNDERRUNS]; - rate_ctr_add(ctr, ctrs_pending[chan].rx_underruns - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_OVERRUNS]; rate_ctr_add(ctr, ctrs_pending[chan].rx_overruns - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_UNDERRUNS]; @@ -136,6 +136,10 @@ rate_ctr_add(ctr, ctrs_pending[chan].rx_dropped_events - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_DROP_SMPL]; rate_ctr_add(ctr, ctrs_pending[chan].rx_dropped_samples - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_DROP_EV]; + rate_ctr_add(ctr, ctrs_pending[chan].tx_dropped_events - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_DROP_SMPL]; + rate_ctr_add(ctr, ctrs_pending[chan].tx_dropped_samples - ctr->current); /* Mark as done */ ctrs_pending[chan].chan = PENDING_CHAN_NONE; diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index 6e4fa4d..155f413 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -4,11 +4,12 @@ #include enum TrxCtr { - TRX_CTR_RX_UNDERRUNS, TRX_CTR_RX_OVERRUNS, TRX_CTR_TX_UNDERRUNS, TRX_CTR_RX_DROP_EV, TRX_CTR_RX_DROP_SMPL, + TRX_CTR_TX_DROP_EV, + TRX_CTR_TX_DROP_SMPL, }; struct ctr_threshold { diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index e184f49..bac9653 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -384,14 +384,15 @@ return -1; } -#define THRESHOLD_ARGS "(rx_underruns|rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples)" +#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples)" #define THRESHOLD_STR_VAL(s) "Set threshold value for rate_ctr device:" OSMO_STRINGIFY_VAL(s) "\n" #define THRESHOLD_STRS \ - THRESHOLD_STR_VAL(rx_underruns) \ THRESHOLD_STR_VAL(rx_overruns) \ THRESHOLD_STR_VAL(tx_underruns) \ THRESHOLD_STR_VAL(rx_drop_events) \ - THRESHOLD_STR_VAL(rx_drop_samples) + THRESHOLD_STR_VAL(rx_drop_samples) \ + THRESHOLD_STR_VAL(tx_drop_events) \ + THRESHOLD_STR_VAL(tx_drop_samples) #define INTV_ARGS "(per-second|per-minute|per-hour|per-day)" #define INTV_STR_VAL(s) "Threshold value sampled " OSMO_STRINGIFY_VAL(s) "\n" #define INTV_STRS \ diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 0eaf0a3..f55b555 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -574,38 +574,37 @@ /* UNUSED on limesdr (only used on usrp1/2) */ return GSM::Time(0,0); } - -void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun) +/*! + * Issue tracking description of several events: https://github.com/myriadrf/LimeSuite/issues/265 + */ +void LMSDevice::update_stream_stats_rx(size_t chan, bool *overrun) { lms_stream_status_t status; bool changed = false; if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) != 0) { - LOGCHAN(chan, DDEV, ERROR) << "LMS_GetStreamStatus failed"; + LOGCHAN(chan, DDEV, ERROR) << "Rx LMS_GetStreamStatus failed"; return; } - if (status.underrun) { - changed = true; - *underrun = true; - LOGCHAN(chan, DDEV, ERROR) << "recv Underrun! (" - << m_ctr[chan].rx_underruns << " -> " - << status.underrun << ")"; - } - m_ctr[chan].rx_underruns += status.underrun; - + /* FIFO overrun is counted when Rx FIFO is full but new data comes from + the board and oldest samples in FIFO are overwritte. Value count + since the last call to LMS_GetStreamStatus(stream). */ if (status.overrun) { changed = true; *overrun = true; - LOGCHAN(chan, DDEV, ERROR) << "recv Overrun! (" + LOGCHAN(chan, DDEV, ERROR) << "Rx Overrun! (" << m_ctr[chan].rx_overruns << " -> " << status.overrun << ")"; } m_ctr[chan].rx_overruns += status.overrun; + /* Dropped packets in Rx are counted when gaps in Rx timestamps are + detected (likely because buffer oveflow in hardware). Value count + since the last call to LMS_GetStreamStatus(stream). */ if (status.droppedPackets) { changed = true; - LOGCHAN(chan, DDEV, ERROR) << "recv Dropped packets by HW! (" + LOGCHAN(chan, DDEV, ERROR) << "Rx Dropped packets by HW! (" << m_ctr[chan].rx_dropped_samples << " -> " << m_ctr[chan].rx_dropped_samples + status.droppedPackets @@ -653,7 +652,7 @@ while ((avail_smpls = rx_buffers[i]->avail_smpls(timestamp)) < len) { thread_enable_cancel(false); num_smpls = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len - avail_smpls, &rx_metadata, 100); - update_stream_stats(i, underrun, overrun); + update_stream_stats_rx(i, overrun); thread_enable_cancel(true); if (num_smpls <= 0) { LOGCHAN(i, DDEV, ERROR) << "Device receive timed out (" << rc << " vs exp " << len << ")."; @@ -697,13 +696,53 @@ return len; } +void LMSDevice::update_stream_stats_tx(size_t chan, bool *underrun) +{ + lms_stream_status_t status; + bool changed = false; + + if (LMS_GetStreamStatus(&m_lms_stream_tx[chan], &status) != 0) { + LOGCHAN(chan, DDEV, ERROR) << "Tx LMS_GetStreamStatus failed"; + return; + } + + /* FIFO underrun is counted when Tx is running but FIFO is empty for + >100 ms (500ms in older versions). Value count since the last call to + LMS_GetStreamStatus(stream). */ + if (status.underrun) { + changed = true; + *underrun = true; + LOGCHAN(chan, DDEV, ERROR) << "Tx Underrun! (" + << m_ctr[chan].tx_underruns << " -> " + << status.underrun << ")"; + } + m_ctr[chan].tx_underruns += status.underrun; + + /* Dropped packets in Tx are counted only when timestamps are enabled + and SDR drops packet because of late timestamp. Value count since the + last call to LMS_GetStreamStatus(stream). */ + if (status.droppedPackets) { + changed = true; + LOGCHAN(chan, DDEV, ERROR) << "Tx Dropped packets by HW! (" + << m_ctr[chan].tx_dropped_samples << " -> " + << m_ctr[chan].tx_dropped_samples + + status.droppedPackets + << ")"; + m_ctr[chan].tx_dropped_events++; + } + m_ctr[chan].tx_dropped_samples += status.droppedPackets; + + if (changed) + osmo_signal_dispatch(SS_DEVICE, S_DEVICE_COUNTER_CHANGE, &m_ctr[chan]); + +} + int LMSDevice::writeSamples(std::vector < short *>&bufs, int len, bool * underrun, unsigned long long timestamp, bool isControl) { int rc = 0; unsigned int i; - lms_stream_status_t status; lms_stream_meta_t tx_metadata = {}; tx_metadata.flushPartialPacket = false; tx_metadata.waitForTimestamp = true; @@ -725,19 +764,12 @@ LOGCHAN(i, DDEV, DEBUG) << "send buffer of len " << len << " timestamp " << std::hex << tx_metadata.timestamp; thread_enable_cancel(false); rc = LMS_SendStream(&m_lms_stream_tx[i], bufs[i], len, &tx_metadata, 100); - if (rc != len) { - LOGCHAN(i, DDEV, ERROR) << "LMS: Device send timed out"; - } - - if (LMS_GetStreamStatus(&m_lms_stream_tx[i], &status) == 0) { - if (status.underrun > m_ctr[i].tx_underruns) { - *underrun = true; - m_ctr[i].tx_underruns = status.underrun; - osmo_signal_dispatch(SS_DEVICE, S_DEVICE_COUNTER_CHANGE, &m_ctr[i]); - } - - } + update_stream_stats_tx(i, underrun); thread_enable_cancel(true); + if (rc != len) { + LOGCHAN(i, DDEV, ERROR) << "LMS: Device Tx timed out (" << rc << " vs exp " << len << ")."; + return -1; + } } return rc; diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 906fbee..bc79f97 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -65,7 +65,8 @@ bool do_filters(size_t chan); int get_ant_idx(const std::string & name, bool dir_tx, size_t chan); bool flush_recv(size_t num_pkts); - void update_stream_stats(size_t chan, bool * underrun, bool * overrun); + void update_stream_stats_rx(size_t chan, bool *overrun); + void update_stream_stats_tx(size_t chan, bool *underrun); public: diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 6955b18..98634ff 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -1,5 +1,6 @@ + // autogenerated by show asciidoc counters -These counters and their description based on OsmoTRX 1.0.0.43-3f7c0 (OsmoTRX). +These counters and their description are based on OsmoTRX 1.0.0.95-9527 (OsmoTRX). === Rate Counters @@ -9,9 +10,17 @@ [options="header"] |=== | Name | Reference | Description -| device:rx_underruns | <> | Number of Rx underruns -| device:rx_overruns | <> | Number of Rx overruns -| device:tx_underruns | <> | Number of Tx underruns +| device:rx_overruns | <> | Number of Rx overruns in FIFO queue +| device:tx_underruns | <> | Number of Tx underruns in FIFO queue | device:rx_drop_events | <> | Number of times Rx samples were dropped by HW | device:rx_drop_samples | <> | Number of Rx samples dropped by HW +| device:tx_drop_events | <> | Number of times Tx samples were dropped by HW +| device:tx_drop_samples | <> | Number of Tx samples dropped by HW |=== +== Osmo Stat Items + +// generating tables for osmo_stat_items +== Osmo Counters + +// generating tables for osmo_counters +// there are no ungrouped osmo_counters diff --git a/doc/manuals/vty/trx_vty_reference.xml b/doc/manuals/vty/trx_vty_reference.xml index ce6d335..38d64c1 100644 --- a/doc/manuals/vty/trx_vty_reference.xml +++ b/doc/manuals/vty/trx_vty_reference.xml @@ -1247,26 +1247,21 @@ - - - - - - - + - + + @@ -1274,15 +1269,16 @@ - + - + + @@ -1290,6 +1286,12 @@ + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iff1535c219a4695a511d383d7c4b06ef6eff959d Gerrit-Change-Number: 14989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:22 +0000 Subject: Change in ...osmo-trx[master]: Move inband-signaling-usb documentation to UserManual In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14998 ) Change subject: Move inband-signaling-usb documentation to UserManual ...................................................................... Move inband-signaling-usb documentation to UserManual Change-Id: I4d6ef1f54f3d6c5a73ce00dc4640bd698f96842b --- D Transceiver52M/inband-signaling-usb A doc/manuals/chapters/device-usrp-inband-signaling-usb.adoc M doc/manuals/chapters/trx-devices.adoc 3 files changed, 305 insertions(+), 314 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/inband-signaling-usb b/Transceiver52M/inband-signaling-usb deleted file mode 100644 index 14f8347..0000000 --- a/Transceiver52M/inband-signaling-usb +++ /dev/null @@ -1,314 +0,0 @@ -This file specifies the format of USB packets used for in-band data -transmission and signaling on the USRP. All packets are 512-byte long, -and are transfered using USB "bulk" transfers. - -IN packets are sent towards the host. -OUT packets are sent away from the host. - -The layout is 32-bits wide. All data is transmitted in little-endian -format across the USB. - - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - |O|U|D|S|E| RSSI | Chan | mbz | Tag | Payload Len | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Timestamp | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | | - + + - | Payload | - . . - . . - . . - | | - + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | ... | . - +-+-+-+-+-+-+-+ . - . . - . Padding . - . . - | | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - - mbz Must be Zero: these bits must be zero in both IN and OUT packets. - - O Overrun Flag: set in an IN packet if an overrun condition was - detected. Must be zero in OUT packets. Overrun occurs when - the FPGA has data to transmit to the host and there is no - buffer space available. This generally indicates a problem on - the host. Either it is not keeping up, or it has configured - the FPGA to transmit data at a higher rate than the transport - (USB) can support. - - U Underrun Flag: set in an IN packet if an underrun condition - was detected. Must be zero in OUT packets. Underrun occurs - when the FPGA runs out of samples, and it's not between - bursts. See the "End of Burst flag" below. - - D Dropped Packet Flag: Set in an IN packet if the FPGA - discarded an OUT packet because its timestamp had already - passed. - - S Start of Burst Flag: Set in an OUT packet if the data is the - first segment of what is logically a continuous burst of data. - Must be zero in IN packets. - - E End of Burst Flag: Set in an OUT packet if the data is the - last segment of what is logically a continuous burst of data. - Must be zero in IN packets. Underruns are not reported - when the FPGA runs out of samples between bursts. - - - RSSI 6-bit Received Strength Signal Indicator: Must be zero in OUT - packets. In IN packets, indicates RSSI as reported by front end. - FIXME The format and interpretation are to be determined. - - Chan 5-bit logical channel number. Channel number 0x1f is reserved - for control information. See "Control Channel" below. Other - channels are "data channels." Each data channel is logically - independent of the others. A data channel payload field - contains a sequence of homogeneous samples. The format of the - samples is determined by the configuration associated with the - given channel. It is often the case that the payload field - contains 32-bit complex samples, each containing 16-bit real - and imaginary components. - - Tag 4-bit tag for matching IN packets with OUT packets. - [FIXME, write more...] - - Payload Len: 9-bit field that specifies the length of the payload - field in bytes. Must be in the range 0 to 504 inclusive. - - Timestamp: 32-bit timestamp. - On IN packets, the timestamp indicates the time at which the - first sample of the packet was produced by the A/D converter(s) - for that channel. On OUT packets, the timestamp specifies the - time at which the first sample in the packet should go out the - D/A converter(s) for that channel. If a packet reaches the - head of the transmit queue, and the current time is later than - the timestamp, an error is assumed to have occurred and the - packet is discarded. As a special case, the timestamp - 0xffffffff is interpreted as "Now". - - The time base is a free running 32-bit counter that is - incremented by the A/D sample-clock. - - Payload: Variable length field. Length is specified by the - Payload Len field. - - Padding: This field is 504 - Payload Len bytes long, and its content - is unspecified. This field pads the packet out to a constant - 512 bytes. - - - -"Data Channel" payload format: -------------------------------- - -If Chan != 0x1f, the packet is a "data packet" and the payload is a -sequence of homogeneous samples. The format of the samples is -determined by the configuration associated with the given channel. -It is often the case that the payload field contains 32-bit complex -samples, each containing 16-bit real and imaginary components. - - -"Control Channel" payload format: ---------------------------------- - -If Chan == 0x1f, the packet is a "control packet". The control channel -payload consists of a sequence of 0 or more sub-packets. - -Each sub-packet starts on a 32-bit boundary, and consists of an 8-bit -Opcode field, an 8-bit Length field, Length bytes of arguments, and 0, -1, 2 or 3 bytes of padding to align the tail of the sub-packet to -a 32-bit boundary. - -Control channel packets shall be processed at the head of the queue, -and shall observe the timestamp semantics described above. - - -General sub-packet format: --------------------------- - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+ - | Opcode | Length | ... | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+ - - -Specific sub-packet formats: ----------------------------- - - RID: 6-bit Request-ID. Copied from request sub-packet into corresponding - reply sub-packet. RID allows the host to match requests and replies. - - Reg Number: 10-bit Register Number. - - - -Ping Fixed Length: - - Opcode: OP_PING_FIXED - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 2 | RID | Ping Value | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -Ping Fixed Length Reply: - - Opcode: OP_PING_FIXED_REPLY - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 2 | RID | Ping Value | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -Write Register: - - Opcode: OP_WRITE_REG - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 6 | mbz | Reg Number | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Register Value | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -Write Register Masked: - - Opcode: OP_WRITE_REG_MASKED - - REG[Num] = (REG[Num] & ~Mask) | (Value & Mask) - - That is, only the register bits that correspond to 1's in the - mask are written with the new value. - - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 10 | mbz | Reg Number | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Register Value | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Mask Value | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -Read Register: - - Opcode: OP_READ_REG - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 2 | RID | Reg Number | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -Read Register Reply: - - Opcode: OP_READ_REG_REPLY - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 6 | RID | Reg Number | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Register Value | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -I2C Write: - - Opcode: OP_I2C_WRITE - I2C Addr: 7-bit I2C address - Data: The bytes to write to the I2C bus - Length: Length of Data + 2 - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | Length | mbz | I2C Addr | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Data ... . - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -I2C Read: - - Opcode: OP_I2C_READ - I2C Addr: 7-bit I2C address - Nbytes: Number of bytes to read from I2C bus - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 3 | RID | mbz | I2C Addr | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Nbytes | unspecified padding | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -I2C Read Reply: - - Opcode: OP_I2C_READ_REPLY - I2C Addr: 7-bit I2C address - Data: Length - 2 bytes of data read from I2C bus. - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | Length | RID | mbz | I2C Addr | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Data ... . - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -SPI Write: - - Opcode: OP_SPI_WRITE - Enables: Which SPI enables to assert (mask) - Format: Specifies format of SPI data and Opt Header Bytes - Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format - Data: The bytes to write to the SPI bus - Length: Length of Data + 6 - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | Length | mbz | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Enables | Format | Opt Header Bytes | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Data ... . - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -SPI Read: - - Opcode: OP_SPI_READ - Enables: Which SPI enables to assert (mask) - Format: Specifies format of SPI data and Opt Header Bytes - Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format - Nbytes: Number of bytes to read from SPI bus. - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 7 | RID | mbz | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Enables | Format | Opt Header Bytes | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Nbytes | unspecified padding | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -SPI Read Reply: - - Opcode: OP_SPI_READ_REPLY - Data: Length - 2 bytes of data read from SPI bus. - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | Length | RID | mbz | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Data ... . - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - -Delay: - - Opcode: OP_DELAY - Ticks: 16-bit unsigned delay count - - Delay Ticks clock ticks before executing next operation. - - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Opcode | 2 | Ticks | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - diff --git a/doc/manuals/chapters/device-usrp-inband-signaling-usb.adoc b/doc/manuals/chapters/device-usrp-inband-signaling-usb.adoc new file mode 100644 index 0000000..dac77e0 --- /dev/null +++ b/doc/manuals/chapters/device-usrp-inband-signaling-usb.adoc @@ -0,0 +1,303 @@ +[[dev_USRP1_inband_signaling_usb]] +==== USRP1 in-band USB protocol + +This section specifies the format of USB packets used for in-band data +transmission and signaling on the USRP1. All packets are 512-byte long, and are +transfered using USB "bulk" transfers. + +IN packets are sent towards the host. OUT packets are sent away from the host. + +The layout is 32-bits wide. All data is transmitted in little-endian format +across the USB. + +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +|O|U|D|S|E| RSSI | Chan | mbz | Tag | Payload Len | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Timestamp | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| | ++ + +| Payload | +. . +. . +. . +| | ++ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| ... | . ++-+-+-+-+-+-+-+ . +. . +. Padding . +. . +| | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +mbz: Must be Zero:: +These bits must be zero in both IN and OUT packets. + +O: Overrun Flag:: +Set in an IN packet if an overrun condition was detected. Must be zero in OUT +packets. Overrun occurs when the FPGA has data to transmit to the host and there +is no buffer space available. This generally indicates a problem on the host. +Either it is not keeping up, or it has configured the FPGA to transmit data at a +higher rate than the transport (USB) can support. + +U: Underrun Flag:: +Set in an IN packet if an underrun condition was detected. Must be zero in OUT +packets. Underrun occurs when the FPGA runs out of samples, and it's not between +bursts. See the "End of Burst flag" below. + +D: Dropped Packet Flag:: +Set in an IN packet if the FPGA discarded an OUT packet because its timestamp +had already passed. + +S: Start of Burst Flag:: +Set in an OUT packet if the data is the first segment of what is logically a +continuous burst of data. Must be zero in IN packets. + +E: End of Burst Flag:: +Set in an OUT packet if the data is the last segment of what is logically a +continuous burst of data. Must be zero in IN packets. Underruns are not +reported when the FPGA runs out of samples between bursts. + +RSSI: 6-bit Received Strength Signal Indicator:: +Must be zero in OUT packets. In IN packets, indicates RSSI as reported by front +end. FIXME The format and interpretation are to be determined. + +Chan: 5-bit logical channel number:: +Channel number 0x1f is reserved for control information. See "Control Channel" +below. Other channels are "data channels". Each data channel is logically +independent of the others. A data channel payload field contains a sequence of +homogeneous samples. The format of the samples is determined by the +configuration associated with the given channel. It is often the case that the +payload field contains 32-bit complex samples, each containing 16-bit real and +imaginary components. + +Tag:: +4-bit tag for matching IN packets with OUT packets. +//FIXME, write more... + +Payload Len:: +9-bit field that specifies the length of the payload field in bytes. Must be in +the range 0 to 504 inclusive. + +Timestamp: 32-bit timestamp:: +On IN packets, the timestamp indicates the time at which the first sample of the +packet was produced by the A/D converter(s) for that channel. On OUT packets, +the timestamp specifies the time at which the first sample in the packet should +go out the D/A converter(s) for that channel. If a packet reaches the head of +the transmit queue, and the current time is later than the timestamp, an error +is assumed to have occurred and the packet is discarded. As a special case, the +timestamp 0xffffffff is interpreted as "Now". +The time base is a free running 32-bit counter that is incremented by the A/D +sample-clock. + +Payload:: +Variable length field Length is specified by the Payload Len field. + +Padding:: +This field is 504 - Payload Len bytes long, and its content is unspecified. +This field pads the packet out to a constant 512 bytes. + + +===== "Data Channel" payload format + +If `Chan != 0x1f`, the packet is a "data packet" and the payload is a sequence of +homogeneous samples. The format of the samples is determined by the +configuration associated with the given channel. It is often the case that the +payload field contains 32-bit complex samples, each containing 16-bit real and +imaginary components. + + +===== "Control Channel" payload format + +If `Chan == 0x1f`, the packet is a "control packet". The control channel payload +consists of a sequence of 0 or more sub-packets. + +Each sub-packet starts on a 32-bit boundary, and consists of an 8-bit Opcode +field, an 8-bit Length field, Length bytes of arguments, and 0, 1, 2 or 3 bytes +of padding to align the tail of the sub-packet to a 32-bit boundary. + +Control channel packets shall be processed at the head of the queue, and shall +observe the timestamp semantics described above. + + +===== General sub-packet format + +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+ +| Opcode | Length | ... | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+ +---- + +===== Specific sub-packet formats + +RID: 6-bit Request-ID:: +Copied from request sub-packet into corresponding reply sub-packet. RID allows +the host to match requests and replies. + +Reg Number:: +10-bit Register Number. + +Ping Fixed Length:: + +* Opcode: OP_PING_FIXED +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 2 | RID | Ping Value | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +Ping Fixed Length Reply:: + +* Opcode: OP_PING_FIXED_REPLY +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 2 | RID | Ping Value | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +Write Register:: + +* Opcode: OP_WRITE_REG +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 6 | mbz | Reg Number | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Register Value | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +Write Register Masked:: +Only the register bits that correspond to 1's in the mask are written +with the new value. `REG[Num] = (REG[Num] & ~Mask) | (Value & Mask)` + +* Opcode: OP_WRITE_REG_MASKED +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 10 | mbz | Reg Number | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Register Value | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Mask Value | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +Read Register:: + +* Opcode: OP_READ_REG +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 2 | RID | Reg Number | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +Read Register Reply:: + +* Opcode: OP_READ_REG_REPLY +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 6 | RID | Reg Number | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Register Value | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +I2C Write:: + +* Opcode: OP_I2C_WRITE +* I2C Addr: 7-bit I2C address +* Data: The bytes to write to the I2C bus +* Length: Length of Data + 2 +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | Length | mbz | I2C Addr | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Data ... . ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +I2C Read:: + +* Opcode: OP_I2C_READ +* I2C Addr: 7-bit I2C address +* Nbytes: Number of bytes to read from I2C bus +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 3 | RID | mbz | I2C Addr | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Nbytes | unspecified padding | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +I2C Read Reply:: + +* Opcode: OP_I2C_READ_REPLY +* I2C Addr: 7-bit I2C address +* Data: Length - 2 bytes of data read from I2C bus. +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | Length | RID | mbz | I2C Addr | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Data ... . ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +SPI Write:: + +* Opcode: OP_SPI_WRITE +* Enables: Which SPI enables to assert (mask) +* Format: Specifies format of SPI data and Opt Header Bytes +* Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format +* Data: The bytes to write to the SPI bus +* Length: Length of Data + 6 +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | Length | mbz | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Enables | Format | Opt Header Bytes | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Data ... . ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +SPI Read:: + +* Opcode: OP_SPI_READ +* Enables: Which SPI enables to assert (mask) +* Format: Specifies format of SPI data and Opt Header Bytes +* Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format +* Nbytes: Number of bytes to read from SPI bus. +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 7 | RID | mbz | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Enables | Format | Opt Header Bytes | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Nbytes | unspecified padding | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +SPI Read Reply:: + +* Opcode: OP_SPI_READ_REPLY +* Data: Length - 2 bytes of data read from SPI bus. +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | Length | RID | mbz | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Data ... . ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- + +Delay:: + +* Opcode: OP_DELAY +* Ticks: 16-bit unsigned delay count +* Delay Ticks clock ticks before executing next operation. +---- ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| Opcode | 2 | Ticks | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +---- diff --git a/doc/manuals/chapters/trx-devices.adoc b/doc/manuals/chapters/trx-devices.adoc index 10c8529..3c21e59 100644 --- a/doc/manuals/chapters/trx-devices.adoc +++ b/doc/manuals/chapters/trx-devices.adoc @@ -29,6 +29,8 @@ The binary _osmo-trx-usrp1_ is used to drive this device, see <>. +include::./device-usrp-inband-signaling-usb.adoc[] + [[dev_ettus_b200]] === Ettus B200 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d6ef1f54f3d6c5a73ce00dc4640bd698f96842b Gerrit-Change-Number: 14998 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:22 +0000 Subject: Change in ...osmo-trx[master]: Move matlab files under utils/matlab In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14999 ) Change subject: Move matlab files under utils/matlab ...................................................................... Move matlab files under utils/matlab Change-Id: I15b687fbf436d662b264cb00f72b367ccd64b962 --- R utils/matlab/laurent.m R utils/matlab/pulseApproximate.m 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/laurent.m b/utils/matlab/laurent.m similarity index 100% rename from Transceiver52M/laurent.m rename to utils/matlab/laurent.m diff --git a/Transceiver52M/pulseApproximate.m b/utils/matlab/pulseApproximate.m similarity index 100% rename from Transceiver52M/pulseApproximate.m rename to utils/matlab/pulseApproximate.m -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I15b687fbf436d662b264cb00f72b367ccd64b962 Gerrit-Change-Number: 14999 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:22 +0000 Subject: Change in ...osmo-trx[master]: Move Transceiver52/README to UserManual In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15000 ) Change subject: Move Transceiver52/README to UserManual ...................................................................... Move Transceiver52/README to UserManual Change-Id: Ib5a56cfe0c27d027bc0c60abda89e646a80849de --- M Transceiver52M/Makefile.am D Transceiver52M/README M doc/manuals/chapters/trx-backends.adoc 3 files changed, 27 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index 791c586..f039e3f 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -33,8 +33,6 @@ dist_rev2_DATA = std_inband.rbf dist_rev4_DATA = std_inband.rbf -EXTRA_DIST = README - noinst_LTLIBRARIES = libtransceiver_common.la COMMON_SOURCES = \ diff --git a/Transceiver52M/README b/Transceiver52M/README deleted file mode 100644 index 491693c..0000000 --- a/Transceiver52M/README +++ /dev/null @@ -1,35 +0,0 @@ -The Transceiver - -The transceiver consists of three modules: - --- transceiver - --- radioInterface - --- USRPDevice - -The USRPDevice module is basically a driver that reads/writes -packets to a USRP with two RFX900 daughterboards, board -A is the Tx chain and board B is the Rx chain. - -The radioInterface module is basically an interface b/w the -transceiver and the USRP. It operates the basestation clock -based upon the sample count of received USRP samples. Packets -from the USRP are queued and segmented into GSM bursts that are -passed up to the transceiver; bursts from the transceiver are -passed down to the USRP. - -The transceiver basically operates "layer 0" of the GSM stack, -performing the modulation, detection, and demodulation of GSM -bursts. It communicates with the GSM stack via three UDP sockets, -one socket for data, one for control messages, and one socket to -pass clocking information. The transceiver contains a priority -queue to sort to-be-transmitted bursts, and a filler table to fill -in timeslots that do not have bursts in the priority queue. The -transceiver tries to stay ahead of the basestation clock, adapting -its latency when underruns are reported by the radioInterface/USRP. -Received bursts (from the radioInterface) pass through a simple -energy detector, a RACH or midamble correlator, and a DFE-based demodulator. - -NOTE: There's a SWLOOPBACK #define statement, where the USRP is replaced -with a memory buffer. In this mode, data written to the USRP is actually stored -in a buffer, and read commands to the USRP simply pull data from this buffer. -This was very useful in early testing, and still may be useful in testing basic -Transceiver and radioInterface functionality. diff --git a/doc/manuals/chapters/trx-backends.adoc b/doc/manuals/chapters/trx-backends.adoc index 8829fa6..fb1e960 100644 --- a/doc/manuals/chapters/trx-backends.adoc +++ b/doc/manuals/chapters/trx-backends.adoc @@ -44,3 +44,30 @@ Related code can be found in the _Transceiver52M/device/usrp1/_ directory in _osmo-trx.git_. + +The USRPDevice module is basically a driver that reads/writes packets to a USRP +with two RFX900 daughterboards, board A is the Tx chain and board B is the Rx +chain. + +The `radioInterface` module is basically an interface between the transceiver +and the USRP. It operates the basestation clock based upon the sample count of +received USRP samples. Packets from the USRP are queued and segmented into GSM +bursts that are passed up to the transceiver; bursts from the transceiver are +passed down to the USRP. + +The transceiver basically operates "layer 0" of the GSM stack, performing the +modulation, detection, and demodulation of GSM bursts. It communicates with the +GSM stack via three UDP sockets, one socket for data, one for control messages, +and one socket to pass clocking information. The transceiver contains a priority +queue to sort to-be-transmitted bursts, and a filler table to fill in timeslots +that do not have bursts in the priority queue. The transceiver tries to stay +ahead of the basestation clock, adapting its latency when underruns are reported +by the radioInterface/USRP. Received bursts (from the radioInterface) pass +through a simple energy detector, a RACH or midamble correlator, and a DFE-based +demodulator. + +NOTE: There's a `SWLOOPBACK` #define statement, where the USRP is replaced +with a memory buffer. In this mode, data written to the USRP is actually stored +in a buffer, and read commands to the USRP simply pull data from this buffer. +This was very useful in early testing, and still may be useful in testing basic +Transceiver and radioInterface functionality. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib5a56cfe0c27d027bc0c60abda89e646a80849de Gerrit-Change-Number: 15000 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:23 +0000 Subject: Change in ...osmo-trx[master]: Move README.DFEsymbolspaced to utils/matlab In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15001 ) Change subject: Move README.DFEsymbolspaced to utils/matlab ...................................................................... Move README.DFEsymbolspaced to utils/matlab Change-Id: Icccc18688ee54e669cf3452b08747b3509042fa2 --- R utils/matlab/README.DFEsymbolspaced 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/README.DFEsymbolspaced b/utils/matlab/README.DFEsymbolspaced similarity index 100% rename from Transceiver52M/README.DFEsymbolspaced rename to utils/matlab/README.DFEsymbolspaced -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icccc18688ee54e669cf3452b08747b3509042fa2 Gerrit-Change-Number: 15001 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:04:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 12:04:24 +0000 Subject: Change in ...osmo-trx[master]: Move std_inband.rbf under device/usrp1/ dir In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15002 ) Change subject: Move std_inband.rbf under device/usrp1/ dir ...................................................................... Move std_inband.rbf under device/usrp1/ dir This file is only used by USRP1, so let's move it there and avoid processing it in Makefiles if build for USRP1 is not requested at configure time. Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0 --- M Transceiver52M/Makefile.am M Transceiver52M/device/usrp1/Makefile.am R Transceiver52M/device/usrp1/std_inband.rbf M debian/copyright 4 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index f039e3f..ade4e30 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -27,12 +27,6 @@ AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -rev2dir = $(datadir)/usrp/rev2 -rev4dir = $(datadir)/usrp/rev4 - -dist_rev2_DATA = std_inband.rbf -dist_rev4_DATA = std_inband.rbf - noinst_LTLIBRARIES = libtransceiver_common.la COMMON_SOURCES = \ diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am index 5078934..24760f7 100644 --- a/Transceiver52M/device/usrp1/Makefile.am +++ b/Transceiver52M/device/usrp1/Makefile.am @@ -3,6 +3,12 @@ AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS) +rev2dir = $(datadir)/usrp/rev2 +rev4dir = $(datadir)/usrp/rev4 + +dist_rev2_DATA = std_inband.rbf +dist_rev4_DATA = std_inband.rbf + noinst_HEADERS = USRPDevice.h noinst_LTLIBRARIES = libdevice.la diff --git a/Transceiver52M/std_inband.rbf b/Transceiver52M/device/usrp1/std_inband.rbf similarity index 100% rename from Transceiver52M/std_inband.rbf rename to Transceiver52M/device/usrp1/std_inband.rbf Binary files differ diff --git a/debian/copyright b/debian/copyright index d8db465..19926cd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: OsmoTRX Source: http://cgit.osmocom.org/osmo-trx/ -Files-Excluded: Transceiver52M/std_inband.rbf +Files-Excluded: Transceiver52M/device/usrp1/std_inband.rbf Files: * Copyright: 2008-2013 Free Software Foundation -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0 Gerrit-Change-Number: 15002 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:07:42 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:07:42 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/14994/4/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14994/4/src/sip.c at 190 PS4, Line 190: TAG_END()); :-( talloc free? funny how I olny see these things once it's on gerrit.. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 12:07:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:19:45 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:19:45 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 to look at the new patch set (#5). Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 159 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/14994/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 1 01:38:12 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 01 Aug 2019 01:38:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5d42da16ea369_3c572b24b2b4e5f46170bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_9.0/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 315s] asciidoc -v -f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -f ../build/python2-filter.conf -a srcdir='.' -a commondir='../common' test-usermanual.adoc > test-usermanual.check 2>&1 [ 353s] # Make absolutely sure that the %.check target is updated. [ 353s] touch test-usermanual.check [ 353s] # Do print the WARNING output but return error if any was found [ 353s] # (grep -v would omit the WARNING output from the log). [ 353s] asciidoc: WARNING: mgcp_extension_osmux.adoc: line 2: section title out of sequence: expected level 1, got level 2 [ 353s] ../build/Makefile.asciidoc.inc:87: recipe for target 'test-usermanual.check' failed [ 353s] make[3]: *** [test-usermanual.check] Error 1 [ 353s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 353s] Makefile:438: recipe for target 'check-recursive' failed [ 353s] make[2]: *** [check-recursive] Error 1 [ 353s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 353s] Makefile:729: recipe for target 'check' failed [ 353s] make[1]: *** [check] Error 2 [ 353s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 353s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 353s] debian/rules:5: recipe for target 'binary' failed [ 353s] make: *** [binary] Error 2 [ 353s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 353s] [ 353s] morla3 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Thu Aug 1 01:37:57 UTC 2019. [ 353s] [ 353s] ### VM INTERACTION START ### [ 356s] [ 338.605220] sysrq: SysRq : Power Off [ 356s] [ 338.628521] reboot: Power down [ 356s] ### VM INTERACTION END ### [ 356s] [ 356s] morla3 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Thu Aug 1 01:38:01 UTC 2019. [ 356s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 1 01:38:29 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 01 Aug 2019 01:38:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5d42da19aeed9_3c572b24b2b4e5f461737@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie/Debian_8.0/i586 Package network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals-debian8-jessie Last lines of build log: [ 340s] asciidoc -v -f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -f ../build/python2-filter.conf -a srcdir='.' -a commondir='../common' test-usermanual.adoc > test-usermanual.check 2>&1 [ 364s] # Make absolutely sure that the %.check target is updated. [ 364s] touch test-usermanual.check [ 364s] # Do print the WARNING output but return error if any was found [ 364s] # (grep -v would omit the WARNING output from the log). [ 364s] asciidoc: WARNING: mgcp_extension_osmux.adoc: line 2: section title out of sequence: expected level 1, got level 2 [ 364s] ../build/Makefile.asciidoc.inc:87: recipe for target 'test-usermanual.check' failed [ 364s] make[3]: *** [test-usermanual.check] Error 1 [ 364s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 364s] Makefile:426: recipe for target 'check-recursive' failed [ 364s] make[2]: *** [check-recursive] Error 1 [ 364s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 364s] Makefile:717: recipe for target 'check' failed [ 364s] make[1]: *** [check] Error 2 [ 364s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 364s] dh_auto_test: make -j1 check returned exit code 2 [ 364s] debian/rules:5: recipe for target 'binary' failed [ 364s] make: *** [binary] Error 2 [ 364s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 364s] [ 364s] cloud125 failed "build osmo-gsm-manuals-dev_0.1.1.8.2e42.dsc" at Thu Aug 1 01:38:23 UTC 2019. [ 364s] [ 364s] ### VM INTERACTION START ### [ 365s] Powering off. [ 365s] [ 335.349536] reboot: Power down [ 366s] ### VM INTERACTION END ### [ 366s] [ 366s] cloud125 failed "build osmo-gsm-manuals-dev_0.1.1.8.2e42.dsc" at Thu Aug 1 01:38:25 UTC 2019. [ 366s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 1 01:41:19 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 01 Aug 2019 01:41:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_10/i586 In-Reply-To: References: Message-ID: <5d42da38851d9_3c572b24b2b4e5f46179d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_10/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 486s] # same. [ 486s] if ! [ -f test-usermanual.adoc ]; then \ [ 486s] ln -s test-usermanual.adoc test-usermanual.adoc; \ [ 486s] fi [ 486s] asciidoc -v -f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -f ../build/python2-filter.conf -a srcdir='.' -a commondir='../common' test-usermanual.adoc > test-usermanual.check 2>&1 [ 523s] # Make absolutely sure that the %.check target is updated. [ 523s] touch test-usermanual.check [ 523s] # Do print the WARNING output but return error if any was found [ 523s] # (grep -v would omit the WARNING output from the log). [ 523s] asciidoc: WARNING: mgcp_extension_osmux.adoc: line 2: section title out of sequence: expected level 1, got level 2 [ 523s] make[3]: *** [../build/Makefile.asciidoc.inc:96: test-usermanual.check] Error 1 [ 523s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 523s] make[2]: *** [Makefile:438: check-recursive] Error 1 [ 523s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 523s] make[1]: *** [Makefile:732: check] Error 2 [ 523s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 523s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 523s] make: *** [debian/rules:5: binary] Error 2 [ 523s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 523s] [ 523s] lamb10 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Thu Aug 1 01:41:14 UTC 2019. [ 523s] [ 523s] ### VM INTERACTION START ### [ 526s] [ 506.406471] sysrq: SysRq : Power Off [ 526s] [ 506.426686] reboot: Power down [ 526s] ### VM INTERACTION END ### [ 526s] [ 526s] lamb10 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Thu Aug 1 01:41:17 UTC 2019. [ 526s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:34:08 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:34:08 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14996/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14996/1/src/mncc.c at 681 PS1, Line 681: other_leg->hold_call(other_leg); > Just wondering... [?] I've been looking at it... Not sure in what case the other side would do anything other than ACK the reINVITE, other than a complete failure, in which case our call is failing anyway. But yes, we should probably not send HOLD_CNF back until the remote SIP has sent back an ACK. I would really like however, if we could move forward based on what is likely to happen in a real world setup, where the SIP EP operator is /expecting/ to talk to osmo-sip-connector (which is far from complete BTW) Otherwise, I might as well say, "oh look, it doesn't even handle a 100rel." -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 12:34:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:40:34 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:40:34 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14996/1/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14996/1/src/sip.c at 291 PS1, Line 291: struct sip_call_leg *leg = sip_find_leg(nh); > Wasn't this already added on a prior commit? I must have added it in a rebase and not pushed all commits? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 12:40:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:40:49 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:40:49 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 to look at the new patch set (#4). Change subject: Prepare to support MO Call HOLD ...................................................................... Prepare to support MO Call HOLD Add function pointers to the call_leg struct for call hold and retrieve. Add function to send re-INVITE to SIP side when MNCC side puts call on HOLD/RETRIEVES. Add MNCC/SIP CC_HOLD to call states. Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c --- M src/call.c M src/call.h M src/sip.c 3 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/95/14995/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:44:54 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:44:54 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 to look at the new patch set (#6). Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly In the case that the re-INVITE changes the media connection ip/port, forward this to the MNCC side with an MNCC_RTP_CONNECT Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 159 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/14994/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:44:54 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:44:54 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 to look at the new patch set (#5). Change subject: Prepare to support MO Call HOLD ...................................................................... Prepare to support MO Call HOLD Add function pointers to the call_leg struct for call hold and retrieve. Add function to send re-INVITE to SIP side when MNCC side puts call on HOLD/RETRIEVES. Add MNCC/SIP CC_HOLD to call states. Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c --- M src/call.c M src/call.h M src/sip.c 3 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/95/14995/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:44:54 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:44:54 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 to look at the new patch set (#5). Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Add support for MNCC HOLD/RETRIEVE Handle MO hold and retrieve and pass this to the SIP side. Handle the 200 from the SIP side in response to our HOLD-ing re-INVITE. With this commit we now handle MO hold and therefore also handle call-waiting and swapping. Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 --- M src/mncc.c 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/96/14996/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 12:44:54 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 12:44:54 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 to look at the new patch set (#5). Change subject: Add further logging. ...................................................................... Add further logging. Log the IP port, payload type for calls. Also log the SIP Call-ID, this help for correlation with SIP traces. Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b --- M src/mncc.c M src/sip.c 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/97/14997/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 13:16:11 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 13:16:11 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 to look at the new patch set (#6). Change subject: Add further logging. ...................................................................... Add further logging. Log the IP port, payload type for calls. Also log the SIP Call-ID, this help for correlation with SIP traces. Use nua_event_name() rather than the number to log the nua event. Log a DEBUG level message for each nua event that is not handled by the nua_callback() Log MEDIA changes in re-INVITES. Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b --- M src/mncc.c M src/sip.c 2 files changed, 23 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/97/14997/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 13:19:07 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 13:19:07 +0000 Subject: Change in ...osmo-sip-connector[master]: Only send update to MNCC if media info changed. Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 Change subject: Only send update to MNCC if media info changed. ...................................................................... Only send update to MNCC if media info changed. Do not send an MNCC_RTP_CONNECT as a result of a SIP re-INVITE, unless the media connection information has changed. Change-Id: I7c48300092a309e50a8fe091b30e395e7c72de9d --- M src/sip.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/10/15010/1 diff --git a/src/sip.c b/src/sip.c index fd3ec2a..0b83697 100644 --- a/src/sip.c +++ b/src/sip.c @@ -225,9 +225,9 @@ LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port); if (ip != leg->base.ip || port != leg->base.port) { LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n"); + if (other->update_rtp) + other->update_rtp(leg->base.call->remote); } - if (other->update_rtp) - other->update_rtp(leg->base.call->remote); sdp = sdp_create_file(leg, other, sdp_sendrecv); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I7c48300092a309e50a8fe091b30e395e7c72de9d Gerrit-Change-Number: 15010 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 13:22:59 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 13:22:59 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 to look at the new patch set (#6). Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Add support for MNCC HOLD/RETRIEVE Handle MO hold and retrieve and pass this to the SIP side. With this commit we now handle MO hold and therefore also handle call-waiting and swapping. Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 --- M src/mncc.c 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/96/14996/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 13:28:14 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 13:28:14 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 to look at the new patch set (#7). Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly In the case that the re-INVITE changes the media connection ip/port, forward this to the MNCC side with an MNCC_RTP_CONNECT Handle the 200 from the SIP side in response to our re-INVITE Also handle 200 in response to our response to their INVITE w/o sdp. Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 159 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/14994/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:14:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:14:41 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 15:14:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:15:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:15:35 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 ) Change subject: Prepare to support MO Call HOLD ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 15:15:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:16:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:16:32 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 15:16:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:17:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:17:02 +0000 Subject: Change in ...osmo-sip-connector[master]: Only send update to MNCC if media info changed. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 ) Change subject: Only send update to MNCC if media info changed. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I7c48300092a309e50a8fe091b30e395e7c72de9d Gerrit-Change-Number: 15010 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 15:17:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:17:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:17:28 +0000 Subject: Change in ...osmo-trx[master]: Drop old README information, provide new updated README In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14985 ) Change subject: Drop old README information, provide new updated README ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3df00799ce80aa4af43225e69a408ba2cbc444db Gerrit-Change-Number: 14985 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 15:17:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:17:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:17:30 +0000 Subject: Change in ...osmo-trx[master]: Drop old README information, provide new updated README In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14985 ) Change subject: Drop old README information, provide new updated README ...................................................................... Drop old README information, provide new updated README Previous content in README file is actually a description of the TRXD and TRXC protocols, and it has already been moved to the User Manual some time ago. INSTALLATION contained README related information, but it was really out of date. So this commit basically drops those two files and provides a new README.md with content taken from Osmocom's OsmoTRX project wiki page. Change-Id: I3df00799ce80aa4af43225e69a408ba2cbc444db --- D INSTALLATION M Makefile.am D README A README.md 4 files changed, 67 insertions(+), 137 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/INSTALLATION b/INSTALLATION deleted file mode 100644 index f87b6cc..0000000 --- a/INSTALLATION +++ /dev/null @@ -1,19 +0,0 @@ -Installation Requirements - - - -osmo-trx compiles to a simple Unix binary and does not require special -installation. - -One some systems (Ubuntu), you will need to define LIBS = -lpthread prior to -running configure. - -To run osmo-trx, the following should be installed: - libuhd (https://gnuradio.org). - This is part of the GNURadio installation. - -For information on specific executables, see tests/README.tests and -apps/README.apps. - -See https://osmocom.org/projects/osmotrx/wiki/OsmoTRX for more -information. diff --git a/Makefile.am b/Makefile.am index 3e87200..8b55e79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,10 +36,9 @@ tests EXTRA_DIST = \ - INSTALLATION \ LEGAL \ COPYING \ - README + README.md AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) diff --git a/README b/README deleted file mode 100644 index 502d661..0000000 --- a/README +++ /dev/null @@ -1,116 +0,0 @@ -This is the interface to the transcevier. - -Each TRX Manager UDP socket interface represents a single ARFCN. -Each of these per-ARFCN interfaces is a pair of UDP sockets, one for control and one for data. -Give a base port B (5700), the master clock interface is at port P=B. -The TRX-side control interface for C(N) is on port P=B+2N+1 and the data interface is on an odd numbered port P=B+2N+2. -The corresponding core-side interface for every socket is at P+100. -For any given build, the number of ARFCN interfaces can be fixed. - - - -Indications on the Master Clock Interface - -The master clock interface is output only (from the radio). -Messages are "indications". - -CLOCK gives the current value of the transceiver clock to be used by the core. -This message is sent whenever a trasmission packet arrives that is too late or too early. The clock value is NOT the current transceiver time. It is a time setting the the core should use to give better packet arrival times. -IND CLOCK - - - -Commands on the Per-ARFCN Control Interface - -The per-ARFCN control interface uses a command-reponse protocol. -Commands are NULL-terminated ASCII strings, one per UDP socket. -Each command has a corresponding response. -Every command is of the form: - -CMD [params] - -The is the actual command. -Parameters are optional depending on the commands type. -Every response is of the form: - -RSP [result] - -The is 0 for success and a non-zero error code for failure. -Successful responses may include results, depending on the command type. - - -Power Control - -POWEROFF shuts off transmitter power and stops the demodulator. -CMD POWEROFF -RSP POWEROFF - -POWERON starts the transmitter and starts the demodulator. Initial power level is very low. -This command fails if the transmitter and receiver are not yet tuned. -This command fails if the transmit or receive frequency creates a conflict with another ARFCN that is already runnng. -If the transceiver is already on, it response with success to this command. -CMD POWERON -RSP POWERON - -SETPOWER sets output power in dB wrt full scale. -This command fails if the transmitter and receiver are not running. -CMD SETPOWER -RSP SETPOWER - -ADJPOWER adjusts power by the given dB step. Response returns resulting power level wrt full scale. -This command fails if the transmitter and receiver are not running. -CMD ADJPOWER -RSP ADJPOWER - - -Tuning Control - -RXTUNE tunes the receiver to a given frequency in kHz. -This command fails if the receiver is already running. -(To re-tune you stop the radio, re-tune, and restart.) -This command fails if the transmit or receive frequency creates a conflict with another ARFCN that is already runnng. -CMD RXTUNE -RSP RXTUNE - -TXTUNE tunes the transmitter to a given frequency in kHz. -This command fails if the transmitter is already running. -(To re-tune you stop the radio, re-tune, and restart.) -This command fails if the transmit or receive frequency creates a conflict with another ARFCN that is already runnng. -CMD TXTUNE -RSP TXTUNE - - -Timeslot Control - -SETSLOT sets the format of the uplink timeslots in the ARFCN. -The indicates the timeslot of interest. -The indicates the type of channel that occupies the timeslot. -A chantype of zero indicates the timeslot is off. -CMD SETSLOT -RSP SETSLOT - - -Messages on the per-ARFCN Data Interface - -Messages on the data interface carry one radio burst per UDP message. - - -Received Data Burst - -1 byte timeslot index -4 bytes GSM frame number, big endian -1 byte RSSI in -dBm -2 bytes correlator timing offset in 1/256 symbol steps, 2's-comp, big endian -148 bytes soft symbol estimates, 0 -> definite "0", 255 -> definite "1" - - -Transmit Data Burst - -1 byte timeslot index -4 bytes GSM frame number, big endian -1 byte transmit level wrt ARFCN max, -dB (attenuation) -148 bytes output symbol values, 0 & 1 - - - - diff --git a/README.md b/README.md new file mode 100644 index 0000000..dc026e0 --- /dev/null +++ b/README.md @@ -0,0 +1,66 @@ +About OsmTRX +============ + +OsmoTRX is a software-defined radio transceiver that implements the Layer 1 +physical layer of a BTS comprising the following 3GPP specifications: + +* TS 05.01 "Physical layer on the radio path" +* TS 05.02 "Multiplexing and Multiple Access on the Radio Path" +* TS 05.04 "Modulation" +* TS 05.10 "Radio subsystem synchronization" + +OsmoTRX is based on the transceiver code from the +[OpenBTS](https://osmocom.org/projects/osmobts/wiki/OpenBTS) project, but setup +to operate independently with the purpose of using with non-OpenBTS software and +projects, while still maintaining backwards compatibility with OpenBTS when +possible. Currently there are numerous features contained in OsmoTRX that extend +the functionality of the OpenBTS transceiver. These features include enhanced +support for various embedded platforms - notably ARM - and dual channel +diversity support for the Fairwaves umtrx. + +Homepage +-------- + +The official homepage of the project is + + +GIT Repository +-------------- + +You can clone from the official osmo-trx.git repository using + + git clone git://git.osmocom.org/osmo-trx.git + +There is a cgit interface at + +Documentation +------------- + +Doxygen-generated API documentation is generated during the build process, but +also available online for each of the sub-libraries at User Manual for OsmoTRX +can be generated during the build process, and is also available online at +. + +Mailing List +------------ + +Discussions related to OsmoTRX are happening on the openbsc at lists.osmocom.org +mailing list, please see +for subscription options and the list archive. + +Please observe the [Osmocom Mailing List +Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules) +when posting. + +Contributing +------------ + +Our coding standards are described at + + +We us a gerrit based patch submission/review process for managing contributions. +Please see +for more details + +The current patch queue for OsmoTRX can be seen at + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3df00799ce80aa4af43225e69a408ba2cbc444db Gerrit-Change-Number: 14985 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:18:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:18:10 +0000 Subject: Change in ...osmo-sip-connector[master]: Add media mode parameter to sdp_create_file() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 ) Change subject: Add media mode parameter to sdp_create_file() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 Gerrit-Change-Number: 14993 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 01 Aug 2019 15:18:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:19:28 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Thu, 1 Aug 2019 15:19:28 +0000 Subject: Change in ...simtrace2[master]: publish: also upload latest Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/15011 Change subject: publish: also upload latest ...................................................................... publish: also upload latest the jenkins script will now upload the versioned output to the all directory, and a copy named "latest" in the latest directory. Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e --- M contrib/jenkins.sh M firmware/Makefile 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/15011/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 16420f7..af99c8e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -64,7 +64,8 @@ [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48" - rsync -avz -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.{bin,elf} binaries at rita.osmocom.org:web-files/simtrace2/firmware/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries at rita.osmocom.org:web-files/simtrace2/firmware/latest/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries at rita.osmocom.org:web-files/simtrace2/firmware/all/ fi echo diff --git a/firmware/Makefile b/firmware/Makefile index 646d2f3..a879297 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -44,8 +44,8 @@ # Output file basename APP ?= dfu -# Output directories -OUTPUT = $(BOARD)-$(APP)-$(GIT_VERSION) +# Output directories and filename +OUTPUT = $(BOARD)-$(APP) BIN = bin OBJ = obj/$(BOARD) @@ -129,8 +129,6 @@ # Optimization level, put in comment for debugging OPTIMIZATION ?= -Os - - # Flags INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB) @@ -173,8 +171,7 @@ LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB) #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats - -# Append OBJ and BIN directories to output filename +# Append BIN directories to output filename OUTPUT := $(BIN)/$(OUTPUT) #------------------------------------------------------------------------------- @@ -207,8 +204,12 @@ $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) @$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf @$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt @$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin @$(SIZE) $$^ $(OUTPUT)-$$@.elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e Gerrit-Change-Number: 15011 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:23:30 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Thu, 1 Aug 2019 15:23:30 +0000 Subject: Change in ...simtrace2[master]: publish: also upload latest In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/15011 to look at the new patch set (#2). Change subject: publish: also upload latest ...................................................................... publish: also upload latest the jenkins script will now upload the versioned output to the all directory, and a copy named "latest" in the latest directory. Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e --- M contrib/jenkins.sh M firmware/Makefile 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/15011/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e Gerrit-Change-Number: 15011 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:34:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:34:31 +0000 Subject: Change in ...simtrace2[master]: publish: also upload latest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/15011 ) Change subject: publish: also upload latest ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e Gerrit-Change-Number: 15011 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 15:34:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:36:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 15:36:16 +0000 Subject: Change in ...simtrace2[master]: publish: also upload latest In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/simtrace2/+/15011 ) Change subject: publish: also upload latest ...................................................................... publish: also upload latest the jenkins script will now upload the versioned output to the all directory, and a copy named "latest" in the latest directory. Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e --- M contrib/jenkins.sh M firmware/Makefile 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 16420f7..202339c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -64,7 +64,8 @@ [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48" - rsync -avz -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.{bin,elf} binaries at rita.osmocom.org:web-files/simtrace2/firmware/ + rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries at rita.osmocom.org:web-files/simtrace2/firmware/latest/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries at rita.osmocom.org:web-files/simtrace2/firmware/all/ fi echo diff --git a/firmware/Makefile b/firmware/Makefile index 646d2f3..a879297 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -44,8 +44,8 @@ # Output file basename APP ?= dfu -# Output directories -OUTPUT = $(BOARD)-$(APP)-$(GIT_VERSION) +# Output directories and filename +OUTPUT = $(BOARD)-$(APP) BIN = bin OBJ = obj/$(BOARD) @@ -129,8 +129,6 @@ # Optimization level, put in comment for debugging OPTIMIZATION ?= -Os - - # Flags INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB) @@ -173,8 +171,7 @@ LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB) #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats - -# Append OBJ and BIN directories to output filename +# Append BIN directories to output filename OUTPUT := $(BIN)/$(OUTPUT) #------------------------------------------------------------------------------- @@ -207,8 +204,12 @@ $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) @$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf @$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt @$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin @$(SIZE) $$^ $(OUTPUT)-$$@.elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e Gerrit-Change-Number: 15011 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:59:07 2019 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 1 Aug 2019 15:59:07 +0000 Subject: Change in ...osmo-ccid-firmware[master]: ensure kernel >= 5.0 is happy Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016 Change subject: ensure kernel >= 5.0 is happy ...................................................................... ensure kernel >= 5.0 is happy dummy_hcd now checks wMaxPacketSize Change-Id: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e --- M ccid/README.linux-dummy_hcd-ffs M ccid/ccid_main_functionfs.c 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/16/15016/1 diff --git a/ccid/README.linux-dummy_hcd-ffs b/ccid/README.linux-dummy_hcd-ffs index bb628b6..2b98eff 100644 --- a/ccid/README.linux-dummy_hcd-ffs +++ b/ccid/README.linux-dummy_hcd-ffs @@ -2,7 +2,8 @@ ============ * you need dummy_hcd.ko, i.e. a kernel compiled with CONFIG_USB_DUMMY_HCD=m -* you need a fixed usb_f_fs.ko, which doesn't make blind assumptions about +* kernel version >= 5.0 does NOT require patching +* kernel version < 5.0 needs a fixed usb_f_fs.ko, which doesn't make blind assumptions about everything being a HID descriptor. See CCID.patch On a stock Debian system, this works as follows (kernel versions will change over time, diff --git a/ccid/ccid_main_functionfs.c b/ccid/ccid_main_functionfs.c index 81cf225..26bb525 100644 --- a/ccid/ccid_main_functionfs.c +++ b/ccid/ccid_main_functionfs.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -87,20 +88,22 @@ .bEndpointAddress = 1 | USB_DIR_IN, .bmAttributes = USB_ENDPOINT_XFER_INT, .wMaxPacketSize = 64, + .bInterval = 1, }, + // dummy_hcd expects a valid wMaxPacketSize! .ep_out = { .bLength = sizeof(descriptors.fs_descs.ep_out), .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = 2 | USB_DIR_OUT, .bmAttributes = USB_ENDPOINT_XFER_BULK, - /* .wMaxPacketSize = autoconfiguration (kernel) */ + .wMaxPacketSize = 64, }, .ep_in = { .bLength = sizeof(descriptors.fs_descs.ep_in), .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = 3 | USB_DIR_IN, .bmAttributes = USB_ENDPOINT_XFER_BULK, - /* .wMaxPacketSize = autoconfiguration (kernel) */ + .wMaxPacketSize = 64, }, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e Gerrit-Change-Number: 15016 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 15:59:08 2019 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 1 Aug 2019 15:59:08 +0000 Subject: Change in ...osmo-ccid-firmware[master]: proper link order Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15017 Change subject: proper link order ...................................................................... proper link order undef syms from the left, def syms from the right, as it should be. It's either this, or -Wl,--start-group/-Wl,--end-group around everything. Change-Id: I8083c5dc990acd6b60b053883fdd1b42c3bc0d4f --- M ccid/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/17/15017/1 diff --git a/ccid/Makefile b/ccid/Makefile index 2194180..3258967 100644 --- a/ccid/Makefile +++ b/ccid/Makefile @@ -1,7 +1,7 @@ CFLAGS=-Wall -g ccid_functionfs: ccid_main_functionfs.o ccid_proto.o ccid_device.o ccid_slot_sim.o - $(CC) $(CFLAGS) -lasan -losmocore -ltalloc -laio -o $@ $^ + $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8083c5dc990acd6b60b053883fdd1b42c3bc0d4f Gerrit-Change-Number: 15017 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:04:47 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 16:04:47 +0000 Subject: Change in ...osmo-sip-connector[master]: Transmit Bearer Caps to MNCC with SETUP_REQ Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 Change subject: Transmit Bearer Caps to MNCC with SETUP_REQ ...................................................................... Transmit Bearer Caps to MNCC with SETUP_REQ This commit attempts to address: https://osmocom.org/issues/1683 Section MT Call, Point 2. Change-Id: I55cdc4b7c52730d7e998a1d692c7552fd07403ee --- M src/mncc.c 1 file changed, 57 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/19/15019/1 diff --git a/src/mncc.c b/src/mncc.c index ab2bed6..850377e 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -818,12 +818,63 @@ OSMO_STRLCPY_ARRAY(mncc.called.number, call->dest); } - /* - * TODO/FIXME: - * - Determine/request channel based on offered audio codecs - * - Screening, redirect? - * - Synth. the bearer caps based on codecs? - */ + if (call->initial->payload_type == 8) { + /* Full Rate GSM codec requested by SIP side. */ + mncc.fields |= MNCC_F_BEARER_CAP; + struct gsm_mncc_bearer_cap bearer_cap = { + .transfer = GSM48_BCAP_ITCAP_SPEECH, + .mode = GSM48_BCAP_TMOD_CIRCUIT, + .coding = GSM48_BCAP_CODING_GSM_STD, + .radio = GSM48_BCAP_RRQ_FR_ONLY, + .speech_ver = { GSM48_BCAP_SV_FR, + -1}, + .data = { + .rate_adaption = GSM48_BCAP_RA_NONE, + .sig_access = 0, + .async = 0, + .nr_stop_bits = 0, + .nr_data_bits = 0, + .user_rate = 0, + .parity = GSM48_BCAP_PAR_ODD, + .interm_rate = 0, + .transp = GSM48_BCAP_TR_TRANSP, + .modem_type = GSM48_BCAP_MT_NONE, + }, + }; + mncc.bearer_cap = bearer_cap; + } + + if (call->initial->payload_type == 98) { + /* WARNING: Dynamic Payload type + * in use by current hacker... + * + * FIXME: Store the codec name in the struct + * so that we can check it here. + */ + mncc.fields |= MNCC_F_BEARER_CAP; + struct gsm_mncc_bearer_cap bearer_cap = { + .transfer = GSM48_BCAP_ITCAP_SPEECH, + .mode = GSM48_BCAP_TMOD_CIRCUIT, + .coding = GSM48_BCAP_CODING_GSM_STD, + .radio = GSM48_BCAP_RRQ_DUAL_HR, + .speech_ver = { GSM48_BCAP_SV_AMR_H, + -1}, + .data = { + .rate_adaption = GSM48_BCAP_RA_NONE, + .sig_access = 0, + .async = 0, + .nr_stop_bits = 0, + .nr_data_bits = 0, + .user_rate = 0, + .parity = GSM48_BCAP_PAR_ODD, + .interm_rate = 0, + .transp = GSM48_BCAP_TR_TRANSP, + .modem_type = GSM48_BCAP_MT_NONE, + }, + }; + mncc.bearer_cap = bearer_cap; + } + rc = write(conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I55cdc4b7c52730d7e998a1d692c7552fd07403ee Gerrit-Change-Number: 15019 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:06:26 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 16:06:26 +0000 Subject: Change in ...osmo-sip-connector[master]: Transmit Bearer Caps to MNCC with SETUP_REQ In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 ) Change subject: Transmit Bearer Caps to MNCC with SETUP_REQ ...................................................................... Patch Set 1: Code-Review-1 I'm not really sure about this.. I'm browsing through the bearer caps code in libosmocore and also what's been done in osmo-msc. But this makes a start.. any tips? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I55cdc4b7c52730d7e998a1d692c7552fd07403ee Gerrit-Change-Number: 15019 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: keith Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 01 Aug 2019 16:06:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:23:41 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 1 Aug 2019 16:23:41 +0000 Subject: Change in ...osmo-msc[master]: minor comments in msc_vty.c Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15020 Change subject: minor comments in msc_vty.c ...................................................................... minor comments in msc_vty.c Change-Id: I83d8c778190adb1e74debc8f8ddac6996de7c513 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15020/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c75cd0e..8ef48ff 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -688,6 +688,7 @@ #define MSC_VTY_DUMP(vty, offset, fmt, args...) \ vty_out(vty, "%*s" fmt, offset, "", ##args) +/* Print value of a named flag, prefixed with a given amount of spaces */ #define MSC_VTY_DUMP_FLAG(vty, offset, name, flag) \ MSC_VTY_DUMP(vty, offset + 2, "%s: %*s%s%s", \ name, 30 - (int)strlen(name), "", \ @@ -712,6 +713,7 @@ } if (dump_flags & MSC_VTY_DUMP_F_CONNECTION) { + /* (If msc_a exists, there *must* be a non-null msc_a->c.msub) */ MSC_VTY_DUMP(vty, offset, "RAN connection: %s%s", trans->msc_a ? msub_ran_conn_name(trans->msc_a->c.msub) : "(not established)", -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I83d8c778190adb1e74debc8f8ddac6996de7c513 Gerrit-Change-Number: 15020 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:23:43 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 1 Aug 2019 16:23:43 +0000 Subject: Change in ...osmo-msc[master]: manual: adjust and fix auth and ciph docs Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15021 Change subject: manual: adjust and fix auth and ciph docs ...................................................................... manual: adjust and fix auth and ciph docs Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f --- M doc/manuals/chapters/net.adoc 1 file changed, 54 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/15021/1 diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc index 06be4ba..aa0a2f3 100644 --- a/doc/manuals/chapters/net.adoc +++ b/doc/manuals/chapters/net.adoc @@ -101,32 +101,56 @@ === Authentication -Authorized subscribers must be entered in the HLR database, see the _OsmoHLR -reference manual_ <>. If authentication tokens (such as KI for -2G, or K and OP/OPC for UMTS) are present in the HLR, OsmoMSC will only attach -a subscriber after successful authentication. +A subscriber's IMSI must be entered in the HLR database to be able to attach. A +subscriber-create-on-demand feature is also available, see the _OsmoHLR +reference manual_ <>. -If no authentication keys are present in the HLR for a given subscriber, -OsmoMSC will attach the subscriber _without_ authentication. You can reject -subscribers that lack authentication info in the HLR with this setting: +A known IMSI in the HLR may or may not have authentication keys associated, +which profoundly affects the ability to attach and the algorithms used to +negotiate authentication, as the following sections explain for 2G and 3G. + +==== Authentication on 2G + +If authentication tokens (such as KI for 2G, or K and OP/OPC for UMTS) are +present in the HLR, OsmoMSC will only attach a subscriber after successful +authentication. Note that the 3G authentication keys are also used on 2G when +the MS indicates UMTS compatibility, in which case the full UMTS style mutual +authentication may indeed take place on 2G (GERAN). + +On 2G, if no authentication keys are present in the HLR for a given subscriber, +OsmoMSC will attach the subscriber _without_ authentication. Subscribers that +lack authentication keys can always be rejected with this setting: ---- network authentication required ---- +==== Authentication on 3G + +3G (UTRAN) always requires authentication (a.k.a. Integrity Protection) by +specification, and hence authentication keys must be present in the HLR for a +subscriber to be able to attach on 3G. + +OsmoMSC always indicates UIA1 and UIA2 as permitted Integrity Protection +algorithms on 3G. + === Ciphering To enable ciphering on the radio link, authentication must take place first: -the Kc resulting from authentication is the key used for ciphering. Hence, all -subscribers must have authentication tokens available in the HLR for ciphering. +the Kc resulting from authentication is the key used for ciphering. Hence, to +be able to use ciphering, a subscriber must have authentication tokens +available in the HLR. + +==== Ciphering on 2G The MS, BTS and MSC must agree on a ciphering algorithm to use. - The MS sends its supported ciphering algorithms via Classmark IEs during Location Updating. - Typically the BSC needs to know which A5 ciphers are supported by connected - BTSes. + BTSes, see the `network / encryption a5` configuration item for OsmoBSC + <>. - Finally, OsmoMSC may impose that specific A5 ciphers shall not be considered. It is the responsibility of the BSC to then pick an A5 cipher that satisfies @@ -143,12 +167,28 @@ + ---- network - encryption a5 3 + encryption a5 1 3 ---- - Never use A5/2: it is an "export grade cipher" and has been deprecated for its low ciphering strength. -NOTE: At the time of writing, OsmoMSC supports setting only a single A5 cipher, -while it should be able to allow a set of ciphers. This is subject to ongoing -development. +- To allow either no encryption or any of A5/1 or A5/3 based on the presence of + authentication keys and abilities of the MS, SIM and BSC configuration, it is + recommended to enable all ciphers in OsmoMSC. The highest available A5 cipher + will be used; the order in which the A5 options are configured does not + affect the choice. ++ +---- +network + encryption a5 0 1 3 +---- + +==== Ciphering on 3G + +While authentication is always required on 3G, ciphering is optional. + +So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim +solution, ciphering is always enabled on 3G. + +OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f Gerrit-Change-Number: 15021 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:23:44 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 1 Aug 2019 16:23:44 +0000 Subject: Change in ...osmo-msc[master]: do not force encryption on UTRAN Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15022 Change subject: do not force encryption on UTRAN ...................................................................... do not force encryption on UTRAN Remove the conditions that always enable encryption on UTRAN. We so far lack an explicit configuration for UTRAN encryption, and this patch does not add any either. Instead, whether UTRAN encryption is enabled is simply triggered on whether GERAN has A5 encryption enabled (A5/n with n > 0). Though GERAN and UTRAN encryption are not technically related at all, this makes UTRAN behave like GERAN for now, until we implement a proper separate configuration for UTRAN encryption. Adjust the msc_vlr_test_* configuration by setting the net->a5_encryption_mask such that the expected output remains unchanged. A subsequent patch (I54227f1f08c38c0bf69b9c48924669c4829b04b9) will add more tests, particularly cases of UTRAN without encryption. Adjust manual and vty doc. Related: OS#2783 Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 --- M doc/manuals/chapters/net.adoc M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.h 7 files changed, 48 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/15022/1 diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc index aa0a2f3..c982bf6 100644 --- a/doc/manuals/chapters/net.adoc +++ b/doc/manuals/chapters/net.adoc @@ -189,6 +189,10 @@ While authentication is always required on 3G, ciphering is optional. So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim -solution, ciphering is always enabled on 3G. +solution, ciphering is enabled on 3G exactly when ciphering is enabled on 2G, +i.e. when any cipher other than A5/0 is enabled in the configuration. If only +A5/0 is configured, ciphering will be disabled on both 2G and 3G. The future +aim is to add comprehensive configuration for 3G ciphering that is independent +from the 2G setting. OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G. diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index ee31747..cd37cff 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -375,7 +375,7 @@ net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -780,7 +780,7 @@ req->cm_service_type, mi-1, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1152,7 +1152,7 @@ net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, mi_lv, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 8ef48ff..5bf9701 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -148,7 +148,10 @@ cfg_net_encryption_cmd, "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]", "Encryption options\n" - "GSM A5 Air Interface Encryption\n" + "GSM A5 Air Interface Encryption." + " NOTE: as long as OsmoMSC lacks distinct configuration for 3G encryption," + " 3G encryption is enabled exactly when any 2G encryption is enabled." + " Hence configuring only A5/0 here switches off 3G encryption.\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index d73a5f8..62ea6c7 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -266,6 +266,8 @@ static void test_auth_use_twice_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 1, 1, true); comment_end(); } @@ -273,6 +275,8 @@ static void test_auth_use_twice_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 1, 1, true); comment_end(); } @@ -280,6 +284,8 @@ static void test_auth_use_infinitely_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, -1, 3, false); comment_end(); } @@ -287,6 +293,8 @@ static void test_auth_use_infinitely_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, -1, 3, false); comment_end(); } @@ -294,6 +302,8 @@ static void test_no_auth_reuse_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 0, 0, true); comment_end(); } @@ -301,6 +311,8 @@ static void test_no_auth_reuse_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 0, 0, true); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 6805f1a..3410e48 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -46,6 +46,7 @@ struct vlr_subscr *vsub; net->authentication_required = true; + net->a5_encryption_mask = A5_0_3; net->vlr->cfg.assign_tmsi = true; rx_from_ran = OSMO_RAT_UTRAN_IU; diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index a89b0d1..6f8fa01 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -306,6 +306,8 @@ static void test_umts_authen_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen(OSMO_RAT_GERAN_A); comment_end(); } @@ -313,6 +315,8 @@ static void test_umts_authen_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -544,6 +548,8 @@ static void test_umts_authen_resync_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_resync(OSMO_RAT_GERAN_A); comment_end(); } @@ -551,6 +557,8 @@ static void test_umts_authen_resync_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -644,6 +652,8 @@ static void test_umts_authen_too_short_res_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_too_short_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -651,6 +661,8 @@ static void test_umts_authen_too_short_res_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_short_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -744,6 +756,8 @@ static void test_umts_authen_too_long_res_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_too_long_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -751,6 +765,8 @@ static void test_umts_authen_too_long_res_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_long_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -849,6 +865,8 @@ static void test_umts_authen_only_sres_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_only_sres(OSMO_RAT_GERAN_A); comment_end(); } @@ -856,6 +874,8 @@ static void test_umts_authen_only_sres_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_only_sres(OSMO_RAT_UTRAN_IU); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 9df9cf0..4330ea8 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -32,6 +32,9 @@ #include #include +#define A5_0 (1 << 0) +#define A5_0_3 ((1 << 0) | (1 << 3)) + extern bool _log_lines; #define _log(fmt, args...) do { \ if (_log_lines) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 Gerrit-Change-Number: 15022 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:23:44 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 1 Aug 2019 16:23:44 +0000 Subject: Change in ...osmo-msc[master]: add msc_vlr tests for UMTS without ciphering Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15023 Change subject: add msc_vlr tests for UMTS without ciphering ...................................................................... add msc_vlr tests for UMTS without ciphering Following I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7, have tests for UMTS authentication both for cases with and without encryption. - Rename test_umts_authen_utran to test_umts_auth_ciph_utran() (uses encryption). - Again add test_umts_authen_utran() not using encryption. - Likewise with test_umts_authen_resync_utran(). Some permutations are still missing, like UMTS AKA on GERAN with encryption enabled; not bothering at the moment. Related: OS#2783 Change-Id: I54227f1f08c38c0bf69b9c48924669c4829b04b9 --- M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err 2 files changed, 966 insertions(+), 79 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/23/15023/1 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 6f8fa01..1bf6cd2 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -122,23 +122,30 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); - VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "27497388b6cb044648f396aa155b95ef"); - ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "27497388b6cb044648f396aa155b95ef"); + ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + ms_sends_security_mode_complete(); + VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } @@ -190,22 +197,29 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts with a CM Service Accept"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "1159ec926a50e98c034a6b7d7c9f418d"); + ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */ + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); + ms_sends_security_mode_complete(); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts with a CM Service Accept"); gsup_expect_tx(NULL); ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */ VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "1159ec926a50e98c034a6b7d7c9f418d"); - ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */ - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); - - btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); - VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); } /* Release connection */ @@ -251,21 +265,28 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts and sends pending SMS"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "eb50e770ddcc3060101d2f43b6c2b884"); + ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */ + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + + btw("MS sends SecurityModeControl acceptance, VLR accepts and sends SMS"); + dtap_expect_tx(sms); + ms_sends_security_mode_complete(); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends pending SMS"); dtap_expect_tx(sms); ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */ VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "eb50e770ddcc3060101d2f43b6c2b884"); - ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */ - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - - btw("MS sends SecurityModeControl acceptance, VLR accepts and sends SMS"); - dtap_expect_tx(sms); - ms_sends_security_mode_complete(); } btw("SMS was delivered, no requests pending for subscr"); @@ -315,6 +336,15 @@ static void test_umts_authen_utran() { comment_start(); + /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0; + _test_umts_authen(OSMO_RAT_UTRAN_IU); + comment_end(); +} + +static void test_umts_auth_ciph_utran() +{ + comment_start(); /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ net->a5_encryption_mask = A5_0_3; _test_umts_authen(OSMO_RAT_UTRAN_IU); @@ -489,23 +519,30 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); - VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "8a90c769b7272f3bb7a1c1fbb1ea9349"); - ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "8a90c769b7272f3bb7a1c1fbb1ea9349"); + ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + ms_sends_security_mode_complete(); + VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } @@ -557,6 +594,15 @@ static void test_umts_authen_resync_utran() { comment_start(); + /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0; + _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); + comment_end(); +} + +static void test_umts_auth_ciph_resync_utran() +{ + comment_start(); /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ net->a5_encryption_mask = A5_0_3; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); @@ -884,8 +930,10 @@ msc_vlr_test_func_t msc_vlr_tests[] = { test_umts_authen_geran, test_umts_authen_utran, + test_umts_auth_ciph_utran, test_umts_authen_resync_geran, test_umts_authen_resync_utran, + test_umts_auth_ciph_resync_utran, test_umts_authen_too_short_res_geran, test_umts_authen_too_short_res_utran, test_umts_authen_too_long_res_geran, diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 63f1bba..cda55f5 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -56,7 +56,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -258,7 +258,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts with a CM Service Accept +- Encryption disabled. MS sends Authen Response, VLR accepts with a CM Service Accept MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -411,7 +411,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts and sends pending SMS +- Encryption disabled. MS sends Authen Response, VLR accepts and sends pending SMS MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (paging-response,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -620,6 +620,611 @@ DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) +DVLR set IMSI on subscriber; IMSI=901700000010650 id=901700000010650 +DVLR New subscr, IMSI: 901700000010650 +DREF VLR subscr IMSI-901700000010650 + active-conn: now used by 2 (_lu_fsm_associate_vsub,active-conn) +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DREF VLR subscr IMSI-901700000010650 - _lu_fsm_associate_vsub: now used by 1 (active-conn) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1_pre() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000000156f00362201039fa2f4e3d523d8619a73b4f65c3e14d21049b36efdf2208059a4f668f6fbe39231027497388b6cb044648f396aa155b95ef2410f64735036e5871319c679f4742a75ea125108704f5ba55f30000d2ee44b22c8ea9192708e229c19e791f2e4103622010c187a53a5e6b9d573cac7c74451fd46d210485aa31302208d3d50a000bf04f6e23101159ec926a50e98c034a6b7d7c9f418d2410df3a03d9ca5335641efc8e36d76cd20b25101843a645b98d00005b2d666af46c45d927087db47cf7f81e4dc703622010efa9c29a9742148d5c9070348716e1bb210469d5f9fb22083df176f0c29f1a3d2310eb50e770ddcc3060101d2f43b6c2b884241076542abce5ff9345b0e8947f4c6e019c2510f9375e6d41e1000096e7fe4ff1c27e392708706f996719ba609c03622010f023d5a3b24726e0631b64b3840f82532104d570c03f2208ec011be8919883d62310c4e58af4ba43f3bcd904e16984f086d724100593f65e752e5cb7f473862bda05aa0a2510541ff1f077270000c5ea00d658bc7e9a27083fd26072eaa2a04d036220102f8f90c780d6a9c0c53da7ac57b6707e2104b072446f220823f39f9f425ad6e6231065af0527fda95b0dc5ae4aa515cdf32f2410537c3b35a3b13b08d08eeb28098f45cc25104bf4e564f75300009bc796706bc6574427080edb0eadbea94ac20a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000010650) Received 5 auth tuples +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:UTRAN-Iu:LU: tuple use_count=1 key_seq=0 auth_types=0x3 and... +- ...rand=39fa2f4e3d523d8619a73b4f65c3e14d +- ...autn=8704f5ba55f30000d2ee44b22c8ea919 +- ...expecting res=e229c19e791f2e41 +DREF VLR subscr IMSI-901700000010650 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e791f2e41 (8 bytes) +DVLR SUBSCR(IMSI-901700000010650) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_ciph() +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f02801020a0101 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + gsup_tx_confirmed == 1 + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000000156f00804032443f20a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR IMSI:901700000010650 has MSISDN:42342 +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342) VLR: update for IMSI=901700000010650 (MSISDN=42342) +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF +- sending LU Accept for IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU, with TMSI 0x03020100 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Deallocated +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 1 +- a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl + llist_count(&msub_list) == 1 +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- even though the TMSI is not acked, we can already find the subscr with it +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 + _test_umts_authen: now used by 2 (active-conn,_test_umts_authen) + vsub != NULL == 1 + strcmp(vsub->imsi, imsi) == 0 + vsub->tmsi_new == 0x03020100 + vsub->tmsi == 0xffffffff +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - _test_umts_authen: now used by 1 (active-conn) +- MS sends TMSI Realloc Complete + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_TMSI_REALL_COMPL +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: TMSI Reallocation Completed +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_NEW_TMSI_ACK +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: Received Event LU_COMPL_VLR_E_NEW_TMSI_ACK +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + attached: now used by 2 (active-conn,attached) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - lu: now used by 1 (rx_from_ms) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (active-conn,attached) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: max total use count was 3 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- LU was successful, and the conn has already been closed + llist_count(&msub_list) == 0 + + +- after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_CM_SERV_REQ +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: Rx CM SERVICE REQUEST cm_service_type=Short-Messaging-Service +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: + cm_service_sms: now used by 2 (rx_from_ms,cm_service_sms) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + proc_arq_vlr_fn_init: now used by 2 (attached,proc_arq_vlr_fn_init) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + active-conn: now used by 3 (attached,proc_arq_vlr_fn_init,active-conn) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=1 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ: tuple use_count=1 key_seq=1 auth_types=0x3 and... +- ...rand=c187a53a5e6b9d573cac7c74451fd46d +- ...autn=1843a645b98d00005b2d666af46c45d9 +- ...expecting res=7db47cf7f81e4dc7 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) + cm_service_result_sent == 0 + auth_request_sent == 1 +- needs auth, not yet accepted +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- Encryption disabled. MS sends Authen Response, VLR accepts with a CM Service Accept + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH on UTRAN received RES: 7db47cf7f81e4dc7 (8 bytes) +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_ciph() +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN encode: DTAP on UTRAN-Iu +- DTAP --UTRAN-Iu--> MS: GSM48_MT_MM_CM_SERV_ACC: 0521 +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_sms) + cm_service_result_sent == 1 +- Concluding CM Service Request +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - cm_service_sms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (attached,active-conn,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (attached,active-conn) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: max total use count was 2 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- all requests serviced, conn has been released + llist_count(&msub_list) == 0 + + +- an SMS is sent, MS is paged +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + _test_umts_authen: now used by 2 (attached,_test_umts_authen) + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS-receiver: now used by 3 (attached,_test_umts_authen,SMS-receiver) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS: now used by 4 (attached,_test_umts_authen,SMS-receiver,SMS) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) New transaction +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Going to send a MT SMS +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Initiating Paging due to MMSMS_EST_REQ +DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Starting paging + paging request (SIGNALLING_LOW_PRIO) to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 on UTRAN-Iu + strcmp(paging_expecting_imsi, vsub->imsi) == 0 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + Paging: now used by 5 (attached,_test_umts_authen,SMS-receiver,SMS,Paging) + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - _test_umts_authen: now used by 4 (attached,SMS-receiver,SMS,Paging) + paging_sent == 1 +- the subscriber and its pending request should remain +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + _test_umts_authen: now used by 5 (attached,SMS-receiver,SMS,Paging,_test_umts_authen) + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - _test_umts_authen: now used by 4 (attached,SMS-receiver,SMS,Paging) +- MS replies with Paging Response, and VLR sends Auth Request with third key + MSC <--UTRAN-Iu-- MS: GSM48_MT_RR_PAG_RESP + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP +DRR msc_a(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: Rx PAGING RESPONSE +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: + paging-response: now used by 2 (rx_from_ms,paging-response) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + proc_arq_vlr_fn_init: now used by 5 (attached,SMS-receiver,SMS,Paging,proc_arq_vlr_fn_init) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + active-conn: now used by 6 (attached,SMS-receiver,SMS,Paging,proc_arq_vlr_fn_init,active-conn) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=2 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP: tuple use_count=1 key_seq=2 auth_types=0x3 and... +- ...rand=efa9c29a9742148d5c9070348716e1bb +- ...autn=f9375e6d41e1000096e7fe4ff1c27e39 +- ...expecting res=706f996719ba609c +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 5 (attached,SMS-receiver,SMS,Paging,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (paging-response) + auth_request_sent == 1 +- needs auth, not yet accepted +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- Encryption disabled. MS sends Authen Response, VLR accepts and sends pending SMS + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (paging-response,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = 706f996719ba609c) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH on UTRAN received RES: 706f996719ba609c (8 bytes) +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_ciph() +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Paging Response action (success) +DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Removing Paging Request +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) mmsms_paging_cb(success) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + sms: now used by 3 (paging-response,rx_from_ms,sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu +- DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 +- DTAP matches expected message +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - Paging: now used by 4 (attached,SMS-receiver,SMS,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - paging-response: now used by 2 (rx_from_ms,sms) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms) + dtap_tx_confirmed == 1 +- SMS was delivered, no requests pending for subscr +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + _test_umts_authen: now used by 5 (attached,SMS-receiver,SMS,active-conn,_test_umts_authen) + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - _test_umts_authen: now used by 4 (attached,SMS-receiver,SMS,active-conn) +- conn is still open to wait for SMS ack dance + llist_count(&msub_list) == 1 +- MS replies with CP-ACK for received SMS + MSC <--UTRAN-Iu-- MS: SMS:0x04 +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x04 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x04 +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms) + llist_count(&msub_list) == 1 +- MS also sends RP-ACK, MSC in turn sends CP-ACK for that + MSC <--UTRAN-Iu-- MS: SMS:0x01 +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x01 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x01 +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 04 +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu +- DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904 +- DTAP matches expected message +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) RX SMS RP-ACK (MO) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS-receiver: now used by 3 (attached,SMS,active-conn) +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Got MMSMS_REL_REQ, destroying transaction. +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Freeing transaction +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS: now used by 2 (attached,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - sms: now used by 1 (rx_from_ms) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (attached,active-conn,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (attached,active-conn) + dtap_tx_confirmed == 1 + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: max total use count was 3 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- SMS is done, conn is gone + llist_count(&msub_list) == 0 + + +- subscriber detaches + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_IMSI_DETACH_IND + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_IMSI_DETACH_IND +DMM IMSI DETACH INDICATION: MI(IMSI)=901700000010650 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + gsm48_rx_mm_imsi_detach_ind: now used by 2 (attached,gsm48_rx_mm_imsi_detach_ind) +DMM IMSI DETACH for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + active-conn: now used by 3 (attached,gsm48_rx_mm_imsi_detach_ind,active-conn) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (attached,gsm48_rx_mm_imsi_detach_ind,active-conn,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,gsm48_rx_mm_imsi_detach_ind,active-conn) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - attached: now used by 2 (gsm48_rx_mm_imsi_detach_ind,active-conn) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - gsm48_rx_mm_imsi_detach_ind: now used by 1 (active-conn) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_CN_CLOSE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: Releasing: msc_a use is 1 (rx_from_ms) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 2 (active-conn,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 3 (active-conn,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 2 (active-conn,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 2 (rx_from_ms,wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 1 (active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: - rx_from_ms: now used by 1 (wait-Clear-Complete) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: max total use count was 2 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 0 (-) +DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 6) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone + llist_count(&msub_list) == 0 +===== test_umts_authen_utran: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 19 + +===== test_umts_auth_ciph_utran +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_LOC_UPD_REQUEST +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: USIM: old LAI: 1665-165-0 +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + mm_rx_loc_upd_req: now used by 2 (rx_from_ms,mm_rx_loc_upd_req) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) @@ -655,7 +1260,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -869,7 +1474,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -955,16 +1560,16 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS-receiver: now used by 3 (attached,_test_umts_authen,SMS-receiver) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS: now used by 4 (attached,_test_umts_authen,SMS-receiver,SMS) -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) New transaction +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) New transaction DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Going to send a MT SMS +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) Going to send a MT SMS DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE DLSMS SMR(0) TX SMS RP-DATA DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Initiating Paging due to MMSMS_EST_REQ +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) Initiating Paging due to MMSMS_EST_REQ DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Starting paging paging request (SIGNALLING_LOW_PRIO) to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 on UTRAN-Iu strcmp(paging_expecting_imsi, vsub->imsi) == 0 @@ -1031,7 +1636,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (paging-response,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -1071,13 +1676,13 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Paging Response action (success) DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Removing Paging Request -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) mmsms_paging_cb(success) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) mmsms_paging_cb(success) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + sms: now used by 2 (paging-response,sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1095,7 +1700,7 @@ DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x04 -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x04 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) receiving SMS message SMS:0x04 DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK DLSMS SMC(0) received CP-ACK DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED @@ -1106,26 +1711,26 @@ DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x01 -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x01 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) receiving SMS message SMS:0x01 DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED DLSMS SMC(0) received CP-DATA -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 04 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) GSM4.11 TX 09 04 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904 - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) MNSMS-DATA/EST-IND +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) MNSMS-DATA/EST-IND DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK DLSMS SMR(0) RX SMS RP-ACK DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) RX SMS RP-ACK (MO) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS-receiver: now used by 3 (attached,SMS,active-conn) DLSMS SMR(0) TX: MNSMS-REL-REQ DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Got MMSMS_REL_REQ, destroying transaction. -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Freeing transaction +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) Got MMSMS_REL_REQ, destroying transaction. +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) Freeing transaction DLSMS SMR(0) clearing SMR instance DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS: now used by 2 (attached,active-conn) @@ -1226,7 +1831,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations - msub gone llist_count(&msub_list) == 0 -===== test_umts_authen_utran: SUCCESS +===== test_umts_auth_ciph_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 19 @@ -1313,7 +1918,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -1482,6 +2087,240 @@ DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) +DVLR set IMSI on subscriber; IMSI=901700000010650 id=901700000010650 +DVLR New subscr, IMSI: 901700000010650 +DREF VLR subscr IMSI-901700000010650 + active-conn: now used by 2 (_lu_fsm_associate_vsub,active-conn) +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DREF VLR subscr IMSI-901700000010650 - _lu_fsm_associate_vsub: now used by 1 (active-conn) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1_pre() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000000156f00362201039fa2f4e3d523d8619a73b4f65c3e14d21049b36efdf2208059a4f668f6fbe39231027497388b6cb044648f396aa155b95ef2410f64735036e5871319c679f4742a75ea125108704f5ba55f30000d2ee44b22c8ea9192708e229c19e791f2e410a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000010650) Received 1 auth tuples +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:UTRAN-Iu:LU: tuple use_count=1 key_seq=0 auth_types=0x3 and... +- ...rand=39fa2f4e3d523d8619a73b4f65c3e14d +- ...autn=8704f5ba55f30000d2ee44b22c8ea919 +- ...expecting res=e229c19e791f2e41 +DREF VLR subscr IMSI-901700000010650 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- MS sends Authen Failure with Resync cause, VLR sends GSUP to HLR to resync + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_FAIL +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + gsup_tx_confirmed == 1 + auth_request_sent == 0 + lu_result_sent == 0 +- HLR replies with new tuples +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000000156f0036220100f1feb1623e1bf626334e37ec448ac182104efde99da220814778c855c52373023108a90c769b7272f3bb7a1c1fbb1ea9349241043ffc1cf8c89a7fd6ab94bd8d6162cbf251002a83f62e9470000660d51afc75f169d27081df5f0b4f22b696e03622010ac21d34937b4e1142a2c757af294931921047818bfdc2208d175571f41f314a42310ff8edbceb6dd24799c77c3b9a6790c102410157c39022ca9d885a7f0766a7dfee44825108a43b91898e500002cf354c6f5d1f8c32708f748a7078f5018db0a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000010650) Received 2 auth tuples +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC}: state_chg to VLR_SUB_AS_WAIT_RESP_RESYNC +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: got auth tuple: use_count=1 key_seq=0 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:UTRAN-Iu:LU: tuple use_count=1 key_seq=0 auth_types=0x3 and... +- ...rand=0f1feb1623e1bf626334e37ec448ac18 +- ...autn=02a83f62e9470000660d51afc75f169d +- ...expecting res=1df5f0b4f22b696e +DREF VLR subscr IMSI-901700000010650 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = 1df5f0b4f22b696e) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: 1df5f0b4f22b696e (8 bytes) +DVLR SUBSCR(IMSI-901700000010650) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_ciph() +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f02801020a0101 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + gsup_tx_confirmed == 1 + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000000156f00804032443f20a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR IMSI:901700000010650 has MSISDN:42342 +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342) VLR: update for IMSI=901700000010650 (MSISDN=42342) +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF +- sending LU Accept for IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU, with TMSI 0x03020100 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Deallocated +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 1 +- a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl + llist_count(&msub_list) == 1 +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- even though the TMSI is not acked, we can already find the subscr with it +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 + _test_umts_authen_resync: now used by 2 (active-conn,_test_umts_authen_resync) + vsub != NULL == 1 + strcmp(vsub->imsi, imsi) == 0 + vsub->tmsi_new == 0x03020100 + vsub->tmsi == 0xffffffff +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - _test_umts_authen_resync: now used by 1 (active-conn) +- MS sends TMSI Realloc Complete + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_TMSI_REALL_COMPL +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: TMSI Reallocation Completed +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_NEW_TMSI_ACK +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: Received Event LU_COMPL_VLR_E_NEW_TMSI_ACK +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + attached: now used by 2 (active-conn,attached) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - lu: now used by 1 (rx_from_ms) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (active-conn,attached) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: max total use count was 3 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- LU was successful, and the conn has already been closed + llist_count(&msub_list) == 0 +DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) +===== test_umts_authen_resync_utran: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 19 + +===== test_umts_auth_ciph_resync_utran +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_LOC_UPD_REQUEST +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: USIM: old LAI: 1665-165-0 +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + mm_rx_loc_upd_req: now used by 2 (rx_from_ms,mm_rx_loc_upd_req) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) @@ -1545,7 +2384,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -1702,7 +2541,7 @@ - LU was successful, and the conn has already been closed llist_count(&msub_list) == 0 DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) -===== test_umts_authen_resync_utran: SUCCESS +===== test_umts_auth_ciph_resync_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 19 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I54227f1f08c38c0bf69b9c48924669c4829b04b9 Gerrit-Change-Number: 15023 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:29:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 16:29:27 +0000 Subject: Change in ...libosmocore[master]: utils: share static buffer in osmo_str_to{lower, upper}() Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15024 Change subject: utils: share static buffer in osmo_str_to{lower,upper}() ...................................................................... utils: share static buffer in osmo_str_to{lower,upper}() Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a --- M src/utils.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/15024/1 diff --git a/src/utils.c b/src/utils.c index 7364bfb..ea1de0f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -42,6 +42,8 @@ * \file utils.c */ static __thread char namebuf[255]; +/* shared by osmo_str_tolower() and osmo_str_toupper() */ +static __thread char capsbuf[128]; /*! get human-readable string for given value * \param[in] vs Array of value_string tuples @@ -901,16 +903,15 @@ /*! Convert a string to lowercase, using a static buffer. * The resulting string may be truncated if the internally used static buffer is shorter than src. * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a - * terminating nul. + * terminating nul. The static buffer returned is shared with osmo_str_toupper(). * See also osmo_str_tolower_buf(). * \param[in] src String to convert to lowercase. * \returns Resulting lowercase string in a static buffer, always nul terminated. */ const char *osmo_str_tolower(const char *src) { - static __thread char buf[128]; - osmo_str_tolower_buf(buf, sizeof(buf), src); - return buf; + osmo_str_tolower_buf(capsbuf, sizeof(capsbuf), src); + return capsbuf; } /*! Convert a string to lowercase, dynamically allocating the output from given talloc context @@ -960,16 +961,15 @@ /*! Convert a string to uppercase, using a static buffer. * The resulting string may be truncated if the internally used static buffer is shorter than src. * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a - * terminating nul. + * terminating nul. The static buffer returned is shared with osmo_str_tolower(). * See also osmo_str_toupper_buf(). * \param[in] src String to convert to uppercase. * \returns Resulting uppercase string in a static buffer, always nul terminated. */ const char *osmo_str_toupper(const char *src) { - static __thread char buf[128]; - osmo_str_toupper_buf(buf, sizeof(buf), src); - return buf; + osmo_str_toupper_buf(capsbuf, sizeof(capsbuf), src); + return capsbuf; } /*! Convert a string to uppercase, dynamically allocating the output from given talloc context -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a Gerrit-Change-Number: 15024 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 16:29:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 1 Aug 2019 16:29:28 +0000 Subject: Change in ...libosmocore[master]: Workaround TLS gcc compiler bug in ARM Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15025 Change subject: Workaround TLS gcc compiler bug in ARM ...................................................................... Workaround TLS gcc compiler bug in ARM Version 8.1.0 is the oldest known to work. We can restrict it more in the future if we find older versions working without the workaround. Related: OS#4062 Change-Id: Icaac4b6628341effe9d488f907dc4d42897f2065 --- M src/utils.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/15025/1 diff --git a/src/utils.c b/src/utils.c index ea1de0f..b668a21 100644 --- a/src/utils.c +++ b/src/utils.c @@ -221,7 +221,19 @@ return nibblepos >> 1; } +#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) + +#define HEXD_BUFF_SIZE 4096 +/* Check for ARM 32 BIT and gcc smaller than 8.1.0 */ +#if __arm__ && GCC_VERSION < 80100 +#pragma message ("ARM && GCC < 8.1.0, Initiallizing hexd_buff from heap, see OS#4062") +static __thread void* hexd_buff; +#define INIT_HEXD_BUFF() do { if (!hexd_buff) hexd_buff = talloc_size(NULL, HEXD_BUFF_SIZE); } while(0) +#else static __thread char hexd_buff[4096]; +#define INIT_HEXD_BUFF() do {} while(0) +#endif + static const char hex_chars[] = "0123456789abcdef"; /*! Convert binary sequence to hexadecimal ASCII string. @@ -319,6 +331,7 @@ */ char *osmo_ubit_dump(const uint8_t *bits, unsigned int len) { + INIT_HEXD_BUFF(); return osmo_ubit_dump_buf(hexd_buff, sizeof(hexd_buff), bits, len); } @@ -335,6 +348,7 @@ */ char *osmo_hexdump(const unsigned char *buf, int len) { + INIT_HEXD_BUFF(); osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, " ", true); return hexd_buff; } @@ -374,6 +388,7 @@ */ char *osmo_hexdump_nospc(const unsigned char *buf, int len) { + INIT_HEXD_BUFF(); osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true); return hexd_buff; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaac4b6628341effe9d488f907dc4d42897f2065 Gerrit-Change-Number: 15025 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 18:57:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 18:57:24 +0000 Subject: Change in ...libosmocore[master]: Workaround TLS gcc compiler bug in ARM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15025 ) Change subject: Workaround TLS gcc compiler bug in ARM ...................................................................... Patch Set 1: Code-Review-1 both Hoernchen and tnt have raised serious concerns about this on IRC, e.g.: < tnt> With O2 it looks like it calls __tls_get_addr for a "big" zone that contains all the TLS variables and then gcc manually 'indexes' in that zone to find the right one. And it's that indexing that's incorrect. The offset it adds is wrong. So if that's the case, then we will get random memory corruption whenver we have __thread variables no matter what their size :/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaac4b6628341effe9d488f907dc4d42897f2065 Gerrit-Change-Number: 15025 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Thu, 01 Aug 2019 18:57:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 18:58:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 18:58:14 +0000 Subject: Change in ...osmo-msc[master]: minor comments in msc_vty.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15020 ) Change subject: minor comments in msc_vty.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I83d8c778190adb1e74debc8f8ddac6996de7c513 Gerrit-Change-Number: 15020 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 18:58:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 18:58:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 18:58:16 +0000 Subject: Change in ...osmo-msc[master]: minor comments in msc_vty.c In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15020 ) Change subject: minor comments in msc_vty.c ...................................................................... minor comments in msc_vty.c Change-Id: I83d8c778190adb1e74debc8f8ddac6996de7c513 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c75cd0e..8ef48ff 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -688,6 +688,7 @@ #define MSC_VTY_DUMP(vty, offset, fmt, args...) \ vty_out(vty, "%*s" fmt, offset, "", ##args) +/* Print value of a named flag, prefixed with a given amount of spaces */ #define MSC_VTY_DUMP_FLAG(vty, offset, name, flag) \ MSC_VTY_DUMP(vty, offset + 2, "%s: %*s%s%s", \ name, 30 - (int)strlen(name), "", \ @@ -712,6 +713,7 @@ } if (dump_flags & MSC_VTY_DUMP_F_CONNECTION) { + /* (If msc_a exists, there *must* be a non-null msc_a->c.msub) */ MSC_VTY_DUMP(vty, offset, "RAN connection: %s%s", trans->msc_a ? msub_ran_conn_name(trans->msc_a->c.msub) : "(not established)", -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I83d8c778190adb1e74debc8f8ddac6996de7c513 Gerrit-Change-Number: 15020 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 18:59:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 18:59:45 +0000 Subject: Change in ...osmo-msc[master]: manual: adjust and fix auth and ciph docs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15021 ) Change subject: manual: adjust and fix auth and ciph docs ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15021/1/doc/manuals/chapters/net.adoc File doc/manuals/chapters/net.adoc: https://gerrit.osmocom.org/#/c/15021/1/doc/manuals/chapters/net.adoc at 117 PS1, Line 117: UMTS compatibility it's "UMTS AKA capability", which IIRC is independent (in theory) whether or not the MS actually supports any UMTS RAN. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f Gerrit-Change-Number: 15021 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 18:59:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:00:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:00:35 +0000 Subject: Change in ...osmo-msc[master]: do not force encryption on UTRAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15022 ) Change subject: do not force encryption on UTRAN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 Gerrit-Change-Number: 15022 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 19:00:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:00:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:00:48 +0000 Subject: Change in ...osmo-msc[master]: add msc_vlr tests for UMTS without ciphering In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15023 ) Change subject: add msc_vlr tests for UMTS without ciphering ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I54227f1f08c38c0bf69b9c48924669c4829b04b9 Gerrit-Change-Number: 15023 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 19:00:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:01:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:01:17 +0000 Subject: Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15026 Change subject: codec/ecu: Introduce new generic Error Concealment Unit abstraction ...................................................................... codec/ecu: Introduce new generic Error Concealment Unit abstraction We don't want to expose the details of a given ECU implementation to the user (e.g. osmo-bts), but have a generic abstraction layer where an ECU implementation can simply register a few call-back functions with the generic core. As the developer and copyright holder of the related code, I hereby state that any ECU implementation using 'struct osmo_ecu_ops' and registering with the 'osmo_ecu_register()' function shall not be considered as a derivative work under any applicable copyright law; the copyleft terms of GPLv2 shall hence not apply to any such ECU implementation. The intent of the above exception is to allow anyone to combine third party Error Concealment Unit implementations with libosmocore, including but not limited to such published by ETSI. Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 --- M include/osmocom/codec/ecu.h M src/codec/Makefile.am A src/codec/ecu.c M src/codec/ecu_fr.c M tests/codec/codec_ecu_fr_test.c M tests/codec/codec_ecu_fr_test.ok 6 files changed, 445 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/15026/1 diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h index f7a29a0..a566712 100644 --- a/include/osmocom/codec/ecu.h +++ b/include/osmocom/codec/ecu.h @@ -13,3 +13,57 @@ void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, uint8_t *frame); int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame); + +enum osmo_ecu_codec { + OSMO_ECU_CODEC_HR, + OSMO_ECU_CODEC_FR, + OSMO_ECU_CODEC_EFR, + OSMO_ECU_CODEC_AMR, + _NUM_OSMO_ECU_CODECS +}; + +/*********************************************************************** + * Generic ECU abstraction layer below + ***********************************************************************/ + +/* As the developer and copyright holder of the related code, I hereby + * state that any ECU implementation using 'struct osmo_ecu_ops' and + * registering with the 'osmo_ecu_register()' function shall not be + * considered as a derivative work under any applicable copyright law; + * the copyleft terms of GPLv2 shall hence not apply to any such ECU + * implementation. + * + * The intent of the above exception is to allow anyone to combine third + * party Error Concealment Unit implementations with libosmocodec. + * including but not limited to such published by ETSI. + * + * -- Harald Welte on August 1, 2019. + */ + +struct osmo_ecu_state { + enum osmo_ecu_codec codec; + uint8_t data[0]; +}; + +/* initialize an ECU instance */ +struct osmo_ecu_state *osmo_ecu_init(void *ctx, enum osmo_ecu_codec codec); + +/* destroy an ECU instance */ +void osmo_ecu_destroy(struct osmo_ecu_state *st); + +/* process a received frame a substitute/erroneous frame */ +int osmo_ecu_frame_in(struct osmo_ecu_state *st, bool bfi, + const uint8_t *frame, unsigned int frame_bytes); + +/* generate output data for a substitute/erroneous frame */ +int osmo_ecu_frame_out(struct osmo_ecu_state *st, uint8_t *frame_out); + +struct osmo_ecu_ops { + struct osmo_ecu_state * (*init)(void *ctx, enum osmo_ecu_codec codec); + void (*destroy)(struct osmo_ecu_state *); + int (*frame_in)(struct osmo_ecu_state *st, bool bfi, + const uint8_t *frame, unsigned int frame_bytes); + int (*frame_out)(struct osmo_ecu_state *st, uint8_t *frame_out); +}; + +int osmo_ecu_register(const struct osmo_ecu_ops *ops, enum osmo_ecu_codec codec); diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index b522d43..c9d7a22 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -13,6 +13,6 @@ lib_LTLIBRARIES = libosmocodec.la -libosmocodec_la_SOURCES = gsm610.c gsm620.c gsm660.c gsm690.c ecu_fr.c +libosmocodec_la_SOURCES = gsm610.c gsm620.c gsm660.c gsm690.c ecu.c ecu_fr.c libosmocodec_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmocodec_la_LIBADD = $(top_builddir)/src/libosmocore.la diff --git a/src/codec/ecu.c b/src/codec/ecu.c new file mode 100644 index 0000000..db7148c --- /dev/null +++ b/src/codec/ecu.c @@ -0,0 +1,118 @@ +/* Core infrastructure for ECU implementations */ + +/* (C) 2019 by Harald Welte + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/* As the developer and copyright holder of the related code, I hereby + * state that any ECU implementation using 'struct osmo_ecu_ops' and + * registering with the 'osmo_ecu_register()' function shall not be + * considered as a derivative work under any applicable copyright law; + * the copyleft terms of GPLv2 shall hence not apply to any such ECU + * implementation. + * + * The intent of the above exception is to allow anyone to combine third + * party Error Concealment Unit implementations with libosmocodec. + * including but not limited to such published by ETSI. + * + * -- Harald Welte on August 1, 2019. + */ + +#include +#include + +#include +#include + +static const struct osmo_ecu_ops *g_ecu_ops[_NUM_OSMO_ECU_CODECS]; + +/*********************************************************************** + * high-level API for users + ***********************************************************************/ + +/*! initialize an ECU instance for given codec. + * \param[in] ctx talloc context from which to allocate + * \parma[in] codec codec for which to initialize/create ECU */ +struct osmo_ecu_state *osmo_ecu_init(void *ctx, enum osmo_ecu_codec codec) +{ + if (codec >= ARRAY_SIZE(g_ecu_ops)) + return NULL; + if (!g_ecu_ops[codec] || !g_ecu_ops[codec]->init) + return NULL; + return g_ecu_ops[codec]->init(ctx, codec); +} + +/*! destroy an ECU instance */ +void osmo_ecu_destroy(struct osmo_ecu_state *st) +{ + if (st->codec >= ARRAY_SIZE(g_ecu_ops)) + return; + if (!g_ecu_ops[st->codec]) + return; + + if (!g_ecu_ops[st->codec]->destroy) + talloc_free(st); + else + g_ecu_ops[st->codec]->destroy(st); +} + +/*! process a received frame a substitute/erroneous frame. + * \param[in] st ECU state/instance on which to operate + * \param[in] bfi Bad Frame Indication + * \param[in] frame received codec frame to be processed + * \param[in] frame_bytes number of bytes available in frame */ +int osmo_ecu_frame_in(struct osmo_ecu_state *st, bool bfi, + const uint8_t *frame, unsigned int frame_bytes) +{ + if (st->codec >= ARRAY_SIZE(g_ecu_ops)) + return -EINVAL; + if (!g_ecu_ops[st->codec]) + return -EBUSY; + return g_ecu_ops[st->codec]->frame_in(st, bfi, frame, frame_bytes); +} + +/*! generate output data for a substitute/erroneous frame. + * \param[in] st ECU state/instance on which to operate + * \param[out] frame_out buffer for generated output frame + * \return number of bytes written to frame_out; negative on error */ +int osmo_ecu_frame_out(struct osmo_ecu_state *st, uint8_t *frame_out) +{ + if (st->codec >= ARRAY_SIZE(g_ecu_ops)) + return -EINVAL; + if (!g_ecu_ops[st->codec]) + return -EBUSY; + return g_ecu_ops[st->codec]->frame_out(st, frame_out); +} + +/*********************************************************************** + * low-level API for ECU implementations + ***********************************************************************/ + +/*! register an ECU implementation for a given codec */ +int osmo_ecu_register(const struct osmo_ecu_ops *ops, enum osmo_ecu_codec codec) +{ + if (codec >= ARRAY_SIZE(g_ecu_ops)) + return -EINVAL; + if (g_ecu_ops[codec]) + return -EBUSY; + + g_ecu_ops[codec] = ops; + + return 0; +} diff --git a/src/codec/ecu_fr.c b/src/codec/ecu_fr.c index 20a0f89..a32ea2e 100644 --- a/src/codec/ecu_fr.c +++ b/src/codec/ecu_fr.c @@ -164,3 +164,54 @@ return 0; } + +/*********************************************************************** + * Integration with ECU core + ***********************************************************************/ + +static struct osmo_ecu_state *ecu_fr_init(void *ctx, enum osmo_ecu_codec codec) +{ + struct osmo_ecu_state *st; + size_t size = sizeof(*st) + sizeof(struct osmo_ecu_fr_state); + + st = talloc_named_const(ctx, size, "ecu_state_FR"); + if (!st) + return NULL; + + memset(st, 0, size); + st->codec = codec; + + return st; +} + +static int ecu_fr_frame_in(struct osmo_ecu_state *st, bool bfi, const uint8_t *frame, + unsigned int frame_bytes) +{ + struct osmo_ecu_fr_state *fr = (struct osmo_ecu_fr_state *) &st->data; + if (bfi) + return 0; + + osmo_ecu_fr_reset(fr, frame); + return 0; +} + +static int ecu_fr_frame_out(struct osmo_ecu_state *st, uint8_t *frame_out) +{ + struct osmo_ecu_fr_state *fr = (struct osmo_ecu_fr_state *) &st->data; + + if (osmo_ecu_fr_conceal(fr, frame_out) == 0) + return GSM_FR_BYTES; + else + return -1; +} + +static const struct osmo_ecu_ops osmo_ecu_ops_fr = { + .init = ecu_fr_init, + .frame_in = ecu_fr_frame_in, + .frame_out = ecu_fr_frame_out, +}; + +static __attribute__((constructor)) void on_dso_load_ecu_fr(void) +{ + osmo_ecu_register(&osmo_ecu_ops_fr, OSMO_ECU_CODEC_FR); +} diff --git a/tests/codec/codec_ecu_fr_test.c b/tests/codec/codec_ecu_fr_test.c index 3561c44..6520935 100644 --- a/tests/codec/codec_ecu_fr_test.c +++ b/tests/codec/codec_ecu_fr_test.c @@ -113,6 +113,8 @@ int i, rc; int j = 0; + printf("=> Testing FR concealment (simple, consecutive bad frames)\n"); + while (sample_frame_hex[j] != NULL) { /* Parse frame from string to hex */ osmo_hexparse(sample_frame_hex[j], frame, GSM_FR_BYTES); @@ -148,6 +150,8 @@ unsigned int frame_len; int rc, i = 0; + printf("\n=> Testing FR concealment (realistic, various bad frames)\n"); + while (fr_frames_hex[i] != NULL) { /* Debug print */ printf("Frame No. %03i:\n", i); @@ -174,11 +178,52 @@ } } +/* Simulate a real life situation: voice frames with a few dropouts, using generic core */ +void test_fr_concealment_realistic_core() +{ + struct osmo_ecu_state *state = osmo_ecu_init(NULL, OSMO_ECU_CODEC_FR); + uint8_t frame[GSM_FR_BYTES]; + unsigned int frame_len; + int rc, i = 0; + + printf("\n=> Testing FR concealment (realistic, using ECU abstraction)\n"); + + OSMO_ASSERT(frame); + + while (fr_frames_hex[i] != NULL) { + /* Debug print */ + printf("Frame No. %03i:\n", i); + + /* Good or bad frame? */ + frame_len = strlen(fr_frames_hex[i]) / 2; + if (frame_len == GSM_FR_BYTES) { + printf(" * input: %s\n", fr_frames_hex[i]); + osmo_hexparse(fr_frames_hex[i], frame, GSM_FR_BYTES); + osmo_ecu_frame_in(state, false, frame, GSM_FR_BYTES); + } else { + printf(" * input: (bad)\n"); + memset(frame, 0x00, GSM_FR_BYTES); + osmo_ecu_frame_in(state, true, frame, 0); + rc = osmo_ecu_frame_out(state, frame); + OSMO_ASSERT(rc == GSM_FR_BYTES); + } + + /* Print result */ + printf(" * output: %s\n", + osmo_hexdump_nospc(frame, GSM_FR_BYTES)); + + /* Go to the next frame */ + i++; + } +} + + int main(int argc, char **argv) { /* Perform actual tests */ test_fr_concealment(); test_fr_concealment_realistic(); + test_fr_concealment_realistic_core(); return 0; } diff --git a/tests/codec/codec_ecu_fr_test.ok b/tests/codec/codec_ecu_fr_test.ok index 3cc35af..30163a9 100644 --- a/tests/codec/codec_ecu_fr_test.ok +++ b/tests/codec/codec_ecu_fr_test.ok @@ -1,3 +1,4 @@ +=> Testing FR concealment (simple, consecutive bad frames) Start with: d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da, XMAXC: [3f, 3f, 3f, 3f] conceal: 00, result: d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da XMAXC: [3f, 3f, 3f, 3f] conceal: 01, result: d9ec9be212901d802335598c501d805bad3d4ba01d809b69df5a501d809cd1b4da XMAXC: [3b, 3b, 3b, 3b] @@ -40,6 +41,181 @@ conceal: 17, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0] conceal: 18, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0] conceal: 19, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0] + +=> Testing FR concealment (realistic, various bad frames) +Frame No. 000: + * input: d9aa93ae63de00471a91b95b8660471392b4a2daa037628f391c624039258dc723 + * output: d9aa93ae63de00471a91b95b8660471392b4a2daa037628f391c624039258dc723 +Frame No. 001: + * input: d8eb83699a66c036ec89b7246e6034dc8d48948620589b7256e3a6603b2371b8da + * output: d8eb83699a66c036ec89b7246e6034dc8d48948620589b7256e3a6603b2371b8da +Frame No. 002: + * input: d967abaa1cbe4035238da6ace4c036d46ec69ba600391c4eb8a2b040591c6a3924 + * output: d967abaa1cbe4035238da6ace4c036d46ec69ba600391c4eb8a2b040591c6a3924 +Frame No. 003: + * input: d8e8a42662c240472469b91bd2e0452291b6dba600495b8e38dcb020491a71c91b + * output: d8e8a42662c240472469b91bd2e0452291b6dba600495b8e38dcb020491a71c91b +Frame No. 004: + * input: da2aac1ddbb00036e46e26dcec6039138db923822047137248e3560048e38dc8e3 + * output: da2aac1ddbb00036e46e26dcec6039138db923822047137248e3560048e38dc8e3 +Frame No. 005: + * input: d929ab2a9b5240395b6dc72ba020469c8d551c5440349c9148e36a4036a372471b + * output: d929ab2a9b5240395b6dc72ba020469c8d551c5440349c9148e36a4036a372471b +Frame No. 006: + * input: d9eb93215bb8a0271c69c724682036db71c71a94a0372491b72bee4044eb71b923 + * output: d9eb93215bb8a0271c69c724682036db71c71a94a0372491b72bee4044eb71b923 +Frame No. 007: + * input: d9ab9aa19abc40391b6e5ae2ee40471b91c6dbe820492291b8e4b84036e47238db + * output: d9ab9aa19abc40391b6e5ae2ee40471b91c6dbe820492291b8e4b84036e47238db +Frame No. 008: + * input: d96b9be9db782044e371b55cb200389491c69b8ea034e271c8d3808038ec6db8e3 + * output: d96b9be9db782044e371b55cb200389491c69b8ea034e271c8d3808038ec6db8e3 +Frame No. 009: + * input: d9aa9365e3f060375c6db6ebc4c02764b1c51b78a0571c91a723de6049248dc8dd + * output: d9aa9365e3f060375c6db6ebc4c02764b1c51b78a0571c91a723de6049248dc8dd +Frame No. 010: + * input: (bad) + * output: d9aa9365e3f060375c6db6ebc4c02764b1c51b78a0571c91a723de6049248dc8dd +Frame No. 011: + * input: d9ea9c219ce60046e38d3724e0c034e56e36eb7e0038d471b8dcb260491b8dbb23 + * output: d9ea9c219ce60046e38d3724e0c034e56e36eb7e0038d471b8dcb260491b8dbb23 +Frame No. 012: + * input: d9e89be9d9e0a0391b6dd6a4624029247138e3a2a04713922524de0036db69d91c + * output: d9e89be9d9e0a0391b6dd6a4624029247138e3a2a04713922524de0036db69d91c +Frame No. 013: + * input: d9699422a2b6a048dd90c91c6a802b6259395c8880575b4a58e4ac20269d7248d4 + * output: d9699422a2b6a048dd90c91c6a802b6259395c8880575b4a58e4ac20269d7248d4 +Frame No. 014: + * input: d967ac5b1baae0371c71b8ab9c804a9e8e58a55a8038626ec8dcb640395c7244dc + * output: d967ac5b1baae0371c71b8ab9c804a9e8e58a55a8038626ec8dcb640395c7244dc +Frame No. 015: + * input: d9e8a3e262e68027638db52b88a038634e471a7ec049136e3b1bc8402923adcad2 + * output: d9e8a3e262e68027638db52b88a038634e471a7ec049136e3b1bc8402923adcad2 +Frame No. 016: + * input: d8eab36e1bbe0046e34d491b608035137658d3524044e48e375cdac0472b9238d4 + * output: d8eab36e1bbe0046e34d491b608035137658d3524044e48e375cdac0472b9238d4 +Frame No. 017: + * input: d9689ba5e3d260491b516adb5e4027256e27227ee0351c8e549a5c60492471971b + * output: d9689ba5e3d260491b516adb5e4027256e27227ee0351c8e549a5c60492471971b +Frame No. 018: + * input: (bad) + * output: d9689ba5e3d260491b516adb5e4027256e27227ee0351c8e549a5c60492471971b +Frame No. 019: + * input: (bad) + * output: d00000000000000000000000000000000000000000000000000000000000000000 +Frame No. 020: + * input: d8e6a2e1d3d2605b1376c8d35280392451391cbc80392a71b6db8aa049238dc8ab + * output: d8e6a2e1d3d2605b1376c8d35280392451391cbc80392a71b6db8aa049238dc8ab +Frame No. 021: + * input: d9a87ba1a3982048eb8a471cac00472b4e391bbc40292489b71cc200495b8d3ae3 + * output: d9a87ba1a3982048eb8a471cac00472b4e391bbc40292489b71cc200495b8d3ae3 +Frame No. 022: + * input: d9278b2a1ba4c0475b8dc722d6e0491b5228da70204ae36dc71d94a056a29236e3 + * output: d9278b2a1ba4c0475b8dc722d6e0491b5228da70204ae36dc71d94a056a29236e3 +Frame No. 023: + * input: d9ec9be2129520392335598c50c04b5bad3d4ba680789b69df5a5aa0469cd1b4da + * output: d9ec9be2129520392335598c50c04b5bad3d4ba680789b69df5a5aa0469cd1b4da +Frame No. 024: + * input: d8ea932623e660669b8e4a9dd8a03aa32a76e466e028d396cc9bbe4047256dc8e5 + * output: d8ea932623e660669b8e4a9dd8a03aa32a76e466e028d396cc9bbe4047256dc8e5 +Frame No. 025: + * input: d96a94215aa0403aab713f22e8e024e68db91ab6a027abd1a55b6e804aec9146e4 + * output: d96a94215aa0403aab713f22e8e024e68db91ab6a027abd1a55b6e804aec9146e4 +Frame No. 026: + * input: d867ac21e270a0350d6ac91a724037247246d2a6c0396c89d6dc562049244e48d5 + * output: d867ac21e270a0350d6ac91a724037247246d2a6c0396c89d6dc562049244e48d5 +Frame No. 027: + * input: d8a9b460d3b48026a4ad471b7c20452491b69bbc803ae48db722ee00292491a8db + * output: d8a9b460d3b48026a4ad471b7c20452491b69bbc803ae48db722ee00292491a8db +Frame No. 028: + * input: d928a3e1d3b24036e37244abf02047634d371b74c047637148a29ac03b234e38e3 + * output: d928a3e1d3b24036e37244abf02047634d371b74c047637148a29ac03b234e38e3 +Frame No. 029: + * input: d9ab9b21d2e0c0471c693aec54e044dbae46dc7c20391badb724ee8038e469bb15 + * output: d9ab9b21d2e0c0471c693aec54e044dbae46dc7c20391badb724ee8038e469bb15 +Frame No. 030: + * input: d9a99361a276403b1a6ad6dcd40026e489c8e3bc40371c4dc564e2c036e28eb963 + * output: d9a99361a276403b1a6ad6dcd40026e489c8e3bc40371c4dc564e2c036e28eb963 +Frame No. 031: + * input: (bad) + * output: d9a99361a276403b1a6ad6dcd40026e489c8e3bc40371c4dc564e2c036e28eb963 +Frame No. 032: + * input: (bad) + * output: d00000000000000000000000000000000000000000000000000000000000000000 +Frame No. 033: + * input: (bad) + * output: d00000000000000000000000000000000000000000000000000000000000000000 +Frame No. 034: + * input: (bad) + * output: d00000000000000000000000000000000000000000000000000000000000000000 +Frame No. 035: + * input: (bad) + * output: d00000000000000000000000000000000000000000000000000000000000000000 +Frame No. 036: + * input: (bad) + * output: d00000000000000000000000000000000000000000000000000000000000000000 +Frame No. 037: + * input: d92c8b6d5aee4034ebb22724862047145634a5c0a038e371b8e4a880485c89dd25 + * output: d92c8b6d5aee4034ebb22724862047145634a5c0a038e371b8e4a880485c89dd25 +Frame No. 038: + * input: d8e78b29e3c6c038dba9d91beca04723ad491cda80471471b6ec7ae03b1396b91b + * output: d8e78b29e3c6c038dba9d91beca04723ad491cda80471471b6ec7ae03b1396b91b +Frame No. 039: + * input: d8a78b25e37a0022dd8a46dc68a0351bad391bde2046e56dd8dc96c038e396d89b + * output: d8a78b25e37a0022dd8a46dc68a0351bad391bde2046e56dd8dc96c038e396d89b +Frame No. 040: + * input: d8a88c255ab6e038e38e48dbde8038ad8dc8db8ec0376372b564b44038e49234dc + * output: d8a88c255ab6e038e38e48dbde8038ad8dc8db8ec0376372b564b44038e49234dc +Frame No. 041: + * input: d9708ce6a39ce049646646a2c1a0272496b29a66c037db562863ace0795b55b2e3 + * output: d9708ce6a39ce049646646a2c1a0272496b29a66c037db562863ace0795b55b2e3 +Frame No. 042: + * input: d8ee9bea5ae4003ae371b713eae05adc91995a5ea064dcc9571e786026ed51c52c + * output: d8ee9bea5ae4003ae371b713eae05adc91995a5ea064dcc9571e786026ed51c52c +Frame No. 043: + * input: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 + * output: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 +Frame No. 044: + * input: d92aab696190c046e26e392cae0026a376a8dc662048d291b75b54c04ad3ae3b1b + * output: d92aab696190c046e26e392cae0026a376a8dc662048d291b75b54c04ad3ae3b1b +Frame No. 045: + * input: d8e7a469627a6038e289cb1baca0569b8db6dddec026dc8e38e5dc803722722d23 + * output: d8e7a469627a6038e289cb1baca0569b8db6dddec026dc8e38e5dc803722722d23 +Frame No. 046: + * input: d8a88c299b64c03a548a58e37420272c6dd76b92c0471c9236dbc0e0551c71c713 + * output: d8a88c299b64c03a548a58e37420272c6dd76b92c0471c9236dbc0e0551c71c713 +Frame No. 047: + * input: (bad) + * output: d8a88c299b64c03a548a58e37420272c6dd76b92c0471c9236dbc0e0551c71c713 +Frame No. 048: + * input: d7299c19a3be8024e58ea7a49f20a522963ad976e0a76ecd92b38500cb62aa4c94 + * output: d7299c19a3be8024e58ea7a49f20a522963ad976e0a76ecd92b38500cb62aa4c94 +Frame No. 049: + * input: d7eb6c6262eee02b2c42e79a60a0aa55aed68a7f00ad358e10fad960e55a39396d + * output: d7eb6c6262eee02b2c42e79a60a0aa55aed68a7f00ad358e10fad960e55a39396d +Frame No. 050: + * input: d970858dd2ab61d91355ebc15ca1a6a7ca48a05cc0dae66f2523c2a1bad3825daa + * output: d970858dd2ab61d91355ebc15ca1a6a7ca48a05cc0dae66f2523c2a1bad3825daa +Frame No. 051: + * input: d8f0844a23ad20da50d6de025e81c37392b9039cc0c764c1bd1e94c1b699736a98 + * output: d8f0844a23ad20da50d6de025e81c37392b9039cc0c764c1bd1e94c1b699736a98 +Frame No. 052: + * input: d9708ce6a39ce049646646a2c1a0272496b29a66c037db562863ace0795b55b2e3 + * output: d9708ce6a39ce049646646a2c1a0272496b29a66c037db562863ace0795b55b2e3 +Frame No. 053: + * input: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 + * output: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 +Frame No. 054: + * input: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 + * output: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 +Frame No. 055: + * input: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 + * output: d9299421d2944036ed69b8e572a048e36d551cd480571d4ec95be680356c69c763 +Frame No. 056: + * input: d2577a1cda50004924924924500049249249245000492492492450004923924924 + * output: d2577a1cda50004924924924500049249249245000492492492450004923924924 + +=> Testing FR concealment (realistic, using ECU abstraction) Frame No. 000: * input: d9aa93ae63de00471a91b95b8660471392b4a2daa037628f391c624039258dc723 * output: d9aa93ae63de00471a91b95b8660471392b4a2daa037628f391c624039258dc723 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 Gerrit-Change-Number: 15026 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:01:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:01:33 +0000 Subject: Change in ...osmo-bts[master]: osmo-bts-trx: migrate to new generic ECU abstraction Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15027 Change subject: osmo-bts-trx: migrate to new generic ECU abstraction ...................................................................... osmo-bts-trx: migrate to new generic ECU abstraction libosmocodec has recently introduced a generic ECU abstraction layer which supports (pluggable) Error Concealment Units for not only the FR codec, but potentially any other codec, too. Change-Id: I001005aae6de76d4e045b8dc572239f057bb150d Depends: libosmocore I4d33c9c7c2d4c7462ff38a49c178b65accae1915 --- M include/osmo-bts/gsm_data_shared.h M src/common/gsm_data_shared.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/scheduler_trx.c 4 files changed, 56 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/27/15027/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index dd2a14c..d1d9522 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -329,9 +329,7 @@ struct msgb *pending_rel_ind_msg; /* ECU (Error Concealment Unit) state */ - union { - struct osmo_ecu_fr_state fr; - } ecu_state; + struct osmo_ecu_state *ecu_state; }; static inline uint8_t lchan_get_ta(const struct gsm_lchan *lchan) @@ -869,4 +867,6 @@ bool ts_is_tch(struct gsm_bts_trx_ts *ts); const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); +int lchan2ecu_codec(const struct gsm_lchan *lchan); + #endif diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index b1785b8..ce6dd2b 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -806,3 +807,24 @@ { LCHAN_CIPH_RXTX_CONF, "RXTX_CONF" }, { 0, NULL } }; + +/* determine the ECU codec constant for the codec used by given lchan */ +int lchan2ecu_codec(const struct gsm_lchan *lchan) +{ + struct gsm_bts_trx_ts *ts = lchan->ts; + + switch (lchan->tch_mode) { + case GSM48_CMODE_SPEECH_V1: + if (ts_pchan(ts) == GSM_PCHAN_TCH_H) + return OSMO_ECU_CODEC_HR; + else + return OSMO_ECU_CODEC_FR; + break; + case GSM48_CMODE_SPEECH_EFR: + return OSMO_ECU_CODEC_EFR; + case GSM48_CMODE_SPEECH_AMR: + return OSMO_ECU_CODEC_AMR; + default: + return -1; + } +} diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 22ef2d7..db53d4c 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -626,6 +627,9 @@ break; } + /* attempt to allocate an Error Concealment Unit instance, if available */ + lchan->ecu_state = osmo_ecu_init(trx, lchan2ecu_codec(lchan)); + /* trx_chan_desc[] in scheduler.c uses the RSL_CHAN_OSMO_PDCH cbits * (0xc0) to indicate the need for PDTCH and PTCCH SAPI activation. * However, 0xc0 is a cbits pattern exclusively used for Osmocom style @@ -671,6 +675,10 @@ break; } if (l1sap->u.info.type == PRIM_INFO_MODIFY) { + /* ECU for possibly new codec */ + if (lchan->ecu_state) + osmo_ecu_destroy(lchan->ecu_state); + lchan->ecu_state = osmo_ecu_init(trx, lchan2ecu_codec(lchan)); /* change mode */ trx_sched_set_mode(&l1h->l1s, chan_nr, lchan->rsl_cmode, lchan->tch_mode, @@ -689,6 +697,11 @@ "chan_nr 0x%02x\n", chan_nr); break; } + /* clear ECU state (if any) */ + if (lchan->ecu_state) { + osmo_ecu_destroy(lchan->ecu_state); + lchan->ecu_state = NULL; + } /* deactivate associated channel */ bts_model_lchan_deactivate_sacch(lchan); if (!l1sap->u.info.u.act_req.sacch_only) { diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 532eca5..742f1c8 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1256,22 +1256,24 @@ ber10k, PRES_INFO_UNKNOWN); bfi: if (rsl_cmode == RSL_CMOD_SPD_SPEECH) { + /* indicate bad frame */ + if (lchan->tch.dtx.ul_sid) { + /* DTXu: pause in progress. Push empty payload to upper layers */ + rc = 0; + goto compose_l1sap; + } + + /* If there is an ECU active on this channel, use its output */ + if (lchan->ecu_state) { + rc = osmo_ecu_frame_out(lchan->ecu_state, tch_data); + goto compose_l1sap; + } + switch (tch_mode) { case GSM48_CMODE_SPEECH_V1: /* FR */ - if (lchan->tch.dtx.ul_sid) { - /* DTXu: pause in progress. Push empty payload to upper layers */ - rc = 0; - goto compose_l1sap; - } - - /* Perform error concealment if possible */ - rc = osmo_ecu_fr_conceal(&lchan->ecu_state.fr, tch_data); - if (rc) { - memset(tch_data, 0, GSM_FR_BYTES); - tch_data[0] = 0xd0; - } - + memset(tch_data, 0, GSM_FR_BYTES); + tch_data[0] = 0xd0; rc = GSM_FR_BYTES; break; case GSM48_CMODE_SPEECH_EFR: /* EFR */ @@ -1299,9 +1301,9 @@ if (rsl_cmode != RSL_CMOD_SPD_SPEECH) return 0; - /* Reset ECU with a good frame */ - if (!bfi_flag && tch_mode == GSM48_CMODE_SPEECH_V1) - osmo_ecu_fr_reset(&lchan->ecu_state.fr, tch_data); + /* Feed frame into ECU */ + if (lchan->ecu_state) + osmo_ecu_frame_in(lchan->ecu_state, bfi_flag, tch_data, rc); /* TCH or BFI */ compose_l1sap: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I001005aae6de76d4e045b8dc572239f057bb150d Gerrit-Change-Number: 15027 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:08:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:08:06 +0000 Subject: Change in ...libosmocore[master]: codec/ecu_fr: Mark input TCH frame as 'const' as we only read it Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15028 Change subject: codec/ecu_fr: Mark input TCH frame as 'const' as we only read it ...................................................................... codec/ecu_fr: Mark input TCH frame as 'const' as we only read it Change-Id: I64c6d3dc08ff87b673ba6225f98546e86f91bcfd --- M include/osmocom/codec/ecu.h M src/codec/ecu_fr.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/15028/1 diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h index f7a29a0..ec0a2f8 100644 --- a/include/osmocom/codec/ecu.h +++ b/include/osmocom/codec/ecu.h @@ -11,5 +11,5 @@ uint8_t frame_backup[GSM_FR_BYTES]; }; -void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, uint8_t *frame); +void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame); int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame); diff --git a/src/codec/ecu_fr.c b/src/codec/ecu_fr.c index 20a0f89..ef42ea9 100644 --- a/src/codec/ecu_fr.c +++ b/src/codec/ecu_fr.c @@ -130,7 +130,7 @@ * \param[in] state The state object for the ECU * \param[out] frame The valid frame (GSM_FR_BYTES bytes in RTP payload format) */ -void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, uint8_t *frame) +void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) { state->subsequent_lost_frame = false; memcpy(state->frame_backup, frame, GSM_FR_BYTES); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I64c6d3dc08ff87b673ba6225f98546e86f91bcfd Gerrit-Change-Number: 15028 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:10:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:10:14 +0000 Subject: Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction In-Reply-To: References: Message-ID: Hello dexter, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15026 to look at the new patch set (#3). Change subject: codec/ecu: Introduce new generic Error Concealment Unit abstraction ...................................................................... codec/ecu: Introduce new generic Error Concealment Unit abstraction We don't want to expose the details of a given ECU implementation to the user (e.g. osmo-bts), but have a generic abstraction layer where an ECU implementation can simply register a few call-back functions with the generic core. As the developer and copyright holder of the related code, I hereby state that any ECU implementation using 'struct osmo_ecu_ops' and registering with the 'osmo_ecu_register()' function shall not be considered as a derivative work under any applicable copyright law; the copyleft terms of GPLv2 shall hence not apply to any such ECU implementation. The intent of the above exception is to allow anyone to combine third party Error Concealment Unit implementations with libosmocore, including but not limited to such published by ETSI. Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 --- M include/osmocom/codec/ecu.h M src/codec/Makefile.am A src/codec/ecu.c M src/codec/ecu_fr.c M tests/codec/codec_ecu_fr_test.c M tests/codec/codec_ecu_fr_test.ok 6 files changed, 445 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/15026/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 Gerrit-Change-Number: 15026 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:14:11 +0000 Subject: Change in ...osmo-bts[master]: osmo-bts-trx: migrate to new generic ECU abstraction In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15027 ) Change subject: osmo-bts-trx: migrate to new generic ECU abstraction ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15027/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/#/c/15027/1/src/osmo-bts-trx/scheduler_trx.c at 1304 PS1, Line 1304: /* Feed frame into ECU */ : if (lchan->ecu_state) : osmo_ecu_frame_in(lchan->ecu_state, bfi_flag, tch_data, rc); frame_in must be called for good and bad frames, but this condition is not fulfilled here. needs rework. Control flow of this function sucks. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I001005aae6de76d4e045b8dc572239f057bb150d Gerrit-Change-Number: 15027 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 01 Aug 2019 19:14:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:15:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 1 Aug 2019 19:15:47 +0000 Subject: Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction In-Reply-To: References: Message-ID: Hello dexter, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15026 to look at the new patch set (#4). Change subject: codec/ecu: Introduce new generic Error Concealment Unit abstraction ...................................................................... codec/ecu: Introduce new generic Error Concealment Unit abstraction We don't want to expose the details of a given ECU implementation to the user (e.g. osmo-bts), but have a generic abstraction layer where an ECU implementation can simply register a few call-back functions with the generic core. As the developer and copyright holder of the related code, I hereby state that any ECU implementation using 'struct osmo_ecu_ops' and registering with the 'osmo_ecu_register()' function shall not be considered as a derivative work under any applicable copyright law; the copyleft terms of GPLv2 shall hence not apply to any such ECU implementation. The intent of the above exception is to allow anyone to combine third party Error Concealment Unit implementations with libosmocore, including but not limited to such published by ETSI. Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 --- M include/osmocom/codec/ecu.h M src/codec/Makefile.am A src/codec/ecu.c M src/codec/ecu_fr.c M tests/codec/codec_ecu_fr_test.c M tests/codec/codec_ecu_fr_test.ok 6 files changed, 447 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/15026/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 Gerrit-Change-Number: 15026 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 19:31:38 2019 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 1 Aug 2019 19:31:38 +0000 Subject: Change in ...libosmocore[master]: Workaround TLS gcc compiler bug in ARM In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15025 ) Change subject: Workaround TLS gcc compiler bug in ARM ...................................................................... Patch Set 1: Code-Review-1 As you've said yourself your maximum size to evade the crash differs from laforge's, and we don't even know if no crash means "it's working as intended", while it is actually overwriting parts of the TCB or something like that. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaac4b6628341effe9d488f907dc4d42897f2065 Gerrit-Change-Number: 15025 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Thu, 01 Aug 2019 19:31:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 21:46:49 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 21:46:49 +0000 Subject: Change in ...libosmocore[master]: utils: share static buffer in osmo_str_to{lower, upper}() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15024 ) Change subject: utils: share static buffer in osmo_str_to{lower,upper}() ...................................................................... Patch Set 1: Code-Review+1 The commit message does not explain why the buffer needs to be shared. What are the benefits? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a Gerrit-Change-Number: 15024 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 01 Aug 2019 21:46:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 21:48:26 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 21:48:26 +0000 Subject: Change in ...libosmocore[master]: codec/ecu_fr: Mark input TCH frame as 'const' as we only read it In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15028 ) Change subject: codec/ecu_fr: Mark input TCH frame as 'const' as we only read it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I64c6d3dc08ff87b673ba6225f98546e86f91bcfd Gerrit-Change-Number: 15028 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 01 Aug 2019 21:48:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 21:56:41 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 21:56:41 +0000 Subject: Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15026 ) Change subject: codec/ecu: Introduce new generic Error Concealment Unit abstraction ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 Gerrit-Change-Number: 15026 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 01 Aug 2019 21:56:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 21:59:26 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 21:59:26 +0000 Subject: Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15026 ) Change subject: codec/ecu: Introduce new generic Error Concealment Unit abstraction ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15026/4/include/osmocom/codec/ecu.h File include/osmocom/codec/ecu.h: https://gerrit.osmocom.org/#/c/15026/4/include/osmocom/codec/ecu.h at 45 PS4, Line 45: uint8_t data[0]; Not sure if it's a good idea to use a flexible array member here. Why not just a 'void *' pointer? What are the benefits of such strict co-allocation? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 Gerrit-Change-Number: 15026 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 01 Aug 2019 21:59:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 22:12:55 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 22:12:55 +0000 Subject: Change in ...osmo-sip-connector[master]: Transmit Bearer Caps to MNCC with SETUP_REQ In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 ) Change subject: Transmit Bearer Caps to MNCC with SETUP_REQ ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15019/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15019/1/src/mncc.c at 824 PS1, Line 824: struct gsm_mncc_bearer_cap bearer_cap I think you can assign the new structure directly to mncc.bearer_cap, no need for temporary variable. Just a cosmetic comment, I guess compiler would be able to optimize this anyway. https://gerrit.osmocom.org/#/c/15019/1/src/mncc.c at 855 PS1, Line 855: struct gsm_mncc_bearer_cap bearer_cap same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I55cdc4b7c52730d7e998a1d692c7552fd07403ee Gerrit-Change-Number: 15019 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 01 Aug 2019 22:12:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 22:13:35 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 22:13:35 +0000 Subject: Change in ...osmo-msc[master]: Set coding in mncc_set_cause() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15009 ) Change subject: Set coding in mncc_set_cause() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 Gerrit-Change-Number: 15009 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 22:13:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 22:14:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 1 Aug 2019 22:14:05 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: make function mncc_tx_to_gsm_cc static In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15008 ) Change subject: cosmetic: make function mncc_tx_to_gsm_cc static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd02c669cfee6dd7e6b154e303cd0f4c148c83c4 Gerrit-Change-Number: 15008 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 01 Aug 2019 22:14:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 1 22:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 1 Aug 2019 22:39:53 +0000 Subject: Change in ...osmo-sip-connector[master]: Transmit Bearer Caps to MNCC with SETUP_REQ In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 ) Change subject: Transmit Bearer Caps to MNCC with SETUP_REQ ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15019/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15019/1/src/mncc.c at 824 PS1, Line 824: struct gsm_mncc_bearer_cap bearer_cap > I think you can assign the new structure directly to mncc. [?] Right, I started thinking to set a default bearer cap in a temporary variable that would apply for all codecs, then only change what is dependent on the codec. finally assign it to mncc.bearer_cap. it would avoid duplication. It just ended up this way for now. I'm not sure which fields actually make any difference to the MSC. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I55cdc4b7c52730d7e998a1d692c7552fd07403ee Gerrit-Change-Number: 15019 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 01 Aug 2019 22:39:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 2 01:36:50 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 02 Aug 2019 01:36:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5d4393cd2f3a7_3c572b24b2b4e5f4846429@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie/Debian_8.0/i586 Package network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals-debian8-jessie Last lines of build log: [ 270s] asciidoc: sigtran-osmocom.adoc: line 355: evaluating: {counter:table-number} [ 270s] asciidoc: sigtran-osmocom.adoc: line 380: evaluating: {counter:table-number} [ 270s] asciidoc: sigtran-osmocom.adoc: line 396: evaluating: {counter:table-number} [ 270s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/port_numbers.adoc [ 270s] asciidoc: test-usermanual.adoc: line 32: reading: /usr/src/packages/BUILD/common/chapters/port_numbers.adoc [ 271s] asciidoc: port_numbers.adoc: line 50: evaluating: {counter:table-number} [ 271s] ../build/Makefile.asciidoc.inc:61: recipe for target 'test-usermanual.pdf' failed [ 271s] make[3]: *** [test-usermanual.pdf] Error 1 [ 271s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 271s] Makefile:426: recipe for target 'all-recursive' failed [ 271s] make[2]: *** [all-recursive] Error 1 [ 271s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 271s] Makefile:349: recipe for target 'all' failed [ 271s] make[1]: *** [all] Error 2 [ 271s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 271s] dh_auto_build: make -j1 returned exit code 2 [ 271s] debian/rules:5: recipe for target 'binary' failed [ 271s] make: *** [binary] Error 2 [ 271s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 271s] [ 271s] cloud105 failed "build osmo-gsm-manuals-dev_0.1.1.8.08fa.dsc" at Fri Aug 2 01:36:37 UTC 2019. [ 271s] [ 271s] ### VM INTERACTION START ### [ 272s] Powering off. [ 272s] [ 245.532489] reboot: Power down [ 273s] ### VM INTERACTION END ### [ 273s] [ 273s] cloud105 failed "build osmo-gsm-manuals-dev_0.1.1.8.08fa.dsc" at Fri Aug 2 01:36:39 UTC 2019. [ 273s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 2 07:17:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 07:17:04 +0000 Subject: Change in ...osmo-bts[master]: osmo-bts-trx: migrate to new generic ECU abstraction In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15027 ) Change subject: osmo-bts-trx: migrate to new generic ECU abstraction ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I001005aae6de76d4e045b8dc572239f057bb150d Gerrit-Change-Number: 15027 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 02 Aug 2019 07:17:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 07:19:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 07:19:47 +0000 Subject: Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15026 ) Change subject: codec/ecu: Introduce new generic Error Concealment Unit abstraction ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15026/4/include/osmocom/codec/ecu.h File include/osmocom/codec/ecu.h: https://gerrit.osmocom.org/#/c/15026/4/include/osmocom/codec/ecu.h at 45 PS4, Line 45: uint8_t data[0]; > Not sure if it's a good idea to use a flexible array member here. [?] it's a very typcial pattern in linux kernel development, hence that's what I'm using here, too. In general, the "data" part is allocated always at the same time as the osmo_ecu_state. Allocating them both at the same time avoids malloc pressure, can help avoid memory fragmentation, allows the use of "offsetof" to get from inner to outer struct (rather than having to use an explicit back-pointer) and avoids the risk of ever only freeing one of the two. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915 Gerrit-Change-Number: 15026 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 02 Aug 2019 07:19:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 07:32:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 07:32:05 +0000 Subject: Change in ...osmo-bts[master]: OML: Send Failure Event Report on short OML messages In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/12872 ) Change subject: OML: Send Failure Event Report on short OML messages ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/12872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4a1b64aa35fa7051d9eb190f3f6f5ea0b28bab8f Gerrit-Change-Number: 12872 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 08:08:34 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 2 Aug 2019 08:08:34 +0000 Subject: Change in ...osmo-msc[master]: Set coding in mncc_set_cause() In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15009 ) Change subject: Set coding in mncc_set_cause() ...................................................................... Set coding in mncc_set_cause() GSM 04.08 10.5.4.11 The Release indication needs to have the Coding Standard set. For phones that would display a message on screen, such as "Number not in use", if the coding standard is not defined, the display may show "Error in Connection" Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 --- M src/libmsc/mncc.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 3 files changed, 3 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c index 8c95ecb..d0b2ff2 100644 --- a/src/libmsc/mncc.c +++ b/src/libmsc/mncc.c @@ -100,6 +100,7 @@ void mncc_set_cause(struct gsm_mncc *data, int loc, int val) { data->fields |= MNCC_F_CAUSE; + data->cause.coding = GSM48_CAUSE_CODING_GSM; data->cause.location = loc; data->cause.value = val; } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 6805f1a..065af25 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -401,7 +401,7 @@ * 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); - dtap_expect_tx("032d080281af"); /* CC: Release */ + dtap_expect_tx("032d0802e1af"); /* CC: Release */ expect_iu_release(); msc_a_release_cn(msub_msc_a(g_msub)); OSMO_ASSERT(dtap_tx_confirmed); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index d5fd893..bbfa61b 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1184,7 +1184,7 @@ DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) starting timer T308 with 10 seconds DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) new state CALL_RECEIVED -> RELEASE_REQ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN encode: DTAP on UTRAN-Iu -- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 032d080281af +- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 032d0802e1af - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_REL_CNF -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib28b62a41d433e231cff5910d19455296b284df6 Gerrit-Change-Number: 15009 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 10:37:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 10:37:13 +0000 Subject: Change in ...osmo-bts[master]: scheduler_trx: Handle negative return of gsm0503_tch_hr_decode() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/14877 ) Change subject: scheduler_trx: Handle negative return of gsm0503_tch_hr_decode() ...................................................................... scheduler_trx: Handle negative return of gsm0503_tch_hr_decode() If gsm0503_tch_hr_decode() returns a negative error, we shouldn't set the marker bit or pass the negative value as length value into osmo_hr_check_sid(). Change-Id: If49ca6926c576a2b17507b6a95b6f3ca17877d66 Closes: CID#187645 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 532eca5..ef24119 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1393,7 +1393,7 @@ */ rc = gsm0503_tch_hr_decode(tch_data, *bursts_p, fn_is_odd, &n_errors, &n_bits_total); - if (rc) /* DTXu */ + if (rc >= 0) /* DTXu */ lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If49ca6926c576a2b17507b6a95b6f3ca17877d66 Gerrit-Change-Number: 14877 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 13:42:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 13:42:42 +0000 Subject: Change in ...osmo-ccid-firmware[master]: ensure kernel >= 5.0 is happy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016 ) Change subject: ensure kernel >= 5.0 is happy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e Gerrit-Change-Number: 15016 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 02 Aug 2019 13:42:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 13:43:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 13:43:34 +0000 Subject: Change in ...osmo-ccid-firmware[master]: proper link order In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15017 ) Change subject: proper link order ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15017/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15017/1//COMMIT_MSG at 2 PS1, Line 2: Eric WIld seems like there's an unintended uppercase "I" in your surname in the git config. JFYI. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8083c5dc990acd6b60b053883fdd1b42c3bc0d4f Gerrit-Change-Number: 15017 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 02 Aug 2019 13:43:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 13:43:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 13:43:54 +0000 Subject: Change in ...osmo-ccid-firmware[master]: ensure kernel >= 5.0 is happy In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016 ) Change subject: ensure kernel >= 5.0 is happy ...................................................................... ensure kernel >= 5.0 is happy dummy_hcd now checks wMaxPacketSize Change-Id: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e --- M ccid/README.linux-dummy_hcd-ffs M ccid/ccid_main_functionfs.c 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid/README.linux-dummy_hcd-ffs b/ccid/README.linux-dummy_hcd-ffs index bb628b6..2b98eff 100644 --- a/ccid/README.linux-dummy_hcd-ffs +++ b/ccid/README.linux-dummy_hcd-ffs @@ -2,7 +2,8 @@ ============ * you need dummy_hcd.ko, i.e. a kernel compiled with CONFIG_USB_DUMMY_HCD=m -* you need a fixed usb_f_fs.ko, which doesn't make blind assumptions about +* kernel version >= 5.0 does NOT require patching +* kernel version < 5.0 needs a fixed usb_f_fs.ko, which doesn't make blind assumptions about everything being a HID descriptor. See CCID.patch On a stock Debian system, this works as follows (kernel versions will change over time, diff --git a/ccid/ccid_main_functionfs.c b/ccid/ccid_main_functionfs.c index 81cf225..26bb525 100644 --- a/ccid/ccid_main_functionfs.c +++ b/ccid/ccid_main_functionfs.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -87,20 +88,22 @@ .bEndpointAddress = 1 | USB_DIR_IN, .bmAttributes = USB_ENDPOINT_XFER_INT, .wMaxPacketSize = 64, + .bInterval = 1, }, + // dummy_hcd expects a valid wMaxPacketSize! .ep_out = { .bLength = sizeof(descriptors.fs_descs.ep_out), .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = 2 | USB_DIR_OUT, .bmAttributes = USB_ENDPOINT_XFER_BULK, - /* .wMaxPacketSize = autoconfiguration (kernel) */ + .wMaxPacketSize = 64, }, .ep_in = { .bLength = sizeof(descriptors.fs_descs.ep_in), .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = 3 | USB_DIR_IN, .bmAttributes = USB_ENDPOINT_XFER_BULK, - /* .wMaxPacketSize = autoconfiguration (kernel) */ + .wMaxPacketSize = 64, }, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e Gerrit-Change-Number: 15016 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 13:43:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 2 Aug 2019 13:43:54 +0000 Subject: Change in ...osmo-ccid-firmware[master]: proper link order In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15017 ) Change subject: proper link order ...................................................................... proper link order undef syms from the left, def syms from the right, as it should be. It's either this, or -Wl,--start-group/-Wl,--end-group around everything. Change-Id: I8083c5dc990acd6b60b053883fdd1b42c3bc0d4f --- M ccid/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid/Makefile b/ccid/Makefile index 2194180..3258967 100644 --- a/ccid/Makefile +++ b/ccid/Makefile @@ -1,7 +1,7 @@ CFLAGS=-Wall -g ccid_functionfs: ccid_main_functionfs.o ccid_proto.o ccid_device.o ccid_slot_sim.o - $(CC) $(CFLAGS) -lasan -losmocore -ltalloc -laio -o $@ $^ + $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8083c5dc990acd6b60b053883fdd1b42c3bc0d4f Gerrit-Change-Number: 15017 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 14:32:50 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 2 Aug 2019 14:32:50 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK Explicitly check for asciidoc warnings when running with jenkins, so we can disable it by default. Since the binary packages for various distributions are built with various asciidoc versions, which may throw different warnings compared to what the version installed on the jenkins slave does, it does not make sense to have this check on by default. Related: OS#4140 Depends: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 (osmo-gsm-manuals) Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/15029/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a696d86..08f9b49 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -20,7 +20,7 @@ combination_filter: '' sequential: false # most common build invocation - cmd: ./contrib/jenkins.sh + cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/{repos}' gerrit_project: '{repos}' @@ -46,7 +46,7 @@ - libosmo-abis - libosmo-netif - libosmo-sccp: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -81,6 +81,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -102,6 +103,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -124,7 +126,7 @@ (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: ASCIIDOC_WARNINGS_CHECK="1" './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP @@ -134,12 +136,12 @@ combination_filter: > (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") - cmd: ./contrib/jenkins.sh + cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-gsm-manuals - osmo-hlr: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-iuh @@ -153,6 +155,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -177,6 +180,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -u build \ @@ -224,6 +228,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ @@ -231,7 +236,7 @@ osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-trx: a1_name: INSTR @@ -245,7 +250,7 @@ (INSTR == "--with-sse" && WITH_MANUALS == "1") - osmocom-bb: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-tetra - osmo-sysmon - osmo-remsim diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 373e975..3417dc3 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -19,7 +19,7 @@ combination_filter: '' sequential: false # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) - cmd: ./contrib/jenkins.sh + cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh wrappers: [] trigger: email: jenkins-notifications at lists.osmocom.org laforge at gnumonks.org @@ -83,7 +83,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -159,6 +159,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -177,6 +178,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -199,7 +201,7 @@ (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") - cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP @@ -209,7 +211,7 @@ combination_filter: > (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-gmr: @@ -224,7 +226,7 @@ cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh - osmo-hlr: - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-iuh: # Full triggers would be: @@ -246,6 +248,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -275,6 +278,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ @@ -304,7 +308,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -325,6 +329,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -332,7 +337,7 @@ - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -347,10 +352,10 @@ concurrent: true combination_filter: > (INSTR == "--with-sse" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmocom-bb: - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-sysmon - osmo-remsim -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 14:33:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 2 Aug 2019 14:33:06 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: warnings check not default Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Makefile.asciidoc.inc: warnings check not default Only check for asciidoc warnings in "make check" if ASCIIDOC_WARNINGS_CHECK is set. Enable it in jenkins.sh by using the new ./configure --enable-asciidoc-warnings-check parameter (similar to --enable-werror in other Osmocom projects' configure.ac files). Related: OS#4140 Change-Id: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 --- M build/Makefile.asciidoc.inc M configure.ac M contrib/jenkins.sh 3 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/31/15031/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 77f3b1d..7cb660f 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -75,7 +75,10 @@ TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ a2x -vv $(A2X_OPTS) $(notdir $<) -check: $(ASCIIDOC_CHECKS) +check: + if [ -n "$$ASCIIDOC_WARNINGS_CHECK" ]; then \ + $(MAKE) $(ASCIIDOC_CHECKS); \ + fi $(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \ $(ASCIIDOCSTYLE) \ diff --git a/configure.ac b/configure.ac index 9858af6..1017e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,15 @@ AC_MSG_ERROR("missing dependencies!") fi +# Asciidoc warnings check (OS#4140) +AC_ARG_ENABLE(asciidoc_warnings_check, + [AS_HELP_STRING( + [--enable-asciidoc-warnings-check], + [Fail the build if asciidoc prints any warnings] + )], + [asciidoc_warnings_check=$enableval], [asciidoc_warnings_check="no"]) +AM_CONDITIONAL([ASCIIDOC_WARNINGS_CHECK], [test x"$asciidoc_warnings_check" = x"yes"]) + AC_OUTPUT( osmo-gsm-manuals.pc Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0c40e2f..cf709b2 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -12,7 +12,7 @@ osmo-clean-workspace.sh autoreconf -fi -./configure +./configure --enable-asciidoc-warnings-check $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check $MAKE $PARALLEL_MAKE distcheck -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 14:33:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 2 Aug 2019 14:33:06 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Makefile.asciidoc.inc: always run verbose asciidoc a2x is a "toolchain manager" for asciidoc, that runs the asciidoc command internally. Replace the previous logic of first running a2x without any verbose flags, and on failure running asciidoc standalone, with a verbose flag, to print the errors the occured. Always run a2x with -vv, so it runs asciidoc in verbose mode. This prevents losing the error message in case asciidoc or a2x fail when running with a2x, but then asciidoc succeeds when running standalone. Related: OS#4132 Change-Id: I2cbd2985645ecdecc7851849be6a9a95d4b3246e --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/30/15030/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 1bed968..77f3b1d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -73,8 +73,7 @@ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ - a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ - asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1) + a2x -vv $(A2X_OPTS) $(notdir $<) check: $(ASCIIDOC_CHECKS) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 14:38:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 2 Aug 2019 14:38:36 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 ) Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15030/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15030/1//COMMIT_MSG at 15 PS1, Line 15: This prevents losing the error message in case asciidoc or a2x fail I don't really understand what you mean in the paragraph. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 02 Aug 2019 14:38:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 14:40:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 2 Aug 2019 14:40:07 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: warnings check not default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 ) Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15031/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/15031/1/build/Makefile.asciidoc.inc at 79 PS1, Line 79: if [ -n "$$ASCIIDOC_WARNINGS_CHECK" ]; then \ What's the point on having this? simply don't run make check then, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 02 Aug 2019 14:40:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 18:05:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 2 Aug 2019 18:05:09 +0000 Subject: Change in ...libosmocore[master]: Workaround TLS gcc compiler bug in ARM In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15025 ) Change subject: Workaround TLS gcc compiler bug in ARM ...................................................................... Abandoned Abandonning as per comments from reviewer. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaac4b6628341effe9d488f907dc4d42897f2065 Gerrit-Change-Number: 15025 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 18:12:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 2 Aug 2019 18:12:18 +0000 Subject: Change in ...libosmocore[master]: utils: share static buffer in osmo_str_to{lower, upper}() In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15024 to look at the new patch set (#2). Change subject: utils: share static buffer in osmo_str_to{lower,upper}() ...................................................................... utils: share static buffer in osmo_str_to{lower,upper}() This way we get rid of extra 128 bytes in memory per thread created. It makes sense to share the buffer since it's same size and it doesn't make much sense to be using both osmo_str_tolower and osmo_strtoupper at the same time (usually you either want to move everything to uppercase or everything to lowerase). In required scenarios, one can still use the _buf versions. Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a --- M src/utils.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/15024/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a Gerrit-Change-Number: 15024 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 2 18:36:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 2 Aug 2019 18:36:55 +0000 Subject: Change in ...libosmocore[master]: Get rid of osmo_str_tolower() use inside libosmocore code Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15032 Change subject: Get rid of osmo_str_tolower() use inside libosmocore code ...................................................................... Get rid of osmo_str_tolower() use inside libosmocore code There's no real good reason for using that function (static buffer) instead of osmo_str_tolower_buf(local buffer), so let's use the later. In any case, we get rid of TLS variables in those places, which is a performance improvement. It will also allow later shrinking of those buffers if we decide to define maximum logging category and level name length. Change-Id: I2e99de1142020e4d80ef0a094e4e751f7903f5f9 --- M src/vty/logging_vty.c 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/15032/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 9911c6f..b785be4 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -289,14 +289,15 @@ static void add_category_strings(char **cmd_str_p, char **doc_str_p, const struct log_info *categories) { + char buf[128]; int i; for (i = 0; i < categories->num_cat; i++) { if (categories->cat[i].name == NULL) continue; /* skip the leading 'D' in each category name, hence '+ 1' */ + osmo_str_tolower_buf(buf, sizeof(buf), categories->cat[i].name + 1); osmo_talloc_asprintf(tall_log_ctx, *cmd_str_p, "%s%s", - i ? "|" : "", - osmo_str_tolower(categories->cat[i].name + 1)); + i ? "|" : "", buf); osmo_talloc_asprintf(tall_log_ctx, *doc_str_p, "%s\n", categories->cat[i].description); } @@ -868,6 +869,7 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt) { + char level_buf[128]; int i; switch (tgt->type) { @@ -923,26 +925,25 @@ if (tgt->loglevel) { const char *level_str = get_value_string_or_null(loglevel_strs, tgt->loglevel); - level_str = osmo_str_tolower(level_str); - if (!level_str) + if (!level_str) { vty_out(vty, "%% Invalid log level %u for 'force-all'%s", tgt->loglevel, VTY_NEWLINE); - else - vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); + } else { + osmo_str_tolower_buf(level_buf, sizeof(level_buf), level_str); + vty_out(vty, " logging level force-all %s%s", level_buf, VTY_NEWLINE); + } } for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; - const char *cat_name; + char cat_name[128]; const char *level_str; /* skip empty entries in the array */ if (!osmo_log_info->cat[i].name) continue; - /* Note: cat_name references the static buffer returned by osmo_str_tolower(), will - * become invalid after next osmo_str_tolower() invocation. */ - cat_name = osmo_str_tolower(osmo_log_info->cat[i].name+1); + osmo_str_tolower_buf(cat_name, sizeof(cat_name), osmo_log_info->cat[i].name + 1); level_str = get_value_string_or_null(loglevel_strs, cat->loglevel); if (!level_str) { @@ -951,8 +952,9 @@ continue; } + osmo_str_tolower_buf(level_buf, sizeof(level_buf), level_str); vty_out(vty, " logging level %s", cat_name); - vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE); + vty_out(vty, " %s%s", level_buf, VTY_NEWLINE); } return 1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2e99de1142020e4d80ef0a094e4e751f7903f5f9 Gerrit-Change-Number: 15032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 3 01:38:48 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 03 Aug 2019 01:38:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_10/i586 In-Reply-To: References: Message-ID: <5d44e5c387252_3c572b24b2b4e5f411218f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_10/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 361s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/spectrum.adoc [ 361s] asciidoc: test-usermanual.adoc: line 29: reading: /usr/src/packages/BUILD/common/chapters/spectrum.adoc [ 361s] asciidoc: spectrum.adoc: line 42: evaluating: {counter:table-number} [ 361s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/mncc.adoc [ 361s] asciidoc: test-usermanual.adoc: line 30: reading: /usr/src/packages/BUILD/common/chapters/mncc.adoc [ 361s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/logging.adoc [ 361s] asciidoc: test-usermanual.adoc: line 31: reading: /usr/src/packages/BUILD/common/chapters/logging.adoc [ 362s] asciidoc: logging.adoc: line 222: evaluating: {counter:figure-number} [ 362s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/bibliography.adoc [ 362s] asciidoc: test-usermanual.adoc: line 32: reading: /usr/src/packages/BUILD/common/chapters/bibliography.adoc [ 362s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 362s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 362s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 362s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 362s] make[1]: *** [Makefile:362: all] Error 2 [ 362s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 362s] dh_auto_build: make -j1 returned exit code 2 [ 362s] make: *** [debian/rules:5: binary] Error 2 [ 362s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 362s] [ 362s] cloud122 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Sat Aug 3 01:38:27 UTC 2019. [ 362s] [ 362s] ### VM INTERACTION START ### [ 365s] [ 330.768963] sysrq: SysRq : Power Off [ 365s] [ 330.788431] reboot: Power down [ 366s] ### VM INTERACTION END ### [ 366s] [ 366s] cloud122 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Sat Aug 3 01:38:31 UTC 2019. [ 366s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 3 01:57:56 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 03 Aug 2019 01:57:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d44ea3a84acc_3c572b24b2b4e5f411236e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Raspbian_10/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 198s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stderr 2019-08-03 01:57:45.840000000 +0000 [ 198s] @@ -20,9 +20,11 @@ [ 198s] autoreconnecting test step 3 [client OK, server OK], FD reg 1 [ 198s] [ 198s] autoreconnecting test step 2 [client OK, server OK], FD reg 0 [ 198s] + [ 198s] +autoreconnecting test step 1 [client OK, server OK], FD reg 0 [ 198s] connection closed with srv [ 198s] [ 198s] -autoreconnecting test step 1 [client OK, server NA], FD reg 0 [ 198s] +autoreconnecting test step 0 [client OK, server NA], FD reg 0 [ 198s] [ 198s] non-reconnecting test step 7 [client NA, server OK], FD reg 1 [ 198s] [ 198s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 198s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 198s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 198s] make: *** [debian/rules:13: build] Error 2 [ 198s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 198s] [ 198s] armbuild04 failed "build libosmo-netif_0.5.0.2.6563.dsc" at Sat Aug 3 01:57:47 UTC 2019. [ 198s] [ 198s] ### VM INTERACTION START ### [ 200s] [ 174.061226] sysrq: SysRq : Power Off [ 200s] [ 174.062663] reboot: Power down [ 201s] ### VM INTERACTION END ### [ 201s] [ 201s] armbuild04 failed "build libosmo-netif_0.5.0.2.6563.dsc" at Sat Aug 3 01:57:50 UTC 2019. [ 201s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:38:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:38:29 +0000 Subject: Change in ...libosmocore[master]: Get rid of osmo_str_tolower() use inside libosmocore code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15032 ) Change subject: Get rid of osmo_str_tolower() use inside libosmocore code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2e99de1142020e4d80ef0a094e4e751f7903f5f9 Gerrit-Change-Number: 15032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 03 Aug 2019 07:38:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:38:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:38:48 +0000 Subject: Change in ...libosmocore[master]: utils: share static buffer in osmo_str_to{lower, upper}() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15024 ) Change subject: utils: share static buffer in osmo_str_to{lower,upper}() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a Gerrit-Change-Number: 15024 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 03 Aug 2019 07:38:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:38:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:38:50 +0000 Subject: Change in ...libosmocore[master]: utils: share static buffer in osmo_str_to{lower, upper}() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15024 ) Change subject: utils: share static buffer in osmo_str_to{lower,upper}() ...................................................................... utils: share static buffer in osmo_str_to{lower,upper}() This way we get rid of extra 128 bytes in memory per thread created. It makes sense to share the buffer since it's same size and it doesn't make much sense to be using both osmo_str_tolower and osmo_strtoupper at the same time (usually you either want to move everything to uppercase or everything to lowerase). In required scenarios, one can still use the _buf versions. Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a --- M src/utils.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/utils.c b/src/utils.c index 7364bfb..ea1de0f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -42,6 +42,8 @@ * \file utils.c */ static __thread char namebuf[255]; +/* shared by osmo_str_tolower() and osmo_str_toupper() */ +static __thread char capsbuf[128]; /*! get human-readable string for given value * \param[in] vs Array of value_string tuples @@ -901,16 +903,15 @@ /*! Convert a string to lowercase, using a static buffer. * The resulting string may be truncated if the internally used static buffer is shorter than src. * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a - * terminating nul. + * terminating nul. The static buffer returned is shared with osmo_str_toupper(). * See also osmo_str_tolower_buf(). * \param[in] src String to convert to lowercase. * \returns Resulting lowercase string in a static buffer, always nul terminated. */ const char *osmo_str_tolower(const char *src) { - static __thread char buf[128]; - osmo_str_tolower_buf(buf, sizeof(buf), src); - return buf; + osmo_str_tolower_buf(capsbuf, sizeof(capsbuf), src); + return capsbuf; } /*! Convert a string to lowercase, dynamically allocating the output from given talloc context @@ -960,16 +961,15 @@ /*! Convert a string to uppercase, using a static buffer. * The resulting string may be truncated if the internally used static buffer is shorter than src. * The internal buffer is at least 128 bytes long, i.e. guaranteed to hold at least 127 characters and a - * terminating nul. + * terminating nul. The static buffer returned is shared with osmo_str_tolower(). * See also osmo_str_toupper_buf(). * \param[in] src String to convert to uppercase. * \returns Resulting uppercase string in a static buffer, always nul terminated. */ const char *osmo_str_toupper(const char *src) { - static __thread char buf[128]; - osmo_str_toupper_buf(buf, sizeof(buf), src); - return buf; + osmo_str_toupper_buf(capsbuf, sizeof(capsbuf), src); + return capsbuf; } /*! Convert a string to uppercase, dynamically allocating the output from given talloc context -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I032803faa0e27c2efdff1ff276acabab95a8319a Gerrit-Change-Number: 15024 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:38:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:38:50 +0000 Subject: Change in ...libosmocore[master]: Get rid of osmo_str_tolower() use inside libosmocore code In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15032 ) Change subject: Get rid of osmo_str_tolower() use inside libosmocore code ...................................................................... Get rid of osmo_str_tolower() use inside libosmocore code There's no real good reason for using that function (static buffer) instead of osmo_str_tolower_buf(local buffer), so let's use the later. In any case, we get rid of TLS variables in those places, which is a performance improvement. It will also allow later shrinking of those buffers if we decide to define maximum logging category and level name length. Change-Id: I2e99de1142020e4d80ef0a094e4e751f7903f5f9 --- M src/vty/logging_vty.c 1 file changed, 13 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 9911c6f..b785be4 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -289,14 +289,15 @@ static void add_category_strings(char **cmd_str_p, char **doc_str_p, const struct log_info *categories) { + char buf[128]; int i; for (i = 0; i < categories->num_cat; i++) { if (categories->cat[i].name == NULL) continue; /* skip the leading 'D' in each category name, hence '+ 1' */ + osmo_str_tolower_buf(buf, sizeof(buf), categories->cat[i].name + 1); osmo_talloc_asprintf(tall_log_ctx, *cmd_str_p, "%s%s", - i ? "|" : "", - osmo_str_tolower(categories->cat[i].name + 1)); + i ? "|" : "", buf); osmo_talloc_asprintf(tall_log_ctx, *doc_str_p, "%s\n", categories->cat[i].description); } @@ -868,6 +869,7 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt) { + char level_buf[128]; int i; switch (tgt->type) { @@ -923,26 +925,25 @@ if (tgt->loglevel) { const char *level_str = get_value_string_or_null(loglevel_strs, tgt->loglevel); - level_str = osmo_str_tolower(level_str); - if (!level_str) + if (!level_str) { vty_out(vty, "%% Invalid log level %u for 'force-all'%s", tgt->loglevel, VTY_NEWLINE); - else - vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE); + } else { + osmo_str_tolower_buf(level_buf, sizeof(level_buf), level_str); + vty_out(vty, " logging level force-all %s%s", level_buf, VTY_NEWLINE); + } } for (i = 0; i < osmo_log_info->num_cat; i++) { const struct log_category *cat = &tgt->categories[i]; - const char *cat_name; + char cat_name[128]; const char *level_str; /* skip empty entries in the array */ if (!osmo_log_info->cat[i].name) continue; - /* Note: cat_name references the static buffer returned by osmo_str_tolower(), will - * become invalid after next osmo_str_tolower() invocation. */ - cat_name = osmo_str_tolower(osmo_log_info->cat[i].name+1); + osmo_str_tolower_buf(cat_name, sizeof(cat_name), osmo_log_info->cat[i].name + 1); level_str = get_value_string_or_null(loglevel_strs, cat->loglevel); if (!level_str) { @@ -951,8 +952,9 @@ continue; } + osmo_str_tolower_buf(level_buf, sizeof(level_buf), level_str); vty_out(vty, " logging level %s", cat_name); - vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE); + vty_out(vty, " %s%s", level_buf, VTY_NEWLINE); } return 1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2e99de1142020e4d80ef0a094e4e751f7903f5f9 Gerrit-Change-Number: 15032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:39:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:39:43 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 ) Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 03 Aug 2019 07:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:42:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:42:02 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: warnings check not default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 ) Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15031/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/15031/1/build/Makefile.asciidoc.inc at 79 PS1, Line 79: if [ -n "$$ASCIIDOC_WARNINGS_CHECK" ]; then \ > What's the point on having this? simply don't run make check then, right? I guess the ratioanle is that "make check" currently only relates to whether our unit tests pass. If we make it cover the documentation, particularly warnings in documentation, I'm sure that some years down the road asciidoc has more warnings than today, and you wouldn't be able to pass a "make check" anymore, which in turn makes people believe that the software is somehow broken. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 03 Aug 2019 07:42:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 07:42:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 3 Aug 2019 07:42:27 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 03 Aug 2019 07:42:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 3 17:14:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 3 Aug 2019 17:14:48 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: warnings check not default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 ) Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 03 Aug 2019 17:14:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 4 01:37:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 04 Aug 2019 01:37:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5d4636eae44c4_3c572b24b2b4e5f4119146e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 297s] # same. [ 297s] if ! [ -f test-usermanual.adoc ]; then \ [ 297s] ln -s test-usermanual.adoc test-usermanual.adoc; \ [ 297s] fi [ 297s] asciidoc -v -f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -f ../build/python2-filter.conf -a srcdir='.' -a commondir='../common' test-usermanual.adoc > test-usermanual.check 2>&1 [ 322s] # Make absolutely sure that the %.check target is updated. [ 322s] touch test-usermanual.check [ 322s] # Do print the WARNING output but return error if any was found [ 322s] # (grep -v would omit the WARNING output from the log). [ 322s] asciidoc: WARNING: mgcp_extension_osmux.adoc: line 2: section title out of sequence: expected level 1, got level 2 [ 322s] make[3]: *** [../build/Makefile.asciidoc.inc:96: test-usermanual.check] Error 1 [ 322s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 322s] make[2]: *** [Makefile:438: check-recursive] Error 1 [ 322s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 322s] make[1]: *** [Makefile:732: check] Error 2 [ 322s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 322s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 322s] make: *** [debian/rules:5: binary] Error 2 [ 322s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 322s] [ 322s] lamb19 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Sun Aug 4 01:37:00 UTC 2019. [ 322s] [ 322s] ### VM INTERACTION START ### [ 325s] [ 311.781855] sysrq: SysRq : Power Off [ 325s] [ 311.790216] reboot: Power down [ 325s] ### VM INTERACTION END ### [ 325s] [ 325s] lamb19 failed "build osmo-gsm-manuals-dev_0.1.1.7.35ca.dsc" at Sun Aug 4 01:37:03 UTC 2019. [ 325s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 5 11:55:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 11:55:50 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15037 Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... configure: Autodetect TLS bug on ARM with old gcc and apply workaround Check if compiler being used contains the bug. GCC 7.3.0 is the oldest version containing the fix, and version 6.3.0 is known to contain the bug. Bug is only known to appear so far only on ARM32. If the bug is present, gcc will generate a wrong binary which wil lend up segfaulting when accessing TLS (__thread) variables under certain conditions. Related: OS#4062 Related: SYS#4628 Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d --- M configure.ac A m4/check_tls_gcc_arm_bug.m4 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/15037/1 diff --git a/configure.ac b/configure.ac index d717a0b..3764e29 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,10 @@ CHECK_TM_INCLUDES_TM_GMTOFF +dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0: +CHECK_TLS_GCC_ARM_BUG +CFLAGS="$CFLAGS $TLS_GCC_ARM_BUG_CFLAGS" + dnl Generate the output AC_CONFIG_HEADER(config.h) diff --git a/m4/check_tls_gcc_arm_bug.m4 b/m4/check_tls_gcc_arm_bug.m4 new file mode 100644 index 0000000..aa93edb --- /dev/null +++ b/m4/check_tls_gcc_arm_bug.m4 @@ -0,0 +1,27 @@ +# OS#4062 (https://osmocom.org/issues/4062) +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81142 +# SYS#4628 + +# Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0. +# TLS_GCC_ARM_BUG_CFLAGS is filled with required workaround bits if needed. + +AC_DEFUN([CHECK_TLS_GCC_ARM_BUG], [ + TLS_GCC_ARM_BUG_CFLAGS="" + AC_MSG_CHECKING([whether to workaround TLS bug in old gcc on ARM platforms]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ + #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) + /* Check for ARM 32 bit and gcc smaller than 7.3.0 */ + /* We need to explicitly exclude GNUC compatible compilers, since they also define GNUC related tokens */ + #if __arm__ && !defined(__llvm__) && !defined(__INTEL_COMPILER) && GCC_VERSION < 70300 + #error TLS bug present! + #endif + ]])], + [tls_bug_present=no], + [tls_bug_present=yes]) + AS_IF([test "x$tls_bug_present" = "xyes"],[ + TLS_GCC_ARM_BUG_CFLAGS="-mtls-dialect=gnu2" + ]) + AC_SUBST([TLS_GCC_ARM_BUG_CFLAGS]) + AC_MSG_RESULT([$TLS_GCC_ARM_BUG_CFLAGS]) +]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 12:00:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 12:00:30 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15037 to look at the new patch set (#2). Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... configure: Autodetect TLS bug on ARM with old gcc and apply workaround Check if compiler being used contains the bug. GCC 7.3.0 is the oldest version containing the fix, and version 6.3.0 is known to contain the bug. Bug is only known to appear so far only on ARM32. If the bug is present, gcc will generate a wrong binary which wil lend up segfaulting when accessing TLS (__thread) variables under certain conditions. Related: OS#4062 Related: SYS#4628 Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d --- M configure.ac A m4/check_tls_gcc_arm_bug.m4 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/15037/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 12:13:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 12:13:40 +0000 Subject: Change in ...libosmocore[master]: tests: logging: Remove undefined param passed to logging_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15038 Change subject: tests: logging: Remove undefined param passed to logging_vty_add_cmds ...................................................................... tests: logging: Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Related: OS#4138 Change-Id: Iaea795521361a8e5b3b45eaeb35e6eda69163af3 --- M tests/logging/logging_vty_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/15038/1 diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index 806a460..30426f3 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -246,7 +246,7 @@ handle_options(argc, argv); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); log_set_print_category(osmo_stderr_target, 1); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaea795521361a8e5b3b45eaeb35e6eda69163af3 Gerrit-Change-Number: 15038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 12:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 12:28:58 +0000 Subject: Change in ...osmo-ggsn[master]: sgsnemu: Fix unaligned pointer access during ip/icmp checksum In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14980 ) Change subject: sgsnemu: Fix unaligned pointer access during ip/icmp checksum ...................................................................... Patch Set 1: While I agree with what you say, I'd like to get this patch merged asap to have at least the compilation error fixed without changing implementation a lot, specially since we are going to release stuff this/next week. We can re-use the other implementation at some point after release. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I783f104c31234a07f2a13f6dbc577a71b25b36a7 Gerrit-Change-Number: 14980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 12:28:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 12:44:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 12:44:08 +0000 Subject: Change in ...osmo-pcu[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15039 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Related: OS#4138 Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 --- M src/pcu_main.cpp M src/pcu_vty.c M src/pcu_vty.h M tests/edge/EdgeTest.cpp M tests/emu/pcu_emu.cpp M tests/llc/LlcTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp 8 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/39/15039/1 diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index fa075cd..21cb244 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -277,7 +277,7 @@ bssgp_set_log_ss(DBSSGP); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); handle_options(argc, argv); if ((!!spoof_mcc) + (!!spoof_mnc) == 1) { diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 3a733ef..1e4f50c 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -1147,7 +1147,7 @@ .is_config_node = pcu_vty_is_config_node, }; -int pcu_vty_init(const struct log_info *cat) +int pcu_vty_init(void) { // install_element_ve(&show_pcu_cmd); @@ -1164,8 +1164,8 @@ NO_STR "GSMTAP Category\n", "\n", "", 0); - logging_vty_add_cmds(cat); - osmo_stats_vty_add_cmds(cat); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); install_node(&pcu_node, config_write_pcu); install_element(CONFIG_NODE, &cfg_pcu_cmd); diff --git a/src/pcu_vty.h b/src/pcu_vty.h index a075350..2097561 100644 --- a/src/pcu_vty.h +++ b/src/pcu_vty.h @@ -12,7 +12,7 @@ int pcu_vty_go_parent(struct vty *vty); int pcu_vty_is_config_node(struct vty *vty, int node); -int pcu_vty_init(const struct log_info *cat); +int pcu_vty_init(); extern struct vty_app_info pcu_vty_info; diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index f124b76..3f424d1 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1411,7 +1411,7 @@ log_set_print_filename(osmo_stderr_target, 0); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_coding_scheme(); test_rlc_info_init(); diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index e0190bf..7ecabe1 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -121,7 +121,7 @@ } vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); current_test = 0; diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index 13bda3c..8163f34 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -229,7 +229,7 @@ log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:"); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_llc_queue(); test_llc_meta(); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 4f8f3a0..c74b3a6 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -616,7 +616,7 @@ log_parse_category_mask(osmo_stderr_target, "DPCU,3:DRLCMAC,3"); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_ms_state(); test_ms_callback(); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 675cf89..8d1b344 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3290,7 +3290,7 @@ "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:"); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_tbf_base(); test_tbf_tlli_update(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 Gerrit-Change-Number: 15039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 12:47:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 12:47:49 +0000 Subject: Change in ...libosmo-sccp[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Related: OS#4138 Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3 --- M stp/stp_main.c M tests/vty/ss7_asp_vty_test.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/40/15040/1 diff --git a/stp/stp_main.c b/stp/stp_main.c index ff33959..a3e3a85 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -177,7 +177,7 @@ osmo_ss7_init(); osmo_fsm_log_addr(false); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); osmo_ss7_vty_init_sg(tall_stp_ctx); osmo_sccp_vty_init(); diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c index 6918df4..76ffcf2 100644 --- a/tests/vty/ss7_asp_vty_test.c +++ b/tests/vty/ss7_asp_vty_test.c @@ -162,7 +162,7 @@ vty_init(&vty_info); osmo_init_logging2(root_ctx, &log_info); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_ss7_init(); osmo_ss7_vty_init_asp(root_ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3 Gerrit-Change-Number: 15040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 12:50:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 12:50:14 +0000 Subject: Change in ...osmo-iuh[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15041 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: I31a286bebe3229671d9960ae32a753d260a26b1d Related: OS#4138 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/41/15041/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index fa655ae..3f94a01 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -539,7 +539,7 @@ osmo_ss7_vty_init_asp(tall_hnb_ctx); osmo_sccp_vty_init(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); - logging_vty_add_cmds(&hnbgw_log_info); + logging_vty_add_cmds(); /* Handle options after vty_init(), for --version */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I31a286bebe3229671d9960ae32a753d260a26b1d Gerrit-Change-Number: 15041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 13:01:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 5 Aug 2019 13:01:00 +0000 Subject: Change in ...libosmocore[master]: tests: logging: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15038 ) Change subject: tests: logging: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaea795521361a8e5b3b45eaeb35e6eda69163af3 Gerrit-Change-Number: 15038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 05 Aug 2019 13:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 13:02:48 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 5 Aug 2019 13:02:48 +0000 Subject: Change in ...libosmo-sccp[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3 Gerrit-Change-Number: 15040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 05 Aug 2019 13:02:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 13:03:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 5 Aug 2019 13:03:54 +0000 Subject: Change in ...osmo-pcu[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15039 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 Gerrit-Change-Number: 15039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 05 Aug 2019 13:03:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 13:04:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 5 Aug 2019 13:04:05 +0000 Subject: Change in ...osmo-iuh[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15041 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I31a286bebe3229671d9960ae32a753d260a26b1d Gerrit-Change-Number: 15041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 05 Aug 2019 13:04:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 13:51:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 13:51:39 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15037 to look at the new patch set (#3). Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... configure: Autodetect TLS bug on ARM with old gcc and apply workaround Check if compiler being used contains the bug. GCC 7.3.0 is the oldest version containing the fix, and version 6.3.0 is known to contain the bug. Bug is only known to appear so far only on ARM32. If the bug is present, gcc will generate a wrong binary which wil lend up segfaulting when accessing TLS (__thread) variables under certain conditions. Related: OS#4062 Related: SYS#4628 Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d --- M configure.ac A m4/check_tls_gcc_arm_bug.m4 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/15037/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 13:57:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 13:57:38 +0000 Subject: Change in ...osmo-hlr[master]: Remove undefined param passed to logging_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15042 Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Related: OS#4138 Change-Id: I6d0dbbd83ce17ee798bfb6e30378ed1dbae19134 --- M src/hlr.c M src/hlr_vty.c M src/hlr_vty.h 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/42/15042/1 diff --git a/src/hlr.c b/src/hlr.c index 90cbac4..8b9dff1 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -846,7 +846,7 @@ vty_init(&vty_info); ctrl_vty_init(hlr_ctx); handle_options(argc, argv); - hlr_vty_init(&hlr_log_info); + hlr_vty_init(); rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { diff --git a/src/hlr_vty.c b/src/hlr_vty.c index e6567cc..f7c5bc8 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -429,9 +429,9 @@ } } -void hlr_vty_init(const struct log_info *cat) +void hlr_vty_init(void) { - logging_vty_add_cmds(cat); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/src/hlr_vty.h b/src/hlr_vty.h index 1f3b87f..280b55a 100644 --- a/src/hlr_vty.h +++ b/src/hlr_vty.h @@ -35,4 +35,4 @@ int hlr_vty_is_config_node(struct vty *vty, int node); int hlr_vty_go_parent(struct vty *vty); -void hlr_vty_init(const struct log_info *cat); +void hlr_vty_init(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6d0dbbd83ce17ee798bfb6e30378ed1dbae19134 Gerrit-Change-Number: 15042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:00:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:00:04 +0000 Subject: Change in ...osmo-ggsn[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15043 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: I0a89586ce683ad060212355b37470c349992ec49 Related: OS#4138 --- M ggsn/ggsn.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/43/15043/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 1c6bc4d..95371a2 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -1267,9 +1267,9 @@ osmo_stats_init(tall_ggsn_ctx); vty_init(&g_vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&log_info); + osmo_stats_vty_add_cmds(); ggsn_vty_init(); ctrl_vty_init(tall_ggsn_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0a89586ce683ad060212355b37470c349992ec49 Gerrit-Change-Number: 15043 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:03:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:03:56 +0000 Subject: Change in ...osmo-sgsn[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15044 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ic4af704958819e6f65ac01be33ef5b3d69628ad0 Related: OS#4138 --- M src/gprs/gb_proxy_main.c M src/gprs/gtphub_main.c M src/gprs/sgsn_main.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/15044/1 diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c index 1e1aeac..4319fda 100644 --- a/src/gprs/gb_proxy_main.c +++ b/src/gprs/gb_proxy_main.c @@ -284,9 +284,9 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&gprs_log_info); + osmo_stats_vty_add_cmds(); gbproxy_vty_init(); handle_options(argc, argv); diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index 6d470bd..f693f09 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -356,7 +356,7 @@ vty_info.copyright = gtphub_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); gtphub_vty_init(hub, cfg); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 3543517..ecfb79b 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -384,9 +384,9 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&gprs_log_info); + osmo_stats_vty_add_cmds(); sgsn_vty_init(&sgsn->cfg); ctrl_vty_init(tall_sgsn_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic4af704958819e6f65ac01be33ef5b3d69628ad0 Gerrit-Change-Number: 15044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:05:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:05:37 +0000 Subject: Change in ...osmo-mgw[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15045 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Icf4d18969488c9eacca7a597d4071828e649e772 Related: OS#4138 --- M src/osmo-mgw/mgw_main.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/45/15045/1 diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 583d0fb..adc1751 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -270,9 +270,9 @@ vty_info.copyright = osmomgw_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&log_info); + osmo_stats_vty_add_cmds(); mgcp_vty_init(); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icf4d18969488c9eacca7a597d4071828e649e772 Gerrit-Change-Number: 15045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:07:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:07:36 +0000 Subject: Change in ...osmo-msc[master]: Remove undefined param passed to logging_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15046 Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: Ia2b24ffd7f9cbb271fcdb979b851f3a07b9d6d3e Related: OS#4138 --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/15046/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 9da26fb..1083271 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -544,7 +544,7 @@ } ctrl_vty_init(tall_msc_ctx); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); msc_vty_init(msc_network); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia2b24ffd7f9cbb271fcdb979b851f3a07b9d6d3e Gerrit-Change-Number: 15046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:09:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:09:36 +0000 Subject: Change in ...osmo-bsc[master]: Remove undefined param passed to logging_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15047 Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: Ic3c578347864fa225feb6d2dbe14798b9c19ace0 Related: OS#4138 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/15047/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b19c950..6de2d4b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5255,7 +5255,7 @@ install_element(ENABLE_NODE, &assignment_any_cmd); install_element(ENABLE_NODE, &handover_any_to_arfcn_bsic_cmd); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); install_element(GSMNET_NODE, &cfg_net_neci_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic3c578347864fa225feb6d2dbe14798b9c19ace0 Gerrit-Change-Number: 15047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:14:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:14:04 +0000 Subject: Change in ...osmo-bts[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15048 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Related: OS#4138 --- M include/osmo-bts/vty.h M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c M src/osmo-bts-sysmo/misc/sysmobts_mgr.c 6 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/15048/1 diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index d90a989..eab58d6 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -25,7 +25,7 @@ int bts_vty_go_parent(struct vty *vty); int bts_vty_is_config_node(struct vty *vty, int node); -int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat); +int bts_vty_init(struct gsm_bts *bts); struct gsm_network *gsmnet_from_vty(struct vty *v); diff --git a/src/common/main.c b/src/common/main.c index 25ecd11..6d8088c 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -249,7 +249,7 @@ } e1inp_vty_init(); - bts_vty_init(bts, &bts_log_info); + bts_vty_init(bts); /* enable realtime priority for us */ if (rt_prio != -1) { diff --git a/src/common/vty.c b/src/common/vty.c index e4f5a16..801f34c 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1600,7 +1600,7 @@ return CMD_SUCCESS; } -int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat) +int bts_vty_init(struct gsm_bts *bts) { cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, "gsmtap-sapi (", @@ -1622,7 +1622,7 @@ install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); - logging_vty_add_cmds(cat); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c index dbdcc9f..ccacc1e 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c @@ -301,7 +301,7 @@ exit(2); lc15bts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = lc15bts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c index 99d2b56..25948b0 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c @@ -288,7 +288,7 @@ exit(2); oc2gbts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = oc2gbts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c index a008073..a8289c2 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c @@ -270,7 +270,7 @@ exit(2); sysmobts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = sysmobts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Gerrit-Change-Number: 15048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:17:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:17:01 +0000 Subject: Change in ...osmo-sip-connector[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ie519d4a4064a95803c33fd6969b53e1ef27045b7 Related: OS#4138 --- M src/main.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/49/15049/1 diff --git a/src/main.c b/src/main.c index ab58a52..13fdd5d 100644 --- a/src/main.c +++ b/src/main.c @@ -133,8 +133,8 @@ osmo_stats_init(tall_mncc_ctx); mncc_sip_vty_init(); - logging_vty_add_cmds(&mncc_sip_info); - osmo_stats_vty_add_cmds(&mncc_sip_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); /* parsing and setup */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie519d4a4064a95803c33fd6969b53e1ef27045b7 Gerrit-Change-Number: 15049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:24:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:24:47 +0000 Subject: Change in ...osmocom-bb[master]: Remove undefined param passed to logging_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15050 Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: I25baaa30b097dad2fae507c5321778f43e863611 Related: OS#4138 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/15050/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index d7c65f0..f0f118b 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -440,7 +440,7 @@ vty_info.tall_ctx = l23_ctx; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); ms_vty_init(); dummy_conn.priv = NULL; vty_reading = 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I25baaa30b097dad2fae507c5321778f43e863611 Gerrit-Change-Number: 15050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:24:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:24:47 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit: Fixes in TRXD documentation Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15051 Change subject: trx_toolkit: Fixes in TRXD documentation ...................................................................... trx_toolkit: Fixes in TRXD documentation Change-Id: I126a8aed6b2bac7a620e95f06ecb98642a63b5f0 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/15051/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index ebb7a0f..de5f908 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -477,17 +477,17 @@ +-----------------+---------------------------------------+ | 7 6 5 4 3 2 1 0 | bit numbers (value range) | +-----------------+---------------------------------------+ - | . . . . . X X X | Training Sequence Code (0..7) | + | X . . . . . . . | IDLE / nope frame indication (0 or 1) | +-----------------+---------------------------------------+ | . X X X X . . . | Modulation, TS set number (see below) | +-----------------+---------------------------------------+ - | X . . . . . . . | IDLE / nope frame indication (0 or 1) | + | . . . . . X X X | Training Sequence Code (0..7) | +-----------------+---------------------------------------+ The bit number 7 (MSB) is set to high when either nothing has been detected, or during IDLE frames, so we can deliver noise levels, and avoid clock gaps on the L1 side. Other bits are ignored, - and should be set to low (0) in this case. L16 shall be set to 0x00. + and should be set to low (0) in this case. == Coding of modulation and TS set number @@ -520,14 +520,14 @@ == Coding of the burst bits - Unlike to be transmitted bursts, the received bursts are designated + Unlike the transmitted bursts, the received 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 bit is 0. The Viterbi algorithm allows to approximate the original sequence of hard-bits (1 or 0) using these values. Each soft-bit (-127..127) of the burst is encoded as an unsigned - value in range (254..0) respectively using the constant shift. + value in range (0..255) respectively using the constant shift. """ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I126a8aed6b2bac7a620e95f06ecb98642a63b5f0 Gerrit-Change-Number: 15051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:28:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:28:40 +0000 Subject: Change in ...osmo-pcap[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15052 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: I2e1ab7005514f1a06cac03e967aa5c8ea472e671 Related: OS#4138 --- M src/osmo_client_main.c M src/osmo_server_main.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/52/15052/1 diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index a28c4b7..5a8da96 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -186,8 +186,8 @@ vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); - logging_vty_add_cmds(&log_info); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); /* parse options */ handle_options(argc, argv); diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 3e399af..22d0f22 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -199,8 +199,8 @@ vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); - logging_vty_add_cmds(&log_info); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); /* parse options */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2e1ab7005514f1a06cac03e967aa5c8ea472e671 Gerrit-Change-Number: 15052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:36:07 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 14:36:07 +0000 Subject: Change in ...osmo-sip-connector[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+1 Seems to make sense! :) -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie519d4a4064a95803c33fd6969b53e1ef27045b7 Gerrit-Change-Number: 15049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Comment-Date: Mon, 05 Aug 2019 14:36:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:40:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:40:09 +0000 Subject: Change in ...openbsc[master]: nat: Remove unused func bsc_vty_init() Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/15053 Change subject: nat: Remove unused func bsc_vty_init() ...................................................................... nat: Remove unused func bsc_vty_init() The function is never called in osmo-bsc-nat, and logging_vty_add_cmds() is called directly in main(). Change-Id: Ie13cf5dc7f8dfa6fc6c3953dfcacaed7d5feb114 --- M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/53/15053/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index bc1050d..a90dc15 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -1429,11 +1429,3 @@ return 0; } - - -/* called by the telnet interface... we have our own init above */ -int bsc_vty_init(struct gsm_network *network) -{ - logging_vty_add_cmds(NULL); - return 0; -} -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie13cf5dc7f8dfa6fc6c3953dfcacaed7d5feb114 Gerrit-Change-Number: 15053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 14:40:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 14:40:09 +0000 Subject: Change in ...openbsc[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/15054 Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: I7d9d477b983b0d62f01237d90acaa7ce455c3c3d Related: OS#4138 --- M openbsc/src/libbsc/bsc_vty.c M openbsc/src/osmo-bsc_mgcp/mgcp_main.c M openbsc/src/osmo-bsc_nat/bsc_nat.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/54/15054/1 diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index c71ea4a..55a716b 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -4335,7 +4335,7 @@ install_element_ve(&show_paging_cmd); install_element_ve(&show_paging_group_cmd); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); install_element(GSMNET_NODE, &cfg_net_neci_cmd); diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 419f852..220efa3 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -222,8 +222,8 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); mgcp_vty_init(); handle_options(argc, argv); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 2e2eac0..9bb33ad 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1628,8 +1628,8 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); bsc_nat_vty_init(nat); ctrl_vty_init(tall_bsc_ctx); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I7d9d477b983b0d62f01237d90acaa7ce455c3c3d Gerrit-Change-Number: 15054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 15:14:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 15:14:49 +0000 Subject: Change in ...osmo-sip-connector[master]: Add media mode parameter to sdp_create_file() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 ) Change subject: Add media mode parameter to sdp_create_file() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 Gerrit-Change-Number: 14993 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 05 Aug 2019 15:14:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 15:17:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 15:17:57 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14994/7/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/14994/7/src/sip.c at 195 PS7, Line 195: struct call_leg *other = call_leg_other(&leg->base); This assignment is repeated in the if above. Simply move this line before the if and drop the other one. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 15:17:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 15:19:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 15:19:10 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 ) Change subject: Prepare to support MO Call HOLD ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 15:19:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 15:19:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 15:19:36 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14996/6/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14996/6/src/mncc.c at 719 PS6, Line 719: // In case of call waiting/swap, At this point we need to tell the BTS to send audio to to tell the MSC. Use /* */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 15:19:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 15:21:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 15:21:30 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 6: Code-Review-1 MY previous comments on this patches were ignored, still not applied. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 15:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 15:22:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 15:22:31 +0000 Subject: Change in ...osmo-sip-connector[master]: Only send update to MNCC if media info changed. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 ) Change subject: Only send update to MNCC if media info changed. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I7c48300092a309e50a8fe091b30e395e7c72de9d Gerrit-Change-Number: 15010 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 15:22:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 16:20:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 16:20:35 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Drop deprecated -t parameter Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 Change subject: bts-trx: Drop deprecated -t parameter ...................................................................... bts-trx: Drop deprecated -t parameter Parameter was dropped a while ago in osmo-bts, since it's calculated dynamically from VTY config. So let's drop it to avoid a deprecation warning message in osmo-bts log file. Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/15057/1 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 0c941e0..b3d45f6 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -135,8 +135,7 @@ self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file), - '-i', self.bsc.addr(), - '-t', str(self.num_trx())) + '-i', self.bsc.addr())) self.suite_run.poll() class OsmoTrx(log.Origin, metaclass=ABCMeta): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb Gerrit-Change-Number: 15057 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 16:34:35 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 16:34:35 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 to look at the new patch set (#7). Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Add support for MNCC HOLD/RETRIEVE Handle MO hold and retrieve and pass this to the SIP side. Handle the 200 from the SIP side in response to our HOLD-ing re-INVITE. With this commit we now handle MO hold and therefore also handle call-waiting and swapping. Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 --- M src/mncc.c 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/96/14996/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 16:42:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 16:42:20 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Drop deprecated -t parameter In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 ) Change subject: bts-trx: Drop deprecated -t parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb Gerrit-Change-Number: 15057 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 16:42:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 16:50:50 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 16:50:50 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 to look at the new patch set (#8). Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly In the case that the re-INVITE changes the media connection ip/port, forward this to the MNCC side with an MNCC_RTP_CONNECT Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 159 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/14994/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 16:52:29 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 16:52:29 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 to look at the new patch set (#6). Change subject: Prepare to support MO Call HOLD ...................................................................... Prepare to support MO Call HOLD Add function pointers to the call_leg struct for call hold and retrieve. Add function to send re-INVITE to SIP side when MNCC side puts call on HOLD/RETRIEVES. Add MNCC/SIP CC_HOLD to call states. Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c --- M src/call.c M src/call.h M src/sip.c 3 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/95/14995/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 16:52:35 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 16:52:35 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 to look at the new patch set (#8). Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Add support for MNCC HOLD/RETRIEVE Handle MO hold and retrieve and pass this to the SIP side. Handle the 200 from the SIP side in response to our HOLD-ing re-INVITE. With this commit we now handle MO hold and therefore also handle call-waiting and swapping. Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 --- M src/mncc.c 1 file changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/96/14996/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:00:03 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:00:03 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:00:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:00:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 17:00:47 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/14996/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14996/8/src/mncc.c at 719 PS8, Line 719: /* In case of call waiting/swap, At this point we need to tell the MSC to send Sorry to say so, but you need to remove this whitespace at the end of the line (otherwise I'll hate you every time my editor fixes it and gets mixed in my patches). -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:00:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:02:47 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:02:47 +0000 Subject: Change in ...osmo-sip-connector[master]: Add media mode parameter to sdp_create_file() In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 ) Change subject: Add media mode parameter to sdp_create_file() ...................................................................... Add media mode parameter to sdp_create_file() This enables call hold implemented by subsequent commits Prior to this commit, osmo-sip-connector would not send any media mode attribute in the sdp. After this commit we will by default always include a=sendrecv. Given that a media mode attribute of "sendrecv" is default and implicit it its absense, this does not represent any functional change. Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 --- M src/sdp.c M src/sdp.h M src/sip.c 3 files changed, 29 insertions(+), 6 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/sdp.c b/src/sdp.c index 17eb577..9bb55d4 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -163,16 +163,35 @@ return true; } -char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other) +char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other, sdp_mode_t mode) { struct in_addr net = { .s_addr = htonl(other->ip) }; char *fmtp_str = NULL, *sdp; + char *mode_attribute; leg->wanted_codec = app_media_name(other->payload_msg_type); if (strcmp(leg->wanted_codec, "AMR") == 0) fmtp_str = talloc_asprintf(leg, "a=fmtp:%d octet-align=1\r\n", other->payload_type); + switch (mode) { + case sdp_inactive: + mode_attribute = "a=inactive\r\n"; + break; + case sdp_sendrecv: + mode_attribute = "a=sendrecv\r\n"; + break; + case sdp_sendonly: + mode_attribute = "a=sendonly\r\n"; + break; + case sdp_recvonly: + mode_attribute = "a=recvonly\r\n"; + break; + default: + OSMO_ASSERT(false); + break; + } + sdp = talloc_asprintf(leg, "v=0\r\n" "o=Osmocom 0 0 IN IP4 %s\r\n" @@ -181,12 +200,14 @@ "t=0 0\r\n" "m=audio %d RTP/AVP %d\r\n" "%s" - "a=rtpmap:%d %s/8000\r\n", + "a=rtpmap:%d %s/8000\r\n" + "%s", inet_ntoa(net), inet_ntoa(net), /* never use diff. addr! */ other->port, other->payload_type, fmtp_str ? fmtp_str : "", other->payload_type, - leg->wanted_codec); + leg->wanted_codec, + mode_attribute); talloc_free(fmtp_str); return sdp; } diff --git a/src/sdp.h b/src/sdp.h index d716644..72ff6b7 100644 --- a/src/sdp.h +++ b/src/sdp.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include @@ -10,4 +11,4 @@ bool sdp_screen_sdp(const sip_t *sip); bool sdp_extract_sdp(struct sip_call_leg *leg, const sip_t *sip, bool any_codec); -char *sdp_create_file(struct sip_call_leg *, struct call_leg *); +char *sdp_create_file(struct sip_call_leg *, struct call_leg *, sdp_mode_t mode); diff --git a/src/sip.c b/src/sip.c index adf20d8..21401c6 100644 --- a/src/sip.c +++ b/src/sip.c @@ -28,6 +28,7 @@ #include #include +#include #include @@ -385,7 +386,7 @@ return; } - sdp = sdp_create_file(leg, other); + sdp = sdp_create_file(leg, other, sdp_sendrecv); leg->state = SIP_CC_CONNECTED; nua_respond(leg->nua_handle, SIP_200_OK, @@ -425,7 +426,7 @@ called_num, agent->app->sip.remote_addr, agent->app->sip.remote_port); - char *sdp = sdp_create_file(leg, other); + char *sdp = sdp_create_file(leg, other, sdp_sendrecv); leg->state = SIP_CC_INITIAL; leg->dir = SIP_DIR_MT; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib4212d0174955042e7d80d3744ce632a4942ccb2 Gerrit-Change-Number: 14993 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:03:50 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 5 Aug 2019 17:03:50 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:03:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:05:31 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 5 Aug 2019 17:05:31 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 7: > Patch Set 6: Code-Review-1 > > MY previous comments on this patches were ignored, still not applied. can't see previous comments? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:09:09 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:09:09 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 to look at the new patch set (#9). Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly In the case that the re-INVITE changes the media connection ip/port, forward this to the MNCC side with an MNCC_RTP_CONNECT Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 157 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/14994/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:09:09 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:09:09 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 to look at the new patch set (#9). Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Add support for MNCC HOLD/RETRIEVE Handle MO hold and retrieve and pass this to the SIP side. Handle the 200 from the SIP side in response to our HOLD-ing re-INVITE. With this commit we now handle MO hold and therefore also handle call-waiting and swapping. Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 --- M src/mncc.c M src/sip.c 2 files changed, 55 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/96/14996/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:11:40 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:11:40 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:11:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:11:42 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:11:42 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle SIP re-INVITEs In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 ) Change subject: Handle SIP re-INVITEs ...................................................................... Handle SIP re-INVITEs SIP end points can send periodic re-INVITES. Previous to this commit, the osmo-sip-connector would send a new call SETUP to the MSC for each re-INVITE. Add a function to find if we already handle this call based on the nua handle. Use this function to detect and respond with an ACK to re-INVITES. Add a function to extract the media mode from the SDP. In the case the re-INVITE has a=sendonly (HOLD) respond with a=recvonly In the case that the re-INVITE changes the media connection ip/port, forward this to the MNCC side with an MNCC_RTP_CONNECT Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed --- M src/call.h M src/mncc.c M src/sdp.c M src/sdp.h M src/sip.c 5 files changed, 157 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified keith: Looks good to me, approved diff --git a/src/call.h b/src/call.h index 65d1111..5076c01 100644 --- a/src/call.h +++ b/src/call.h @@ -74,6 +74,9 @@ * A DTMF key was entered. Forward it. */ void (*dtmf)(struct call_leg *, int keypad); + + void (*update_rtp)(struct call_leg *); + }; enum sip_cc_state { diff --git a/src/mncc.c b/src/mncc.c index ab2bed6..6ee7670 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -198,6 +198,23 @@ return true; } +static void update_rtp(struct call_leg *_leg) { + + struct mncc_call_leg *leg; + + LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP with LEG Type (%u)\n", _leg->type); + + if (_leg->type == CALL_TYPE_MNCC) { + leg = (struct mncc_call_leg *) _leg; + struct call_leg *other = call_leg_other(&leg->base); + send_rtp_connect(leg, other); + } else { + leg = (struct mncc_call_leg *) call_leg_other(_leg); + send_rtp_connect(leg, _leg); + } +} + + /* CONNECT call-back for MNCC call leg */ static void mncc_call_leg_connect(struct call_leg *_leg) { @@ -482,6 +499,7 @@ leg->base.connect_call = mncc_call_leg_connect; leg->base.ring_call = mncc_call_leg_ring; leg->base.release_call = mncc_call_leg_release; + leg->base.update_rtp = update_rtp; leg->callref = data->callref; leg->conn = conn; leg->state = MNCC_CC_INITIAL; @@ -788,6 +806,7 @@ leg->base.ring_call = mncc_call_leg_ring; leg->base.release_call = mncc_call_leg_release; leg->base.call = call; + leg->base.update_rtp = update_rtp; leg->callref = call->id; diff --git a/src/sdp.c b/src/sdp.c index 9bb55d4..52f7e25 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -33,6 +33,45 @@ #include /* + * Check if the media mode attribute exists in SDP, in this + * case update the passed pointer with the media mode + */ +bool sdp_get_sdp_mode(const sip_t *sip, sdp_mode_t *mode) { + + const char *sdp_data; + sdp_parser_t *parser; + sdp_session_t *sdp; + + if (!sip->sip_payload || !sip->sip_payload->pl_data) { + LOGP(DSIP, LOGL_ERROR, "No SDP file\n"); + return false; + } + + sdp_data = sip->sip_payload->pl_data; + parser = sdp_parse(NULL, sdp_data, strlen(sdp_data), sdp_f_mode_0000); + if (!parser) { + LOGP(DSIP, LOGL_ERROR, "Failed to parse SDP\n"); + return false; + } + + sdp = sdp_session(parser); + if (!sdp) { + LOGP(DSIP, LOGL_ERROR, "No sdp session\n"); + sdp_parser_free(parser); + return false; + } + + if (!sdp->sdp_media || !sdp->sdp_media->m_mode) { + sdp_parser_free(parser); + return sdp_sendrecv; + } + + sdp_parser_free(parser); + *mode = sdp->sdp_media->m_mode; + return true; +} + +/* * We want to decide on the audio codec later but we need to see * if it is even including some of the supported ones. */ diff --git a/src/sdp.h b/src/sdp.h index 72ff6b7..8e4e314 100644 --- a/src/sdp.h +++ b/src/sdp.h @@ -8,6 +8,7 @@ struct sip_call_leg; struct call_leg; +bool sdp_get_sdp_mode(const sip_t *sip, sdp_mode_t *mode); bool sdp_screen_sdp(const sip_t *sip); bool sdp_extract_sdp(struct sip_call_leg *leg, const sip_t *sip, bool any_codec); diff --git a/src/sip.c b/src/sip.c index 21401c6..be0d24a 100644 --- a/src/sip.c +++ b/src/sip.c @@ -41,6 +41,27 @@ static void sip_connect_call(struct call_leg *_leg); static void sip_dtmf_call(struct call_leg *_leg, int keypad); +/* Find a SIP Call leg by given nua_handle */ +static struct sip_call_leg *sip_find_leg(nua_handle_t *nh) +{ + struct call *call; + + llist_for_each_entry(call, &g_call_list, entry) { + if (call->initial && call->initial->type == CALL_TYPE_SIP) { + struct sip_call_leg *leg = (struct sip_call_leg *) call->initial; + if (leg->nua_handle == nh) + return leg; + } + if (call->remote && call->remote->type == CALL_TYPE_SIP) { + struct sip_call_leg *leg = (struct sip_call_leg *) call->remote; + if (leg->nua_handle == nh) + return leg; + } + } + + return NULL; +} + static void call_progress(struct sip_call_leg *leg, const sip_t *sip, int status) { struct call_leg *other = call_leg_other(&leg->base); @@ -149,6 +170,57 @@ talloc_strdup(leg, to)); } +static void sip_handle_reinvite(struct sip_call_leg *leg, nua_handle_t *nh, const sip_t *sip) { + + char *sdp; + sdp_mode_t mode = sdp_sendrecv; + + LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id); + + struct call_leg *other = call_leg_other(&leg->base); + if (!sdp_get_sdp_mode(sip, &mode)) { + /* re-INVITE with no SDP. + * We should respond with SDP reflecting current session + */ + sdp = sdp_create_file(leg, other, sdp_sendrecv); + nua_respond(nh, SIP_200_OK, + NUTAG_MEDIA_ENABLE(0), + SIPTAG_CONTENT_TYPE_STR("application/sdp"), + SIPTAG_PAYLOAD_STR(sdp), + TAG_END()); + talloc_free(sdp); + return; + } + + if (mode == sdp_sendonly) { + /* SIP side places call on HOLD */ + sdp = sdp_create_file(leg, other, sdp_recvonly); + /* TODO: Tell core network to stop sending RTP ? */ + } else { + /* SIP re-INVITE may want to change media, IP, port */ + if (!sdp_extract_sdp(leg, sip, true)) { + LOGP(DSIP, LOGL_ERROR, "leg(%p) no audio, releasing\n", leg); + nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); + nua_handle_destroy(nh); + call_leg_release(&leg->base); + return; + } + if (other->update_rtp) + other->update_rtp(leg->base.call->remote); + + sdp = sdp_create_file(leg, other, sdp_sendrecv); + } + + LOGP(DSIP, LOGL_DEBUG, "Sending 200 response to re-INVITE for mode(%u)\n", mode); + nua_respond(nh, SIP_200_OK, + NUTAG_MEDIA_ENABLE(0), + SIPTAG_CONTENT_TYPE_STR("application/sdp"), + SIPTAG_PAYLOAD_STR(sdp), + TAG_END()); + talloc_free(sdp); + return; +} + /* Sofia SIP definitions come with error code numbers and strings, this * map allows us to reuse the existing definitions. * The map is in priority order. The first matching entry found @@ -235,8 +307,13 @@ if (status == 180 || status == 183) call_progress(leg, sip, status); - else if (status == 200) - call_connect(leg, sip); + else if (status == 200) { + struct sip_call_leg *leg = sip_find_leg(nh); + if (leg) + nua_ack(leg->nua_handle, TAG_END()); + else + call_connect(leg, sip); + } else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); @@ -251,6 +328,14 @@ other->release_call(other); } } + } else if (event == nua_i_ack) { + /* SDP comes back to us in 200 ACK after we + * respond to the re-INVITE query. */ + if (sip->sip_payload && sip->sip_payload->pl_data) { + struct sip_call_leg *leg = sip_find_leg(nh); + if (leg) + sip_handle_reinvite(leg, nh, sip); + } } else if (event == nua_r_bye || event == nua_r_cancel) { /* our bye or hang up is answered */ struct sip_call_leg *leg = (struct sip_call_leg *) hmagic; @@ -270,10 +355,15 @@ if (other) other->release_call(other); } else if (event == nua_i_invite) { - /* new incoming leg */ + /* new incoming leg or re-INVITE */ - if (status == 100) - new_call((struct sip_agent *) magic, nh, sip); + if (status == 100) { + struct sip_call_leg *leg = sip_find_leg(nh); + if (leg) + sip_handle_reinvite(leg, nh, sip); + else + new_call((struct sip_agent *) magic, nh, sip); + } } else if (event == nua_i_cancel) { struct sip_call_leg *leg; struct call_leg *other; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I4083ed50d0cf1b302b80354fe0c2b73fc6e14fed Gerrit-Change-Number: 14994 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:12:28 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:12:28 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 ) Change subject: Prepare to support MO Call HOLD ...................................................................... Patch Set 7: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:12:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:12:41 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:12:41 +0000 Subject: Change in ...osmo-sip-connector[master]: Prepare to support MO Call HOLD In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 ) Change subject: Prepare to support MO Call HOLD ...................................................................... Prepare to support MO Call HOLD Add function pointers to the call_leg struct for call hold and retrieve. Add function to send re-INVITE to SIP side when MNCC side puts call on HOLD/RETRIEVES. Add MNCC/SIP CC_HOLD to call states. Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c --- M src/call.c M src/call.h M src/sip.c 3 files changed, 55 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified keith: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/call.c b/src/call.c index 9be6b4d..67207e5 100644 --- a/src/call.c +++ b/src/call.c @@ -40,6 +40,7 @@ { MNCC_CC_INITIAL, "INITIAL" }, { MNCC_CC_PROCEEDING, "PROCEEDING" }, { MNCC_CC_CONNECTED, "CONNECTED" }, + { MNCC_CC_HOLD, "ON HOLD" }, { 0, NULL }, }; @@ -53,6 +54,7 @@ { SIP_CC_INITIAL, "INITIAL" }, { SIP_CC_DLG_CNFD, "CONFIRMED" }, { SIP_CC_CONNECTED, "CONNECTED" }, + { SIP_CC_HOLD, "ON HOLD" }, { 0, NULL }, }; diff --git a/src/call.h b/src/call.h index 5076c01..bc772a4 100644 --- a/src/call.h +++ b/src/call.h @@ -75,6 +75,17 @@ */ void (*dtmf)(struct call_leg *, int keypad); + /** + * Call HOLD requested + */ + void (*hold_call)(struct call_leg *); + + /** + * Call HOLD ended + */ + void (*retrieve_call)(struct call_leg *); + + void (*update_rtp)(struct call_leg *); }; @@ -83,6 +94,7 @@ SIP_CC_INITIAL, SIP_CC_DLG_CNFD, SIP_CC_CONNECTED, + SIP_CC_HOLD, }; enum sip_dir { @@ -113,6 +125,7 @@ MNCC_CC_INITIAL, MNCC_CC_PROCEEDING, /* skip delivered state */ MNCC_CC_CONNECTED, + MNCC_CC_HOLD, }; enum mncc_dir { diff --git a/src/sip.c b/src/sip.c index be0d24a..8a96bed 100644 --- a/src/sip.c +++ b/src/sip.c @@ -40,6 +40,9 @@ static void sip_ring_call(struct call_leg *_leg); static void sip_connect_call(struct call_leg *_leg); static void sip_dtmf_call(struct call_leg *_leg, int keypad); +static void sip_hold_call(struct call_leg *_leg); +static void sip_retrieve_call(struct call_leg *_leg); + /* Find a SIP Call leg by given nua_handle */ static struct sip_call_leg *sip_find_leg(nua_handle_t *nh) @@ -160,6 +163,8 @@ leg->base.ring_call = sip_ring_call; leg->base.connect_call = sip_connect_call; leg->base.dtmf = sip_dtmf_call; + leg->base.hold_call = sip_hold_call; + leg->base.retrieve_call = sip_retrieve_call; leg->agent = agent; leg->nua_handle = nh; nua_handle_bind(nh, leg); @@ -441,6 +446,7 @@ } break; case SIP_CC_CONNECTED: + case SIP_CC_HOLD: LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in con\n", leg); nua_bye(leg->nua_handle, TAG_END()); break; @@ -503,6 +509,40 @@ talloc_free(buf); } +static void sip_hold_call(struct call_leg *_leg) +{ + struct sip_call_leg *leg; + struct call_leg *other_leg; + OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); + leg = (struct sip_call_leg *) _leg; + other_leg = call_leg_other(&leg->base); + char *sdp = sdp_create_file(leg, other_leg, sdp_sendonly); + nua_invite(leg->nua_handle, + NUTAG_MEDIA_ENABLE(0), + SIPTAG_CONTENT_TYPE_STR("application/sdp"), + SIPTAG_PAYLOAD_STR(sdp), + TAG_END()); + talloc_free(sdp); + leg->state = SIP_CC_HOLD; +} + +static void sip_retrieve_call(struct call_leg *_leg) +{ + struct sip_call_leg *leg; + struct call_leg *other_leg; + OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); + leg = (struct sip_call_leg *) _leg; + other_leg = call_leg_other(&leg->base); + char *sdp = sdp_create_file(leg, other_leg, sdp_sendrecv); + nua_invite(leg->nua_handle, + NUTAG_MEDIA_ENABLE(0), + SIPTAG_CONTENT_TYPE_STR("application/sdp"), + SIPTAG_PAYLOAD_STR(sdp), + TAG_END()); + talloc_free(sdp); + leg->state = SIP_CC_CONNECTED; +} + static int send_invite(struct sip_agent *agent, struct sip_call_leg *leg, const char *calling_num, const char *called_num) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2595626dfa50eb2f8e29a02540b708c9c1dce88c Gerrit-Change-Number: 14995 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:14:07 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:14:07 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 9: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14996/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14996/8/src/mncc.c at 719 PS8, Line 719: /* In case of call waiting/swap, At this point we need to tell the MSC to send > Sorry to say so, but you need to remove this whitespace at the end of the line (otherwise I'll hate [?] yeah.. I already saw it.. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:14:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:15:52 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:15:52 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:15:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:15:59 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:15:59 +0000 Subject: Change in ...osmo-sip-connector[master]: Add support for MNCC HOLD/RETRIEVE In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 ) Change subject: Add support for MNCC HOLD/RETRIEVE ...................................................................... Add support for MNCC HOLD/RETRIEVE Handle MO hold and retrieve and pass this to the SIP side. Handle the 200 from the SIP side in response to our HOLD-ing re-INVITE. With this commit we now handle MO hold and therefore also handle call-waiting and swapping. Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 --- M src/mncc.c M src/sip.c 2 files changed, 55 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified keith: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index 6ee7670..81fe30f 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -188,6 +188,8 @@ * FIXME: mncc.payload_msg_type should already be compatible.. but * payload_type should be different.. */ + struct in_addr net = { .s_addr = other->ip }; + LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port); rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n", @@ -687,14 +689,40 @@ { const struct gsm_mncc *data; struct mncc_call_leg *leg; + struct call_leg *other_leg; leg = find_leg(conn, buf, rc, &data); if (!leg) return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) is req hold. rejecting.\n", leg->callref); - mncc_send(leg->conn, MNCC_HOLD_REJ, leg->callref); + "leg(%u) is req hold.\n", leg->callref); + other_leg = call_leg_other(&leg->base); + other_leg->hold_call(other_leg); + mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref); + leg->state = MNCC_CC_HOLD; +} + +static void check_retrieve_ind(struct mncc_connection *conn, const char *buf, int rc) +{ + const struct gsm_mncc *data; + struct mncc_call_leg *leg; + struct call_leg *other_leg; + + leg = find_leg(conn, buf, rc, &data); + if (!leg) + return; + + LOGP(DMNCC, LOGL_DEBUG, + "leg(%u) is req unhold.\n", leg->callref); + other_leg = call_leg_other(&leg->base); + other_leg->retrieve_call(other_leg); + mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); + /* In case of call waiting/swap, At this point we need to tell the MSC to send + * audio to the port of the original call + */ + leg->state = MNCC_CC_CONNECTED; + send_rtp_connect(leg, other_leg); } static void check_stp_cnf(struct mncc_connection *conn, const char *buf, int rc) @@ -938,6 +966,9 @@ case MNCC_HOLD_IND: check_hold_ind(conn, buf, rc); break; + case MNCC_RETRIEVE_IND: + check_retrieve_ind(conn, buf, rc); + break; case MNCC_START_DTMF_IND: check_dtmf_start(conn, buf, rc); break; diff --git a/src/sip.c b/src/sip.c index 8a96bed..4e011bd 100644 --- a/src/sip.c +++ b/src/sip.c @@ -98,7 +98,7 @@ return; } - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected.\n", leg); + LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id); leg->state = SIP_CC_CONNECTED; other->connect_call(other); nua_ack(leg->nua_handle, TAG_END()); @@ -111,7 +111,7 @@ struct sip_call_leg *leg; const char *from = NULL, *to = NULL; - LOGP(DSIP, LOGL_DEBUG, "Incoming call handle(%p)\n", nh); + LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); if (!sdp_screen_sdp(sip)) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); @@ -158,6 +158,11 @@ call_leg_release(&leg->base); return; } + struct in_addr net = { .s_addr = leg->base.ip }; + LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", + inet_ntoa(net), + leg->base.port, + leg->base.payload_type); leg->base.release_call = sip_release_call; leg->base.ring_call = sip_ring_call; @@ -179,6 +184,8 @@ char *sdp; sdp_mode_t mode = sdp_sendrecv; + uint32_t ip = leg->base.ip; + uint16_t port = leg->base.port; LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id); @@ -197,6 +204,9 @@ return; } + struct in_addr net = { .s_addr = leg->base.ip }; + LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", inet_ntoa(net), leg->base.port); + if (mode == sdp_sendonly) { /* SIP side places call on HOLD */ sdp = sdp_create_file(leg, other, sdp_recvonly); @@ -210,9 +220,13 @@ call_leg_release(&leg->base); return; } + struct in_addr net = { .s_addr = leg->base.ip }; + LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port); + if (ip != leg->base.ip || port != leg->base.port) { + LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n"); + } if (other->update_rtp) other->update_rtp(leg->base.call->remote); - sdp = sdp_create_file(leg, other, sdp_sendrecv); } @@ -297,8 +311,8 @@ void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[]) { - LOGP(DSIP, LOGL_DEBUG, "SIP event(%u) status(%d) phrase(%s) %p\n", - event, status, phrase, hmagic); + LOGP(DSIP, LOGL_DEBUG, "SIP event[%s] status(%d) phrase(%s) %p\n", + nua_event_name(event), status, phrase, hmagic); if (event == nua_r_invite) { struct sip_call_leg *leg; @@ -361,6 +375,7 @@ other->release_call(other); } else if (event == nua_i_invite) { /* new incoming leg or re-INVITE */ + LOGP(DSIP, LOGL_NOTICE, "Processing INVITE Call-ID: %s\n", sip->sip_call_id->i_id); if (status == 100) { struct sip_call_leg *leg = sip_find_leg(nh); @@ -382,6 +397,8 @@ call_leg_release(&leg->base); if (other) other->release_call(other); + } else { + LOGP(DSIP, LOGL_DEBUG, "Did not handle event[%s] status(%d)\n", nua_event_name(event), status); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 Gerrit-Change-Number: 14996 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:16:25 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 17:16:25 +0000 Subject: Change in ...osmo-sip-connector[master]: Only send update to MNCC if media info changed. In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 ) Change subject: Only send update to MNCC if media info changed. ...................................................................... Only send update to MNCC if media info changed. Do not send an MNCC_RTP_CONNECT as a result of a SIP re-INVITE, unless the media connection information has changed. Change-Id: I7c48300092a309e50a8fe091b30e395e7c72de9d --- M src/sip.c 1 file changed, 2 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/src/sip.c b/src/sip.c index 4e011bd..0179226 100644 --- a/src/sip.c +++ b/src/sip.c @@ -224,9 +224,9 @@ LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port); if (ip != leg->base.ip || port != leg->base.port) { LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n"); + if (other->update_rtp) + other->update_rtp(leg->base.call->remote); } - if (other->update_rtp) - other->update_rtp(leg->base.call->remote); sdp = sdp_create_file(leg, other, sdp_sendrecv); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I7c48300092a309e50a8fe091b30e395e7c72de9d Gerrit-Change-Number: 15010 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:44:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:44:52 +0000 Subject: Change in ...osmo-ggsn[master]: sgsnemu: Fix unaligned pointer access during ip/icmp checksum In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14980 ) Change subject: sgsnemu: Fix unaligned pointer access during ip/icmp checksum ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I783f104c31234a07f2a13f6dbc577a71b25b36a7 Gerrit-Change-Number: 14980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:44:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:44:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:44:54 +0000 Subject: Change in ...osmo-ggsn[master]: sgsnemu: Fix unaligned pointer access during ip/icmp checksum In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14980 ) Change subject: sgsnemu: Fix unaligned pointer access during ip/icmp checksum ...................................................................... sgsnemu: Fix unaligned pointer access during ip/icmp checksum Catched by gcc 9.1.0: osmo-ggsn/sgsnemu/sgsnemu.c:1294:2: error: converting a packed struct ip_ping pointer (alignment 1) to a uint16_t {aka short unsigned int} pointer (alignment 2) may result in an unaligned pointer value [-Werror=address-of-packed-member] 1294 | p = (uint16_t *) & pack; Change-Id: I783f104c31234a07f2a13f6dbc577a71b25b36a7 --- M sgsnemu/sgsnemu.c 1 file changed, 12 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 8e41031..4f1f844 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -1234,7 +1234,7 @@ { struct ip_ping pack; - uint16_t *p = (uint16_t *) & pack; + uint16_t v16; uint8_t *p8 = (uint8_t *) & pack; struct in_addr src; unsigned int n; @@ -1270,7 +1270,7 @@ pack.seq = htons(seq); /* Generate ICMP payload */ - p8 = (uint8_t *) & pack + CREATEPING_IP + CREATEPING_ICMP; + p8 = (uint8_t *) &pack + CREATEPING_IP + CREATEPING_ICMP; for (n = 0; n < (datasize); n++) p8[n] = n; @@ -1278,11 +1278,13 @@ gettimeofday(tp, &tz); /* Calculate IP header checksum */ - p = (uint16_t *) & pack; + p8 = (uint8_t *) &pack; count = CREATEPING_IP; sum = 0; while (count > 1) { - sum += *p++; + memcpy(&v16, p8, 2); + sum += v16; + p8 += 2; count -= 2; } while (sum >> 16) @@ -1292,14 +1294,16 @@ /* Calculate ICMP checksum */ count = CREATEPING_ICMP + datasize; /* Length of ICMP message */ sum = 0; - p = (uint16_t *) & pack; - p += CREATEPING_IP / 2; + p8 = (uint8_t *) &pack; + p8 += CREATEPING_IP; while (count > 1) { - sum += *p++; + memcpy(&v16, p8, 2); + sum += v16; + p8 += 2; count -= 2; } if (count > 0) - sum += *(unsigned char *)p; + sum += *(unsigned char *)p8; while (sum >> 16) sum = (sum & 0xffff) + (sum >> 16); pack.checksum = ~sum; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I783f104c31234a07f2a13f6dbc577a71b25b36a7 Gerrit-Change-Number: 14980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:45:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:45:05 +0000 Subject: Change in ...libosmocore[master]: tests: logging: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15038 ) Change subject: tests: logging: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaea795521361a8e5b3b45eaeb35e6eda69163af3 Gerrit-Change-Number: 15038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:45:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:45:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:45:08 +0000 Subject: Change in ...libosmocore[master]: tests: logging: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15038 ) Change subject: tests: logging: Remove undefined param passed to logging_vty_add_cmds ...................................................................... tests: logging: Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Related: OS#4138 Change-Id: Iaea795521361a8e5b3b45eaeb35e6eda69163af3 --- M tests/logging/logging_vty_test.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index 806a460..30426f3 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -246,7 +246,7 @@ handle_options(argc, argv); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); log_set_print_category(osmo_stderr_target, 1); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaea795521361a8e5b3b45eaeb35e6eda69163af3 Gerrit-Change-Number: 15038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:45:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:45:52 +0000 Subject: Change in ...libosmo-sccp[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3 Gerrit-Change-Number: 15040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:45:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:45:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:45:53 +0000 Subject: Change in ...libosmo-sccp[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Related: OS#4138 Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3 --- M stp/stp_main.c M tests/vty/ss7_asp_vty_test.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/stp/stp_main.c b/stp/stp_main.c index ff33959..a3e3a85 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -177,7 +177,7 @@ osmo_ss7_init(); osmo_fsm_log_addr(false); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); osmo_ss7_vty_init_sg(tall_stp_ctx); osmo_sccp_vty_init(); diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c index 6918df4..76ffcf2 100644 --- a/tests/vty/ss7_asp_vty_test.c +++ b/tests/vty/ss7_asp_vty_test.c @@ -162,7 +162,7 @@ vty_init(&vty_info); osmo_init_logging2(root_ctx, &log_info); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_ss7_init(); osmo_ss7_vty_init_asp(root_ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3 Gerrit-Change-Number: 15040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:46:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:46:09 +0000 Subject: Change in ...openbsc[master]: nat: Remove unused func bsc_vty_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/15053 ) Change subject: nat: Remove unused func bsc_vty_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie13cf5dc7f8dfa6fc6c3953dfcacaed7d5feb114 Gerrit-Change-Number: 15053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:46:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:46:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:46:10 +0000 Subject: Change in ...openbsc[master]: nat: Remove unused func bsc_vty_init() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/openbsc/+/15053 ) Change subject: nat: Remove unused func bsc_vty_init() ...................................................................... nat: Remove unused func bsc_vty_init() The function is never called in osmo-bsc-nat, and logging_vty_add_cmds() is called directly in main(). Change-Id: Ie13cf5dc7f8dfa6fc6c3953dfcacaed7d5feb114 --- M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index bc1050d..a90dc15 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -1429,11 +1429,3 @@ return 0; } - - -/* called by the telnet interface... we have our own init above */ -int bsc_vty_init(struct gsm_network *network) -{ - logging_vty_add_cmds(NULL); - return 0; -} -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie13cf5dc7f8dfa6fc6c3953dfcacaed7d5feb114 Gerrit-Change-Number: 15053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:46:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:46:23 +0000 Subject: Change in ...openbsc[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/15054 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I7d9d477b983b0d62f01237d90acaa7ce455c3c3d Gerrit-Change-Number: 15054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:46:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:46:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:46:25 +0000 Subject: Change in ...openbsc[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/openbsc/+/15054 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: I7d9d477b983b0d62f01237d90acaa7ce455c3c3d Related: OS#4138 --- M openbsc/src/libbsc/bsc_vty.c M openbsc/src/osmo-bsc_mgcp/mgcp_main.c M openbsc/src/osmo-bsc_nat/bsc_nat.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index c71ea4a..55a716b 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -4335,7 +4335,7 @@ install_element_ve(&show_paging_cmd); install_element_ve(&show_paging_group_cmd); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); install_element(GSMNET_NODE, &cfg_net_neci_cmd); diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 419f852..220efa3 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -222,8 +222,8 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); mgcp_vty_init(); handle_options(argc, argv); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 2e2eac0..9bb33ad 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1628,8 +1628,8 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); bsc_nat_vty_init(nat); ctrl_vty_init(tall_bsc_ctx); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I7d9d477b983b0d62f01237d90acaa7ce455c3c3d Gerrit-Change-Number: 15054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:46:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:46:45 +0000 Subject: Change in ...osmo-pcu[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15039 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 Gerrit-Change-Number: 15039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:46:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:46:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:46:47 +0000 Subject: Change in ...osmo-pcu[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15039 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Related: OS#4138 Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 --- M src/pcu_main.cpp M src/pcu_vty.c M src/pcu_vty.h M tests/edge/EdgeTest.cpp M tests/emu/pcu_emu.cpp M tests/llc/LlcTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp 8 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index fa075cd..21cb244 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -277,7 +277,7 @@ bssgp_set_log_ss(DBSSGP); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); handle_options(argc, argv); if ((!!spoof_mcc) + (!!spoof_mnc) == 1) { diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 3a733ef..1e4f50c 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -1147,7 +1147,7 @@ .is_config_node = pcu_vty_is_config_node, }; -int pcu_vty_init(const struct log_info *cat) +int pcu_vty_init(void) { // install_element_ve(&show_pcu_cmd); @@ -1164,8 +1164,8 @@ NO_STR "GSMTAP Category\n", "\n", "", 0); - logging_vty_add_cmds(cat); - osmo_stats_vty_add_cmds(cat); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); install_node(&pcu_node, config_write_pcu); install_element(CONFIG_NODE, &cfg_pcu_cmd); diff --git a/src/pcu_vty.h b/src/pcu_vty.h index a075350..2097561 100644 --- a/src/pcu_vty.h +++ b/src/pcu_vty.h @@ -12,7 +12,7 @@ int pcu_vty_go_parent(struct vty *vty); int pcu_vty_is_config_node(struct vty *vty, int node); -int pcu_vty_init(const struct log_info *cat); +int pcu_vty_init(); extern struct vty_app_info pcu_vty_info; diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index f124b76..3f424d1 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1411,7 +1411,7 @@ log_set_print_filename(osmo_stderr_target, 0); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_coding_scheme(); test_rlc_info_init(); diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index e0190bf..7ecabe1 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -121,7 +121,7 @@ } vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); current_test = 0; diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index 13bda3c..8163f34 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -229,7 +229,7 @@ log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:"); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_llc_queue(); test_llc_meta(); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 4f8f3a0..c74b3a6 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -616,7 +616,7 @@ log_parse_category_mask(osmo_stderr_target, "DPCU,3:DRLCMAC,3"); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_ms_state(); test_ms_callback(); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 675cf89..8d1b344 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3290,7 +3290,7 @@ "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:"); vty_init(&pcu_vty_info); - pcu_vty_init(&gprs_log_info); + pcu_vty_init(); test_tbf_base(); test_tbf_tlli_update(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic1ac815eafab49577ff883a5d700ecca5936d216 Gerrit-Change-Number: 15039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:12 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15037 ) Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:47:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:22 +0000 Subject: Change in ...osmo-iuh[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15041 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I31a286bebe3229671d9960ae32a753d260a26b1d Gerrit-Change-Number: 15041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:47:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:23 +0000 Subject: Change in ...osmo-iuh[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15041 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: I31a286bebe3229671d9960ae32a753d260a26b1d Related: OS#4138 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index fa655ae..3f94a01 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -539,7 +539,7 @@ osmo_ss7_vty_init_asp(tall_hnb_ctx); osmo_sccp_vty_init(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); - logging_vty_add_cmds(&hnbgw_log_info); + logging_vty_add_cmds(); /* Handle options after vty_init(), for --version */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I31a286bebe3229671d9960ae32a753d260a26b1d Gerrit-Change-Number: 15041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:40 +0000 Subject: Change in ...osmo-hlr[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15042 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6d0dbbd83ce17ee798bfb6e30378ed1dbae19134 Gerrit-Change-Number: 15042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:47:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:42 +0000 Subject: Change in ...osmo-hlr[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15042 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Related: OS#4138 Change-Id: I6d0dbbd83ce17ee798bfb6e30378ed1dbae19134 --- M src/hlr.c M src/hlr_vty.c M src/hlr_vty.h 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index 90cbac4..8b9dff1 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -846,7 +846,7 @@ vty_init(&vty_info); ctrl_vty_init(hlr_ctx); handle_options(argc, argv); - hlr_vty_init(&hlr_log_info); + hlr_vty_init(); rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { diff --git a/src/hlr_vty.c b/src/hlr_vty.c index e6567cc..f7c5bc8 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -429,9 +429,9 @@ } } -void hlr_vty_init(const struct log_info *cat) +void hlr_vty_init(void) { - logging_vty_add_cmds(cat); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/src/hlr_vty.h b/src/hlr_vty.h index 1f3b87f..280b55a 100644 --- a/src/hlr_vty.h +++ b/src/hlr_vty.h @@ -35,4 +35,4 @@ int hlr_vty_is_config_node(struct vty *vty, int node); int hlr_vty_go_parent(struct vty *vty); -void hlr_vty_init(const struct log_info *cat); +void hlr_vty_init(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6d0dbbd83ce17ee798bfb6e30378ed1dbae19134 Gerrit-Change-Number: 15042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:53 +0000 Subject: Change in ...osmo-ggsn[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15043 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0a89586ce683ad060212355b37470c349992ec49 Gerrit-Change-Number: 15043 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:47:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:47:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:47:55 +0000 Subject: Change in ...osmo-ggsn[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15043 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: I0a89586ce683ad060212355b37470c349992ec49 Related: OS#4138 --- M ggsn/ggsn.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 1c6bc4d..95371a2 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -1267,9 +1267,9 @@ osmo_stats_init(tall_ggsn_ctx); vty_init(&g_vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&log_info); + osmo_stats_vty_add_cmds(); ggsn_vty_init(); ctrl_vty_init(tall_ggsn_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0a89586ce683ad060212355b37470c349992ec49 Gerrit-Change-Number: 15043 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:06 +0000 Subject: Change in ...osmo-mgw[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15045 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icf4d18969488c9eacca7a597d4071828e649e772 Gerrit-Change-Number: 15045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:48:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:07 +0000 Subject: Change in ...osmo-mgw[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15045 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Icf4d18969488c9eacca7a597d4071828e649e772 Related: OS#4138 --- M src/osmo-mgw/mgw_main.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 583d0fb..adc1751 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -270,9 +270,9 @@ vty_info.copyright = osmomgw_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&log_info); + osmo_stats_vty_add_cmds(); mgcp_vty_init(); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icf4d18969488c9eacca7a597d4071828e649e772 Gerrit-Change-Number: 15045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:18 +0000 Subject: Change in ...osmo-sgsn[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15044 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic4af704958819e6f65ac01be33ef5b3d69628ad0 Gerrit-Change-Number: 15044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:48:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:20 +0000 Subject: Change in ...osmo-sgsn[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15044 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ic4af704958819e6f65ac01be33ef5b3d69628ad0 Related: OS#4138 --- M src/gprs/gb_proxy_main.c M src/gprs/gtphub_main.c M src/gprs/sgsn_main.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c index 1e1aeac..4319fda 100644 --- a/src/gprs/gb_proxy_main.c +++ b/src/gprs/gb_proxy_main.c @@ -284,9 +284,9 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&gprs_log_info); + osmo_stats_vty_add_cmds(); gbproxy_vty_init(); handle_options(argc, argv); diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index 6d470bd..f693f09 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -356,7 +356,7 @@ vty_info.copyright = gtphub_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); gtphub_vty_init(hub, cfg); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 3543517..ecfb79b 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -384,9 +384,9 @@ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(&gprs_log_info); + osmo_stats_vty_add_cmds(); sgsn_vty_init(&sgsn->cfg); ctrl_vty_init(tall_sgsn_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic4af704958819e6f65ac01be33ef5b3d69628ad0 Gerrit-Change-Number: 15044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:28 +0000 Subject: Change in ...osmo-msc[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15046 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia2b24ffd7f9cbb271fcdb979b851f3a07b9d6d3e Gerrit-Change-Number: 15046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:48:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:29 +0000 Subject: Change in ...osmo-msc[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15046 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: Ia2b24ffd7f9cbb271fcdb979b851f3a07b9d6d3e Related: OS#4138 --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 9da26fb..1083271 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -544,7 +544,7 @@ } ctrl_vty_init(tall_msc_ctx); - logging_vty_add_cmds(&log_info); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); msc_vty_init(msc_network); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia2b24ffd7f9cbb271fcdb979b851f3a07b9d6d3e Gerrit-Change-Number: 15046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:39 +0000 Subject: Change in ...osmo-bsc[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15047 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic3c578347864fa225feb6d2dbe14798b9c19ace0 Gerrit-Change-Number: 15047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:41 +0000 Subject: Change in ...osmo-bsc[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15047 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: Ic3c578347864fa225feb6d2dbe14798b9c19ace0 Related: OS#4138 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b19c950..6de2d4b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5255,7 +5255,7 @@ install_element(ENABLE_NODE, &assignment_any_cmd); install_element(ENABLE_NODE, &handover_any_to_arfcn_bsic_cmd); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); install_element(GSMNET_NODE, &cfg_net_neci_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic3c578347864fa225feb6d2dbe14798b9c19ace0 Gerrit-Change-Number: 15047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:56 +0000 Subject: Change in ...osmo-bts[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15048 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Gerrit-Change-Number: 15048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:48:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:48:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:48:59 +0000 Subject: Change in ...osmo-bts[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15048 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Related: OS#4138 --- M include/osmo-bts/vty.h M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c M src/osmo-bts-sysmo/misc/sysmobts_mgr.c 6 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index d90a989..eab58d6 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -25,7 +25,7 @@ int bts_vty_go_parent(struct vty *vty); int bts_vty_is_config_node(struct vty *vty, int node); -int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat); +int bts_vty_init(struct gsm_bts *bts); struct gsm_network *gsmnet_from_vty(struct vty *v); diff --git a/src/common/main.c b/src/common/main.c index 25ecd11..6d8088c 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -249,7 +249,7 @@ } e1inp_vty_init(); - bts_vty_init(bts, &bts_log_info); + bts_vty_init(bts); /* enable realtime priority for us */ if (rt_prio != -1) { diff --git a/src/common/vty.c b/src/common/vty.c index e4f5a16..801f34c 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1600,7 +1600,7 @@ return CMD_SUCCESS; } -int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat) +int bts_vty_init(struct gsm_bts *bts) { cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, "gsmtap-sapi (", @@ -1622,7 +1622,7 @@ install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); - logging_vty_add_cmds(cat); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c index dbdcc9f..ccacc1e 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr.c @@ -301,7 +301,7 @@ exit(2); lc15bts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = lc15bts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c index 99d2b56..25948b0 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c @@ -288,7 +288,7 @@ exit(2); oc2gbts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = oc2gbts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c index a008073..a8289c2 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c @@ -270,7 +270,7 @@ exit(2); sysmobts_mgr_vty_init(); - logging_vty_add_cmds(&mgr_log_info); + logging_vty_add_cmds(); rc = sysmobts_mgr_parse_config(&manager); if (rc < 0) { LOGP(DFIND, LOGL_FATAL, "Cannot parse config file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia4d1a7914308d1481fe31fe0986265ead339e61e Gerrit-Change-Number: 15048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:49:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:49:13 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit: Fixes in TRXD documentation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15051 ) Change subject: trx_toolkit: Fixes in TRXD documentation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I126a8aed6b2bac7a620e95f06ecb98642a63b5f0 Gerrit-Change-Number: 15051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:49:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:49:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:49:25 +0000 Subject: Change in ...osmocom-bb[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15050 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I25baaa30b097dad2fae507c5321778f43e863611 Gerrit-Change-Number: 15050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:49:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:49:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:49:29 +0000 Subject: Change in ...osmocom-bb[master]: Remove undefined param passed to logging_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15050 ) Change subject: Remove undefined param passed to logging_vty_add_cmds ...................................................................... Remove undefined param passed to logging_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. Change-Id: I25baaa30b097dad2fae507c5321778f43e863611 Related: OS#4138 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index d7c65f0..f0f118b 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -440,7 +440,7 @@ vty_info.tall_ctx = l23_ctx; vty_init(&vty_info); - logging_vty_add_cmds(NULL); + logging_vty_add_cmds(); ms_vty_init(); dummy_conn.priv = NULL; vty_reading = 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I25baaa30b097dad2fae507c5321778f43e863611 Gerrit-Change-Number: 15050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:49:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:49:37 +0000 Subject: Change in ...osmo-pcap[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15052 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2e1ab7005514f1a06cac03e967aa5c8ea472e671 Gerrit-Change-Number: 15052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:49:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:49:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:49:38 +0000 Subject: Change in ...osmo-pcap[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15052 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: I2e1ab7005514f1a06cac03e967aa5c8ea472e671 Related: OS#4138 --- M src/osmo_client_main.c M src/osmo_server_main.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index a28c4b7..5a8da96 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -186,8 +186,8 @@ vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); - logging_vty_add_cmds(&log_info); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); /* parse options */ handle_options(argc, argv); diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 3e399af..22d0f22 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -199,8 +199,8 @@ vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); - logging_vty_add_cmds(&log_info); - osmo_stats_vty_add_cmds(&log_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); /* parse options */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2e1ab7005514f1a06cac03e967aa5c8ea472e671 Gerrit-Change-Number: 15052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:49:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:49:59 +0000 Subject: Change in ...osmo-sip-connector[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie519d4a4064a95803c33fd6969b53e1ef27045b7 Gerrit-Change-Number: 15049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 17:49:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:50:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:50:01 +0000 Subject: Change in ...osmo-sip-connector[master]: Remove undefined param passed to {logging, osmo_stats}_vty_add_cmds In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 ) Change subject: Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds ...................................................................... Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However, definition in C file doesn't contain "(void)", which means number of parameters is undefined and thus compiler doesn't complain. Let's remove parameters from all callers before enforcing "(void)" on it. API osmo_stats_vty_add_cmds never had a param list but has seem problem (no "void"), so some users decided to pass a parameter to it. Change-Id: Ie519d4a4064a95803c33fd6969b53e1ef27045b7 Related: OS#4138 --- M src/main.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved keith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/main.c b/src/main.c index ab58a52..13fdd5d 100644 --- a/src/main.c +++ b/src/main.c @@ -133,8 +133,8 @@ osmo_stats_init(tall_mncc_ctx); mncc_sip_vty_init(); - logging_vty_add_cmds(&mncc_sip_info); - osmo_stats_vty_add_cmds(&mncc_sip_info); + logging_vty_add_cmds(); + osmo_stats_vty_add_cmds(); /* parsing and setup */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie519d4a4064a95803c33fd6969b53e1ef27045b7 Gerrit-Change-Number: 15049 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:50:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:50:32 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 ) Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 17:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:50:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:50:35 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 ) Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Makefile.asciidoc.inc: always run verbose asciidoc a2x is a "toolchain manager" for asciidoc, that runs the asciidoc command internally. Replace the previous logic of first running a2x without any verbose flags, and on failure running asciidoc standalone, with a verbose flag, to print the errors the occured. Always run a2x with -vv, so it runs asciidoc in verbose mode. This prevents losing the error message in case asciidoc or a2x fail when running with a2x, but then asciidoc succeeds when running standalone. Related: OS#4132 Change-Id: I2cbd2985645ecdecc7851849be6a9a95d4b3246e --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 1bed968..77f3b1d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -73,8 +73,7 @@ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ - a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ - asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1) + a2x -vv $(A2X_OPTS) $(notdir $<) check: $(ASCIIDOC_CHECKS) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 17:50:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 5 Aug 2019 17:50:36 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: warnings check not default In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 ) Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Makefile.asciidoc.inc: warnings check not default Only check for asciidoc warnings in "make check" if ASCIIDOC_WARNINGS_CHECK is set. Enable it in jenkins.sh by using the new ./configure --enable-asciidoc-warnings-check parameter (similar to --enable-werror in other Osmocom projects' configure.ac files). Related: OS#4140 Change-Id: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 --- M build/Makefile.asciidoc.inc M configure.ac M contrib/jenkins.sh 3 files changed, 14 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 77f3b1d..7cb660f 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -75,7 +75,10 @@ TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ a2x -vv $(A2X_OPTS) $(notdir $<) -check: $(ASCIIDOC_CHECKS) +check: + if [ -n "$$ASCIIDOC_WARNINGS_CHECK" ]; then \ + $(MAKE) $(ASCIIDOC_CHECKS); \ + fi $(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \ $(ASCIIDOCSTYLE) \ diff --git a/configure.ac b/configure.ac index 9858af6..1017e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,15 @@ AC_MSG_ERROR("missing dependencies!") fi +# Asciidoc warnings check (OS#4140) +AC_ARG_ENABLE(asciidoc_warnings_check, + [AS_HELP_STRING( + [--enable-asciidoc-warnings-check], + [Fail the build if asciidoc prints any warnings] + )], + [asciidoc_warnings_check=$enableval], [asciidoc_warnings_check="no"]) +AM_CONDITIONAL([ASCIIDOC_WARNINGS_CHECK], [test x"$asciidoc_warnings_check" = x"yes"]) + AC_OUTPUT( osmo-gsm-manuals.pc Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0c40e2f..cf709b2 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -12,7 +12,7 @@ osmo-clean-workspace.sh autoreconf -fi -./configure +./configure --enable-asciidoc-warnings-check $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check $MAKE $PARALLEL_MAKE distcheck -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 18:06:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 5 Aug 2019 18:06:09 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit: Fixes in TRXD documentation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15051 ) Change subject: trx_toolkit: Fixes in TRXD documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I126a8aed6b2bac7a620e95f06ecb98642a63b5f0 Gerrit-Change-Number: 15051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 18:06:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 18:09:58 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 5 Aug 2019 18:09:58 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Drop deprecated -t parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 ) Change subject: bts-trx: Drop deprecated -t parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb Gerrit-Change-Number: 15057 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 05 Aug 2019 18:09:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 18:58:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 18:58:39 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit: Fixes in TRXD documentation In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15051 ) Change subject: trx_toolkit: Fixes in TRXD documentation ...................................................................... trx_toolkit: Fixes in TRXD documentation Change-Id: I126a8aed6b2bac7a620e95f06ecb98642a63b5f0 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index ebb7a0f..de5f908 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -477,17 +477,17 @@ +-----------------+---------------------------------------+ | 7 6 5 4 3 2 1 0 | bit numbers (value range) | +-----------------+---------------------------------------+ - | . . . . . X X X | Training Sequence Code (0..7) | + | X . . . . . . . | IDLE / nope frame indication (0 or 1) | +-----------------+---------------------------------------+ | . X X X X . . . | Modulation, TS set number (see below) | +-----------------+---------------------------------------+ - | X . . . . . . . | IDLE / nope frame indication (0 or 1) | + | . . . . . X X X | Training Sequence Code (0..7) | +-----------------+---------------------------------------+ The bit number 7 (MSB) is set to high when either nothing has been detected, or during IDLE frames, so we can deliver noise levels, and avoid clock gaps on the L1 side. Other bits are ignored, - and should be set to low (0) in this case. L16 shall be set to 0x00. + and should be set to low (0) in this case. == Coding of modulation and TS set number @@ -520,14 +520,14 @@ == Coding of the burst bits - Unlike to be transmitted bursts, the received bursts are designated + Unlike the transmitted bursts, the received 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 bit is 0. The Viterbi algorithm allows to approximate the original sequence of hard-bits (1 or 0) using these values. Each soft-bit (-127..127) of the burst is encoded as an unsigned - value in range (254..0) respectively using the constant shift. + value in range (0..255) respectively using the constant shift. """ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I126a8aed6b2bac7a620e95f06ecb98642a63b5f0 Gerrit-Change-Number: 15051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 19:00:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 5 Aug 2019 19:00:36 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Drop deprecated -t parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 to look at the new patch set (#2). Change subject: bts-trx: Drop deprecated -t parameter ...................................................................... bts-trx: Drop deprecated -t parameter Parameter was dropped a while ago in osmo-bts, since it's calculated dynamically from VTY config. So let's drop it to avoid a deprecation warning message in osmo-bts log file. Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/15057/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb Gerrit-Change-Number: 15057 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 19:13:09 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 5 Aug 2019 19:13:09 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c at 191 PS1, Line 191: struct in_addr net = { .s_addr = other->ip }; > Are you sure this is correct? or you need to use mncc. [?] Yes, mncc.ip is in host byte order, if that's the correct terminology. certainly, using mncc.ip here result in the IP in the log message being printed "backwards" https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c at 192 PS1, Line 192: LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port); > Better use inet_ntop(). There are other places in the code that use inet_ntoa() Would it be better to accept this patch and then submit another changing them all to inet_ntop() ? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 19:13:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 20:52:25 2019 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 5 Aug 2019 20:52:25 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15037 ) Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... Patch Set 3: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 05 Aug 2019 20:52:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 21:24:50 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 5 Aug 2019 21:24:50 +0000 Subject: Change in ...osmo-msc[master]: manual: adjust and fix auth and ciph docs In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 to look at the new patch set (#2). Change subject: manual: adjust and fix auth and ciph docs ...................................................................... manual: adjust and fix auth and ciph docs Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f --- M doc/manuals/chapters/net.adoc 1 file changed, 54 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/15021/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f Gerrit-Change-Number: 15021 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 21:25:33 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 5 Aug 2019 21:25:33 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15058 Change subject: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak ...................................................................... doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak - add SIP messages, taken from OS#1683 - change some wording and clarify some message ordering - have a separate sipcon1 and sipcon2 for the MO and MT sides Change-Id: I6782e416dbd8ee88d093cbef722b0c5084f3865c --- M doc/sequence_charts/mncc_fsm.msc 1 file changed, 57 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/58/15058/1 diff --git a/doc/sequence_charts/mncc_fsm.msc b/doc/sequence_charts/mncc_fsm.msc index ae5e0a2..45a77ca 100644 --- a/doc/sequence_charts/mncc_fsm.msc +++ b/doc/sequence_charts/mncc_fsm.msc @@ -1,84 +1,104 @@ msc { - hscale=2; - msc1[label="osmo-msc"], mncc1[label="MNCC FSM"], pbx[label="MNCC server (osmo-sip-connector)"], mncc2[label="MNCC FSM"], msc2[label="osmo-msc"]; + hscale=3; + msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], msc2[label="osmo-msc"]; - mncc1 note mncc1 [label="The typical progression of an outgoing call, i.e. a call initiated by osmo-msc, as - implemented in mncc_fsm.h, mncc_fsm.c"]; - mncc2 note mncc2 [label="The typical progression of an incoming call, i.e. a call initiated by the PBX, as - implemented in mncc_fsm.h, mncc_fsm.c"]; + msc1 note sipcon1 [label="MO call"]; + sipcon2 note msc2 [label="MT call"]; mncc1 abox mncc1 [label="MNCC_ST_NOT_STARTED"]; msc1 rbox msc1 [label="mncc_outgoing_start()"]; msc1 -> mncc1 [label="MNCC_EV_OUTGOING_START"]; mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_PROCEEDING"]; - mncc1 => pbx [label="MNCC_SETUP_IND - \n callref, IMSI, called and calling number"]; - mncc1 <= pbx [label="MNCC_RTP_CREATE + mncc1 => sipcon1 [label="MNCC_SETUP_IND + \n callref, IMSI, called and calling number, SDP"]; + sipcon1 => sip [label="SIP INVITE + \n from, to, SDP"]; + sipcon1 <= sip [label="SIP 100 Trying"]; + mncc1 <= sipcon1 [label="MNCC_RTP_CREATE \n callref"]; mncc1 rbox mncc1 [label="mncc_rx_rtp_create()"]; - mncc1 => pbx [label="MNCC_RTP_CREATE + mncc1 => sipcon1 [label="MNCC_RTP_CREATE \n callref, RTP IP address and port"]; - mncc1 <= pbx [label="MNCC_CALL_PROC_REQ + mncc1 <= sipcon1 [label="MNCC_CALL_PROC_REQ \n callref, RTP IP address and port"]; mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_COMPLETE"]; - msc2 <= pbx [label="MNCC_SETUP_REQ - \n callref, called and calling number"]; + sip => sipcon2 [label="SIP INVITE + \n from, to, SDP"]; + sipcon2 => sip [label="SIP 100 Trying"]; + msc2 <= sipcon2 [label="MNCC_SETUP_REQ + \n callref, called and calling number + \n SDP"]; mncc2 abox mncc2 [label="MNCC_ST_NOT_STARTED"]; msc2 rbox msc2 [label="mncc_incoming_start()"]; msc2 -> mncc2 [label="MNCC_EV_INCOMING_START"]; mncc2 abox mncc2 [label="MNCC_ST_INCOMING_WAIT_COMPLETE"]; - mncc2 => pbx [label="MNCC_CALL_CONF_IND - \n callref, bearer capabilities, cccap and IMSI"]; - mncc2 <= pbx [label="MNCC_RTP_CREATE + mncc2 => sipcon2 [label="MNCC_CALL_CONF_IND + \n callref, bearer capabilities, cccap and IMSI, SDP?"]; + mncc2 <= sipcon2 [label="MNCC_RTP_CREATE \n callref"]; mncc2 rbox mncc2 [label="mncc_rx_rtp_create()"]; - mncc2 => pbx [label="MNCC_RTP_CREATE - \n callref, RTP IP address and port"]; - mncc2 => pbx [label="MNCC_ALERT_IND + mncc2 => sipcon2 [label="MNCC_RTP_CREATE + \n callref, RTP IP address and port, SDP?"]; + mncc2 => sipcon2 [label="MNCC_ALERT_IND \n callref"]; + sipcon2 => sip [label="SIP 180 Ringing + \n SDP"]; - mncc1 <= pbx [label="MNCC_ALERT_REQ + sipcon1 <= sip [label="SIP 180 Ringing + \n SDP"]; + mncc1 <= sipcon1 [label="MNCC_ALERT_REQ \n callref and progress"]; + sipcon1 => sip [label="SIP PRACK 180 Ringing"]; + sipcon1 <= sip [label="SIP PRACK 200"]; - mncc2 => pbx [label="MNCC_SETUP_CNF - \n callref, imsi and connected number"]; - mncc2 <= pbx [label="MNCC_RTP_CONNECT - \n callref, RTP IP and port"]; - mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"]; - mncc2 <= pbx [label="MNCC_SETUP_COMPL_REQ - \n callref"]; - mncc2 abox mncc2 [label="MNCC_ST_TALKING"]; - - mncc1 <= pbx [label="MNCC_RTP_CONNECT + mncc1 <= sipcon1 [label="MNCC_RTP_CONNECT \n callref, RTP IP and port"]; mncc1 rbox mncc1 [label="mncc_rx_rtp_connect()"]; msc1 <- mncc1 [label="rtp_stream_set_remote_addr()"]; - mncc1 <= pbx [label="MNCC_SETUP_RSP + + mncc2 => sipcon2 [label="MNCC_SETUP_CNF + \n callref, imsi and connected number, SDP?"]; + sipcon2 => sip [label="SIP 200 OK + \n SDP"]; + mncc2 <= sipcon2 [label="MNCC_RTP_CONNECT + \n callref, RTP IP and port"]; + mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"]; + mncc2 <= sipcon2 [label="MNCC_SETUP_COMPL_REQ \n callref"]; - mncc1 => pbx [label="MNCC_SETUP_COMPL_IND + mncc2 abox mncc2 [label="MNCC_ST_TALKING"]; + + sipcon1 <= sip [label="SIP 200 OK INVITE"]; + mncc1 <= sipcon1 [label="MNCC_SETUP_RSP + \n callref"]; + mncc1 => sipcon1 [label="MNCC_SETUP_COMPL_IND \n callref"]; mncc1 abox mncc1 [label="MNCC_ST_TALKING"]; + sipcon1 => sip [label="SIP ACK"]; ...; ... [label="Call goes on for a while..."]; ...; mncc1 rbox mncc1 [label="mncc_release()"]; - mncc1 => pbx [label="MNCC_DISC_IND + mncc1 => sipcon1 [label="MNCC_DISC_IND \n callref and cause"]; mncc1 abox mncc1 [label="MNCC_ST_WAIT_RELEASE_ACK"]; - mncc1 <= pbx [label="MNCC_REL_REQ + sipcon1 => sip [label="SIP BYE"]; + sipcon1 <= sip [label="SIP 200 OK"]; + mncc1 <= sipcon1 [label="MNCC_REL_REQ \n callref and cause"]; - mncc2 <= pbx [label="MNCC_DISC_REQ + sip => sipcon2 [label="SIP BYE"]; + sip <= sipcon2 [label="SIP 200 OK"]; + mncc2 <= sipcon2 [label="MNCC_DISC_REQ \n callref and cause"]; - mncc2 => pbx [label="MNCC_REL_IND + mncc2 => sipcon2 [label="MNCC_REL_IND \n callref and cause"]; mncc2 abox mncc2 [label="terminated"]; - mncc1 => pbx [label="MNCC_REL_CNF + mncc1 => sipcon1 [label="MNCC_REL_CNF \n callref"]; mncc1 abox mncc1 [label="terminated"]; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6782e416dbd8ee88d093cbef722b0c5084f3865c Gerrit-Change-Number: 15058 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 21:25:33 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 5 Aug 2019 21:25:33 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts: fix naming of mncc_fsm to mncc_call Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15059 Change subject: doc/sequence_charts: fix naming of mncc_fsm to mncc_call ...................................................................... doc/sequence_charts: fix naming of mncc_fsm to mncc_call mncc_fsm.[hc] were renamed to mncc_call.[hc] during patch review, which failed to carry through to this sequence chart. Also fix the MNCC_ST_* to MNCC_CALL_ST_* and MNCC_EV_* to MNCC_CALL_EV_*. Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203 --- M doc/sequence_charts/Makefile.am R doc/sequence_charts/mncc_call_fsm.msc 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/15059/1 diff --git a/doc/sequence_charts/Makefile.am b/doc/sequence_charts/Makefile.am index b667a6f..f1775c8 100644 --- a/doc/sequence_charts/Makefile.am +++ b/doc/sequence_charts/Makefile.am @@ -6,17 +6,17 @@ EXTRA_DIST = \ inter_bsc_ho.msc \ inter_msc_ho.msc \ - mncc_fsm.msc \ + mncc_call_fsm.msc \ $(NULL) CLEANFILES = \ inter_bsc_ho.png \ inter_msc_ho.png \ - mncc_fsm.png \ + mncc_call_fsm.png \ $(NULL) msc: \ - $(builddir)/mncc_fsm.png \ + $(builddir)/mncc_call_fsm.png \ $(builddir)/inter_bsc_ho.png \ $(builddir)/inter_msc_ho.png \ $(NULL) diff --git a/doc/sequence_charts/mncc_fsm.msc b/doc/sequence_charts/mncc_call_fsm.msc similarity index 77% rename from doc/sequence_charts/mncc_fsm.msc rename to doc/sequence_charts/mncc_call_fsm.msc index 45a77ca..4a14ff7 100644 --- a/doc/sequence_charts/mncc_fsm.msc +++ b/doc/sequence_charts/mncc_call_fsm.msc @@ -1,15 +1,15 @@ msc { hscale=3; - msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], msc2[label="osmo-msc"]; + msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_call.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_call.c)"], msc2[label="osmo-msc"]; msc1 note sipcon1 [label="MO call"]; sipcon2 note msc2 [label="MT call"]; - mncc1 abox mncc1 [label="MNCC_ST_NOT_STARTED"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_NOT_STARTED"]; msc1 rbox msc1 [label="mncc_outgoing_start()"]; - msc1 -> mncc1 [label="MNCC_EV_OUTGOING_START"]; + msc1 -> mncc1 [label="MNCC_CALL_EV_OUTGOING_START"]; - mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_PROCEEDING"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_OUTGOING_WAIT_PROCEEDING"]; mncc1 => sipcon1 [label="MNCC_SETUP_IND \n callref, IMSI, called and calling number, SDP"]; sipcon1 => sip [label="SIP INVITE @@ -22,7 +22,7 @@ \n callref, RTP IP address and port"]; mncc1 <= sipcon1 [label="MNCC_CALL_PROC_REQ \n callref, RTP IP address and port"]; - mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_COMPLETE"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_OUTGOING_WAIT_COMPLETE"]; sip => sipcon2 [label="SIP INVITE \n from, to, SDP"]; @@ -30,10 +30,10 @@ msc2 <= sipcon2 [label="MNCC_SETUP_REQ \n callref, called and calling number \n SDP"]; - mncc2 abox mncc2 [label="MNCC_ST_NOT_STARTED"]; + mncc2 abox mncc2 [label="MNCC_CALL_ST_NOT_STARTED"]; msc2 rbox msc2 [label="mncc_incoming_start()"]; - msc2 -> mncc2 [label="MNCC_EV_INCOMING_START"]; - mncc2 abox mncc2 [label="MNCC_ST_INCOMING_WAIT_COMPLETE"]; + msc2 -> mncc2 [label="MNCC_CALL_EV_INCOMING_START"]; + mncc2 abox mncc2 [label="MNCC_CALL_ST_INCOMING_WAIT_COMPLETE"]; mncc2 => sipcon2 [label="MNCC_CALL_CONF_IND \n callref, bearer capabilities, cccap and IMSI, SDP?"]; mncc2 <= sipcon2 [label="MNCC_RTP_CREATE @@ -67,14 +67,14 @@ mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"]; mncc2 <= sipcon2 [label="MNCC_SETUP_COMPL_REQ \n callref"]; - mncc2 abox mncc2 [label="MNCC_ST_TALKING"]; + mncc2 abox mncc2 [label="MNCC_CALL_ST_TALKING"]; sipcon1 <= sip [label="SIP 200 OK INVITE"]; mncc1 <= sipcon1 [label="MNCC_SETUP_RSP \n callref"]; mncc1 => sipcon1 [label="MNCC_SETUP_COMPL_IND \n callref"]; - mncc1 abox mncc1 [label="MNCC_ST_TALKING"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_TALKING"]; sipcon1 => sip [label="SIP ACK"]; ...; @@ -84,7 +84,7 @@ mncc1 rbox mncc1 [label="mncc_release()"]; mncc1 => sipcon1 [label="MNCC_DISC_IND \n callref and cause"]; - mncc1 abox mncc1 [label="MNCC_ST_WAIT_RELEASE_ACK"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_WAIT_RELEASE_ACK"]; sipcon1 => sip [label="SIP BYE"]; sipcon1 <= sip [label="SIP 200 OK"]; mncc1 <= sipcon1 [label="MNCC_REL_REQ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203 Gerrit-Change-Number: 15059 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 5 21:25:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 5 Aug 2019 21:25:34 +0000 Subject: Change in ...osmo-msc[master]: mncc: send payload type matching chosen codec Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15060 Change subject: mncc: send payload type matching chosen codec ...................................................................... mncc: send payload type matching chosen codec Change-Id: Id32f32d77d24b753adb96b5393c0363439e312c2 --- M include/osmocom/msc/mncc_call.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 29 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/15060/1 diff --git a/include/osmocom/msc/mncc_call.h b/include/osmocom/msc/mncc_call.h index ad0f0f8..e887cbe 100644 --- a/include/osmocom/msc/mncc_call.h +++ b/include/osmocom/msc/mncc_call.h @@ -22,6 +22,7 @@ */ #pragma once +#include #include #include @@ -138,3 +139,5 @@ struct mncc_call *mncc_call_find_by_callref(uint32_t callref); void mncc_call_release(struct mncc_call *mncc_call); + +uint32_t mgcp_codec_to_mncc_payload_msg_type(enum mgcp_codecs codec); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 03830de..444d860 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -30,6 +30,8 @@ #include #include +#include + #include #include #include @@ -1667,18 +1669,34 @@ struct gsm_network *net = msc_a_net(msc_a); struct call_leg *cl = msc_a->cc.call_leg; struct osmo_sockaddr_str *rtp_cn_local; + struct rtp_stream *rtp_cn = cl ? cl->rtp[RTP_TO_CN] : NULL; /* FIXME: This has to be set to some meaningful value, * before the MSC-Split, this value was pulled from * lchan->abis_ip.rtp_payload */ uint32_t payload_type = 0; - int msg_type; + int payload_msg_type; + const struct mgcp_conn_peer *mgcp_info; - /* FIXME This has to be set to some meaningful value. - * Possible options are: - * GSM_TCHF_FRAME, GSM_TCHF_FRAME_EFR, - * GSM_TCHH_FRAME, GSM_TCH_FRAME_AMR - * (0 if unknown) */ - msg_type = GSM_TCHF_FRAME; + if (!rtp_cn) { + LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "Cannot RTP CREATE to MNCC, no RTP set up for the CN side\n"); + return -EINVAL; + } + + if (!rtp_cn->codec_known) { + LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, + "Cannot RTP CREATE to MNCC, no codec set up for the RTP CN side\n"); + return -EINVAL; + } + + /* Codec */ + payload_msg_type = mgcp_codec_to_mncc_payload_msg_type(rtp_cn->codec); + + /* Payload Type number */ + /* FIXME: since several codecs could be enabled, the proper solution is to forward SDP to MNCC as a + * whole. For now, let's just send the first codec, knowing that currently most of our code actually + * only sets a single codec to begin with. */ + mgcp_info = osmo_mgcpc_ep_ci_get_rtp_info(rtp_cn->ci); + payload_type = map_codec_to_pt(mgcp_info->ptmap, mgcp_info->ptmap_len, rtp_cn->codec); rtp_cn_local = call_leg_local_ip(cl, RTP_TO_CN); if (!rtp_cn_local) { @@ -1686,7 +1704,7 @@ return -EINVAL; } - return mncc_recv_rtp(net, trans, trans->callref, MNCC_RTP_CREATE, rtp_cn_local, payload_type, msg_type); + return mncc_recv_rtp(net, trans, trans->callref, MNCC_RTP_CREATE, rtp_cn_local, payload_type, payload_msg_type); } static int tch_rtp_connect(struct gsm_network *net, const struct gsm_mncc_rtp *rtp) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id32f32d77d24b753adb96b5393c0363439e312c2 Gerrit-Change-Number: 15060 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 04:53:53 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 6 Aug 2019 04:53:53 +0000 Subject: Change in ...osmo-msc[master]: manual: adjust and fix auth and ciph docs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15021 ) Change subject: manual: adjust and fix auth and ciph docs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f Gerrit-Change-Number: 15021 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 04:53:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 04:57:37 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 6 Aug 2019 04:57:37 +0000 Subject: Change in ...osmo-msc[master]: do not force encryption on UTRAN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15022 ) Change subject: do not force encryption on UTRAN ...................................................................... Patch Set 2: Why not to introduce the UMTS specific VTY option first? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 Gerrit-Change-Number: 15022 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 06 Aug 2019 04:57:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 08:10:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 08:10:18 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 7: (2 comments) https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c at 191 PS1, Line 191: struct in_addr net = { .s_addr = other->ip }; > Yes, mncc.ip is in host byte order, if that's the correct terminology. certainly, using mncc. [?] Well, according to existing code [mncc.ip = htonl(other->ip)], other->ip is host byte order, and mncc.ip is network byte order. And afar the struct in_addr net expects to have content in net byte order. So if I'm not wrong, either use "struct in_addr net = { .s_addr = mncc.ip };" or function above should be ntohl() instead of htonl(). https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c at 192 PS1, Line 192: LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port); > There are other places in the code that use inet_ntoa() [?] Having inet_ntoa already in some places in code doesn't mean we should keep adding references to it. Using inet_ntop() doesn't imply a big change, it's mostly declaring a local buffer in the stack + using the new function, so let's use proper functions before merging since it's not a lot of extra hassle. man inet_ntop: "inet_ntop() extends the inet_ntoa(3) function to support multiple address families, inet_ntoa(3) is now considered to be deprecated in favor of inet_ntop()." -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 08:10:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 08:10:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 08:10:44 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15037 ) Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... Patch Set 3: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 08:10:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 08:10:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 08:10:48 +0000 Subject: Change in ...libosmocore[master]: configure: Autodetect TLS bug on ARM with old gcc and apply workaround In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15037 ) Change subject: configure: Autodetect TLS bug on ARM with old gcc and apply workaround ...................................................................... configure: Autodetect TLS bug on ARM with old gcc and apply workaround Check if compiler being used contains the bug. GCC 7.3.0 is the oldest version containing the fix, and version 6.3.0 is known to contain the bug. Bug is only known to appear so far only on ARM32. If the bug is present, gcc will generate a wrong binary which wil lend up segfaulting when accessing TLS (__thread) variables under certain conditions. Related: OS#4062 Related: SYS#4628 Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d --- M configure.ac A m4/check_tls_gcc_arm_bug.m4 2 files changed, 33 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve; Verified Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index d717a0b..3764e29 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,10 @@ CHECK_TM_INCLUDES_TM_GMTOFF +dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0: +CHECK_TLS_GCC_ARM_BUG +CFLAGS="$CFLAGS $TLS_GCC_ARM_BUG_CFLAGS" + dnl Generate the output AC_CONFIG_HEADER(config.h) diff --git a/m4/check_tls_gcc_arm_bug.m4 b/m4/check_tls_gcc_arm_bug.m4 new file mode 100644 index 0000000..73b3e95 --- /dev/null +++ b/m4/check_tls_gcc_arm_bug.m4 @@ -0,0 +1,29 @@ +# OS#4062 (https://osmocom.org/issues/4062) +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81142 +# SYS#4628 + +# Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0. +# TLS_GCC_ARM_BUG_CFLAGS is filled with required workaround bits if needed. + +AC_DEFUN([CHECK_TLS_GCC_ARM_BUG], [ + TLS_GCC_ARM_BUG_CFLAGS="" + AC_MSG_CHECKING([whether to workaround TLS bug in old gcc on ARM platforms]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ + #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) + /* Check for ARM 32 bit and gcc smaller than 7.3.0 */ + /* We need to explicitly exclude GNUC compatible compilers, since they also define GNUC related tokens */ + #if __arm__ && \ + !defined(__clang__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && \ + defined(__GNUC__) && GCC_VERSION < 70300 + #error TLS bug present! + #endif + ]])], + [tls_bug_present=no], + [tls_bug_present=yes]) + AS_IF([test "x$tls_bug_present" = "xyes"],[ + TLS_GCC_ARM_BUG_CFLAGS="-mtls-dialect=gnu2" + ]) + AC_SUBST([TLS_GCC_ARM_BUG_CFLAGS]) + AC_MSG_RESULT([$TLS_GCC_ARM_BUG_CFLAGS]) +]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8acc2cf41b73da0c3290f1cefd79f2bc68b0e77d Gerrit-Change-Number: 15037 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 08:24:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 08:24:46 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15058 ) Change subject: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6782e416dbd8ee88d093cbef722b0c5084f3865c Gerrit-Change-Number: 15058 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 08:24:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 09:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 09:14:11 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: keith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Abandoned These changes were erroneously included in https://gerrit.osmocom.org/#/c/osmo-sip-connector/+/14996/ -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 09:54:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 09:54:19 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Drop deprecated -t parameter In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 ) Change subject: bts-trx: Drop deprecated -t parameter ...................................................................... Patch Set 2: Code-Review+2 Re-applying after fixing extra ")". -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb Gerrit-Change-Number: 15057 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 09:54:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 09:54:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 09:54:22 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Drop deprecated -t parameter In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 ) Change subject: bts-trx: Drop deprecated -t parameter ...................................................................... bts-trx: Drop deprecated -t parameter Parameter was dropped a while ago in osmo-bts, since it's calculated dynamically from VTY config. So let's drop it to avoid a deprecation warning message in osmo-bts log file. Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 0c941e0..93e3c62 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -135,8 +135,7 @@ self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file), - '-i', self.bsc.addr(), - '-t', str(self.num_trx())) + '-i', self.bsc.addr()) self.suite_run.poll() class OsmoTrx(log.Origin, metaclass=ABCMeta): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia17a2528e091d4691c511732ed251e472d1270eb Gerrit-Change-Number: 15057 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 10:52:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 10:52:02 +0000 Subject: Change in ...libosmocore[master]: configure: Allow disabling workaround for TLS bug in old ARM gcc vers... Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15061 Change subject: configure: Allow disabling workaround for TLS bug in old ARM gcc versions ...................................................................... configure: Allow disabling workaround for TLS bug in old ARM gcc versions Some toolchains (such as sysmobts 201705 one) containing the TLS bug on old ARM gcc versions (<7.3.0) also crash if the initial workaround found is aplied (CFLAGS="-mtls-dialect=gnu2"). In that scenario, let's provide a way to disable the workaround (to avoid "ld" crashing) and warn the user about requirement to build with -O0 to avoid runtime crashes. Related: OS#4062 Related: SYS#4628 Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe --- M configure.ac M m4/check_tls_gcc_arm_bug.m4 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/15061/1 diff --git a/configure.ac b/configure.ac index 3764e29..7ad5908 100644 --- a/configure.ac +++ b/configure.ac @@ -123,8 +123,7 @@ CHECK_TM_INCLUDES_TM_GMTOFF dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0: -CHECK_TLS_GCC_ARM_BUG -CFLAGS="$CFLAGS $TLS_GCC_ARM_BUG_CFLAGS" +ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG dnl Generate the output AC_CONFIG_HEADER(config.h) diff --git a/m4/check_tls_gcc_arm_bug.m4 b/m4/check_tls_gcc_arm_bug.m4 index 73b3e95..cee20e6 100644 --- a/m4/check_tls_gcc_arm_bug.m4 +++ b/m4/check_tls_gcc_arm_bug.m4 @@ -27,3 +27,25 @@ AC_SUBST([TLS_GCC_ARM_BUG_CFLAGS]) AC_MSG_RESULT([$TLS_GCC_ARM_BUG_CFLAGS]) ]) + +# Allow disabling the check in order to workaround bug by letting user pass +# CFLAGS="-O0" on toolchains that crash when "-mtls-dialect=gnu2" is used. +# CFLAGS is updated with workaround if detection is enabled and workaround is needed. +AC_DEFUN([ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG], [ + AC_ARG_ENABLE(detect_tls_gcc_arm_bug, + [AS_HELP_STRING( + [--disable-detect-tls-gcc-arm-bug], + [Disable detecting and applying workaround for TLS bug on ARM platform for GCC < 7.3.0] + )], + [detect_tls_gcc_arm_bug=$enableval], [detect_tls_gcc_arm_bug="yes"]) + if test x"$detect_tls_gcc_arm_bug" = x"yes"; then + CHECK_TLS_GCC_ARM_BUG + if test "x$TLS_GCC_ARM_BUG_CFLAGS" != "x"; then + CFLAGS="$CFLAGS $TLS_GCC_ARM_BUG_CFLAGS" + AC_MSG_WARN([Applying workaround for TLS bug on ARM platform for GCC < 7.3.0 + ($TLS_GCC_ARM_BUG_CFLAGS). On some toolchain versions, ld may + crash. In that case you must build with CFLAGS='-O0' and run + ./configure with --disable-detect-tls-gcc-arm-bug]) + fi +fi +]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe Gerrit-Change-Number: 15061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 11:32:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 11:32:10 +0000 Subject: Change in ...libosmocore[master]: configure: Allow disabling workaround for TLS bug in old ARM gcc vers... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15061 ) Change subject: configure: Allow disabling workaround for TLS bug in old ARM gcc versions ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe Gerrit-Change-Number: 15061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 11:32:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 11:53:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 6 Aug 2019 11:53:04 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance 0 instead of 1 Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 Change subject: osmo_sccp_simple_client(): use sccp instance 0 instead of 1 ...................................................................... osmo_sccp_simple_client(): use sccp instance 0 instead of 1 When using osmo_sccp_simple_client(), it will create an sccp instance if one is not yet present. The sccp connection identifier starts with 0. So the implicit created connection should use sccp connection 0 (the first connection). Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae --- M src/sccp_user.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/62/15062/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index 63eba2a..ff5eb08 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -635,7 +635,7 @@ * the only difference is that the ID of the CS7 instance will be * set to 1 statically */ - return osmo_sccp_simple_client_on_ss7_id(ctx, 1, name, default_pc, prot, + return osmo_sccp_simple_client_on_ss7_id(ctx, 0, name, default_pc, prot, default_local_port, default_local_ip, default_remote_port, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 11:55:04 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 11:55:04 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c at 191 PS1, Line 191: struct in_addr net = { .s_addr = other->ip }; > Well, according to existing code [mncc. [?] just making notes... in sdp_extract_sdp, the code is: struct in_addr addr; inet_aton(conn->c_address, &addr); leg->base.ip = addr.s_addr; so the values stored in (struct call)->ip are always network byte order. but then, the original code was: mncc.ip = htonl(other->ip); so this is wrong, no? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 11:55:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:00:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 12:00:14 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/14997/1/src/mncc.c at 191 PS1, Line 191: struct in_addr net = { .s_addr = other->ip }; > just making notes... [?] So the result is probably fine because htonl() and ntohl() are implemented the same way afaik, but from what you say, it should be ntohl() then since apparently other->ip is network byte order, and what we send over the unix MNCC socket appears to be host byte order. You can make sure also by checking implementation of the peer on the other side of the unix mncc socket. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 12:00:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:07:09 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 12:07:09 +0000 Subject: Change in ...osmo-sip-connector[master]: IPs stored in the call struct are NETWORK byte order Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 Change subject: IPs stored in the call struct are NETWORK byte order ...................................................................... IPs stored in the call struct are NETWORK byte order As far as I can make out, the intention is to always store ip address in the call struct in network byte order, whereas the ip address sent on MNCC are in host byte order. Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 --- M src/mncc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/63/15063/1 diff --git a/src/mncc.c b/src/mncc.c index 81fe30f..2bd40e9 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -181,7 +181,7 @@ */ mncc.msg_type = MNCC_RTP_CONNECT; mncc.callref = leg->callref; - mncc.ip = htonl(other->ip); + mncc.ip = ntohl(other->ip); mncc.port = other->port; mncc.payload_type = other->payload_type; /* -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 Gerrit-Change-Number: 15063 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:08:42 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 12:08:42 +0000 Subject: Change in ...osmo-sip-connector[master]: Add further logging. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 ) Change subject: Add further logging. ...................................................................... Patch Set 7: > (1 comment) yep.. that's what it looks like. I was doing the patch while you wrote this. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/14997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2620cce245be199d849d8fad3fc998c96c243f6b Gerrit-Change-Number: 14997 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 12:08:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:09:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 12:09:42 +0000 Subject: Change in ...osmo-sip-connector[master]: IPs stored in the call struct are NETWORK byte order In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 ) Change subject: IPs stored in the call struct are NETWORK byte order ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 Gerrit-Change-Number: 15063 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 12:09:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:38:36 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 12:38:36 +0000 Subject: Change in ...osmo-sip-connector[master]: IPs stored in the call struct are NETWORK byte order In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 to look at the new patch set (#2). Change subject: IPs stored in the call struct are NETWORK byte order ...................................................................... IPs stored in the call struct are NETWORK byte order As far as I can make out, the intention is to always store ip address in the call struct in network byte order, whereas the ip address sent on MNCC are in host byte order. Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 --- M src/mncc.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/63/15063/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 Gerrit-Change-Number: 15063 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:40:43 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 12:40:43 +0000 Subject: Change in ...libosmocore[master]: configure: Allow disabling workaround for TLS bug in old ARM gcc vers... In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15061 ) Change subject: configure: Allow disabling workaround for TLS bug in old ARM gcc versions ...................................................................... Patch Set 1: Code-Review+1 things look quite convoluted and feels like there should be a simpler way. then again, if it works, fair enough. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe Gerrit-Change-Number: 15061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 12:40:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:45:47 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 12:45:47 +0000 Subject: Change in ...osmo-sip-connector[master]: IPs stored in the call struct are NETWORK byte order In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 ) Change subject: IPs stored in the call struct are NETWORK byte order ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 Gerrit-Change-Number: 15063 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 12:45:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:45:51 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 12:45:51 +0000 Subject: Change in ...osmo-sip-connector[master]: IPs stored in the call struct are NETWORK byte order In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 ) Change subject: IPs stored in the call struct are NETWORK byte order ...................................................................... IPs stored in the call struct are NETWORK byte order As far as I can make out, the intention is to always store ip address in the call struct in network byte order, whereas the ip address sent on MNCC are in host byte order. Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 --- M src/mncc.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index 81fe30f..7bffbd1 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -181,7 +181,7 @@ */ mncc.msg_type = MNCC_RTP_CONNECT; mncc.callref = leg->callref; - mncc.ip = htonl(other->ip); + mncc.ip = ntohl(other->ip); mncc.port = other->port; mncc.payload_type = other->payload_type; /* @@ -410,13 +410,13 @@ } /* extract information about where the RTP is */ - leg->base.ip = rtp->ip; + leg->base.ip = htonl(rtp->ip); leg->base.port = rtp->port; leg->base.payload_type = rtp->payload_type; leg->base.payload_msg_type = rtp->payload_msg_type; /* TODO.. now we can continue with the call */ - struct in_addr net = { .s_addr = htonl(leg->base.ip) }; + struct in_addr net = { .s_addr = leg->base.ip }; LOGP(DMNCC, LOGL_DEBUG, "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", leg->callref, inet_ntoa(net), leg->base.port, -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 Gerrit-Change-Number: 15063 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:50:40 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 12:50:40 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance 0 instead of 1 In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 ) Change subject: osmo_sccp_simple_client(): use sccp instance 0 instead of 1 ...................................................................... Patch Set 1: Code-Review+1 It would have been interesting to read in the commit log that currently osmo-msc, osmo-bsc and osmo-hnbgw use osmo_sccp_simple_client_on_ss7_id() and are not affected by this. Only osmo-sgsn seems to be affected. Now I figured that out myself. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 06 Aug 2019 12:50:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:51:19 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 12:51:19 +0000 Subject: Change in ...osmo-msc[master]: manual: adjust and fix auth and ciph docs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15021 ) Change subject: manual: adjust and fix auth and ciph docs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f Gerrit-Change-Number: 15021 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 06 Aug 2019 12:51:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:51:29 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 12:51:29 +0000 Subject: Change in ...osmo-msc[master]: manual: adjust and fix auth and ciph docs In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15021 ) Change subject: manual: adjust and fix auth and ciph docs ...................................................................... manual: adjust and fix auth and ciph docs Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f --- M doc/manuals/chapters/net.adoc 1 file changed, 54 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc index 06be4ba..431455d 100644 --- a/doc/manuals/chapters/net.adoc +++ b/doc/manuals/chapters/net.adoc @@ -101,32 +101,56 @@ === Authentication -Authorized subscribers must be entered in the HLR database, see the _OsmoHLR -reference manual_ <>. If authentication tokens (such as KI for -2G, or K and OP/OPC for UMTS) are present in the HLR, OsmoMSC will only attach -a subscriber after successful authentication. +A subscriber's IMSI must be entered in the HLR database to be able to attach. A +subscriber-create-on-demand feature is also available, see the _OsmoHLR +reference manual_ <>. -If no authentication keys are present in the HLR for a given subscriber, -OsmoMSC will attach the subscriber _without_ authentication. You can reject -subscribers that lack authentication info in the HLR with this setting: +A known IMSI in the HLR may or may not have authentication keys associated, +which profoundly affects the ability to attach and the algorithms used to +negotiate authentication, as the following sections explain for 2G and 3G. + +==== Authentication on 2G + +If authentication tokens (such as KI for 2G, or K and OP/OPC for UMTS) are +present in the HLR, OsmoMSC will only attach a subscriber after successful +authentication. Note that the 3G authentication keys are also used on 2G when +the MS indicates UMTS AKA capability, in which case the full UMTS style mutual +authentication may indeed take place on 2G (GERAN). + +On 2G, if no authentication keys are present in the HLR for a given subscriber, +OsmoMSC will attach the subscriber _without_ authentication. Subscribers that +lack authentication keys can always be rejected with this setting: ---- network authentication required ---- +==== Authentication on 3G + +3G (UTRAN) always requires authentication (a.k.a. Integrity Protection) by +specification, and hence authentication keys must be present in the HLR for a +subscriber to be able to attach on 3G. + +OsmoMSC always indicates UIA1 and UIA2 as permitted Integrity Protection +algorithms on 3G. + === Ciphering To enable ciphering on the radio link, authentication must take place first: -the Kc resulting from authentication is the key used for ciphering. Hence, all -subscribers must have authentication tokens available in the HLR for ciphering. +the Kc resulting from authentication is the key used for ciphering. Hence, to +be able to use ciphering, a subscriber must have authentication tokens +available in the HLR. + +==== Ciphering on 2G The MS, BTS and MSC must agree on a ciphering algorithm to use. - The MS sends its supported ciphering algorithms via Classmark IEs during Location Updating. - Typically the BSC needs to know which A5 ciphers are supported by connected - BTSes. + BTSes, see the `network / encryption a5` configuration item for OsmoBSC + <>. - Finally, OsmoMSC may impose that specific A5 ciphers shall not be considered. It is the responsibility of the BSC to then pick an A5 cipher that satisfies @@ -143,12 +167,28 @@ + ---- network - encryption a5 3 + encryption a5 1 3 ---- - Never use A5/2: it is an "export grade cipher" and has been deprecated for its low ciphering strength. -NOTE: At the time of writing, OsmoMSC supports setting only a single A5 cipher, -while it should be able to allow a set of ciphers. This is subject to ongoing -development. +- To allow either no encryption or any of A5/1 or A5/3 based on the presence of + authentication keys and abilities of the MS, SIM and BSC configuration, it is + recommended to enable all ciphers in OsmoMSC. The highest available A5 cipher + will be used; the order in which the A5 options are configured does not + affect the choice. ++ +---- +network + encryption a5 0 1 3 +---- + +==== Ciphering on 3G + +While authentication is always required on 3G, ciphering is optional. + +So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim +solution, ciphering is always enabled on 3G. + +OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iffe159d4c0e0e9439f8719e0ddd28f06d4c80d9f Gerrit-Change-Number: 15021 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 12:56:22 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 12:56:22 +0000 Subject: Change in ...osmo-sip-connector[master]: IPs stored in the call struct are NETWORK byte order In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 ) Change subject: IPs stored in the call struct are NETWORK byte order ...................................................................... Patch Set 2: > Change has been successfully merged by neels Damn.. too soon... -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 Gerrit-Change-Number: 15063 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 12:56:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:01:06 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 13:01:06 +0000 Subject: Change in ...osmo-sip-connector[master]: Following from previous commit, assume other->ip is network byte order Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15064 Change subject: Following from previous commit, assume other->ip is network byte order ...................................................................... Following from previous commit, assume other->ip is network byte order Change-Id: I3641a843a3b4a9b2686c1a07d48f52527dce46a2 --- M src/sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/64/15064/1 diff --git a/src/sdp.c b/src/sdp.c index 52f7e25..e2ed25e 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -204,7 +204,7 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other, sdp_mode_t mode) { - struct in_addr net = { .s_addr = htonl(other->ip) }; + struct in_addr net = { .s_addr = other->ip }; char *fmtp_str = NULL, *sdp; char *mode_attribute; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3641a843a3b4a9b2686c1a07d48f52527dce46a2 Gerrit-Change-Number: 15064 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:01:27 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 13:01:27 +0000 Subject: Change in ...osmo-msc[master]: do not force encryption on UTRAN In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15022 ) Change subject: do not force encryption on UTRAN ...................................................................... Patch Set 2: > Why not to introduce the UMTS specific VTY option first? to do that properly we would need to add UEA1 and UEA2 choices, which would require drilling into osmo-iuh and adding distinct options... not a priority at the moment. added https://osmocom.org/issues/4144 and 4143 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 Gerrit-Change-Number: 15022 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 06 Aug 2019 13:01:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:04:18 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 13:04:18 +0000 Subject: Change in ...osmo-sip-connector[master]: Following from previous commit, assume other->ip is network byte order In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15064 ) Change subject: Following from previous commit, assume other->ip is network byte order ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3641a843a3b4a9b2686c1a07d48f52527dce46a2 Gerrit-Change-Number: 15064 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 06 Aug 2019 13:04:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:04:23 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 6 Aug 2019 13:04:23 +0000 Subject: Change in ...osmo-sip-connector[master]: Following from previous commit, assume other->ip is network byte order In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15064 ) Change subject: Following from previous commit, assume other->ip is network byte order ...................................................................... Following from previous commit, assume other->ip is network byte order Change-Id: I3641a843a3b4a9b2686c1a07d48f52527dce46a2 --- M src/sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/sdp.c b/src/sdp.c index 52f7e25..e2ed25e 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -204,7 +204,7 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other, sdp_mode_t mode) { - struct in_addr net = { .s_addr = htonl(other->ip) }; + struct in_addr net = { .s_addr = other->ip }; char *fmtp_str = NULL, *sdp; char *mode_attribute; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3641a843a3b4a9b2686c1a07d48f52527dce46a2 Gerrit-Change-Number: 15064 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:21:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 13:21:23 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts: fix naming of mncc_fsm to mncc_call In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15059 ) Change subject: doc/sequence_charts: fix naming of mncc_fsm to mncc_call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203 Gerrit-Change-Number: 15059 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 13:21:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:22:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 13:22:01 +0000 Subject: Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14768 ) Change subject: add vty 'no neighbors' to remove all HO targets ...................................................................... Patch Set 2: Code-Review+1 Leaving +2 to Harald since main discussion involves him -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 Gerrit-Change-Number: 14768 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 13:22:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:44:13 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 13:44:13 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... inet_ntoa() is deprecated, use inet_ntop() instead Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/65/15065/1 diff --git a/src/mncc.c b/src/mncc.c index 7bffbd1..0d78d05 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -189,7 +189,9 @@ * payload_type should be different.. */ struct in_addr net = { .s_addr = other->ip }; - LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port); + char ip_addr[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); + LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port); rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n", @@ -417,9 +419,11 @@ /* TODO.. now we can continue with the call */ struct in_addr net = { .s_addr = leg->base.ip }; + char ip_addr[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); LOGP(DMNCC, LOGL_DEBUG, "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", - leg->callref, inet_ntoa(net), leg->base.port, + leg->callref, ip_addr, leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); continue_call(leg); diff --git a/src/sdp.c b/src/sdp.c index e2ed25e..fda6c27 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -207,6 +207,8 @@ struct in_addr net = { .s_addr = other->ip }; char *fmtp_str = NULL, *sdp; char *mode_attribute; + char ip_addr[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); leg->wanted_codec = app_media_name(other->payload_msg_type); @@ -241,7 +243,7 @@ "%s" "a=rtpmap:%d %s/8000\r\n" "%s", - inet_ntoa(net), inet_ntoa(net), /* never use diff. addr! */ + ip_addr, ip_addr, other->port, other->payload_type, fmtp_str ? fmtp_str : "", other->payload_type, diff --git a/src/sip.c b/src/sip.c index 0179226..9366f18 100644 --- a/src/sip.c +++ b/src/sip.c @@ -159,8 +159,10 @@ return; } struct in_addr net = { .s_addr = leg->base.ip }; + char ip_addr[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", - inet_ntoa(net), + ip_addr, leg->base.port, leg->base.payload_type); @@ -186,6 +188,7 @@ sdp_mode_t mode = sdp_sendrecv; uint32_t ip = leg->base.ip; uint16_t port = leg->base.port; + char ip_addr[INET_ADDRSTRLEN]; LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id); @@ -205,7 +208,8 @@ } struct in_addr net = { .s_addr = leg->base.ip }; - LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", inet_ntoa(net), leg->base.port); + inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); + LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port); if (mode == sdp_sendonly) { /* SIP side places call on HOLD */ @@ -221,7 +225,8 @@ return; } struct in_addr net = { .s_addr = leg->base.ip }; - LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port); + inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); + LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port); if (ip != leg->base.ip || port != leg->base.port) { LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n"); if (other->update_rtp) -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:46:08 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 13:46:08 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 to look at the new patch set (#2). Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... inet_ntoa() is deprecated, use inet_ntop() instead Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/65/15065/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:46:38 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 6 Aug 2019 13:46:38 +0000 Subject: Change in ...simtrace2[master]: add serial and version information in USB descriptor Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/15066 Change subject: add serial and version information in USB descriptor ...................................................................... add serial and version information in USB descriptor the device ID (unique to the micro-controller) is now displayed in the USB iSerial descriptor. the git version is now also displayed in iConfiguration in an additional (empty) configuration descriptor. this allows the user to quickly get the device hardware serial and firmware version just by using lsusb (no need for a custom USB software). Change-Id: If9fadecc097ca3e006990160936bf11b22eae4e0 --- M firmware/libcommon/include/simtrace.h M firmware/libcommon/source/usb.c 2 files changed, 109 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/66/15066/1 diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h index 0486581..67f3988 100644 --- a/firmware/libcommon/include/simtrace.h +++ b/firmware/libcommon/include/simtrace.h @@ -1,6 +1,7 @@ /* SIMtrace 2 mode definitions * - * (C) 2015-2017 by Harald Welte + * Copyright (c) 2015-2017 by Harald Welte + * Copyright (c) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,6 +58,7 @@ #ifdef HAVE_MITM CFG_NUM_MITM, #endif + CFG_NUM_VERSION, NUM_CONF }; diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 43c7bb2..3efb9fc 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -2,7 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation - * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * Copyright (c) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -46,7 +46,10 @@ * USB String descriptors *------------------------------------------------------------------------------*/ #include "usb_strings_generated.h" + +// the index of the strings (must match the order in usb_strings.txt) enum strDescNum { + // static strings from usb_strings MANUF_STR = 1, PRODUCT_STRING, SNIFFER_CONF_STR, @@ -55,9 +58,61 @@ MITM_CONF_STR, CARDEM_USIM1_INTF_STR, CARDEM_USIM2_INTF_STR, + CARDEM_USIM3_INTF_STR, + CARDEM_USIM4_INTF_STR, + // runtime strings + SERIAL_STR, + VERSION_STR, + // count STRING_DESC_CNT }; +/** array of static (from usb_strings) and runtime (serial, version) USB strings + */ +static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 2]; + +/* USB string for the serial (using 128-bit device ID) */ +static unsigned char usb_string_serial[] = { + USBStringDescriptor_LENGTH(32), + USBGenericDescriptor_STRING, + USBStringDescriptor_UNICODE('0'), + USBStringDescriptor_UNICODE('0'), + USBStringDescriptor_UNICODE('1'), + USBStringDescriptor_UNICODE('1'), + USBStringDescriptor_UNICODE('2'), + USBStringDescriptor_UNICODE('2'), + USBStringDescriptor_UNICODE('3'), + USBStringDescriptor_UNICODE('3'), + USBStringDescriptor_UNICODE('4'), + USBStringDescriptor_UNICODE('4'), + USBStringDescriptor_UNICODE('5'), + USBStringDescriptor_UNICODE('5'), + USBStringDescriptor_UNICODE('6'), + USBStringDescriptor_UNICODE('6'), + USBStringDescriptor_UNICODE('7'), + USBStringDescriptor_UNICODE('7'), + USBStringDescriptor_UNICODE('8'), + USBStringDescriptor_UNICODE('8'), + USBStringDescriptor_UNICODE('9'), + USBStringDescriptor_UNICODE('9'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('b'), + USBStringDescriptor_UNICODE('b'), + USBStringDescriptor_UNICODE('c'), + USBStringDescriptor_UNICODE('c'), + USBStringDescriptor_UNICODE('d'), + USBStringDescriptor_UNICODE('d'), + USBStringDescriptor_UNICODE('e'), + USBStringDescriptor_UNICODE('e'), + USBStringDescriptor_UNICODE('f'), + USBStringDescriptor_UNICODE('f'), +}; + +/* USB string for the version */ +static const char git_version[] = GIT_VERSION; +static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2]; + /*------------------------------------------------------------------------------ * USB Device descriptors *------------------------------------------------------------------------------*/ @@ -523,6 +578,27 @@ }; #endif /* HAVE_CARDEM */ +/* USB descriptor just to show the version */ +typedef struct _SIMTraceDriverConfigurationDescriptorVersion { + /** Standard configuration descriptor. */ + USBConfigurationDescriptor configuration; +} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion; + +static const SIMTraceDriverConfigurationDescriptorVersion + configurationDescriptorVersion = { + /* Standard configuration descriptor */ + .configuration = { + .bLength = sizeof(USBConfigurationDescriptor), + .bDescriptorType = USBGenericDescriptor_CONFIGURATION, + .wTotalLength = sizeof(SIMTraceDriverConfigurationDescriptorVersion), + .bNumInterfaces = 0, + .bConfigurationValue = CFG_NUM_VERSION, + .iConfiguration = VERSION_STR, + .bmAttributes = USBD_BMATTRIBUTES, + .bMaxPower = USBConfigurationDescriptor_POWER(100), + }, +}; + const USBConfigurationDescriptor *configurationDescriptorsArr[] = { #ifdef HAVE_SNIFFER &configurationDescriptorSniffer.configuration, @@ -536,6 +612,7 @@ #ifdef HAVE_MITM &configurationDescriptorMITM.configuration, #endif + &configurationDescriptorVersion.configuration, }; /** Standard USB device descriptor for the CDC serial driver */ @@ -552,7 +629,7 @@ .bcdDevice = 2, /* Release number */ .iManufacturer = MANUF_STR, .iProduct = PRODUCT_STRING, - .iSerialNumber = 0, + .iSerialNumber = SERIAL_STR, .bNumConfigurations = ARRAY_SIZE(configurationDescriptorsArr), }; @@ -566,8 +643,8 @@ 0, /* No high-speed configuration descriptor */ 0, /* No high-speed device qualifier descriptor */ 0, /* No high-speed other speed configuration descriptor */ - usb_strings, - ARRAY_SIZE(usb_strings),/* cnt string descriptors in list */ + usb_strings_extended, + ARRAY_SIZE(usb_strings_extended),/* cnt string descriptors in list */ }; /*---------------------------------------------------------------------------- @@ -593,6 +670,31 @@ // Get std USB driver USBDDriver *pUsbd = USBD_GetDriver(); + // put device ID into USB serial number description + unsigned int device_id[4]; + EEFC_ReadUniqueID(device_id); + char device_id_string[32 + 1]; + snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x", + device_id[0], device_id[1], device_id[2], device_id[3]); + for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { + usb_string_serial[2 + 2 * i] = device_id_string[i]; + } + + // put version into USB string + usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1); + usb_string_version[1] = USBGenericDescriptor_STRING; + for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { + usb_string_version[2 + i * 2 + 0] = git_version[i]; + usb_string_version[2 + i * 2 + 1] = 0; + } + + // fill extended USB strings + for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { + usb_strings_extended[i] = usb_strings[i]; + } + usb_strings_extended[SERIAL_STR] = usb_string_serial; + usb_strings_extended[VERSION_STR] = usb_string_version; + // Initialize standard USB driver USBDDriver_Initialize(pUsbd, &driverDescriptors, 0); // Multiple interface settings not supported USBD_Init(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If9fadecc097ca3e006990160936bf11b22eae4e0 Gerrit-Change-Number: 15066 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:46:39 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 13:46:39 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 to look at the new patch set (#3). Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... inet_ntoa() is deprecated, use inet_ntop() instead Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/65/15065/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:50:59 2019 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 6 Aug 2019 13:50:59 +0000 Subject: Change in ...libosmocore[master]: configure: Allow disabling workaround for TLS bug in old ARM gcc vers... In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15061 ) Change subject: configure: Allow disabling workaround for TLS bug in old ARM gcc versions ...................................................................... Patch Set 1: Verified+1 Code-Review+1 It's ugly, but it's unfortunately not a pretty problem. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe Gerrit-Change-Number: 15061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 13:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:59:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 13:59:45 +0000 Subject: Change in ...libosmocore[master]: configure: Allow disabling workaround for TLS bug in old ARM gcc vers... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15061 ) Change subject: configure: Allow disabling workaround for TLS bug in old ARM gcc versions ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe Gerrit-Change-Number: 15061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 13:59:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 13:59:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 13:59:51 +0000 Subject: Change in ...libosmocore[master]: configure: Allow disabling workaround for TLS bug in old ARM gcc vers... In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15061 ) Change subject: configure: Allow disabling workaround for TLS bug in old ARM gcc versions ...................................................................... configure: Allow disabling workaround for TLS bug in old ARM gcc versions Some toolchains (such as sysmobts 201705 one) containing the TLS bug on old ARM gcc versions (<7.3.0) also crash if the initial workaround found is aplied (CFLAGS="-mtls-dialect=gnu2"). In that scenario, let's provide a way to disable the workaround (to avoid "ld" crashing) and warn the user about requirement to build with -O0 to avoid runtime crashes. Related: OS#4062 Related: SYS#4628 Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe --- M configure.ac M m4/check_tls_gcc_arm_bug.m4 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve; Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 3764e29..7ad5908 100644 --- a/configure.ac +++ b/configure.ac @@ -123,8 +123,7 @@ CHECK_TM_INCLUDES_TM_GMTOFF dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0: -CHECK_TLS_GCC_ARM_BUG -CFLAGS="$CFLAGS $TLS_GCC_ARM_BUG_CFLAGS" +ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG dnl Generate the output AC_CONFIG_HEADER(config.h) diff --git a/m4/check_tls_gcc_arm_bug.m4 b/m4/check_tls_gcc_arm_bug.m4 index 73b3e95..cee20e6 100644 --- a/m4/check_tls_gcc_arm_bug.m4 +++ b/m4/check_tls_gcc_arm_bug.m4 @@ -27,3 +27,25 @@ AC_SUBST([TLS_GCC_ARM_BUG_CFLAGS]) AC_MSG_RESULT([$TLS_GCC_ARM_BUG_CFLAGS]) ]) + +# Allow disabling the check in order to workaround bug by letting user pass +# CFLAGS="-O0" on toolchains that crash when "-mtls-dialect=gnu2" is used. +# CFLAGS is updated with workaround if detection is enabled and workaround is needed. +AC_DEFUN([ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG], [ + AC_ARG_ENABLE(detect_tls_gcc_arm_bug, + [AS_HELP_STRING( + [--disable-detect-tls-gcc-arm-bug], + [Disable detecting and applying workaround for TLS bug on ARM platform for GCC < 7.3.0] + )], + [detect_tls_gcc_arm_bug=$enableval], [detect_tls_gcc_arm_bug="yes"]) + if test x"$detect_tls_gcc_arm_bug" = x"yes"; then + CHECK_TLS_GCC_ARM_BUG + if test "x$TLS_GCC_ARM_BUG_CFLAGS" != "x"; then + CFLAGS="$CFLAGS $TLS_GCC_ARM_BUG_CFLAGS" + AC_MSG_WARN([Applying workaround for TLS bug on ARM platform for GCC < 7.3.0 + ($TLS_GCC_ARM_BUG_CFLAGS). On some toolchain versions, ld may + crash. In that case you must build with CFLAGS='-O0' and run + ./configure with --disable-detect-tls-gcc-arm-bug]) + fi +fi +]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04ff8c702eabcf4f6e7b59e11aece2744267cefe Gerrit-Change-Number: 15061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 14:07:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 14:07:23 +0000 Subject: Change in ...osmo-gsm-tester[master]: contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosm... Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15067 Change subject: contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosmocore ...................................................................... contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosmocore Some gcc version (< 7.3.0) on ARM generate wrong code for __thread variables that crash at runtime. It seems, due to some unknown reason, that we are not affected by this bug with toolchain from poky pyro (6.4.0). However, libosmocore as of e188b8cd98f599468fbb200c7d590de955daf761 applies some CFLAGS="-mtls-dialect=gnu2" to workaround the issue automatically. But same toolchain contains an "ld" that crashes when those flags are applied. Fortunately, libosmocore provides a way to disable the workaround, and since we are not affected by the bug, we are fine with that. If the toolchain had the TLS runtime bug, then we'd had to build with -O0. Can be probably dropped once we move to newer toolchain. Depends: libosmocore.git afce89dac1a3cdb975da72020acdba16940fd679 Related: OS#4062 Change-Id: I583354735a7671e5bba1c0f6e60c84b6ef55ac63 --- M contrib/jenkins-build-osmo-bts-oc2g.sh M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-oc2g.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/15067/1 diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh index c4357f0..aa37beb 100755 --- a/contrib/jenkins-build-osmo-bts-oc2g.sh +++ b/contrib/jenkins-build-osmo-bts-oc2g.sh @@ -24,7 +24,7 @@ git_url="${prev_git_url}" L1_OC2G_HEADERS="$PWD/oc2g-fw/inc" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo libosmo-abis build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g --with-oc2g="$L1_OC2G_HEADERS" diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index afce771..1acf8b0 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -18,7 +18,7 @@ prefix_real="$DESTDIR$prefix" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo libosmo-abis build_repo osmo-bts --enable-sysmocom-bts --with-openbsc=$base/openbsc/openbsc/include diff --git a/contrib/jenkins-build-osmo-pcu-oc2g.sh b/contrib/jenkins-build-osmo-pcu-oc2g.sh index b113f21..d2ae028 100755 --- a/contrib/jenkins-build-osmo-pcu-oc2g.sh +++ b/contrib/jenkins-build-osmo-pcu-oc2g.sh @@ -24,7 +24,7 @@ git_url="${prev_git_url}" L1_OC2G_HEADERS="$PWD/oc2g-fw/inc" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo osmo-pcu --disable-sysmocom-dsp -enable-oc2gbts-phy --with-oc2g="$L1_OC2G_HEADERS" create_bin_tgz osmo-pcu diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index 4dc7704..ecc8bc3 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -18,7 +18,7 @@ prefix_real="$DESTDIR$prefix" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo osmo-pcu --enable-sysmocom-dsp create_bin_tgz osmo-pcu -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I583354735a7671e5bba1c0f6e60c84b6ef55ac63 Gerrit-Change-Number: 15067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 14:18:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 14:18:06 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 ) Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... Patch Set 3: Code-Review+1 (5 comments) https://gerrit.osmocom.org/#/c/15065/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15065/3/src/mncc.c at 192 PS3, Line 192: char ip_addr[INET_ADDRSTRLEN]; Please move this line to start of the function together with other variables, there's no specific need/reason to have it placed here. https://gerrit.osmocom.org/#/c/15065/3/src/mncc.c at 193 PS3, Line 193: inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); As a tip, usually you want to use sizeof(ip_addr) here instead of INET_ADDRSTRLEN (this way if size of ip_addr changes later this lines doesn't need to be changed). https://gerrit.osmocom.org/#/c/15065/3/src/mncc.c at 422 PS3, Line 422: char ip_addr[INET_ADDRSTRLEN]; Same comment. https://gerrit.osmocom.org/#/c/15065/3/src/sdp.c File src/sdp.c: https://gerrit.osmocom.org/#/c/15065/3/src/sdp.c at 211 PS3, Line 211: inet_ntop(AF_INET, &net, ip_addr, INET_ADDRSTRLEN); cosmetic: Usually leave an empty line between variable definition block and logic block. https://gerrit.osmocom.org/#/c/15065/3/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/15065/3/src/sip.c at 162 PS3, Line 162: char ip_addr[INET_ADDRSTRLEN]; Same comments. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 14:18:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 14:51:46 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 14:51:46 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 to look at the new patch set (#4). Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... inet_ntoa() is deprecated, use inet_ntop() instead Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/65/15065/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 14:53:33 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 14:53:33 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 to look at the new patch set (#5). Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... inet_ntoa() is deprecated, use inet_ntop() instead Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/65/15065/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 14:54:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 14:54:01 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 ) Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 14:54:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 14:56:33 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 14:56:33 +0000 Subject: Change in ...osmo-sip-connector[master]: inet_ntoa() is deprecated, use inet_ntop() instead In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 ) Change subject: inet_ntoa() is deprecated, use inet_ntop() instead ...................................................................... inet_ntoa() is deprecated, use inet_ntop() instead Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 17 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/mncc.c b/src/mncc.c index 7bffbd1..8f512d9 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -174,6 +174,7 @@ { struct gsm_mncc_rtp mncc = { 0, }; int rc; + char ip_addr[INET_ADDRSTRLEN]; /* * Send RTP CONNECT and we handle the general failure of it by @@ -189,7 +190,8 @@ * payload_type should be different.. */ struct in_addr net = { .s_addr = other->ip }; - LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port); + inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); + LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port); rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n", @@ -395,6 +397,7 @@ { const struct gsm_mncc_rtp *rtp; struct mncc_call_leg *leg; + char ip_addr[INET_ADDRSTRLEN]; if (rc < sizeof(*rtp)) { LOGP(DMNCC, LOGL_ERROR, "gsm_mncc_rtp of wrong size %d < %zu\n", @@ -417,9 +420,10 @@ /* TODO.. now we can continue with the call */ struct in_addr net = { .s_addr = leg->base.ip }; + inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); LOGP(DMNCC, LOGL_DEBUG, "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", - leg->callref, inet_ntoa(net), leg->base.port, + leg->callref, ip_addr, leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); continue_call(leg); diff --git a/src/sdp.c b/src/sdp.c index e2ed25e..56a41f7 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -207,7 +207,9 @@ struct in_addr net = { .s_addr = other->ip }; char *fmtp_str = NULL, *sdp; char *mode_attribute; + char ip_addr[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); leg->wanted_codec = app_media_name(other->payload_msg_type); if (strcmp(leg->wanted_codec, "AMR") == 0) @@ -241,7 +243,7 @@ "%s" "a=rtpmap:%d %s/8000\r\n" "%s", - inet_ntoa(net), inet_ntoa(net), /* never use diff. addr! */ + ip_addr, ip_addr, /* never use diff. addr! */ other->port, other->payload_type, fmtp_str ? fmtp_str : "", other->payload_type, diff --git a/src/sip.c b/src/sip.c index 0179226..b652b4b 100644 --- a/src/sip.c +++ b/src/sip.c @@ -110,6 +110,7 @@ struct call *call; struct sip_call_leg *leg; const char *from = NULL, *to = NULL; + char ip_addr[INET_ADDRSTRLEN]; LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); @@ -159,8 +160,9 @@ return; } struct in_addr net = { .s_addr = leg->base.ip }; + inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", - inet_ntoa(net), + ip_addr, leg->base.port, leg->base.payload_type); @@ -186,6 +188,7 @@ sdp_mode_t mode = sdp_sendrecv; uint32_t ip = leg->base.ip; uint16_t port = leg->base.port; + char ip_addr[INET_ADDRSTRLEN]; LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id); @@ -205,7 +208,8 @@ } struct in_addr net = { .s_addr = leg->base.ip }; - LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", inet_ntoa(net), leg->base.port); + inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); + LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port); if (mode == sdp_sendonly) { /* SIP side places call on HOLD */ @@ -221,7 +225,8 @@ return; } struct in_addr net = { .s_addr = leg->base.ip }; - LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port); + inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); + LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port); if (ip != leg->base.ip || port != leg->base.port) { LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n"); if (other->update_rtp) -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 Gerrit-Change-Number: 15065 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 15:57:51 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 15:57:51 +0000 Subject: Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting. Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 Change subject: Fix bug with MO calls not connecting. ...................................................................... Fix bug with MO calls not connecting. Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2 where we would not call mncc_call_leg_connect() on receiving 200 from SIP side, and therefore never send MNCC_SETUP_RSP to the MS Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 --- M src/sip.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/68/15068/1 diff --git a/src/sip.c b/src/sip.c index b652b4b..4eb7689 100644 --- a/src/sip.c +++ b/src/sip.c @@ -332,11 +332,13 @@ if (status == 180 || status == 183) call_progress(leg, sip, status); else if (status == 200) { - struct sip_call_leg *leg = sip_find_leg(nh); - if (leg) + if (leg->state == SIP_CC_CONNECTED || leg->state == SIP_CC_HOLD) { + /* This 200 is a response to our re-INVITE on + * a connected call. We just need to ACK it. */ nua_ack(leg->nua_handle, TAG_END()); - else + } else { call_connect(leg, sip); + } } else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 15:57:51 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 15:57:51 +0000 Subject: Change in ...osmo-sip-connector[master]: Define hold/retrieve functions for MO calls Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 Change subject: Define hold/retrieve functions for MO calls ...................................................................... Define hold/retrieve functions for MO calls My original patch that introduced this functionality, bd2d14bd4af592c2694217d84aaf81d759d2ca1 only did so for MT calls. Change-Id: Ifd42ed94053f6a38abfe6d6b18e2fe3582d037bb --- M src/sip.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/69/15069/1 diff --git a/src/sip.c b/src/sip.c index 4eb7689..350eb0b 100644 --- a/src/sip.c +++ b/src/sip.c @@ -614,6 +614,8 @@ leg->base.call = call; leg->base.release_call = sip_release_call; leg->base.dtmf = sip_dtmf_call; + leg->base.hold_call = sip_hold_call; + leg->base.retrieve_call = sip_retrieve_call; leg->agent = agent; leg->nua_handle = nua_handle(agent->nua, leg, TAG_END()); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ifd42ed94053f6a38abfe6d6b18e2fe3582d037bb Gerrit-Change-Number: 15069 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:03:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 16:03:30 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15070 Change subject: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION ...................................................................... osmo-release.sh: Drop whitespace after = when parsing LIBVERSION As a result whitespace ended up in some variables and then command "expr" was not happy about it. It was spotted because src/coding/Makefile.am had some whitespacing. Since it's the only one, let's drop the whitespace there too to have similar line in all Makefile.am files. Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb --- M osmo-release.sh M src/coding/Makefile.am 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/15070/1 diff --git a/osmo-release.sh b/osmo-release.sh index 4d4d080..4446da7 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -47,7 +47,7 @@ fi if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then echo "$LIBVERS" | while read -r line; do - libversion=$(echo "$line" | cut -d "=" -f 2) + libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") major="$(libversion_to_deb_major "$libversion")" file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" if [ "z$file_matches" = "z0" ]; then diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index c001c13..f47fe45 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION = 1:1:1 +LIBVERSION=1:1:1 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb Gerrit-Change-Number: 15070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:03:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 16:03:31 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E107-afce-dirty_=E2=86=92_1=2E2=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15071 Change subject: Bump version: 1.1.0.107-afce-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.107-afce-dirty ? 1.2.0 Change-Id: I05dd1f2725e05f856f1d27c9201a0005de101b8f --- M debian/changelog M debian/control R debian/libosmogsm13.install M src/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 9 files changed, 149 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/15071/1 diff --git a/debian/changelog b/debian/changelog index 5ed8fe6..0e28089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,141 @@ +libosmocore (1.2.0) unstable; urgency=medium + + [ Harald Welte ] + * Add VTY and CTRL port numbers for OsmoCBC (Cell Broadcast Centre) + * deal with rate_ctr_group_alloc() returning NULL + * Fix osmo_quote_str_c() for strings larger than 32 bytes + * Print error message if application fails to call rate_ctr_init() + * gsm0808_utils: Introduce gsm0808_msgb_put_cell_id_u() + * Revert "Print error message if application fails to call rate_ctr_init()" + * osmo_sock_get_name_*: Ensure string is returned in error case + * Revert "Change GSM48_PDISC_* to enum type" + * pseudotalloc: turn talloc_steal() into #define + * TLV: Add one-shot TLV encoder + * lapdm_rslms_recvmsg: Fix memory leak in error path + * rsl: Add osmocom-specific extensions to RSL channel numbers for CBCH + * oap_client: Fix license: GPLv2+ instead of AGPLv3+ + * tdef: Fix license: GPLv2+ instead of AGPLv3+ + * gsm48_rest_octets: Fix license: GPLv2+ instead of AGPLv3+ + * rest_octets: Use correct symbols names for range encoder + * rest_octets: Actually include gsm48_rest_octets.c in Makefile.am + * rest_octets: Fix export of osmo_gsm48_rest_octets + * rest_octets: Suffix encoder functiosn with _encode + * rest_octets: Add function to parse SI3 rest octets + * rest_octets: Implement actual SI6 rest octets encoding + * rest_octets: Remove SI2ter + SI2bis encoders that don't do anything + * lapdm: Don't truncate L3 payload at 200 bytes length + * make all library-internal static buffers thread-local + * gsm0808_utils: Add gsm0808_decode_cell_id_u() + * lapdm: Allow user to specify T200 values; Use correct N200 values + * lapd_core: Perform N200 retransmissions, not N200-1 + * fsm: Allow millisecond granularity in osmo_fsm built-in timer + * fsm: Reduce amount of copy+pasted LOGPFSMSRC() statements + * fsm.c: Print error message for FSM with allstate_action but no events + * CBSP (Cell Broadcast Service Protocol; 3GPP TS 48.049) support + * cbsp: Introduce osmo_cbsp_errstr + * Add Cell Broadcast related definitions from 3GPP TS 23.041 + * cbsp.c: Remove dead code + * tdef: remove bogus OSMO_ASSERT(unsigned long >= 0) + * osmo_get_rand_id(): Avoid dead code by proper #if/#else/#endif + * avoid gcc format error on embedded builds + * pseudotalloc: Simplistic wrapper of talloc_named() + + [ Keith ] + * Add expect script: 'vty' for easy access to all vtys + + [ K?vin Redon ] + * fix typo in FSM description + * fix isdigit taking unsigned as input + * minor: don't redefine macros + * (minor) fix typo in comments + + [ Omar Ramadan ] + * Add MO-FALLBACK-VALUE SGsAP IE + + [ Max ] + * NS: log address:port on error + * Change GSM48_PDISC_* to enum type + + [ Pau Espin Pedrol ] + * gsm0808: Introduce Osmocom extensions to announce Osmux support + * vty: command.c: Get rid of huge indentation block + * vty: command.c: Fix is_cmd_ambiguous() returning always 0 + * cosmetic: vty: command.c: Use upper case for enum match_type value names + * vty: command.c: Get rid of huge indentation block + * logging: Check return error from time() call + * logging: Use reentrant ctime_r instead of ctime + * command.c: Improve return check condition in cmd_execut_command_real() + * vty: command.c: Get rid of big indentation block + * vty: tests: Verify incomplete optional parameters are passed to vty funcs + * vty: command.c: Fix: multi-choice args are no longer passed incomplete to vty func + * vty: command.c: Fix: single-choice optional args are no longer passed incomplete to vty func + * vty: Remove trailing whitespace in output from show asciidoc + * gsm: lapd_core: Log timeout used upon start of T200 + * vty: Simplify char escaping in asciidoc output + * gsm0808_test: Fix wrong use of memcp + * utils: share static buffer in osmo_str_to{lower,upper}() + * Get rid of osmo_str_tolower() use inside libosmocore code + * tests: logging: Remove undefined param passed to logging_vty_add_cmds + * configure: Autodetect TLS bug on ARM with old gcc and apply workaround + * configure: Allow disabling workaround for TLS bug in old ARM gcc versions + * osmo-release.sh: Drop whitespace after = when parsing LIBVERSION + + [ Oliver Smith ] + * gsm_23_003: add GSM23003_MSISDN_{MIN,MAX}_DIGITS + * Cosmetic: GSUP: fix too long comment line + * gsm48_decode_bcd_number2: fix ENOSPC edge case + * gitignore: add doc/*.tag.prep + * Makefile.am: don't delete example.xml, vtydoc.xsd + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Sylvain Munaut ] + * codec/ecu: Add a bit of precision about the actual frame format used + + [ Daniel Willmann ] + * Deprecate usage of osmo_counter_* + * stats_vty: Add verb to sentence for show asciidoc counters + + [ Vadim Yanitskiy ] + * protocol/gsm_12_21.h: fix copy-pasted struct description + * gsm0408/gsm0408_test.c: introduce BCD number encoding / decoding test + * gsm48_decode_bcd_number2(): fix output truncation + * gsm48_decode_bcd_number2(): fix: return -ENOSPC on truncation + * gsm48_decode_bcd_number2(): return -EINVAL if LV has too big length + * gsm48_encode_bcd_number(): clarify optional LHV header initialization + * vty/command.c: cosmetic: add missing curly brackets + * socket.c: fix Doxygen doc for osmo_sock_unix_init_ofd() + * vty_transcript_test.vty: add choice auto-complete tests + * core/utils: drop meaningless const from return value of osmo_luhn() + * protocol/gsm_04_08.h: do not check if unsigned is positive + * Revert "fsm.c: Print error message for FSM with allstate_action but no events" + * Revert "utils.h: require a semi colon after OSMO_ASSERT" + * libosmogsm/l1sap.h: extend ph_rach_ind_param with lqual_cb + * osmo_gsm48_rest_octets_si3_decode(): fix copy-paste error in comment + * bitvec/bitval2mask(): cosmetic: get rid of temporary int variable + * gsm/gsm0480.c: parse_ss(): drop needless debug print + * gsm/gsm0480.c: use DLGLOBAL and LOGL_ERROR for logging + * gsm/gsm48.h: drop meaningless 'const' from gsm48_mi_to_string() + * vty/telnet_interface.c: use DLGLOBAL logging sub-system + * vty/telnet_interface.c: avoid unneeded initialization + * vty/logging_vty.c: fix writing of 'print category-hex' + * vty/telnet_interface.c: log connection accept() / close() events + * vty/vty.c: fix vty_read(): prevent further heap-buffer overrun + * vty/vty.c: the command buffer can be accessed directly + + [ Alexander Couzens ] + * utils: add gsmtap_logread.py a gsmtap log reader + * bitvec: correct comment in bitvec_alloc + * utils.h: require a semi colon after OSMO_ASSERT + + [ Eric Wild ] + * add define for magic tmsi constant + * tell ubsan to ignore SUN_LEN + + [ Ruben Undheim ] + * Set HTML_TIMESTAMP to NO to make build reproducible + + -- Pau Espin Pedrol Tue, 06 Aug 2019 18:02:01 +0200 + libosmocore (1.1.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 9accf61..07163da 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ libosmocoding0 (= ${binary:Version}), libosmocore12 (= ${binary:Version}), libosmogb9 (= ${binary:Version}), - libosmogsm12 (= ${binary:Version}), + libosmogsm13 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), @@ -178,7 +178,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm12 +Package: libosmogsm13 Section: libs Architecture: any Multi-Arch: same @@ -202,7 +202,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm12, + libosmogsm13, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmogsm12.install b/debian/libosmogsm13.install similarity index 100% rename from debian/libosmogsm12.install rename to debian/libosmogsm13.install diff --git a/src/Makefile.am b/src/Makefile.am index e65e0c9..f937810 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=13:0:1 +LIBVERSION=14:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index fe7c47d..ca64286 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=3:0:3 +LIBVERSION=4:0:4 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 9d66678..e14c11c 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,6 +1,7 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=9:0:0 +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=9:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(TALLOC_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 006e78c..0aa0de3 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=12:0:0 +LIBVERSION=13:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index f495985..1a8e508 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:0:1 +LIBVERSION=1:1:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 258d193..abed92a 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=7:0:3 +LIBVERSION=8:0:4 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I05dd1f2725e05f856f1d27c9201a0005de101b8f Gerrit-Change-Number: 15071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:19:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:19:08 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E107-afce-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15071 ) Change subject: Bump version: 1.1.0.107-afce-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I05dd1f2725e05f856f1d27c9201a0005de101b8f Gerrit-Change-Number: 15071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 16:19:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:21:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:21:29 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15070 ) Change subject: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb Gerrit-Change-Number: 15070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 16:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:21:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:21:33 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15070 ) Change subject: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION ...................................................................... osmo-release.sh: Drop whitespace after = when parsing LIBVERSION As a result whitespace ended up in some variables and then command "expr" was not happy about it. It was spotted because src/coding/Makefile.am had some whitespacing. Since it's the only one, let's drop the whitespace there too to have similar line in all Makefile.am files. Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb --- M osmo-release.sh M src/coding/Makefile.am 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 4d4d080..4446da7 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -47,7 +47,7 @@ fi if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then echo "$LIBVERS" | while read -r line; do - libversion=$(echo "$line" | cut -d "=" -f 2) + libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") major="$(libversion_to_deb_major "$libversion")" file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" if [ "z$file_matches" = "z0" ]; then diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index c001c13..f47fe45 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION = 1:1:1 +LIBVERSION=1:1:1 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb Gerrit-Change-Number: 15070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:21:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 16:21:56 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15070 ) Change subject: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb Gerrit-Change-Number: 15070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 16:21:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:22:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 16:22:01 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E107-afce-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15071 ) Change subject: Bump version: 1.1.0.107-afce-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I05dd1f2725e05f856f1d27c9201a0005de101b8f Gerrit-Change-Number: 15071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 16:22:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:22:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:22:15 +0000 Subject: Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 16:22:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:22:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:22:29 +0000 Subject: Change in ...osmo-sip-connector[master]: Define hold/retrieve functions for MO calls In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 ) Change subject: Define hold/retrieve functions for MO calls ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ifd42ed94053f6a38abfe6d6b18e2fe3582d037bb Gerrit-Change-Number: 15069 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 16:22:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:22:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 16:22:47 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E107-afce-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15071 ) Change subject: Bump version: 1.1.0.107-afce-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.107-afce-dirty ? 1.2.0 Change-Id: I05dd1f2725e05f856f1d27c9201a0005de101b8f --- M debian/changelog M debian/control R debian/libosmogsm13.install M src/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 9 files changed, 149 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 5ed8fe6..0e28089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,141 @@ +libosmocore (1.2.0) unstable; urgency=medium + + [ Harald Welte ] + * Add VTY and CTRL port numbers for OsmoCBC (Cell Broadcast Centre) + * deal with rate_ctr_group_alloc() returning NULL + * Fix osmo_quote_str_c() for strings larger than 32 bytes + * Print error message if application fails to call rate_ctr_init() + * gsm0808_utils: Introduce gsm0808_msgb_put_cell_id_u() + * Revert "Print error message if application fails to call rate_ctr_init()" + * osmo_sock_get_name_*: Ensure string is returned in error case + * Revert "Change GSM48_PDISC_* to enum type" + * pseudotalloc: turn talloc_steal() into #define + * TLV: Add one-shot TLV encoder + * lapdm_rslms_recvmsg: Fix memory leak in error path + * rsl: Add osmocom-specific extensions to RSL channel numbers for CBCH + * oap_client: Fix license: GPLv2+ instead of AGPLv3+ + * tdef: Fix license: GPLv2+ instead of AGPLv3+ + * gsm48_rest_octets: Fix license: GPLv2+ instead of AGPLv3+ + * rest_octets: Use correct symbols names for range encoder + * rest_octets: Actually include gsm48_rest_octets.c in Makefile.am + * rest_octets: Fix export of osmo_gsm48_rest_octets + * rest_octets: Suffix encoder functiosn with _encode + * rest_octets: Add function to parse SI3 rest octets + * rest_octets: Implement actual SI6 rest octets encoding + * rest_octets: Remove SI2ter + SI2bis encoders that don't do anything + * lapdm: Don't truncate L3 payload at 200 bytes length + * make all library-internal static buffers thread-local + * gsm0808_utils: Add gsm0808_decode_cell_id_u() + * lapdm: Allow user to specify T200 values; Use correct N200 values + * lapd_core: Perform N200 retransmissions, not N200-1 + * fsm: Allow millisecond granularity in osmo_fsm built-in timer + * fsm: Reduce amount of copy+pasted LOGPFSMSRC() statements + * fsm.c: Print error message for FSM with allstate_action but no events + * CBSP (Cell Broadcast Service Protocol; 3GPP TS 48.049) support + * cbsp: Introduce osmo_cbsp_errstr + * Add Cell Broadcast related definitions from 3GPP TS 23.041 + * cbsp.c: Remove dead code + * tdef: remove bogus OSMO_ASSERT(unsigned long >= 0) + * osmo_get_rand_id(): Avoid dead code by proper #if/#else/#endif + * avoid gcc format error on embedded builds + * pseudotalloc: Simplistic wrapper of talloc_named() + + [ Keith ] + * Add expect script: 'vty' for easy access to all vtys + + [ K?vin Redon ] + * fix typo in FSM description + * fix isdigit taking unsigned as input + * minor: don't redefine macros + * (minor) fix typo in comments + + [ Omar Ramadan ] + * Add MO-FALLBACK-VALUE SGsAP IE + + [ Max ] + * NS: log address:port on error + * Change GSM48_PDISC_* to enum type + + [ Pau Espin Pedrol ] + * gsm0808: Introduce Osmocom extensions to announce Osmux support + * vty: command.c: Get rid of huge indentation block + * vty: command.c: Fix is_cmd_ambiguous() returning always 0 + * cosmetic: vty: command.c: Use upper case for enum match_type value names + * vty: command.c: Get rid of huge indentation block + * logging: Check return error from time() call + * logging: Use reentrant ctime_r instead of ctime + * command.c: Improve return check condition in cmd_execut_command_real() + * vty: command.c: Get rid of big indentation block + * vty: tests: Verify incomplete optional parameters are passed to vty funcs + * vty: command.c: Fix: multi-choice args are no longer passed incomplete to vty func + * vty: command.c: Fix: single-choice optional args are no longer passed incomplete to vty func + * vty: Remove trailing whitespace in output from show asciidoc + * gsm: lapd_core: Log timeout used upon start of T200 + * vty: Simplify char escaping in asciidoc output + * gsm0808_test: Fix wrong use of memcp + * utils: share static buffer in osmo_str_to{lower,upper}() + * Get rid of osmo_str_tolower() use inside libosmocore code + * tests: logging: Remove undefined param passed to logging_vty_add_cmds + * configure: Autodetect TLS bug on ARM with old gcc and apply workaround + * configure: Allow disabling workaround for TLS bug in old ARM gcc versions + * osmo-release.sh: Drop whitespace after = when parsing LIBVERSION + + [ Oliver Smith ] + * gsm_23_003: add GSM23003_MSISDN_{MIN,MAX}_DIGITS + * Cosmetic: GSUP: fix too long comment line + * gsm48_decode_bcd_number2: fix ENOSPC edge case + * gitignore: add doc/*.tag.prep + * Makefile.am: don't delete example.xml, vtydoc.xsd + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Sylvain Munaut ] + * codec/ecu: Add a bit of precision about the actual frame format used + + [ Daniel Willmann ] + * Deprecate usage of osmo_counter_* + * stats_vty: Add verb to sentence for show asciidoc counters + + [ Vadim Yanitskiy ] + * protocol/gsm_12_21.h: fix copy-pasted struct description + * gsm0408/gsm0408_test.c: introduce BCD number encoding / decoding test + * gsm48_decode_bcd_number2(): fix output truncation + * gsm48_decode_bcd_number2(): fix: return -ENOSPC on truncation + * gsm48_decode_bcd_number2(): return -EINVAL if LV has too big length + * gsm48_encode_bcd_number(): clarify optional LHV header initialization + * vty/command.c: cosmetic: add missing curly brackets + * socket.c: fix Doxygen doc for osmo_sock_unix_init_ofd() + * vty_transcript_test.vty: add choice auto-complete tests + * core/utils: drop meaningless const from return value of osmo_luhn() + * protocol/gsm_04_08.h: do not check if unsigned is positive + * Revert "fsm.c: Print error message for FSM with allstate_action but no events" + * Revert "utils.h: require a semi colon after OSMO_ASSERT" + * libosmogsm/l1sap.h: extend ph_rach_ind_param with lqual_cb + * osmo_gsm48_rest_octets_si3_decode(): fix copy-paste error in comment + * bitvec/bitval2mask(): cosmetic: get rid of temporary int variable + * gsm/gsm0480.c: parse_ss(): drop needless debug print + * gsm/gsm0480.c: use DLGLOBAL and LOGL_ERROR for logging + * gsm/gsm48.h: drop meaningless 'const' from gsm48_mi_to_string() + * vty/telnet_interface.c: use DLGLOBAL logging sub-system + * vty/telnet_interface.c: avoid unneeded initialization + * vty/logging_vty.c: fix writing of 'print category-hex' + * vty/telnet_interface.c: log connection accept() / close() events + * vty/vty.c: fix vty_read(): prevent further heap-buffer overrun + * vty/vty.c: the command buffer can be accessed directly + + [ Alexander Couzens ] + * utils: add gsmtap_logread.py a gsmtap log reader + * bitvec: correct comment in bitvec_alloc + * utils.h: require a semi colon after OSMO_ASSERT + + [ Eric Wild ] + * add define for magic tmsi constant + * tell ubsan to ignore SUN_LEN + + [ Ruben Undheim ] + * Set HTML_TIMESTAMP to NO to make build reproducible + + -- Pau Espin Pedrol Tue, 06 Aug 2019 18:02:01 +0200 + libosmocore (1.1.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 9accf61..07163da 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ libosmocoding0 (= ${binary:Version}), libosmocore12 (= ${binary:Version}), libosmogb9 (= ${binary:Version}), - libosmogsm12 (= ${binary:Version}), + libosmogsm13 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), @@ -178,7 +178,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm12 +Package: libosmogsm13 Section: libs Architecture: any Multi-Arch: same @@ -202,7 +202,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm12, + libosmogsm13, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmogsm12.install b/debian/libosmogsm13.install similarity index 100% rename from debian/libosmogsm12.install rename to debian/libosmogsm13.install diff --git a/src/Makefile.am b/src/Makefile.am index e65e0c9..f937810 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=13:0:1 +LIBVERSION=14:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index fe7c47d..ca64286 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=3:0:3 +LIBVERSION=4:0:4 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 9d66678..e14c11c 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,6 +1,7 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=9:0:0 +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=9:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(TALLOC_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 006e78c..0aa0de3 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=12:0:0 +LIBVERSION=13:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index f495985..1a8e508 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:0:1 +LIBVERSION=1:1:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 258d193..abed92a 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=7:0:3 +LIBVERSION=8:0:4 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I05dd1f2725e05f856f1d27c9201a0005de101b8f Gerrit-Change-Number: 15071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:23:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:23:03 +0000 Subject: Change in ...osmo-gsm-tester[master]: contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosm... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15067 ) Change subject: contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I583354735a7671e5bba1c0f6e60c84b6ef55ac63 Gerrit-Change-Number: 15067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 16:23:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:24:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:24:56 +0000 Subject: Change in ...simtrace2[master]: add serial and version information in USB descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/15066 ) Change subject: add serial and version information in USB descriptor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If9fadecc097ca3e006990160936bf11b22eae4e0 Gerrit-Change-Number: 15066 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 16:24:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:24:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 6 Aug 2019 16:24:58 +0000 Subject: Change in ...simtrace2[master]: add serial and version information in USB descriptor In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/simtrace2/+/15066 ) Change subject: add serial and version information in USB descriptor ...................................................................... add serial and version information in USB descriptor the device ID (unique to the micro-controller) is now displayed in the USB iSerial descriptor. the git version is now also displayed in iConfiguration in an additional (empty) configuration descriptor. this allows the user to quickly get the device hardware serial and firmware version just by using lsusb (no need for a custom USB software). Change-Id: If9fadecc097ca3e006990160936bf11b22eae4e0 --- M firmware/libcommon/include/simtrace.h M firmware/libcommon/source/usb.c 2 files changed, 109 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h index 0486581..67f3988 100644 --- a/firmware/libcommon/include/simtrace.h +++ b/firmware/libcommon/include/simtrace.h @@ -1,6 +1,7 @@ /* SIMtrace 2 mode definitions * - * (C) 2015-2017 by Harald Welte + * Copyright (c) 2015-2017 by Harald Welte + * Copyright (c) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,6 +58,7 @@ #ifdef HAVE_MITM CFG_NUM_MITM, #endif + CFG_NUM_VERSION, NUM_CONF }; diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 43c7bb2..3efb9fc 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -2,7 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation - * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * Copyright (c) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -46,7 +46,10 @@ * USB String descriptors *------------------------------------------------------------------------------*/ #include "usb_strings_generated.h" + +// the index of the strings (must match the order in usb_strings.txt) enum strDescNum { + // static strings from usb_strings MANUF_STR = 1, PRODUCT_STRING, SNIFFER_CONF_STR, @@ -55,9 +58,61 @@ MITM_CONF_STR, CARDEM_USIM1_INTF_STR, CARDEM_USIM2_INTF_STR, + CARDEM_USIM3_INTF_STR, + CARDEM_USIM4_INTF_STR, + // runtime strings + SERIAL_STR, + VERSION_STR, + // count STRING_DESC_CNT }; +/** array of static (from usb_strings) and runtime (serial, version) USB strings + */ +static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 2]; + +/* USB string for the serial (using 128-bit device ID) */ +static unsigned char usb_string_serial[] = { + USBStringDescriptor_LENGTH(32), + USBGenericDescriptor_STRING, + USBStringDescriptor_UNICODE('0'), + USBStringDescriptor_UNICODE('0'), + USBStringDescriptor_UNICODE('1'), + USBStringDescriptor_UNICODE('1'), + USBStringDescriptor_UNICODE('2'), + USBStringDescriptor_UNICODE('2'), + USBStringDescriptor_UNICODE('3'), + USBStringDescriptor_UNICODE('3'), + USBStringDescriptor_UNICODE('4'), + USBStringDescriptor_UNICODE('4'), + USBStringDescriptor_UNICODE('5'), + USBStringDescriptor_UNICODE('5'), + USBStringDescriptor_UNICODE('6'), + USBStringDescriptor_UNICODE('6'), + USBStringDescriptor_UNICODE('7'), + USBStringDescriptor_UNICODE('7'), + USBStringDescriptor_UNICODE('8'), + USBStringDescriptor_UNICODE('8'), + USBStringDescriptor_UNICODE('9'), + USBStringDescriptor_UNICODE('9'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('b'), + USBStringDescriptor_UNICODE('b'), + USBStringDescriptor_UNICODE('c'), + USBStringDescriptor_UNICODE('c'), + USBStringDescriptor_UNICODE('d'), + USBStringDescriptor_UNICODE('d'), + USBStringDescriptor_UNICODE('e'), + USBStringDescriptor_UNICODE('e'), + USBStringDescriptor_UNICODE('f'), + USBStringDescriptor_UNICODE('f'), +}; + +/* USB string for the version */ +static const char git_version[] = GIT_VERSION; +static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2]; + /*------------------------------------------------------------------------------ * USB Device descriptors *------------------------------------------------------------------------------*/ @@ -523,6 +578,27 @@ }; #endif /* HAVE_CARDEM */ +/* USB descriptor just to show the version */ +typedef struct _SIMTraceDriverConfigurationDescriptorVersion { + /** Standard configuration descriptor. */ + USBConfigurationDescriptor configuration; +} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion; + +static const SIMTraceDriverConfigurationDescriptorVersion + configurationDescriptorVersion = { + /* Standard configuration descriptor */ + .configuration = { + .bLength = sizeof(USBConfigurationDescriptor), + .bDescriptorType = USBGenericDescriptor_CONFIGURATION, + .wTotalLength = sizeof(SIMTraceDriverConfigurationDescriptorVersion), + .bNumInterfaces = 0, + .bConfigurationValue = CFG_NUM_VERSION, + .iConfiguration = VERSION_STR, + .bmAttributes = USBD_BMATTRIBUTES, + .bMaxPower = USBConfigurationDescriptor_POWER(100), + }, +}; + const USBConfigurationDescriptor *configurationDescriptorsArr[] = { #ifdef HAVE_SNIFFER &configurationDescriptorSniffer.configuration, @@ -536,6 +612,7 @@ #ifdef HAVE_MITM &configurationDescriptorMITM.configuration, #endif + &configurationDescriptorVersion.configuration, }; /** Standard USB device descriptor for the CDC serial driver */ @@ -552,7 +629,7 @@ .bcdDevice = 2, /* Release number */ .iManufacturer = MANUF_STR, .iProduct = PRODUCT_STRING, - .iSerialNumber = 0, + .iSerialNumber = SERIAL_STR, .bNumConfigurations = ARRAY_SIZE(configurationDescriptorsArr), }; @@ -566,8 +643,8 @@ 0, /* No high-speed configuration descriptor */ 0, /* No high-speed device qualifier descriptor */ 0, /* No high-speed other speed configuration descriptor */ - usb_strings, - ARRAY_SIZE(usb_strings),/* cnt string descriptors in list */ + usb_strings_extended, + ARRAY_SIZE(usb_strings_extended),/* cnt string descriptors in list */ }; /*---------------------------------------------------------------------------- @@ -593,6 +670,31 @@ // Get std USB driver USBDDriver *pUsbd = USBD_GetDriver(); + // put device ID into USB serial number description + unsigned int device_id[4]; + EEFC_ReadUniqueID(device_id); + char device_id_string[32 + 1]; + snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x", + device_id[0], device_id[1], device_id[2], device_id[3]); + for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { + usb_string_serial[2 + 2 * i] = device_id_string[i]; + } + + // put version into USB string + usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1); + usb_string_version[1] = USBGenericDescriptor_STRING; + for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { + usb_string_version[2 + i * 2 + 0] = git_version[i]; + usb_string_version[2 + i * 2 + 1] = 0; + } + + // fill extended USB strings + for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { + usb_strings_extended[i] = usb_strings[i]; + } + usb_strings_extended[SERIAL_STR] = usb_string_serial; + usb_strings_extended[VERSION_STR] = usb_string_version; + // Initialize standard USB driver USBDDriver_Initialize(pUsbd, &driverDescriptors, 0); // Multiple interface settings not supported USBD_Init(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If9fadecc097ca3e006990160936bf11b22eae4e0 Gerrit-Change-Number: 15066 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:44:18 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 16:44:18 +0000 Subject: Change in ...osmo-sip-connector[master]: Cosmetic: Logging and Comments, spelling and clarity changes Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 Change subject: Cosmetic: Logging and Comments, spelling and clarity changes ...................................................................... Cosmetic: Logging and Comments, spelling and clarity changes Also removes a comment in sdp_create_file() about the IP address in o= and c= having to be the same. It is completely legal in SDP and often normal for the originator and the connection information IP to be different. Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a --- M src/call.c M src/mncc.c M src/sdp.c M src/sip.c M src/vty.c 5 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/72/15072/1 diff --git a/src/call.c b/src/call.c index 67207e5..9f593ea 100644 --- a/src/call.c +++ b/src/call.c @@ -169,6 +169,6 @@ mncc = (struct mncc_call_leg *) leg; return get_value_string(mncc_state_vals, mncc->state); default: - return "unknown call type"; + return "Unknown call type"; } } diff --git a/src/mncc.c b/src/mncc.c index 8f512d9..a60b104 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -50,7 +50,7 @@ struct mncc_call_leg *leg = data; struct call_leg *other_leg; - LOGP(DMNCC, LOGL_ERROR, "cmd(0x%x) never arrived for leg(%u)\n", + LOGP(DMNCC, LOGL_ERROR, "command(0x%x) never arrived for leg(%u)\n", leg->rsp_wanted, leg->callref); other_leg = call_leg_other(&leg->base); @@ -72,7 +72,7 @@ static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res) { if (leg->rsp_wanted != got_res) { - LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%s) but got(%s) for leg(%u)\n", + LOGP(DMNCC, LOGL_ERROR, "Wanted response(%s) but got(%s) for leg(%u)\n", osmo_mncc_name(leg->rsp_wanted), osmo_mncc_name(got_res), leg->callref); return; } @@ -141,7 +141,7 @@ rc = write(conn->fd.fd, mncc, sizeof(*mncc)); LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type)); if (rc != sizeof(*mncc)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref); + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref); close_connection(conn); } } @@ -164,12 +164,12 @@ rc = write(conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref); + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref); close_connection(conn); } } -/* Send a MNCC_RTP_CONNET to the MSC for the given call legs */ +/* Send a MNCC_RTP_CONNECT to the MSC for the given call legs */ static bool send_rtp_connect(struct mncc_call_leg *leg, struct call_leg *other) { struct gsm_mncc_rtp mncc = { 0, }; @@ -194,7 +194,7 @@ LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port); rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n", + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", leg->callref); close_connection(leg->conn); return false; @@ -206,7 +206,7 @@ struct mncc_call_leg *leg; - LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP with LEG Type (%u)\n", _leg->type); + LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP for LEG Type (%u)\n", _leg->type); if (_leg->type == CALL_TYPE_MNCC) { leg = (struct mncc_call_leg *) _leg; @@ -251,7 +251,7 @@ mncc_fill_header(&out_mncc, MNCC_ALERT_REQ, leg->callref); /* GSM 04.08 10.5.4.21 */ out_mncc.fields |= MNCC_F_PROGRESS; - out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSM?PLMNS */ + out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSM PLMNS */ out_mncc.progress.location = GSM48_CAUSE_LOC_PRN_S_LU; /* Private network serving the local user */ out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */ @@ -277,7 +277,7 @@ /* drop it directly, if not connected */ if (leg->conn->state != MNCC_READY) { LOGP(DMNCC, LOGL_DEBUG, - "MNCC not connected releasing leg leg(%u)\n", leg->callref); + "MNCC not connected releasing leg(%u)\n", leg->callref); return mncc_leg_release(leg); } @@ -422,7 +422,7 @@ struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); LOGP(DMNCC, LOGL_DEBUG, - "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", + "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", leg->callref, ip_addr, leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); @@ -658,7 +658,7 @@ return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) confirmend. creating RTP socket.\n", + "leg(%u) confirmed. creating RTP socket.\n", leg->callref); start_cmd_timer(leg, MNCC_RTP_CREATE); @@ -700,7 +700,7 @@ return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) is req hold.\n", leg->callref); + "leg(%u) is requesting hold.\n", leg->callref); other_leg = call_leg_other(&leg->base); other_leg->hold_call(other_leg); mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref); @@ -718,7 +718,7 @@ return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) is req unhold.\n", leg->callref); + "leg(%u) is requesting unhold.\n", leg->callref); other_leg = call_leg_other(&leg->base); other_leg->retrieve_call(other_leg); mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); diff --git a/src/sdp.c b/src/sdp.c index 56a41f7..46330cd 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -243,7 +243,7 @@ "%s" "a=rtpmap:%d %s/8000\r\n" "%s", - ip_addr, ip_addr, /* never use diff. addr! */ + ip_addr, ip_addr, other->port, other->payload_type, fmtp_str ? fmtp_str : "", other->payload_type, diff --git a/src/sip.c b/src/sip.c index 350eb0b..327e90f 100644 --- a/src/sip.c +++ b/src/sip.c @@ -150,7 +150,7 @@ * not this place. It starts with the TCH/F vs. TCH/H selection based * on the offered codecs, and then RTP_CREATE should have it. So both * are GSM related... and do not belong here. Just pick the first codec - * so the IP addresss port and payload type is set. + * so the IP address, port and payload type is set. */ if (!sdp_extract_sdp(leg, sip, true)) { LOGP(DSIP, LOGL_ERROR, "leg(%p) no audio, releasing\n", leg); @@ -395,7 +395,7 @@ struct sip_call_leg *leg; struct call_leg *other; - LOGP(DSIP, LOGL_ERROR, "Canceled on leg(%p)\n", hmagic); + LOGP(DSIP, LOGL_ERROR, "Cancelled on leg(%p)\n", hmagic); leg = (struct sip_call_leg *) hmagic; other = call_leg_other(&leg->base); @@ -453,12 +453,12 @@ switch (leg->state) { case SIP_CC_INITIAL: - LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in int state\n", leg); + LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in initial state\n", leg); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); break; case SIP_CC_DLG_CNFD: - LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in cnfd state\n", leg); + LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in confirmed state\n", leg); if (leg->dir == SIP_DIR_MT) nua_cancel(leg->nua_handle, TAG_END()); else { @@ -471,7 +471,7 @@ break; case SIP_CC_CONNECTED: case SIP_CC_HOLD: - LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in con\n", leg); + LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in connected state.\n", leg); nua_bye(leg->nua_handle, TAG_END()); break; } diff --git a/src/vty.c b/src/vty.c index c11a976..ea76d46 100644 --- a/src/vty.c +++ b/src/vty.c @@ -129,7 +129,7 @@ DEFUN(cfg_sip_remote_addr, cfg_sip_remote_addr_cmd, "remote ADDR <1-65534>", - "Remore information\nSIP hostname\nport\n") + "Remote information\nSIP hostname\nport\n") { talloc_free((char *) g_app.sip.remote_addr); g_app.sip.remote_addr = talloc_strdup(tall_mncc_ctx, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a Gerrit-Change-Number: 15072 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 16:50:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 16:50:17 +0000 Subject: Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15068/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15068/1//COMMIT_MSG at 9 PS1, Line 9: Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2 Usually in this scenario you add a tag below in the commit description: blablabla... Fixes: 5f73c2033b6b4e690f30292020d7361f48b5f2c2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 16:50:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:14:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 17:14:54 +0000 Subject: Change in ...osmo-sip-connector[master]: Cosmetic: Logging and Comments, spelling and clarity changes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 ) Change subject: Cosmetic: Logging and Comments, spelling and clarity changes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a Gerrit-Change-Number: 15072 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 17:14:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:15:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 17:15:30 +0000 Subject: Change in ...osmo-gsm-tester[master]: contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosm... In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15067 ) Change subject: contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosmocore ...................................................................... contrib: Avoid sysmobts/oc2g toolchain ld crashes building new libosmocore Some gcc version (< 7.3.0) on ARM generate wrong code for __thread variables that crash at runtime. It seems, due to some unknown reason, that we are not affected by this bug with toolchain from poky pyro (6.4.0). However, libosmocore as of e188b8cd98f599468fbb200c7d590de955daf761 applies some CFLAGS="-mtls-dialect=gnu2" to workaround the issue automatically. But same toolchain contains an "ld" that crashes when those flags are applied. Fortunately, libosmocore provides a way to disable the workaround, and since we are not affected by the bug, we are fine with that. If the toolchain had the TLS runtime bug, then we'd had to build with -O0. Can be probably dropped once we move to newer toolchain. Depends: libosmocore.git afce89dac1a3cdb975da72020acdba16940fd679 Related: OS#4062 Change-Id: I583354735a7671e5bba1c0f6e60c84b6ef55ac63 --- M contrib/jenkins-build-osmo-bts-oc2g.sh M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-oc2g.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh index c4357f0..aa37beb 100755 --- a/contrib/jenkins-build-osmo-bts-oc2g.sh +++ b/contrib/jenkins-build-osmo-bts-oc2g.sh @@ -24,7 +24,7 @@ git_url="${prev_git_url}" L1_OC2G_HEADERS="$PWD/oc2g-fw/inc" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo libosmo-abis build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g --with-oc2g="$L1_OC2G_HEADERS" diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index afce771..1acf8b0 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -18,7 +18,7 @@ prefix_real="$DESTDIR$prefix" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo libosmo-abis build_repo osmo-bts --enable-sysmocom-bts --with-openbsc=$base/openbsc/openbsc/include diff --git a/contrib/jenkins-build-osmo-pcu-oc2g.sh b/contrib/jenkins-build-osmo-pcu-oc2g.sh index b113f21..d2ae028 100755 --- a/contrib/jenkins-build-osmo-pcu-oc2g.sh +++ b/contrib/jenkins-build-osmo-pcu-oc2g.sh @@ -24,7 +24,7 @@ git_url="${prev_git_url}" L1_OC2G_HEADERS="$PWD/oc2g-fw/inc" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo osmo-pcu --disable-sysmocom-dsp -enable-oc2gbts-phy --with-oc2g="$L1_OC2G_HEADERS" create_bin_tgz osmo-pcu diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index 4dc7704..ecc8bc3 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -18,7 +18,7 @@ prefix_real="$DESTDIR$prefix" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls +build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo osmo-pcu --enable-sysmocom-dsp create_bin_tgz osmo-pcu -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I583354735a7671e5bba1c0f6e60c84b6ef55ac63 Gerrit-Change-Number: 15067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:27:48 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 17:27:48 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle case where SIP side hangsup while MNCC is on hold Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 Change subject: Handle case where SIP side hangsup while MNCC is on hold ...................................................................... Handle case where SIP side hangsup while MNCC is on hold Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 --- M src/mncc.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/73/15073/1 diff --git a/src/mncc.c b/src/mncc.c index a60b104..d8545da 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -297,6 +297,7 @@ break; case MNCC_CC_PROCEEDING: case MNCC_CC_CONNECTED: + case MNCC_CC_HOLD: LOGP(DMNCC, LOGL_DEBUG, "Releasing call in non-initial leg(%u) cause(%s)\n", leg->callref, gsm48_cc_cause_name(leg->base.cause)); leg->base.in_release = true; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 Gerrit-Change-Number: 15073 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:30:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 17:30:53 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle case where SIP side hangsup while MNCC is on hold In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 ) Change subject: Handle case where SIP side hangsup while MNCC is on hold ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 Gerrit-Change-Number: 15073 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 17:30:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:31:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 17:31:36 +0000 Subject: Change in ...osmo-sip-connector[master]: Define hold/retrieve functions for MO calls In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 ) Change subject: Define hold/retrieve functions for MO calls ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ifd42ed94053f6a38abfe6d6b18e2fe3582d037bb Gerrit-Change-Number: 15069 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 17:31:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:40:19 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 17:40:19 +0000 Subject: Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting. In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 to look at the new patch set (#2). Change subject: Fix bug with MO calls not connecting. ...................................................................... Fix bug with MO calls not connecting. Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2 where we would not call mncc_call_leg_connect() on receiving 200 from SIP side, and therefore never send MNCC_SETUP_RSP to the MS Fixes: 5f73c2033b6b4e690f30292020d7361f48b5f2c2 Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 --- M src/sip.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/68/15068/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:42:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 6 Aug 2019 17:42:24 +0000 Subject: Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 17:42:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:48:30 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 17:48:30 +0000 Subject: Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting. In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. ...................................................................... Fix bug with MO calls not connecting. Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2 where we would not call mncc_call_leg_connect() on receiving 200 from SIP side, and therefore never send MNCC_SETUP_RSP to the MS Fixes: 5f73c2033b6b4e690f30292020d7361f48b5f2c2 Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 --- M src/sip.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sip.c b/src/sip.c index b652b4b..4eb7689 100644 --- a/src/sip.c +++ b/src/sip.c @@ -332,11 +332,13 @@ if (status == 180 || status == 183) call_progress(leg, sip, status); else if (status == 200) { - struct sip_call_leg *leg = sip_find_leg(nh); - if (leg) + if (leg->state == SIP_CC_CONNECTED || leg->state == SIP_CC_HOLD) { + /* This 200 is a response to our re-INVITE on + * a connected call. We just need to ACK it. */ nua_ack(leg->nua_handle, TAG_END()); - else + } else { call_connect(leg, sip); + } } else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 6 17:48:37 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 6 Aug 2019 17:48:37 +0000 Subject: Change in ...osmo-sip-connector[master]: Define hold/retrieve functions for MO calls In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 ) Change subject: Define hold/retrieve functions for MO calls ...................................................................... Define hold/retrieve functions for MO calls My original patch that introduced this functionality, bd2d14bd4af592c2694217d84aaf81d759d2ca1 only did so for MT calls. Change-Id: Ifd42ed94053f6a38abfe6d6b18e2fe3582d037bb --- M src/sip.c 1 file changed, 2 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/src/sip.c b/src/sip.c index 4eb7689..350eb0b 100644 --- a/src/sip.c +++ b/src/sip.c @@ -614,6 +614,8 @@ leg->base.call = call; leg->base.release_call = sip_release_call; leg->base.dtmf = sip_dtmf_call; + leg->base.hold_call = sip_hold_call; + leg->base.retrieve_call = sip_retrieve_call; leg->agent = agent; leg->nua_handle = nua_handle(agent->nua, leg, TAG_END()); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ifd42ed94053f6a38abfe6d6b18e2fe3582d037bb Gerrit-Change-Number: 15069 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 00:08:45 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 7 Aug 2019 00:08:45 +0000 Subject: Change in ...osmo-dev[master]: add sysmobts-calib.py Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/15074 Change subject: add sysmobts-calib.py ...................................................................... add sysmobts-calib.py Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 --- A sysmobts-calib.py 1 file changed, 176 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/74/15074/1 diff --git a/sysmobts-calib.py b/sysmobts-calib.py new file mode 100755 index 0000000..9551fb2 --- /dev/null +++ b/sysmobts-calib.py @@ -0,0 +1,176 @@ +#!/usr/bin/env python3 +doc = '''Remotely do a clock calibration of a sysmoBTS. All you need is ssh root access to the BTS.''' + +import sys +import subprocess +import re +import shlex +import argparse + +class Globals: + orig_calib_val = None + calib_val = None + bts = 'bts0' + band = '900' + arfcn = None + +def error(*msgs): + sys.stderr.write(''.join(str(m) for m in msgs)) + sys.stderr.write('\n') + exit(1) + +def log(*msgs): + print(''.join(str(m) for m in msgs)) + +def cmd_to_str(cmd): + return ' '.join(shlex.quote(c) for c in cmd) + +def call_output(*cmd): + cmd = ('ssh', Globals.bts,) + cmd + log('+ %s' % cmd_to_str(cmd)) + sys.stdout.flush() + sys.stderr.flush() + p = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE) + o,e = p.communicate() + return o.decode('utf-8') + +def call(*cmd): + o = call_output(*cmd) + if o: + log(o) + +def reload_dsp(): + #call('/bin/sh', '-c', r"'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s'") + # systemd service contains the DSP reload commands in the ExecStopPost. + # So starting and stopping the service is the easy way to reload the DSP. + call('systemctl', 'start', 'osmo-bts-sysmo') + call('systemctl', 'stop', 'osmo-bts-sysmo') + +def get_cfg_calib_val(): + o = call_output('grep', 'clock-calibration', '/etc/osmocom/osmo-bts-sysmo.cfg') + if not o: + return None + o = o.strip() + calib_val_re = re.compile(r'clock-calibration +([0-9]+)') + m = calib_val_re.match(o) + if not m: + return None + return m.group(1) + +def set_cfg_calib_val(calib_val): + if get_cfg_calib_val() is None: + call('sed', '-i', "'s/^ instance 0$/&\\n clock-calibration %s/'" % calib_val, '/etc/osmocom/osmo-bts-sysmo.cfg'); + else: + call('sed', '-i', "'s/clock-calibration.*$/clock-calibration %s/'" % calib_val, '/etc/osmocom/osmo-bts-sysmo.cfg'); + + now = get_cfg_calib_val() + if now != calib_val: + print('Failed to set calibration value, set manually in osmo-bts-sysmo.cfg') + print('phy 0\n instance 0\n clock-calibration %s' % calib_val) + + +def ask(*question, valid_answers=('*',)): + while True: + print('\n' + '\n '.join(question)) + + answer = sys.stdin.readline().strip() + for v in valid_answers: + if v == answer: + return answer + if v == '*': + return answer + if v == '+' and len(answer): + return answer + +def call_sysmobts_calib(mode, *args): + o = call_output('sysmobts-calib', '-c', 'ocxo', '-s', 'netlisten', '-b', Globals.band, '-i', Globals.calib_val, '-m', mode, *args) + log(o) + reload_dsp() + return o + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description=doc) + parser.add_argument('-b', '--band', dest='band', default=None, + help='Which GSM band to scan and calibrate to (850, 900, 1800, 1900)') + parser.add_argument('-a', '--arfcn', dest='arfcn', default=None, + help="Don't scan, directly use this ARFCN to calibrate to") + parser.add_argument('-i', '--initial-clock-correction', dest='calib_val', default=None, + help='Clock calibration value to start out with. If omitted, this is obtained from' + '/etc/osmocom/osmo-bts-sysmo.cfg from the BTS file system.') + parser.add_argument('-I', '--set-clock-correction', dest='set_calib_val', default=None, + help="Don't scan or calibrate, just set the given value in the config file") + parser.add_argument('-G', '--get-clock-correction', dest='get_calib_val', default=False, action='store_true', + help="Don't scan or calibrate, just read the given value in the config file") + parser.add_argument('args', nargs=1, help='Hostname (SSH) to reach the BTS at') + + cmdline = parser.parse_args() + + Globals.bts = cmdline.args[0] + if cmdline.band: + Globals.band = cmdline.band + + if cmdline.set_calib_val: + set_cfg_calib_val(cmdline.set_calib_val) + exit(0) + + if cmdline.get_calib_val: + print(get_cfg_calib_val()) + exit(0) + + Globals.orig_calib_val = cmdline.calib_val + if Globals.orig_calib_val is None: + Globals.orig_calib_val = get_cfg_calib_val() or '0' + Globals.calib_val = Globals.orig_calib_val + + print('Starting out with clock calibration value %s' % Globals.calib_val) + + #call('systemctl', 'stop', 'osmo-bts-sysmo') + reload_dsp() + + if cmdline.arfcn: + Globals.arfcn = cmdline.arfcn + else: + arfcns = call_sysmobts_calib('scan') + best_arfcn_line = arfcns.splitlines()[-1] + Globals.arfcn = best_arfcn_line.split(':')[0].split(' ')[-1] + try: + int(Globals.arfcn) + except: + error('Error while scanning bands') + + print('Using ARFCN %r' % Globals.arfcn) + + collected_values = [] + result_re = re.compile('The calibration value is: ([0-9]*)') + + for i in range(7): + print('\nround %d' % (i+1)) + o = call_sysmobts_calib('calibrate', '-a', Globals.arfcn) + for m in result_re.finditer(o): + collected_values.append(int(m.group(1))) + + collected_values = list(sorted(collected_values)) + print(collected_values) + if not collected_values: + continue + + best_values = collected_values + if len(best_values) > 3: + best_values = best_values[1:-1] + + avg = sum(best_values) / len(best_values) + Globals.calib_val = str(int(avg)) + print('clock-calibration: started with %s, current=%s' % + (Globals.orig_calib_val, Globals.calib_val)) + + print('RESULT:', Globals.calib_val, ' (was %s)' % Globals.orig_calib_val) + + cfg_calib_val = get_cfg_calib_val() + if Globals.calib_val != cfg_calib_val: + a = ask('osmo-bts-sysmo.cfg currently has %s\nmodify osmo-bts-sysmo.cfg to clock-calibration %s? (ok, no)' + % (cfg_calib_val, Globals.calib_val), + valid_answers=('ok', 'no', '')) + if a == 'ok': + set_cfg_calib_val(Globals.calib_val) + call('systemctl', 'start', 'osmo-bts-sysmo') +# vim: shiftwidth=4 expandtab tabstop=4 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 00:08:46 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 7 Aug 2019 00:08:46 +0000 Subject: Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/15075 Change subject: run.sh: add comment to show how to enable MNCC udtrace ...................................................................... run.sh: add comment to show how to enable MNCC udtrace Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 --- M net/templates/run.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/75/15075/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 3244b11..6b0d065 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -66,6 +66,8 @@ hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" +# To enable udtrace on MNCC socket, use this with adjusted /path/to/udtrace: +#msc="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/path/to/udtrace/libudtrace.so osmo-msc 2>&1 | tee -a current_log/osmo-msc.out" gbproxy="osmo-gbproxy" sgsn="osmo-sgsn" ggsn="osmo-ggsn" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 00:08:46 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 7 Aug 2019 00:08:46 +0000 Subject: Change in ...osmo-dev[master]: osmo-bsc.cfg: remove 'as' config from cs7 Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/15076 Change subject: osmo-bsc.cfg: remove 'as' config from cs7 ...................................................................... osmo-bsc.cfg: remove 'as' config from cs7 It's not needed and causes confusion with routing-keys when more BSCs show up. Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0 --- M net/templates/osmo-bsc.cfg 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/76/15076/1 diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg index 7741b26..10aa0e3 100644 --- a/net/templates/osmo-bsc.cfg +++ b/net/templates/osmo-bsc.cfg @@ -20,9 +20,6 @@ cs7 instance 0 point-code ${BSC_PC} asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 4 ${BSC_PC} network network country code ${MCC} mobile network code ${MNC} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0 Gerrit-Change-Number: 15076 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 00:08:47 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 7 Aug 2019 00:08:47 +0000 Subject: Change in ...osmo-dev[master]: kamailio: fixes and tweaks Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 Change subject: kamailio: fixes and tweaks ...................................................................... kamailio: fixes and tweaks This is what I did to get external MNCC with kamailio to work. (As before, only change MSC_MNCC from "internal" to "external ..." in config_* to enable use of kamailio as external MNCC.) Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 --- M net/templates/kamailio.cfg M net/templates/run.sh 2 files changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/77/15077/1 diff --git a/net/templates/kamailio.cfg b/net/templates/kamailio.cfg index c5b0bf2..b0e2bf3 100644 --- a/net/templates/kamailio.cfg +++ b/net/templates/kamailio.cfg @@ -102,8 +102,8 @@ loadmodule "xlog.so" loadmodule "sanity.so" # loadmodule "ctl.so" -loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" +# loadmodule "cfg_rpc.so" +# loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_NAT diff --git a/net/templates/run.sh b/net/templates/run.sh index 6b0d065..c50cfca 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -130,15 +130,9 @@ read enter_to_close echo Closing... -if [ "x${MSC_MNCC}" != "xinternal" ]; then - kill %13 %14 - killall osmo-sip-connector - killall kamailio -fi - #ssh bts neels/stop_remote.sh -kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 +kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 killall osmo-msc killall osmo-bsc killall osmo-gbproxy @@ -150,6 +144,13 @@ sudo killall tcpdump killall osmo-ggsn +if [ "x${MSC_MNCC}" != "xinternal" ]; then + # 'killall' seems to work only with the shortened name + killall osmo-sip-connec + killall kamailio +fi + + set +e cp *.cfg "$logdir"/ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 08:06:33 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 08:06:33 +0000 Subject: Change in ...osmo-sip-connector[master]: Cosmetic: Logging and Comments, spelling and clarity changes In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 to look at the new patch set (#2). Change subject: Cosmetic: Logging and Comments, spelling and clarity changes ...................................................................... Cosmetic: Logging and Comments, spelling and clarity changes Also removes a comment in sdp_create_file() about the IP address in o= and c= having to be the same. It is completely legal in SDP and often normal for the originator and the connection information IP to be different. Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a --- M src/call.c M src/mncc.c M src/sdp.c M src/sip.c M src/vty.c 5 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/72/15072/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a Gerrit-Change-Number: 15072 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 08:06:33 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 08:06:33 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle case where SIP side hangsup while MNCC is on hold In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 to look at the new patch set (#2). Change subject: Handle case where SIP side hangsup while MNCC is on hold ...................................................................... Handle case where SIP side hangsup while MNCC is on hold Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 --- M src/mncc.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/73/15073/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 Gerrit-Change-Number: 15073 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 08:06:36 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 08:06:36 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 Change subject: Logging: Make use of Levels ...................................................................... Logging: Make use of Levels Up to now most logging is on LDEBUG, lets make more use of Log Levels. NOTICE reports basic call setup INFO gives a little more DEBUG, well.. it's DEBUG Also, a 4XX or 5XX response to INVITE is not an Error so don't log it as such. Also 183 does not necessarily mean "ringing". Change those log messages for clarity. Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe --- M src/mncc.c M src/sip.c 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/78/15078/1 diff --git a/src/mncc.c b/src/mncc.c index d8545da..90eddc1 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -422,7 +422,7 @@ /* TODO.. now we can continue with the call */ struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DMNCC, LOGL_DEBUG, + LOGP(DMNCC, LOGL_INFO, "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", leg->callref, ip_addr, leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); @@ -515,7 +515,7 @@ memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); - LOGP(DMNCC, LOGL_DEBUG, + LOGP(DMNCC, LOGL_NOTICE, "Created call(%u) with MNCC leg(%u) IMSI(%.16s)\n", call->id, leg->callref, data->imsi); diff --git a/src/sip.c b/src/sip.c index 327e90f..c1e34d3 100644 --- a/src/sip.c +++ b/src/sip.c @@ -76,7 +76,7 @@ if (status == 183) sdp_extract_sdp(leg, sip, false); - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg); + LOGP(DSIP, LOGL_INFO, "leg(%p) is now progressing.\n", leg); other->ring_call(other); } @@ -98,7 +98,7 @@ return; } - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id); + LOGP(DSIP, LOGL_INFO, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id); leg->state = SIP_CC_CONNECTED; other->connect_call(other); nua_ack(leg->nua_handle, TAG_END()); @@ -112,7 +112,7 @@ const char *from = NULL, *to = NULL; char ip_addr[INET_ADDRSTRLEN]; - LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); + LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); if (!sdp_screen_sdp(sip)) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); @@ -161,7 +161,7 @@ } struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", + LOGP(DSIP, LOGL_INFO, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", ip_addr, leg->base.port, leg->base.payload_type); @@ -343,13 +343,13 @@ else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown SIP status(%d), releasing.\n", leg, status); + LOGP(DSIP, LOGL_NOTICE, "INVITE got status(%d), releasing leg(%p).\n", status, leg); nua_cancel(leg->nua_handle, TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); if (other) { - LOGP(DSIP, LOGL_DEBUG, "Releasing other leg (%p) with status(%d)\n", other, status); + LOGP(DSIP, LOGL_INFO, "Releasing MNCC leg (%p) with status(%d)\n", other, status); other->cause = status2cause(status); other->release_call(other); } @@ -365,7 +365,7 @@ } else if (event == nua_r_bye || event == nua_r_cancel) { /* our bye or hang up is answered */ struct sip_call_leg *leg = (struct sip_call_leg *) hmagic; - LOGP(DSIP, LOGL_NOTICE, "leg(%p) got resp to %s\n", + LOGP(DSIP, LOGL_INFO, "leg(%p) got resp to %s\n", leg, event == nua_r_bye ? "bye" : "cancel"); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); @@ -374,7 +374,7 @@ struct sip_call_leg *leg = (struct sip_call_leg *) hmagic; struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_ERROR, "leg(%p) got bye, releasing.\n", leg); + LOGP(DSIP, LOGL_NOTICE, "leg(%p) got bye, releasing.\n", leg); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); @@ -395,7 +395,7 @@ struct sip_call_leg *leg; struct call_leg *other; - LOGP(DSIP, LOGL_ERROR, "Cancelled on leg(%p)\n", hmagic); + LOGP(DSIP, LOGL_NOTICE, "Cancelled on leg(%p)\n", hmagic); leg = (struct sip_call_leg *) hmagic; other = call_leg_other(&leg->base); @@ -447,7 +447,7 @@ * to help us here. */ - LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause)); + LOGP(DSIP, LOGL_INFO, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause)); cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text); snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 08:10:27 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 08:10:27 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels ...................................................................... Logging: Make use of Levels Up to now most logging is on LDEBUG, lets make more use of Log Levels. NOTICE reports basic call setup INFO gives a little more DEBUG, well.. it's DEBUG * BYE is not an Error. * 4XX or 5XX response to INVITE is not an Error don't log as such. * 183 does not necessarily mean "ringing". Change those log messages for clarity. Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe --- M src/mncc.c M src/sip.c 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/78/15078/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:13:05 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 09:13:05 +0000 Subject: Change in ...osmo-sip-connector[master]: In hold/retreive/reinvite, add check that other_leg exists Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 Change subject: In hold/retreive/reinvite, add check that other_leg exists ...................................................................... In hold/retreive/reinvite, add check that other_leg exists We should always check that the other leg did not somehow dissapear before accessing it. Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 --- M src/mncc.c M src/sip.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/79/15079/1 diff --git a/src/mncc.c b/src/mncc.c index 90eddc1..744e0ea 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -703,6 +703,12 @@ LOGP(DMNCC, LOGL_DEBUG, "leg(%u) is requesting hold.\n", leg->callref); other_leg = call_leg_other(&leg->base); + if (!other_leg) { + LOGP(DMNCC, LOGL_ERROR, "leg(%u) other leg gone!\n", + leg->callref); + mncc_send(leg->conn, MNCC_HOLD_REJ, leg->callref); + return; + } other_leg->hold_call(other_leg); mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref); leg->state = MNCC_CC_HOLD; @@ -721,6 +727,14 @@ LOGP(DMNCC, LOGL_DEBUG, "leg(%u) is requesting unhold.\n", leg->callref); other_leg = call_leg_other(&leg->base); + if (!other_leg) { + /* The SIP leg went away while we were holding! */ + LOGP(DMNCC, LOGL_ERROR, "leg(%u) other leg gone!\n", + leg->callref); + mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); + mncc_call_leg_release(&leg->base); + return; + } other_leg->retrieve_call(other_leg); mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); /* In case of call waiting/swap, At this point we need to tell the MSC to send diff --git a/src/sip.c b/src/sip.c index c1e34d3..13bb183 100644 --- a/src/sip.c +++ b/src/sip.c @@ -193,6 +193,13 @@ LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id); struct call_leg *other = call_leg_other(&leg->base); + + if (!other) { + LOGP(DMNCC, LOGL_ERROR, "leg(%p) other leg gone!\n", leg); + sip_release_call(&leg->base); + return; + } + if (!sdp_get_sdp_mode(sip, &mode)) { /* re-INVITE with no SDP. * We should respond with SDP reflecting current session @@ -540,6 +547,11 @@ OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); leg = (struct sip_call_leg *) _leg; other_leg = call_leg_other(&leg->base); + if (!other_leg) { + LOGP(DMNCC, LOGL_ERROR, "leg(%p) other leg gone!\n", leg); + sip_release_call(&leg->base); + return; + } char *sdp = sdp_create_file(leg, other_leg, sdp_sendonly); nua_invite(leg->nua_handle, NUTAG_MEDIA_ENABLE(0), @@ -557,6 +569,11 @@ OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); leg = (struct sip_call_leg *) _leg; other_leg = call_leg_other(&leg->base); + if (!other_leg) { + LOGP(DMNCC, LOGL_ERROR, "leg(%p) other leg gone!\n", leg); + sip_release_call(&leg->base); + return; + } char *sdp = sdp_create_file(leg, other_leg, sdp_sendrecv); nua_invite(leg->nua_handle, NUTAG_MEDIA_ENABLE(0), -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 Gerrit-Change-Number: 15079 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:13:34 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 09:13:34 +0000 Subject: Change in ...osmo-sip-connector[master]: In hold/retrieve/reinvite, add check that other_leg exists In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 ) Change subject: In hold/retrieve/reinvite, add check that other_leg exists ...................................................................... In hold/retrieve/reinvite, add check that other_leg exists We should always check that the other leg did not somehow dissapear before accessing it. Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 --- M src/mncc.c M src/sip.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/79/15079/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 Gerrit-Change-Number: 15079 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:16:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:16:13 +0000 Subject: Change in ...osmo-dev[master]: add sysmobts-calib.py In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15074 ) Change subject: add sysmobts-calib.py ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:16:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:16:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:16:44 +0000 Subject: Change in ...osmo-dev[master]: osmo-bsc.cfg: remove 'as' config from cs7 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15076 ) Change subject: osmo-bsc.cfg: remove 'as' config from cs7 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0 Gerrit-Change-Number: 15076 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:16:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:17:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:17:54 +0000 Subject: Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15075 ) Change subject: run.sh: add comment to show how to enable MNCC udtrace ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:17:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:19:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:19:16 +0000 Subject: Change in ...osmo-dev[master]: kamailio: fixes and tweaks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:19:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:22:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:22:03 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c at 518 PS2, Line 518: LOGP(DMNCC, LOGL_NOTICE, IMHO that should be INFO, since it's normal procedure, nothing really noticeable indicating something strange going on. https://gerrit.osmocom.org/#/c/15078/2/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/15078/2/src/sip.c at 346 PS2, Line 346: LOGP(DSIP, LOGL_NOTICE, "INVITE got status(%d), releasing leg(%p).\n", status, leg); INFO https://gerrit.osmocom.org/#/c/15078/2/src/sip.c at 377 PS2, Line 377: LOGP(DSIP, LOGL_NOTICE, "leg(%p) got bye, releasing.\n", leg); INFO https://gerrit.osmocom.org/#/c/15078/2/src/sip.c at 398 PS2, Line 398: LOGP(DSIP, LOGL_NOTICE, "Cancelled on leg(%p)\n", hmagic); INFO -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:22:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:23:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:23:28 +0000 Subject: Change in ...osmo-sip-connector[master]: In hold/retrieve/reinvite, add check that other_leg exists In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 ) Change subject: In hold/retrieve/reinvite, add check that other_leg exists ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 Gerrit-Change-Number: 15079 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:23:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:44:06 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 09:44:06 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c at 518 PS2, Line 518: LOGP(DMNCC, LOGL_NOTICE, > IMHO that should be INFO, since it's normal procedure, nothing really noticeable indicating somethin [?] ACK. If call creation is happening quite often, this message would be rather annoying than NOTICEable. https://gerrit.osmocom.org/#/c/15078/2/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/15078/2/src/sip.c at 79 PS2, Line 79: progressing Unrelated change, but not critical. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:44:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 09:48:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 09:48:53 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E2-6563_=E2=86=92_0=2E6=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15080 Change subject: Bump version: 0.5.0.2-6563 ? 0.6.0 ...................................................................... Bump version: 0.5.0.2-6563 ? 0.6.0 Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a --- M TODO-RELEASE M debian/changelog M src/Makefile.am 3 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/80/15080/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 45ebb75..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif Add new field to struct osmux_out_handle Breaks ABI with older versions -libosmo-netif Add new API osmux_xfrm_output_init2 Deprecates old osmux_xfrm_output_init diff --git a/debian/changelog b/debian/changelog index e3b19c9..ad070c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libosmo-netif (0.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmux: Extend osmux_out_handle and add new API to set rtp payload_type + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 11:47:35 +0200 + libosmo-netif (0.5.0) unstable; urgency=medium [ Max ] diff --git a/src/Makefile.am b/src/Makefile.am index 4d8b900..b317684 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=7:0:1 +LIBVERSION=8:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a Gerrit-Change-Number: 15080 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:13:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:13:09 +0000 Subject: Change in ...libusrp[master]: Remove trailing whitespace Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15081 Change subject: Remove trailing whitespace ...................................................................... Remove trailing whitespace Change-Id: I8b6b8781c95a4930b89e5c5462d322cf04ccda67 --- M Makefile.am M configure.ac 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/81/15081/1 diff --git a/Makefile.am b/Makefile.am index 4dcbb92..a9baf62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,23 +1,23 @@ # # Copyright 2003 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# include $(top_srcdir)/Makefile.common diff --git a/configure.ac b/configure.ac index ac486bc..fc1933c 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl AX_BOOST_UNIT_TEST_FRAMEWORK dnl AX_BOOST_WSERIALIZATION -# Allow user to choose whether to generate SWIG/Python +# Allow user to choose whether to generate SWIG/Python # Default is enabled AC_ARG_ENABLE([python], [AS_HELP_STRING([--enable-python], -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I8b6b8781c95a4930b89e5c5462d322cf04ccda67 Gerrit-Change-Number: 15081 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:13:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:13:09 +0000 Subject: Change in ...libusrp[master]: Use release helper from libosmocore Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15082 Change subject: Use release helper from libosmocore ...................................................................... Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I3aaa768a9c7afda11852521c548352244bf141ac --- M Makefile.am A TODO-RELEASE M configure.ac 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/82/15082/1 diff --git a/Makefile.am b/Makefile.am index a9baf62..553747e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,5 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ usrp.pc + + at RELMAKE@ diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac index fc1933c..ec86209 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,10 @@ AC_CONFIG_MACRO_DIRS([m4]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + AC_PROG_CXX LT_INIT([pic-only disable-static]) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3aaa768a9c7afda11852521c548352244bf141ac Gerrit-Change-Number: 15082 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:13:10 +0000 Subject: Change in ...libusrp[master]: configure.ac: Use git-version-gen Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15083 Change subject: configure.ac: Use git-version-gen ...................................................................... configure.ac: Use git-version-gen Change-Id: Ib5458af1df08eec82339b4e7f7696b9c390a3078 --- M configure.ac A git-version-gen 2 files changed, 155 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/83/15083/1 diff --git a/configure.ac b/configure.ac index ec86209..3f02c14 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,7 @@ -AC_INIT([libusrp], [3.4.2]) +AC_INIT([libusrp], + m4_esyscmd([./git-version-gen .tarball-version]), + [openbsc at lists.osmocom.org]) + AM_INIT_AUTOMAKE([foreign subdir-objects silent-rules]) AM_SILENT_RULES([yes]) diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib5458af1df08eec82339b4e7f7696b9c390a3078 Gerrit-Change-Number: 15083 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:13:10 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibusrp=5Bmaster=5D=3A_Bump_version=3A_3=2E4=2E2=2E17-1489_=E2=86=92_3=2E4=2E3?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15084 Change subject: Bump version: 3.4.2.17-1489 ? 3.4.3 ...................................................................... Bump version: 3.4.2.17-1489 ? 3.4.3 Change-Id: I7f3ace74e30aba8609f435e76256badd93fb0220 --- M debian/changelog 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/84/15084/1 diff --git a/debian/changelog b/debian/changelog index 1ce0ac4..877cc76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +libusrp (3.4.3) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * build: use correct python version in generate_regs.py + * debian/rules: Don't overwrite .tarball-version + * build_eeprom.py: Fix build for distros with python3 as default + * edit-gpif: Fix build for distros with python3 as default + * Remove trailing whitespace + * Use release helper from libosmocore + * configure.ac: Use git-version-gen + + [ Harald Welte ] + * firmware: Fix include directory path names + * firmware: Port to more modern SDCC syntax. + * Re-enable build of usrp FX2 firmware + * debian: Make sure the FX2 firmware is packaged + * debian: Add 'sdcc' package to BuildDepends + + [ Max ] + * Add config for git-review + + [ Alexander Huemer ] + * usrp2: firmware: ignore .lk build artifacts + * Avoid compiler warning 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]' + + [ Oliver Smith ] + * firmware/src/usrp2/Makefile.am: fix "distcheck" + * contrib/jenkins.sh: run "make {distcheck,maintainer-clean}" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 12:12:21 +0200 + libusrp (3.4.2) unstable; urgency=medium * Initial release -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I7f3ace74e30aba8609f435e76256badd93fb0220 Gerrit-Change-Number: 15084 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:29:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:29:40 +0000 Subject: Change in ...libgtpnl[master]: debian: Adapt package name to lib's current major version Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/15085 Change subject: debian: Adapt package name to lib's current major version ...................................................................... debian: Adapt package name to lib's current major version Current LIBVERSION is 1:1:1 (current:revision:age), so major=current-age makes it be major=0: libgtpnl0. It can bee seen in current osmocom debian repos that libgtpnl1 package contains libgtpnl.so.0. Let's set package name accordingly. Change-Id: I7d2fa50b6a17a598467f555558660ef2396c1744 --- M debian/control R debian/libgtpnl0.install 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/85/15085/1 diff --git a/debian/control b/debian/control index af83842..3128f3e 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libgtpnl.git;a=summary Homepage: https://projects.osmocom.org/projects/openggsn -Package: libgtpnl1 +Package: libgtpnl0 Section: libs Architecture: any Multi-Arch: same @@ -29,7 +29,7 @@ Multi-Arch: same Section: libdevel Depends: libmnl-dev, - libgtpnl1 (= ${binary:Version}), + libgtpnl0 (= ${binary:Version}), ${misc:Depends} Description: Development headers for Linux kernel GTP-U netlink library The header files provided by this package may be used to develop @@ -40,6 +40,6 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libgtpnl1 (= ${binary:Version}), +Depends: libgtpnl0 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for Linux kernel GTP-U netlink library diff --git a/debian/libgtpnl1.install b/debian/libgtpnl0.install similarity index 100% rename from debian/libgtpnl1.install rename to debian/libgtpnl0.install -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I7d2fa50b6a17a598467f555558660ef2396c1744 Gerrit-Change-Number: 15085 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:29:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:29:40 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-d160-dirty_=E2=86=92_1=2E2=2E1?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/15086 Change subject: Bump version: 1.2.0.2-d160-dirty ? 1.2.1 ...................................................................... Bump version: 1.2.0.2-d160-dirty ? 1.2.1 Change-Id: Icc0dca37a88ce213f9b80598ab89570bd81cf0e7 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/86/15086/1 diff --git a/debian/changelog b/debian/changelog index 6499958..9e8e6c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libgtpnl (1.2.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * debian/rules: Don't overwrite .tarball-version + * debian: Adapt package name to lib's current major version + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 12:29:04 +0200 + libgtpnl (1.2.0) unstable; urgency=medium * Fix CTRL_ATTR_FAMILY_ID attribute size -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Icc0dca37a88ce213f9b80598ab89570bd81cf0e7 Gerrit-Change-Number: 15086 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:36:35 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 10:36:35 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15078/2/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/15078/2/src/sip.c at 79 PS2, Line 79: progressing > Unrelated change, but not critical. I included a ref to this in the commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 10:36:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:40:08 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 10:40:08 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c at 518 PS2, Line 518: LOGP(DMNCC, LOGL_NOTICE, > IMHO that should be INFO, since it's normal procedure, nothing really noticeable indicating somethin [?] wha...? Wait.... INFO includes NOTICE, no? So if you set log level INFO, you are going to see the NOTICEs -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 10:40:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:43:53 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 10:43:53 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c at 518 PS2, Line 518: LOGP(DMNCC, LOGL_NOTICE, > ACK. [?] I was thinking.. If you really want to watch/log extra details of what's going on, you set INFO, if you want to just get regular logging of calls, you get NOTICE. But you guys feel that NOTICE is not for that? so if i demote those notice to info, there's no way to just log call occurence without logging juicy details, unless i demote the juicy details to DEBUG and the the things currently on DEBUG need to go to... VERBOSE_DEBUG ?? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 10:43:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:52:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:52:37 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing header netinet/in.h Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 Change subject: Transceiver: Add missing header netinet/in.h ...................................................................... Transceiver: Add missing header netinet/in.h Previous commit started using IPPROTO_UDP without including required include. Newer versions of libosmocore's osmocom/core/socket.h include that header so the define is present, but older versions of libosmocore (such as 0.12.0) don't, so let's include it explicitly (the correct thing to do). Fixes: b9d2515704ac83cacd88d0a73ecba30323df0b2d Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/15087/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index b12a498..4da1876 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -24,6 +24,7 @@ */ #include +#include #include // std::setprecision #include #include "Transceiver.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:52:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:52:37 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15088 Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Require newer version of libosmocore to avoid build failure Older commit started using osmo_timerd_* APIs which are only available starting libosmocore 0.12.0, but configure.ac still states 0.11.0 is accepted, which is incorrect. Fixes: 4456b6f132437a95833e3a3d3353836331b9c8a0 Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/15088/1 diff --git a/configure.ac b/configure.ac index f2664ed..fa9cf8d 100644 --- a/configure.ac +++ b/configure.ac @@ -75,9 +75,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:52:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:52:38 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-190b_=E2=86=92_1=2E1=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15089 Change subject: Bump version: 1.0.0.104-190b ? 1.1.0 ...................................................................... Bump version: 1.0.0.104-190b ? 1.1.0 Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 --- M debian/changelog 1 file changed, 126 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/15089/1 diff --git a/debian/changelog b/debian/changelog index dc20ec8..80cadd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,129 @@ +osmo-trx (1.1.0) unstable; urgency=medium + + [ Sylvain Munaut ] + * arm/convolve: Fix the vfp4 real convolution for h_len=12 + * convolve: Remove support for step, offset parameters + * tests: Rework the convolve_test + * tests: Re-enable the convolve_test by default + * sigProcLib: Add C/I (Carrier-to-Interference ratio) computation + + [ Vadim Yanitskiy ] + * VTY: add extended (11-bit) RACH detection toggle + * doc/configuration.adoc: fix incorrect number of physical RF channels for B210 + * driveTxPriorityQueue(): cosmetic: use proper type for TDMA TN + * driveTxPriorityQueue(): use trxd_hdr_common for message parsing + * driveTxPriorityQueue(): check if message header format is supported + * driveTxPriorityQueue(): enrich logging message + * trxd_fill_common(): fix TRXD header version coding + * manuals/configuration.adoc: fix copy-paste error in config example + + [ Pau Espin Pedrol ] + * osmo-trx: Avoid handling signals after shutdown triggered + * osmo-trx: Use signalfd to serialize signals in main thread ctx + * osmo-trx: Check return code of osmo_fd_register + * lms: flush_recv: alloc buf on stack instead of heap + * lms: Improve log during flush recv error + * cosmetic: Threads.h: Remove trailing whitespace + * Move duplicated thread_enable_cancel to CommonLibs + * lms: Log underrun/overrun events + * lms: Remove references to ALERT loglevel + * lms: Remove unused var m_last_tx_overruns + * lms: Catch and log dropped packets by HW during recv + * cosmetic: uhd: Move smpl_buf out of UHDDevice, move UHDDevice class definition to .h + * uhd: smpl_buf: Drop UHD specifics out back to UHDDevice + * uhd: smpl_buf: Use TIMESTAMP type in str_status + * cosmetic: uhd: Use loglevel ERROR instead of ERR + * uhd: Avoid reallocation of buffers every read + * Move smpl_buf out of uhd dir to re-use it in other devices + * device: Drop unused numberRead/numberWritten APIs + * smpl_buf: Remove unused clk_rt variable + * smpl_buf: Remove unused clk_rt variable (fixup) + * smpl_buf: Remove dbg log line with duplicated info + * Introduce LOGCHAN macro to standarize logging channel info + * smpl_buf: Move it to device/common and create libdevice_common.la + * lms: Use smpl_buf to recover from timestamp jumps + * lms: Fix stream_stats checks with droppedPackets + * Add rate_ctr support to store/retrieve SDR errors through VTY + * Rename and move STOP signal from Transceiver to main + * doc: vty: Update trx_vty_reference.xml + * lms: Drop unusued variable masterClockRate + * lms: Fix stream_stats checks with overrun/underrun + * Add VTY commands to set error ctr thresholds + * Remove AUTHORS file + * trx_{vty,rate_ctr}: Set proper license AGPLv3+ + * Introduce structs to encode TRXD packets + * Transceiver: refactor: gather uplink burst parameters in struct + * Transceiver: Drop unused rssi_valid struct field + * Transceiver: Move nbits burst size calculation to pullRadioVector() + * Transceiver: Move calculation of normalized values (rssiOffset) to pullRadioVector() + * Transceiver: Move soft bits normalization to pullRadioVector() + * Transceiver: Drop use of GSM::Time from trx_ul_burst_ind + * Transceiver: Get rid of SoftVector in struct trx_ul_burst_ind + * Transceiver: replace UDPSocket with libosmocore socket API + * Transceiver: Avoid noise calculation formula in 2 branches in pullRadioVector + * Transceiver: Simplify code on early error return when calling detectAnyBurst + * Transceiver: pullRadioVector(): Move initialization of var to start of function + * Transceiver: Support pulling idle frames in pullRadioVector() + * sigProcLib: detectAnyBurst() family: Use struct to gather all out params + * sigProcLib: detectAnyBurst(): make TSC used to detect burst available to caller + * Logger: global Log mutex is now available from C code + * Transceiver: Move out TRXD socket send code to prepare for TRXDv1 + * Transceiver: Support SETFORMAT command + * Transceiver: Support TRXD v1 + * Transceiver: Initialize mExtRACH in constructor + * debian/copyright: Remove non existent radioInterfaceDiversity.cpp from list + * debian/copyright: Update wrong paths in license list + * debian/copyright: Add missing file Utils.* to LGPL-2.1+ list + * cosmetic: Fix trailing whitespace in several files + * Add SPDX annotation + * Bind CTRL port to IP addr specified in VTY config + * Transceiver: Store TRXD version per channel + * Transceiver: Clean up code passing parameters to threads + * Remove empty ChangeLog fnd NEWS files + * Remove unused autogen.sh + * radioInterface: Clarify how underruns are handled driving a radioDevice + * usrp1: don't check for non-null underrun pointer + * jenkins.sh: Workaround libusrp build race conditon + * lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr + * Move inband-signaling-usb documentation to UserManual + * Move matlab files under utils/matlab + * Move Transceiver52/README to UserManual + * Move README.DFEsymbolspaced to utils/matlab + * Move std_inband.rbf under device/usrp1/ dir + * Drop old README information, provide new updated README + * Transceiver: Add missing header netinet/in.h + * Require newer version of libosmocore to avoid build failure + + [ Tom Tsou ] + * multi-ARFCN: fix maximum number of carriers limitation + + [ Harald Welte ] + * use BSC_FD_READ and not OSMO_FD_READ + * proto_trxd.c: Use bit-wise AND, not boolean AND + * Timeval: Restore output stream flags after changing them + * ChannelizerBase: fix initialization of class members + * CorrelationSequence: fix initialization of class members + * radioInterface.cpp: Fix missing member initialization of RadioInterface() + + [ Joachim Steiger ] + * lms: Remove wrong unused code copied from -uhd + * lms: move LMS_EnableChannel from Start/Stop to Open/Close device + * lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start + * lms: add device type detection and device specific gains + * lms: properly call close if set_antennas() fails, add some comments + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Eric Wild ] + * Add option to set stack size in config file, default == 0 == OS default + + [ Ruben Undheim ] + * Fix spelling discovered by lintian + + -- Pau Espin Pedrol Wed, 07 Aug 2019 12:52:13 +0200 + osmo-trx (1.0.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:59:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:59:48 +0000 Subject: Change in ...osmo-pcu[master]: Require newer libosmocore to avoid compile failures Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15090 Change subject: Require newer libosmocore to avoid compile failures ...................................................................... Require newer libosmocore to avoid compile failures Older commit started using OSMO_IMSI_BUF_SIZE, only available in libosmocore 1.1.0 onwards, but forgot to increase the values in configure.ac. Fixes: 2c076bcb4dc1bc2ada340441c2f898c55318209f Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 --- M configure.ac 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/15090/1 diff --git a/configure.ac b/configure.ac index 149162e..5ecd133 100644 --- a/configure.ac +++ b/configure.ac @@ -74,10 +74,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.1.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 Gerrit-Change-Number: 15090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 10:59:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 10:59:48 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E87-cd2a-dirty_=E2=86=92_0=2E7=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15091 Change subject: Bump version: 0.6.0.87-cd2a-dirty ? 0.7.0 ...................................................................... Bump version: 0.6.0.87-cd2a-dirty ? 0.7.0 Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 --- M debian/changelog 1 file changed, 120 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/91/15091/1 diff --git a/debian/changelog b/debian/changelog index ac9c6a8..b4c3ad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,123 @@ +osmo-pcu (0.7.0) unstable; urgency=medium + + [ Rafael Diniz ] + * Added support for daemonize to osmo-pcu. + * Fix help message formatting of osmo-pcu. + + [ Max ] + * Don't install pcuif_proto.h header + * Move C include to proper place + * Add define for dummy burst string + * Add encoding tests for Immediate Assignment + * Clarify write_immediate_assignment() signature + * Restructure IA Rest Octets encoders + * Rewrite Packet Downlink Assignment + * Rewrite EGPRS Packet Uplink IA Rest Octets for MBA + * Rewrite EGPRS Packet Uplink IA Rest Octets for SBA + * MCS: internalize 'family' parameter + * EDGE tests: reduce code duplication + * MCS: remove dead code + * EDGE tests: remove no-op check + * Use msgb_eq_data_print() in tests + * Tighten lqual table limits check + * Enable LGLOBAL logging for TBF tests + * Log (M)CS UL update errors + * MCS: move Coding Scheme enum outside of class definition + * Make get_retx_mcs() into regular function + * MCS: remove unused function + * Debian: bump copyright year + * Use unique NSEI/BVCI/NSVCI in TBF tests + * MS store: move test helper to unit test + * Explicitly clean up BTS singleton + * MCS: move HeaderType enum outside of class definition + * MCS: use value_string for conversion + * TBF-DL: log MCS as string + * Fix TA index encoder + * MCS: move Mode enum outside of class definition + * MCS: add mcs_is_*() helpers + * MCS: add Channel Coding Command encoder + * Fix Channel Coding Command for MCS + * Rewrite Packet Uplink IA Rest Octets for MBA + * Rewrite Packet Uplink IA Rest Octets for SBA + * Use Timing Advance Index in UL assignments + * TBF: update MCS counters + * TBF-DL: cosmetic update for helper routines + * Update IA Rest Octets encoding + * TS alloc: expand tests log + * vty: add commands to show TBF of a certain kind + * Update MCS selection for retransmission + * cosmetic: use const pointer for bts_data + * Add test for MS mode and (M)CS settings + * Use libosmocore for IMSI parsing + + [ Harald Welte ] + * Mark gprs_ns_reconnect() as static (not used outside of C file) + * Optionally Use the NS Sub-Network-Service (SNS) on Gb + * pcu_l1_if: Fix erroneous endian-swapping of the CellID + * Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP + * gprs_debug: Use named initializers and explicit array indicies + * bssgp: Fix dead code: PDUT_STATUS can never reach this part + + [ JF Dionne ] + * encoding: Fixes TMSI vs MI bit selection in repeated page info + + [ Oliver Smith ] + * tests: use -no-install libtool flag to avoid ./lt-* scripts + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Daniel Willmann ] + * Include pdch.h in bts.h even if we're not compiling C++ + * oc2g: Remove custom alarms + * oc2g: Change log type (Litecell15->Oc2g) + * jenkins.sh: Add oc2g build support + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update VTY documentation + + [ Jean-Francois Dionne ] + * Initial commit for OC-2G support. + + [ Minh-Quang Nguyen ] + * OC-2G: Fix missing header + * OC-2G: Fix TA adjustment + * OC-2G: Always use positive TA information provided in PH-RA-IND + + [ Alexander Couzens ] + * gprs_bssgp_pcu: make gprs_bssgp_ns_cb public + * gprs_bssgp_pcu: explicit allocate & initialize bssgp_nsi instance + * encoding: correct encoding of CRBB in ACK/NACK when not byte aligned + * encoding: use `/* */` for comments instead of `#if 0 #endif` + * egprs_rlc_compression: fix white spaces + * tests/BitcompTest: fix wording in log message + * rlc: replace int with uint16_t + * Encoding: drop struct gprs_rlcmac_bts* from all functions + * decompress_crbb: add length argument for search_runlen + * Encoding: write_packet_ack_nack_desc_egprs: don't use a reference for rest_bits + * bts.cpp: ensure left-shift operation does not exceed uint32_t + * Encoding: use uint16_t when interacting with the window object + * Encoding: ACK/NACK: always encode with length field present + + [ Keith ] + * Cosmetic: Osmcoom -> Osmocom + + [ Vadim Yanitskiy ] + * src/pcu_l1_if.cpp: fix: properly pass measurements from PCUIF + * gprs_bssgp_pcu_rx_dl_ud(): fix: BSSGP_IE_IMSI is optional + * gprs_bssgp_pcu.cpp: check return code of gsm48_mi_to_string() + * gprs_bssgp_pcu_rx_dl_ud(): use OSMO_IMSI_BUF_SIZE + + [ Thorsten Alteholz ] + * fix spelling errors detected by lintian + + [ Eric Wild ] + * ubsan: fix shift + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require newer libosmocore to avoid compile failures + + -- Pau Espin Pedrol Wed, 07 Aug 2019 12:59:10 +0200 + osmo-pcu (0.6.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 Gerrit-Change-Number: 15091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:11:05 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 11:11:05 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels, clarify some messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 to look at the new patch set (#3). Change subject: Logging: Make use of Levels, clarify some messages ...................................................................... Logging: Make use of Levels, clarify some messages Up to now most logging is on LDEBUG, lets make more use of Log Levels. reserve NOTICE for unusual events INFO: normal call setup/teardown DEBUG, well.. it's DEBUG * BYE is not an Error. * 4XX or 5XX response to INVITE is not an Error don't log as such. * 183 does not necessarily mean "ringing". Change those log messages for clarity. Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe --- M src/mncc.c M src/sip.c 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/78/15078/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:13:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 11:13:45 +0000 Subject: Change in ...osmo-pcap[master]: Require libosmocore 0.11.0 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15092 Change subject: Require libosmocore 0.11.0 ...................................................................... Require libosmocore 0.11.0 Building against older versions fail for different reasons, newest one being due to osmo_init_logging2 being added in 0.11.0. Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/92/15092/1 diff --git a/configure.ac b/configure.ac index 95c5270..2511b37 100644 --- a/configure.ac +++ b/configure.ac @@ -115,9 +115,9 @@ AC_SUBST([PCAP_CFLAGS]) dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(LIBZMQ, libzmq >= 3.2.2) PKG_CHECK_MODULES(LIBGNUTLS, gnutls) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725 Gerrit-Change-Number: 15092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:13:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 11:13:46 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E2-ce06_=E2=86=92_0=2E1=2E1?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15093 Change subject: Bump version: 0.1.0.2-ce06 ? 0.1.1 ...................................................................... Bump version: 0.1.0.2-ce06 ? 0.1.1 Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/93/15093/1 diff --git a/debian/changelog b/debian/changelog index f2da97e..168df55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-pcap (0.1.1) unstable; urgency=medium + + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require libosmocore 0.11.0 + + -- Pau Espin Pedrol Wed, 07 Aug 2019 13:12:47 +0200 + osmo-pcap (0.1.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02 Gerrit-Change-Number: 15093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:13:53 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 11:13:53 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels, clarify some messages In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels, clarify some messages ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15078/2/src/mncc.c at 518 PS2, Line 518: LOGP(DMNCC, LOGL_NOTICE, > ACK. [?] The original code had rather a lot of routine messages logging in NOTICE, so let's move them to INFO then. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 11:13:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:19:43 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 11:19:43 +0000 Subject: Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15075 ) Change subject: run.sh: add comment to show how to enable MNCC udtrace ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 11:19:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:19:57 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 11:19:57 +0000 Subject: Change in ...osmo-dev[master]: kamailio: fixes and tweaks In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 11:19:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:23:46 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 7 Aug 2019 11:23:46 +0000 Subject: Change in ...osmo-dev[master]: add sysmobts-calib.py In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15074 ) Change subject: add sysmobts-calib.py ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 11:23:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:26:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 11:26:37 +0000 Subject: Change in ...libasn1c[master]: Fix LIBVERSION not applied Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libasn1c/+/15094 Change subject: Fix LIBVERSION not applied ...................................................................... Fix LIBVERSION not applied Change-Id: I232c2fdcc5e9dc821fbea6e7dc498b6ed5b460a9 --- M debian/control R debian/libasn1c1.install M src/Makefile.am 3 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/94/15094/1 diff --git a/debian/control b/debian/control index 4313249..32b93e3 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libasn1c.git;a=summary Homepage: https://projects.osmocom.org/projects/libasn1c -Package: libasn1c0 +Package: libasn1c1 Section: libs Architecture: any Multi-Arch: same @@ -22,12 +22,12 @@ Section: debug Architecture: any Multi-Arch: same -Depends: libasn1c0 (= ${binary:Version}), ${misc:Depends} +Depends: libasn1c1 (= ${binary:Version}), ${misc:Depends} Description: asn1c runtime code as shared library Package: libasn1c-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libasn1c0 (= ${binary:Version}), ${misc:Depends} +Depends: libasn1c1 (= ${binary:Version}), ${misc:Depends} Description: asn1c runtime code as shared library diff --git a/debian/libasn1c0.install b/debian/libasn1c1.install similarity index 100% rename from debian/libasn1c0.install rename to debian/libasn1c1.install diff --git a/src/Makefile.am b/src/Makefile.am index 27fce6d..29b5e64 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,5 @@ lib_LTLIBRARIES = libasn1c.la -libasn1c_la_LDFLAGS = $(LIBTALLOC_LIBS) -lm +libasn1c_la_LDFLAGS = $(LIBTALLOC_LIBS) -lm -version-info $(LIBVERSION) -no-undefined libasn1c_la_SOURCES = ANY.c constraints.c GeneralizedTime.c NumericString.c T61String.c asn_codecs_prim.c constr_CHOICE.c GeneralString.c ObjectDescriptor.c TeletexString.c asn_SEQUENCE_OF.c constr_SEQUENCE.c GraphicString.c OBJECT_IDENTIFIER.c UniversalString.c asn_SET_OF.c constr_SEQUENCE_OF.c IA5String.c OCTET_STRING.c UTCTime.c ber_decoder.c constr_SET.c INTEGER.c per_decoder.c UTF8String.c ber_tlv_length.c constr_SET_OF.c ISO646String.c per_encoder.c VideotexString.c ber_tlv_tag.c constr_TYPE.c NativeEnumerated.c per_support.c VisibleString.c BIT_STRING.c NativeInteger.c PrintableString.c xer_decoder.c BMPString.c der_encoder.c NativeReal.c REAL.c xer_encoder.c BOOLEAN.c ENUMERATED.c NULL.c RELATIVE-OID.c xer_support.c per_opentype.c asn1helpers.c - -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/15094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I232c2fdcc5e9dc821fbea6e7dc498b6ed5b460a9 Gerrit-Change-Number: 15094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 11:26:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 11:26:37 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E31=2E4-cd14-dirty_=E2=86=92_0=2E9=2E32?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libasn1c/+/15095 Change subject: Bump version: 0.9.31.4-cd14-dirty ? 0.9.32 ...................................................................... Bump version: 0.9.31.4-cd14-dirty ? 0.9.32 Change-Id: Id7d60b7d7f4fa50d980c7636041eb36810c748ac --- M debian/changelog 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/95/15095/1 diff --git a/debian/changelog b/debian/changelog index e7480c2..d6987b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +libasn1c (0.9.32) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * debian/rules: Don't overwrite .tarball-version + * Fix LIBVERSION not applied + + [ Oliver Smith ] + * jenkins.sh: disable parallel build + * Revert "jenkins.sh: disable parallel build" + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 13:26:10 +0200 + libasn1c (0.9.31) unstable; urgency=medium [ Alexander Couzens ] -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/15095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: Id7d60b7d7f4fa50d980c7636041eb36810c748ac Gerrit-Change-Number: 15095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 12:41:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 12:41:56 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Add DRY_RUN mode Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15096 Change subject: osmo-release.sh: Add DRY_RUN mode ...................................................................... osmo-release.sh: Add DRY_RUN mode This option allows testing if everything is in place before attempting release related actions such as commiting, applying tag, etc. It's also useful during development of the osmo-release.sh release itself, sine it makes test iterations faster (no need to undo actions done). Change-Id: Ie5c320b7c92f92fcc37287bb9801368265a986b3 --- M osmo-release.sh 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/15096/1 diff --git a/osmo-release.sh b/osmo-release.sh index 4446da7..d59083c 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -9,6 +9,8 @@ ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" +# Test stuff but don't modify stuff: +DRY_RUN="${DRY_RUN:-0}" libversion_to_deb_major() { libversion="$1" @@ -73,12 +75,19 @@ exit 1 fi fi + if [ "z$DRY_RUN" != "z0" ]; then + exit 0 + fi if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE git add TODO-RELEASE fi fi + +if [ "z$DRY_RUN" != "z0" ]; then + exit 0 +fi gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" dch -r -m --distribution "unstable" "" git add debian/changelog -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie5c320b7c92f92fcc37287bb9801368265a986b3 Gerrit-Change-Number: 15096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 12:41:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 12:41:56 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15097 Change subject: osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION ...................................................................... osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION Change-Id: Ib929bfac3689f35aaa58d7d079a46fff188b7e8e --- M osmo-release.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/15097/1 diff --git a/osmo-release.sh b/osmo-release.sh index d59083c..e9602aa 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -60,6 +60,7 @@ else echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" fi + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" if [ "z$control_matches" = "z0" ]; then echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" @@ -69,6 +70,19 @@ else echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" fi + + dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" + dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" + if [ "z$dhstrip_lib_total" != "z0" ]; then + if [ "z$dhstrip_lib_matches" = "z0" ] ; then + echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" + exit 1 + elif [ "z$dhstrip_lib_total" = "z1" ]; then + echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" + else + echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" + fi + fi done # catch and forward exit from pipe subshell "while read": if [ $? -ne 0 ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib929bfac3689f35aaa58d7d079a46fff188b7e8e Gerrit-Change-Number: 15097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 12:44:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 12:44:05 +0000 Subject: Change in ...osmo-ggsn[master]: Require libosmocore 1.1.0 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 Change subject: Require libosmocore 1.1.0 ...................................................................... Require libosmocore 1.1.0 Older commit made use of gsm48_decode_bcd_number2(), which is available in libosmocore 1.1.0 onwards, but forgot to increase configure.ac requirements. Fixes: fb625041601c525c23c96482250157dddb0941a4 Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/98/15098/1 diff --git a/configure.ac b/configure.ac index 7b985b9..4c39681 100644 --- a/configure.ac +++ b/configure.ac @@ -138,9 +138,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.1.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 Gerrit-Change-Number: 15098 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 12:44:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 12:44:06 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E49-0036-dirty_=E2=86=92_1=2E4=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 Change subject: Bump version: 1.3.0.49-0036-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.49-0036-dirty ? 1.4.0 Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp5.install M debian/rules M gtp/Makefile.am 6 files changed, 72 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/99/15099/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index a3d63ac..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libgtp Several new APIs added see I653cbdc185165592d985e3efab6e3f1add97877b -libgtp API (non-used externally) pdp_init modified see I653cbdc185165592d985e3efab6e3f1add97877b -libgtp Several pdp_* APIs marked as deprecated see I653cbdc185165592d985e3efab6e3f1add97877b diff --git a/debian/changelog b/debian/changelog index 21bd8ff..8957912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +osmo-ggsn (1.4.0) unstable; urgency=medium + + [ Max ] + * Don't return error on normal shutdown + + [ Harald Welte ] + * process_pco() const-ify 'apn' argument + * ggsn: Remove magic numbers from pco_contains_proto() + * ggsn: const-ify input / read-only arguments of PCO related functions + * ggsn: Remove magic numbers from ipcp_contains_option() + * ggsn: Fix build_ipcp_pco() in presence of invalid IPCP content + * ggsn.c: Refactor PCO processing during PDP activation + * ggsn: Add minimalistic PAP support + * ggsn: More logging from PCO handling (e.g. in case of malconfiguration) + * sgsnemu: Fix format string argument count + + [ Vadim Yanitskiy ] + * osmo-ggsn: fix VTY command for getting PDP contexts by APN + * osmo-ggsn: add VTY command to show PDP context by IPv4 + * osmo-ggsn: check result of osmo_apn_to_str() + * osmo-ggsn: print requested / actual APN in PDP info + * osmo-ggsn: properly show subscriber's MSISDN in the VTY + + [ Pau Espin Pedrol ] + * ggsn: Drop unused param force in apn_stop() + * gtp: Document spec reasoning drop of Rx DeleteCtxReq + * ggsn: Start gtp retrans timer during startup + * gtp: Take queue_resp into account to schedule retrans timer + * gtp: Fix typo dublicate->duplicate + * pdp: Introduce new API pdp_count_secondary + * gtp_create_pdp_ind: simplify code by reordering and compacting parsing + * gtp: Refactor code to use gtp_freepdp(_teardown) APIs + * cosmetic: gtp: Document free pdp ctx in non-teardown scenario + * gtp: Re-arrange free pdp ctx code in non-teardown scenario + * pdp: Drop unused code for haship + * cosmetic: gtp.h: Remove trailing whitespaces + * ggsn: Fix undefined behaviour shifting beyond sign bit + * gtp: Introduce new pdp APIs (and deprecate old ones) to support multiple GSN + * gtp: Make use of new libgtp APIs with multi-gsn support + * ggsn_vty_reference.xml: Update from last code changes + * ggsn: vty: Require ggsn param in cmd + * sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one + * cosmetic: gtp: queue: remove trailing whitespace + * gtp: Add missing headers + * gtp: queue.c: Document queue APIs + * gtp: queue: Add unit test queue_test + * ggsn: Avoid unaligned mem access reading PCO proto id + * ggsn: Use structures instead of raw arrays when parsing ipcp_hdr + * configure.ac: Replace obosolete macro AC_CANONICAL_SYSTEM + * configure.ac: Use brackets in AC_INIT params + * configure.ac: Use prefered AC_CONFIG_HEADERS over AM_CONFIG_HEADER + * configure.ac: some versions of linux/if.h require including sys/socket.h + * sgsnemu: Fix unaligned pointer access during ip/icmp checksum + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require libosmocore 1.1.0 + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * ggsn: Use gtp_delete_context_req2() everywhere + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + + -- Pau Espin Pedrol Wed, 07 Aug 2019 14:42:11 +0200 + osmo-ggsn (1.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 272fd79..0e03228 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp4 +Package: libgtp5 Architecture: any Multi-Arch: same Section: libs @@ -42,7 +42,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp4 (= ${binary:Version}) + libgtp5 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -55,7 +55,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -66,7 +66,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp4.install b/debian/libgtp5.install similarity index 100% rename from debian/libgtp4.install rename to debian/libgtp5.install diff --git a/debian/rules b/debian/rules index d0f5935..cdb2480 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp4 --dbg-package=libgtp-dbg + dh_strip -plibgtp5 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals diff --git a/gtp/Makefile.am b/gtp/Makefile.am index d6c8c62..20255f7 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=4:0:0 +LIBVERSION=5:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 Gerrit-Change-Number: 15099 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 12:48:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 12:48:36 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E13=2E0=2E7-ffff_=E2=86=92_1=2E14=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/15100 Change subject: Bump version: 1.13.0.7-ffff ? 1.14.0 ...................................................................... Bump version: 1.13.0.7-ffff ? 1.14.0 Change-Id: Id7ef68f50fb951dfb0687977924115204f8482a6 --- M TODO-RELEASE M debian/changelog M src/Makefile.am 3 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/00/15100/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index bbc1495..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libsmpp34 smpp34_heap Adding new API/ABI to override memory allocator diff --git a/debian/changelog b/debian/changelog index b8459ad..3c07045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +libsmpp34 (1.14.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * debian/rules: Don't overwrite .tarball-version + + [ Neels Hofmeyr ] + * esme.c: mark switch statement fall-thru for coverity + + [ Stefan Sperling ] + * fix use of partly initialized struct in tcp test + + [ Vadim Yanitskiy ] + * configure.ac: enable kernel style compile messages + + [ Harald Welte ] + * Allow application to override default heap allocator + * bind_receiver_test: Fix "unused value" of writing addr_ton twice + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 14:48:06 +0200 + libsmpp34 (1.13.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] diff --git a/src/Makefile.am b/src/Makefile.am index 55097c4..5958c38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=1:0:0 +LIBVERSION=2:0:1 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/15100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Id7ef68f50fb951dfb0687977924115204f8482a6 Gerrit-Change-Number: 15100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:02:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:02:01 +0000 Subject: Change in ...osmo-bts[master]: configure.ac: Require libosmocore 1.2.0 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15101 Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... configure.ac: Require libosmocore 1.2.0 Some commits started using libosmocore APIs osmo_gsm48_rest_octets_si3_encode() and lapdm_channel_init2(), which are only available in latest libosmocore release 1.2.0. Let's update configure.ac accordingly. Fixes: 1e96e31c106aed9192ed9ea78ff1a711464390d7 Fixes: 46d62b984a10b3966d8a0d0a435d4efab0e9c500 Change-Id: If84c53d8192e8db98eb9439b898d83e94c5e5476 --- M configure.ac 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/01/15101/1 diff --git a/configure.ac b/configure.ac index 15c4259..b70d934 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If84c53d8192e8db98eb9439b898d83e94c5e5476 Gerrit-Change-Number: 15101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:02:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:02:01 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E1_=E2=86=92_1=2E1=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15102 Change subject: Bump version: 1.0.1 ? 1.1.0 ...................................................................... Bump version: 1.0.1 ? 1.1.0 Change-Id: I708f6a63b51459d77368c48e115f64aaa6646bfd --- M debian/changelog 1 file changed, 187 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/15102/1 diff --git a/debian/changelog b/debian/changelog index a33d21f..5cb0f0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,190 @@ +osmo-bts (1.1.0) unstable; urgency=medium + + [ Daniel Willmann ] + * Rename oc2g config file to match new naming scheme + * dump_docs: Use new config file naming scheme + * systemd: Install OC2G service files with autotools + * doc/examples: Install OC2G config files with autotools + * osmo-bts-oc2g: Fix status LED responsibilities + * osmo-bts-lc15: Change LED behaviour to be the same as oc2g + * manuals: Add script to regenerate counter/vty documentation + * manuals: Add counter documentation + * manuals: Update vty documentation + + [ Harald Welte ] + * Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 + * scheduler_trx: Fix erroneous multiply-by-four + * OML: some more comments on what functions do + * OML: Return attributes in ACK/NACK messages + * OML: Ensure MOs are initialized with valid "Administrative State' + * OML: Don't overwrite MO instance before oml_tx_failure_event_rep() + * OML: remove double-logging on oml_tx_failure_event_rep() + * OML: send proper OML alerts in case of errors + * OML: Reduce code duplication in down_mom/down_fom + * OML: Report short messages even for invalid TRX numbers in down_fom() + * OML: Use 'const struct abis_oml_mo *' whenever users only read + * OML: Reject segmented OML messages + * OML: Properly reject short messages and truncate over-long messages + * OML: Work around OsmoBSC sending "GET ATTRIBUTES" with short length + * OML: Store merged attributes of IPA OML Managed Objects + * OML: Don't advertise baseband transceiver as UNLOCKED at startup + * OC-2G: Nominal transmit power is 25 dBm, not 40 + * rsl.c: Add missing #include of gsm0808.h + * Forward GPRS SUSPEND REQ from DCCH to PCU socket + * handle NULL return from rate_ctr_group_alloc() + * rsl: Send RSL Error Report in case of unknown/unsupported msg_type + * rsl: Include Channel Nr and Link ID in Error reports whenever possible + * RSL: Reject RLL messages for lchans that are not active yet + * RSL: Fix off-by-one error when parsing SACCH INFO IE in RSL CHAN ACT + * cbch: Implement handling of "Schedule" message + * cbch: Refactor get_smscb_block() / remove smscb_msg.next_seg + * cbch: Log every RSL SMSCB COMMAND with type and number of blocks + * cbch: Implement support for DEFAULT message + * cbch: Fix memory leak and send error message on invalid SMSCB command + * cbch: Support Extended CBCH + * cbch: Keep SMSCB queue length counter + * manual: We now support RSL CBCH LOAD INDICATION + * manual: SMSCB BROADCAST COMMAND has no limitations anymore + * README.md: Mention LimeSDR as SDR device + * sysmo: Fix "nominal power" / BS power display in VTY + * cbch: Add counters; queue length limits and CBCH LOAD reporting + * cbch: Improve verbosity and extend logging; Always indicate BASIC/EXTD CBCH + * Use LOGPLCHAN whenever possible + * rsl.adoc: DELETE INDICATION is implemented since Feb '18 + * RSL: Fix logic about fixed/dynamic MS power control in MS POWER COMMAND + * rsl: Implement parsing of BS Power Control message + * rsl: MS POWER COCNTROL isn't (only) about "forcing" power levels + * load_indication: Fix missing re-set of RACH parameters + * l1sap: Correctly count RACH slots in calc_exprd_rach_frames() + * l1sap: Fix calculation of expired RACH slots in case of missing frame numbers + * oml: Print more context from FOM Header or using MO + * oml: Have one generic log message for all transmitted messages + * Add severity to OML FAILURE EVENT REPORT + * Fix passing of RR SUSPEND REQ from DCCH to PCU socket + * clear GPRS indicator in SI3 while PCU is disconnected + * trx: Update documentation for fn-advance and rts-advance + * l1sap: Compute statistics on FN advance in PH-RTS.ind + * [correctly] use the LAPDm T200 values received via OML + * Update T200 timer default values + * lapdm: Use new libosmocore API to ensure per-channel-type N200 values + * sysmo/l1_if.c: Annotate fall-through in switch statement + * osmo-bts-trx: Don't increment rssi_valid_count twice + * osmo-bts-trx: Don't attemtp to adjust MS power if fixed + * scheduler_trx: Handle negative return of gsm0503_tch_hr_decode() + + [ Vadim Yanitskiy ] + * common/vty.c: fix 'cfg_phy_no_inst_cmd' command description + * common/oml.c: fix: properly push abis_nm_ipa_magic + * common/pcu_sock.c: fix possible memleaks in pcu_sock_read() + * common/oml.c: constify argument 'trx' of handle_attrs_trx() + * common/oml.c: use proper NACK reason in oml_tx_attr_resp() + * common/oml.c: use proper OML object for Get Attribute Response + * common/oml.c: fix total length calculation in cleanup_attr_msg() + * common/l1sap.c: fix: add missing new line to a debug message + * common/rsl.c: fix size argument in memcmp() call + * common/rsl.c: fix unaligned pointers in rsl_add_rtp_stats() + * common/paging.c: fix unaligned pointer access + * common/oml.c: introduce and use both LOGPFOH and DEBUGPFOH + * common/oml.c: use proper format specifier for uint16_t + * common/oml.c: fix broken debug print in down_mom() + * common/oml.c: refactor Get Attribute Response message generation + * common/oml.c: fix: properly encode NM_ATT_SW_CONFIG + * osmo-bts-trx: distinguish 11-bit Access Bursts by synch. sequence + * osmo-bts-sysmo: fix: indicate BTS_FEAT_CBCH support on OML + * README.md: remove OS#1865 from 'Known limitations' + * common/rsl.c: fix NULL-pointer dereference in rsl_rx_rll() + * osmo-bts-trx/trx_if.c: dropping Tx bursts is a noticeable event + * osmo-bts-trx/l1_if.h: drop unused ho_rach_detect from trx_l1h + * osmo-bts/scheduler.h: cosmetic: use bool for ho_rach_detect + * common/rsl.c: RSL_IE_HANDO_REF is mandatory for handover CHAN ACT + * common/bts.c: bts_supports_cm(): take care about GSM48_CMODE_SIGN + * Use #define RSL_CHAN_RACH for RSL Channel Number of RACH + * common/scheduler.c: refactor description of TRXC_* lchans + * osmo-bts-trx/trx_if.c: use osmo_loadXXbe() for TDMA FN and ToA256 + * osmo-bts-trx/trx_if.c: rename and clarify TRX_MAX_BURST_LEN + * osmo-bts-trx/trx_if.c: introduce TRXD header version handling + * osmo-bts-trx/trx_if.c: introduce TRXD header version 0x01 support + * osmo-bts-trx/trx_if.c: drop RSSI / ToA debugging code + * osmo-bts-trx/trx_if.c: properly describe TRXD messages in logs + * osmo-bts-trx/trx_if.c: add TRXD header version negotiation + * osmo-bts-trx/trx_if.c: encode actual TRXD header version + * osmo-bts-trx/scheduler: pass trx_ul_burst_ind to lchan handlers + * osmo-bts/scheduler: provide actual C/I values to OsmoPCU + * osmo-bts-trx/scheduler: rx_rach_fn(): use optional TSC info from TRX + * osmo-bts-trx/scheduler: rx_rach_fn(): clarify handover RACH handling + * osmo-bts-trx/scheduler: rx_rach_fn(): enrich debug message + * common/rsl.c: fix: properly handle SI3 Rest Octets + * Clarify and refactor link quality (C/I) handling + * Move Access Burst link quality handling to L1SAP + * osmo-bts-trx/scheduler: rx_rach_fn(): provide actual C/I ratio to L1SAP + * osmo-bts-trx/scheduler: rx_data_fn(): provide actual C/I ratio to L1SAP + + [ Max ] + * osmo-bts-trx: add extended (11-bit) RACH support + * Log lchan kind on PCU-related error + * Enable statsd support + * Make gsm_pchan2chan_nr() static + * Constify pcu_rx_*() parameters + + [ Philipp Maier ] + * scheduler_trx: use stored fn for pdtch data indications + * oc2g: remove unused define constant FACTORY_ROM_PATH + * lc15: remove unused define constant FACTORY_ROM_PATH + * oml: make oml_tx_failure_event_rep() public + * oc2gbts_mgr_vty: remove calls to vty_install_default() + * oc2g: l1if: delay trx initialization to avoid race condition + * oc2gbts_mgr: use msgb_talloc_ctx_init() instead of msgb_set_talloc_ctx() + * oc2g: generate failure event report in case of bad calibration + * oc2g: change log level for calibration file errors to FATAL + * vty: add function gsmnet_from_vty() to vty.h + * main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT + * oml: use oml_tx_failure_event_rep() instead of oml_fail_rep() + * oml: use oml_tx_failure_event_rep() instead of signals to SS_FAIL + * l1_if: add include for missing header file + * oc2gbts_mgr_calib: don't use fsync() on *FILE pointer + * oc2gbts_mgr_calib: do not return NULL on integer function + * oc2gbts_mgr: use osmo_init_logging2() instead of osmo_init_logging() + * pcu_sock: use %zu conversion specifier for printing sizeof() result + + [ Pau Espin Pedrol ] + * oc2g: Fix compilation error (comment mark inside comment) + * oc2g: Add get_hwversion_desc to header file + * oc2g: Cleanup of get_hwversion_desc + * oc2g: led_sleep_cb: pass correct ptr to llist_move_tail + * oc2g: fsync requires fd instead of file stream + * oc2g: Remove unused variables + * oc2g: Remove unused static function + * oc2g: vty: Compilation error fixes due to commented code + * contrib: Remove deprecated screen script helpers + * bts-trx: trx_if.c: Introduce logging macro LOGPPHI + * gsm_data_shared.h: Remove unused loc_list from struct gsm_bts + * bts: Bypass T200 DCCH values for CCCH + * bts-trx: Introduce VTY command osmotrx trxd-max-version + * trx: Use LOGPPHI instead of LOGP in some more messages + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * configure.ac: Require libosmocore 1.2.0 + + [ Alexander Huemer ] + * Remove 11-bit RACH support from 'Known Limitations' + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * Revert "debian: create -doc subpackage with pdf manuals" + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Neels Hofmeyr ] + * lc15,sysmo,oc2g: fix dsp-trace-flag command + + [ Eric Wild ] + * revert changes to T200 + * RSL: Fix fixed MS power control in RSL CHAN ACTIV + + [ Thorsten Alteholz ] + * fix spelling stuff mentioned by lintian + + -- Pau Espin Pedrol Wed, 07 Aug 2019 15:59:02 +0200 + osmo-bts (1.0.0) unstable; urgency=medium [ Stefan Sperling ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I708f6a63b51459d77368c48e115f64aaa6646bfd Gerrit-Change-Number: 15102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:15:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:15:01 +0000 Subject: Change in ...osmo-hlr[master]: configure.ac: Require libosmocore 1.2.0 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15103 Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... configure.ac: Require libosmocore 1.2.0 Current code uses GSM23003_MSISDN_MAX_DIGITS, which is only available in libosmocore 1.2.0 onwards. Let's update configure.ac accordingly. Fixes: 2e403d6c3f0caa4fd40e8cab8acd6586deadfdf8 Change-Id: Iad03a8cf7a36bdc824ec2acc8fb8f9c27a1c0421 --- M configure.ac 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/03/15103/1 diff --git a/configure.ac b/configure.ac index ef703f2..993d4d5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iad03a8cf7a36bdc824ec2acc8fb8f9c27a1c0421 Gerrit-Change-Number: 15103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:15:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:15:01 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E49-e493-dirty_=E2=86=92_1=2E1=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15104 Change subject: Bump version: 1.0.0.49-e493-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.49-e493-dirty ? 1.1.0 Change-Id: If53bdb2e216cb98df4d5a482cbbf24096db536ed --- M debian/changelog 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/04/15104/1 diff --git a/debian/changelog b/debian/changelog index ecb36d3..0b89abe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +osmo-hlr (1.1.0) unstable; urgency=medium + + [ Oliver Smith ] + * docs: running: document --db-upgrade + * Add IMEI column to subscriber table + * Optionally store IMEI in subscriber table + * VTY tests: fill DB before running test + * VTY: integrate IMEI + * hlr.c: replace deprecated osmo_gsup_get_err_msg_type() + * hlr.c: move hlr_ctx to the top + * tests: use -no-install libtool flag to avoid ./lt-* scripts + * Cosmetic: gsup_route_find: comment addr, addrlen + * USSD: save MO USSD's originating MSC's vlr_number + * USSD: don't use gsm0480_msgb_alloc_name() + * hlr.c: forward GSUP messages between clients + * db_hlr.c: db_subscr_create(): add flags argument + * db_hlr.c: add db_subscr_exists_by_imsi() + * Create subscribers on demand + * Document subscribers create on demand feature + * debian: create -doc subpackage with pdf manuals + * db_test: set timezone to work around mktime bug + * db_hlr: zero-initialize "struct tm" + * rx_check_imei_req(): fix IMEI bounds checking + * contrib/jenkins.sh: run "make maintainer-clean" + * VTY: add subscriber update network-access-mode + * manuals: improve subscribers create on demand + * gitignore: ignore everything generated in db_test + * db_auc.c: verify hex key sizes read from DB + + [ Max ] + * Log ip:port when adding GSUP routes + * Add link to project wiki to .service file + * Enable statsd support + + [ Vadim Yanitskiy ] + * hlr.c: properly terminate the process on SIGTERM + * hlr.c: fix: also store the session state in read_cb_forward() + * hlr.c: fix: properly print the original message type in read_cb_forward() + * hlr.c: check the presence of msgb->l2h in read_cb() + * hlr.c: fix possible msgb memleaks in read_cb() + * db_hlr.c: add db_subscr_exists_by_msisdn() + * src/db.h: use GSM23003_MSISDN_MAX_DIGITS for MSISDN buffer size + * src/hlr.c: fix deprecation warning: use gsm48_decode_bcd_number2() + * hlr_ussd.c: fix: properly pass invokeID in handle_ussd_own_msisdn() + * hlr_ussd.c: rx_proc_ss_req(): fix NULL pointer dereference + * build: fix mess with 'db_test_SOURCES' and 'db_test_LDADD' + * tests/db_test: close the database when test is finished + * src/db.c: integrate SQLite3 with talloc allocator + + [ Neels Hofmeyr ] + * USSD: fix routing to multiple MSC + * fix error logging for GSUP route + * add missing error log: invalid IMSI + * osmo-hlr: allow configuring db path from cfg file + * use new OSMO_IMSI_BUF_SIZE + + [ Daniel Willmann ] + * manuals: Add script to update vty/counter documentation from docker + * manuals: Update vty documentation + + [ Pau Espin Pedrol ] + * Remove undefined param passed to logging_vty_add_cmds + * configure.ac: Require libosmocore 1.2.0 + + -- Pau Espin Pedrol Wed, 07 Aug 2019 16:14:23 +0200 + osmo-hlr (1.0.0) unstable; urgency=medium [ Stefan Sperling ] -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If53bdb2e216cb98df4d5a482cbbf24096db536ed Gerrit-Change-Number: 15104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:31:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:31:16 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E26-2728_=E2=86=92_1=2E1=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 Change subject: Bump version: 1.0.0.26-2728 ? 1.1.0 ...................................................................... Bump version: 1.0.0.26-2728 ? 1.1.0 Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b --- M debian/changelog M src/Makefile.am 2 files changed, 49 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/05/15105/1 diff --git a/debian/changelog b/debian/changelog index 06496c1..4e73e7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,51 @@ +libosmo-sccp (1.1.0) unstable; urgency=medium + + [ Max ] + * Don't use deprecated osmo_stream_cli_open2() + * osmo_ss7.c: fix typo + * OsmoSTP: enable statsd support + + [ Neels Hofmeyr ] + * debug log typo fix in sccp_scoc.c + * improve logging for rejected AS in xua_rkm.c + * add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree() + * add osmo_sccp_addr_cmp(), osmo_sccp_addr_ri_cmp() + + [ Harald Welte ] + * vty: Ensure to properly save route pointcode and mask when writing + * Store + show remote ip/port in dynamically created ASPs + * Fix output of route destination in 'show ss7 instance <0-15> route' + * sccp_scoc: Add more comments describing conn_id and local_ref members + * stp: Ensure telnet uses STP talloc context, not NULL context + + [ Oliver Smith ] + * Cosmetic: sccp_scoc: fix local reference comments + * sccp_scoc: move sccp_find_user() up + * sccp_scoc: conn_create{,_id}() user arg, not inst + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * contrib/jenkins.sh: "maintainer-clean" after "publish" + + [ Holger Hans Peter Freyther ] + * xudt: Implement address and data extraction + * udts/xudts: Attempt to implement unitdata service parsing + + [ Vadim Yanitskiy ] + * osmo-stp: register VTY commands for talloc context introspection + * osmo-stp: expose root talloc context to the VTY code + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update vty documentation + + [ Kira Obrezkova ] + * This patch fixes typos on which Lintian complains + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + + -- Pau Espin Pedrol Wed, 07 Aug 2019 16:29:43 +0200 + libosmo-sccp (1.0.0) unstable; urgency=medium [ Harald Welte ] diff --git a/src/Makefile.am b/src/Makefile.am index 56567d6..bdb225b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=3:0:0 +LIBVERSION=4:0:1 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b Gerrit-Change-Number: 15105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:54:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:54:39 +0000 Subject: Change in ...osmo-mgw[master]: configure.ac: Require libosmo-netif 0.6.0 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15106 Change subject: configure.ac: Require libosmo-netif 0.6.0 ...................................................................... configure.ac: Require libosmo-netif 0.6.0 Current code uses APIs like osmux_xfrm_output_init2() and osmo_amr_*(), that are only available in libosmo-netif 0.6.0 onwards. Let's update configure.ac accordingly. Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/06/15106/1 diff --git a/configure.ac b/configure.ac index b4858c4..124f1e6 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 Gerrit-Change-Number: 15106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 14:54:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 14:54:39 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E84-a2d10-dirty_=E2=86=92_1=2E6=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15107 Change subject: Bump version: 1.5.0.84-a2d10-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.84-a2d10-dirty ? 1.6.0 Change-Id: I57277c34bbab1fc9ea2be6a754d5a79786ce627d --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmo-mgcp-client6.install M src/libosmo-mgcp-client/Makefile.am 5 files changed, 109 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/07/15107/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 14cb163..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,6 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -libosmo-mgcp-client add struct members AMR SDP/fmtp parameter generation -libosmo-mgcp-client add struct members Osmux use+cid fields to struct mgcp_msg and mgcp_conn_peer -libosmo-mgcp-client add struct members Osmux use+cid fields to struct mgcp_response_head diff --git a/debian/changelog b/debian/changelog index c1708fa..2259eac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,109 @@ +osmo-mgw (1.6.0) unstable; urgency=medium + + [ Oliver Smith ] + * Cosmetic: fix spaces/tabs in mgcp_requests[] + * Inactive connection cleanup (disabled by default) + * debian: create -doc subpackage with pdf manuals + * vty: allow 0 as conn-timeout to disable it + * vty: update desc of conn-timeout + * manuals: update VTY documentation + * "make dist" fix for: no rule to make mgcp_common.h + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Philipp Maier ] + * Add option to GSM HR frames to RFC5593 representation + * mgcp_sdp: cosmetic: correct typo in comment + * mgco_client: cosmetic: remove excess whitespace + * mgcp_sdp: mgcp_sdp.c does not include own header file + * mgcp_sdp: untangle parsing of a= parameters + * mgcp_network: use mgcp_rtp_codec in downlink format callback + * AMR: Add function to convert between bw-effient and octet aligned mode + + [ Neels Hofmeyr ] + * log: don't spam with "can not patch PT" messages + * mgcp client: allow setting conn mode for CRCX and MDCX + * make codec_table public as osmo_mgcpc_codec_names + * move MGW endpoint FSM from osmo-bsc to here + * fix: multiple initial CRCX + * constify map_codec_to_pt() ptmap arg + + [ Pau Espin Pedrol ] + * mgcp-client: whitespace cleanup in mgcp_client.c + * mgcp-client: Sanitize implementation of mgcp_client_rtpbridge_wildcard + * libosmo-mgcp: Use trunk type during endpoint allocation + * cosmetic: Fix typos in comment + * cosmetic: tests: mgcp_client_test: clean trailing whitespace + * mgcp_msg: Log faulty line on Osmux parsing error + * cosmetic: handle_modify_con: Fix indentation level + * Introduce log fmt helpers LOGPENDP and LOGPCONN + * create_response_with_sdp: Fix inclusion of X-Osmux + * osmux: Cleanup of CID alloc pool APIs + * mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check + * osmux: Log osmux socket during osmux_init + * mgcp-cli: Change osmo_mgcpc_ep_fsm name to avoid collision with old osmo-bsc + * osmux: Document func and return different rc upon osmux init failure + * osmux: Fix reception of legacy dummy payloads + * osmux: Use LOGPCONN in several log calls + * cosmetic: mgcp_udp_send: Document port param is in network byte order + * cosmetic: osmux: Document network byte order in port variable + * vty: Allow enabling Osmux + * osmux: Allocate CID during CRCX + * osmux: Introduce mgcp_conn_rtp_is_osmux() helper + * osmux: Mark conn_rtp->type as osmux during CRCX + * mgcp-cli: Allow submitting X-Osmux on CRCX request + * mgcp-cli: Parse X-Osmux on CRCX response + * osmux: Handle Osmux MGCP extension in MDCX messages + * mgcp-cli: Allow submitting X-Osmux on MDCX request + * mgcp-cli: Parse X-Osmux on MDCX response + * osmux: Drop unneeded OSMUX_STATE_NEGOTIATING + * mgcp-cli: endpoint_fsm: Add API to retrieve Osmux CID from MGW + * osmux: Provide correct local port during mgcp resp + * osmux: Use remote port to send osmux frames + * osmux: Improve logging around osmux enabling events + * osmux: Delay osmux enable of conn until remote addr is configured by MDCX + * osmux: Redo read/write osmux glue code to have data routed correctly + * mgw, mgcp-li: Handle X-Osmux param name as case insensitive + * osmux: Use DUMMY ft msg as per Osmux spec + * osmux: Fix loopback for Osmux connections + * osmux: Fix CID release for non-enabled connections + * osmux: Fix hardcoded rtp payload_type 98 in osmux conn + * mgcp-cli: Validate osmux cid value during mgcp_msg_gen + * mgw: Support uppercase LCO options + * mgw: Support lowercase header parameters + * mgcp-cli: Support lowercase header parameters + * mgw: Support receiving uppercase connection mode + * mgw: Support receiving lowercase LCO codec + * mgw: Make check of duplicated LCO fields case insensitive + * mgw: Allow receiving lowercase MGCP header keyword + * mgw: Allow receiving lowercase X-Osmo-Ign Callid field + * mgw: Allow receiving uppercase noanswer keyword + * doc: X-Osmo-IGN: small formatting and typo fixes + * doc: Add Osmux documentation to OsmoMGW User Manual + * Catch unsigned integer MGCP parsing errors with strtoul + * Fix return variable of strtoul() + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * configure.ac: Require libosmo-netif 0.6.0 + + [ Alexander Couzens ] + * mgcp_internal: LOGPENDP: ensure *endp is not NULL + + [ Harald Welte ] + * handle NULL return of rate_ctr_group_alloc() + * update .gitignore + * mgcp_sdp: Don't check if an unsigned int is below 0 + + [ Vadim Yanitskiy ] + * configure.ac: drop useless check for -fvisibility=hidden + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update vty/counter documentation + + [ Hoernchen ] + * turn -Werror=null-dereference into a warning + + -- Pau Espin Pedrol Wed, 07 Aug 2019 16:52:58 +0200 + osmo-mgw (1.5.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 8e0e079..aeceeac 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client5 +Package: libosmo-mgcp-client6 Section: libs Architecture: any Multi-Arch: same @@ -32,7 +32,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client5 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client6 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities Package: osmo-mgw-doc diff --git a/debian/libosmo-mgcp-client5.install b/debian/libosmo-mgcp-client6.install similarity index 100% rename from debian/libosmo-mgcp-client5.install rename to debian/libosmo-mgcp-client6.install diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 1529853..8f5513a 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -20,7 +20,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=5:0:0 +MGCP_CLIENT_LIBVERSION=6:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I57277c34bbab1fc9ea2be6a754d5a79786ce627d Gerrit-Change-Number: 15107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:00:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 15:00:06 +0000 Subject: Change in ...osmo-mgw[master]: configure.ac: Require libosmo-netif 0.6.0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15106 ) Change subject: configure.ac: Require libosmo-netif 0.6.0 ...................................................................... Patch Set 1: Expected failure since libosmo-netif 0.6.0 is in process of being released/merged. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 Gerrit-Change-Number: 15106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:00:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:11:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 15:11:03 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E14-92ea-dirty_=E2=86=92_0=2E5=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15108 Change subject: Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 ...................................................................... Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 37 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/08/15108/1 diff --git a/configure.ac b/configure.ac index dc3d1eb..4293635 100644 --- a/configure.ac +++ b/configure.ac @@ -33,12 +33,12 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.2.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.12.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.12.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.12.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.3.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.10.0) PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 26f7525..26c25da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +osmo-iuh (0.5.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * ranap_msg_factory.h: fix enum def within function signature + * osmo-hnbgw: fix cmdline: do not force-disable colored logging + * osmo-hnbgw: set a proper talloc ctx for logging + * osmo-hnbgw: logging tweaks + * osmo-hnbgw: reply with RESET ACK when receiving a RESET + + [ Oliver Smith ] + * tests: use -no-install libtool flag to avoid ./lt-* scripts + * contrib/jenkins.sh: run "make maintainer-clean" + * osmo-hnbgw.cfg: set local-ip to 0.0.0.0 + + [ Harald Welte ] + * iu_client: Implement transmission of ResetAcknowledge + * ranap_msg_factory: Fix criticality of PDUs + + [ Thorsten Alteholz ] + * spelling stuff found by lintian + + [ Daniel Willmann ] + * Add VTY reference manual + * jenkins: Enable manual publishing and building + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + + -- Pau Espin Pedrol Wed, 07 Aug 2019 17:10:24 +0200 + osmo-iuh (0.4.0) unstable; urgency=medium [ Bernhard M. Wiedemann ] diff --git a/src/Makefile.am b/src/Makefile.am index 586c689..928092f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # build the shared RANAP library # -RANAP_LIBVERSION=2:1:0 +RANAP_LIBVERSION=2:2:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 Gerrit-Change-Number: 15108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:42:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:42:30 +0000 Subject: Change in ...libasn1c[master]: Fix LIBVERSION not applied In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/15094 ) Change subject: Fix LIBVERSION not applied ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/15094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I232c2fdcc5e9dc821fbea6e7dc498b6ed5b460a9 Gerrit-Change-Number: 15094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:42:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:42:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:42:49 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E31=2E4-cd14-dirty_=E2=86=92_0=2E9=2E32?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/15095 ) Change subject: Bump version: 0.9.31.4-cd14-dirty ? 0.9.32 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/15095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: Id7d60b7d7f4fa50d980c7636041eb36810c748ac Gerrit-Change-Number: 15095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:42:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:42:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:42:52 +0000 Subject: Change in ...libasn1c[master]: Fix LIBVERSION not applied In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libasn1c/+/15094 ) Change subject: Fix LIBVERSION not applied ...................................................................... Fix LIBVERSION not applied Change-Id: I232c2fdcc5e9dc821fbea6e7dc498b6ed5b460a9 --- M debian/control R debian/libasn1c1.install M src/Makefile.am 3 files changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index 4313249..32b93e3 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libasn1c.git;a=summary Homepage: https://projects.osmocom.org/projects/libasn1c -Package: libasn1c0 +Package: libasn1c1 Section: libs Architecture: any Multi-Arch: same @@ -22,12 +22,12 @@ Section: debug Architecture: any Multi-Arch: same -Depends: libasn1c0 (= ${binary:Version}), ${misc:Depends} +Depends: libasn1c1 (= ${binary:Version}), ${misc:Depends} Description: asn1c runtime code as shared library Package: libasn1c-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libasn1c0 (= ${binary:Version}), ${misc:Depends} +Depends: libasn1c1 (= ${binary:Version}), ${misc:Depends} Description: asn1c runtime code as shared library diff --git a/debian/libasn1c0.install b/debian/libasn1c1.install similarity index 100% rename from debian/libasn1c0.install rename to debian/libasn1c1.install diff --git a/src/Makefile.am b/src/Makefile.am index 27fce6d..29b5e64 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,5 @@ lib_LTLIBRARIES = libasn1c.la -libasn1c_la_LDFLAGS = $(LIBTALLOC_LIBS) -lm +libasn1c_la_LDFLAGS = $(LIBTALLOC_LIBS) -lm -version-info $(LIBVERSION) -no-undefined libasn1c_la_SOURCES = ANY.c constraints.c GeneralizedTime.c NumericString.c T61String.c asn_codecs_prim.c constr_CHOICE.c GeneralString.c ObjectDescriptor.c TeletexString.c asn_SEQUENCE_OF.c constr_SEQUENCE.c GraphicString.c OBJECT_IDENTIFIER.c UniversalString.c asn_SET_OF.c constr_SEQUENCE_OF.c IA5String.c OCTET_STRING.c UTCTime.c ber_decoder.c constr_SET.c INTEGER.c per_decoder.c UTF8String.c ber_tlv_length.c constr_SET_OF.c ISO646String.c per_encoder.c VideotexString.c ber_tlv_tag.c constr_TYPE.c NativeEnumerated.c per_support.c VisibleString.c BIT_STRING.c NativeInteger.c PrintableString.c xer_decoder.c BMPString.c der_encoder.c NativeReal.c REAL.c xer_encoder.c BOOLEAN.c ENUMERATED.c NULL.c RELATIVE-OID.c xer_support.c per_opentype.c asn1helpers.c - -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/15094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I232c2fdcc5e9dc821fbea6e7dc498b6ed5b460a9 Gerrit-Change-Number: 15094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:42:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:42:52 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E31=2E4-cd14-dirty_=E2=86=92_0=2E9=2E32?= In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libasn1c/+/15095 ) Change subject: Bump version: 0.9.31.4-cd14-dirty ? 0.9.32 ...................................................................... Bump version: 0.9.31.4-cd14-dirty ? 0.9.32 Change-Id: Id7d60b7d7f4fa50d980c7636041eb36810c748ac --- M debian/changelog 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index e7480c2..d6987b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +libasn1c (0.9.32) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * debian/rules: Don't overwrite .tarball-version + * Fix LIBVERSION not applied + + [ Oliver Smith ] + * jenkins.sh: disable parallel build + * Revert "jenkins.sh: disable parallel build" + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 13:26:10 +0200 + libasn1c (0.9.31) unstable; urgency=medium [ Alexander Couzens ] -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/15095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: Id7d60b7d7f4fa50d980c7636041eb36810c748ac Gerrit-Change-Number: 15095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:44:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:44:08 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E87-cd2a-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15091 ) Change subject: Bump version: 0.6.0.87-cd2a-dirty ? 0.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 Gerrit-Change-Number: 15091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:44:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:44:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:44:13 +0000 Subject: Change in ...osmo-pcu[master]: Require newer libosmocore to avoid compile failures In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15090 ) Change subject: Require newer libosmocore to avoid compile failures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 Gerrit-Change-Number: 15090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:44:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:44:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:44:32 +0000 Subject: Change in ...libusrp[master]: configure.ac: Use git-version-gen In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15083 ) Change subject: configure.ac: Use git-version-gen ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib5458af1df08eec82339b4e7f7696b9c390a3078 Gerrit-Change-Number: 15083 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:44:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:44:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:44:39 +0000 Subject: Change in ...libusrp[master]: Remove trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15081 ) Change subject: Remove trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I8b6b8781c95a4930b89e5c5462d322cf04ccda67 Gerrit-Change-Number: 15081 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:44:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:44:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:44:42 +0000 Subject: Change in ...libusrp[master]: Use release helper from libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15082 ) Change subject: Use release helper from libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3aaa768a9c7afda11852521c548352244bf141ac Gerrit-Change-Number: 15082 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:44:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:45:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:45:10 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibusrp=5Bmaster=5D=3A_Bump_version=3A_3=2E4=2E2=2E17-1489_=E2=86=92_3=2E4=2E3?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15084 ) Change subject: Bump version: 3.4.2.17-1489 ? 3.4.3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I7f3ace74e30aba8609f435e76256badd93fb0220 Gerrit-Change-Number: 15084 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:45:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:45:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:45:28 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Add DRY_RUN mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15096 ) Change subject: osmo-release.sh: Add DRY_RUN mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie5c320b7c92f92fcc37287bb9801368265a986b3 Gerrit-Change-Number: 15096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:45:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:45:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:45:42 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15097 ) Change subject: osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib929bfac3689f35aaa58d7d079a46fff188b7e8e Gerrit-Change-Number: 15097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:45:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:45:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:45:46 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Add DRY_RUN mode In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15096 ) Change subject: osmo-release.sh: Add DRY_RUN mode ...................................................................... osmo-release.sh: Add DRY_RUN mode This option allows testing if everything is in place before attempting release related actions such as commiting, applying tag, etc. It's also useful during development of the osmo-release.sh release itself, sine it makes test iterations faster (no need to undo actions done). Change-Id: Ie5c320b7c92f92fcc37287bb9801368265a986b3 --- M osmo-release.sh 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 4446da7..d59083c 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -9,6 +9,8 @@ ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" +# Test stuff but don't modify stuff: +DRY_RUN="${DRY_RUN:-0}" libversion_to_deb_major() { libversion="$1" @@ -73,12 +75,19 @@ exit 1 fi fi + if [ "z$DRY_RUN" != "z0" ]; then + exit 0 + fi if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE git add TODO-RELEASE fi fi + +if [ "z$DRY_RUN" != "z0" ]; then + exit 0 +fi gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" dch -r -m --distribution "unstable" "" git add debian/changelog -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie5c320b7c92f92fcc37287bb9801368265a986b3 Gerrit-Change-Number: 15096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:45:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:45:46 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15097 ) Change subject: osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION ...................................................................... osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION Change-Id: Ib929bfac3689f35aaa58d7d079a46fff188b7e8e --- M osmo-release.sh 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index d59083c..e9602aa 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -60,6 +60,7 @@ else echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" fi + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" if [ "z$control_matches" = "z0" ]; then echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" @@ -69,6 +70,19 @@ else echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" fi + + dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" + dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" + if [ "z$dhstrip_lib_total" != "z0" ]; then + if [ "z$dhstrip_lib_matches" = "z0" ] ; then + echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" + exit 1 + elif [ "z$dhstrip_lib_total" = "z1" ]; then + echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" + else + echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" + fi + fi done # catch and forward exit from pipe subshell "while read": if [ $? -ne 0 ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib929bfac3689f35aaa58d7d079a46fff188b7e8e Gerrit-Change-Number: 15097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:47:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:47:06 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E2-6563_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15080 ) Change subject: Bump version: 0.5.0.2-6563 ? 0.6.0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15080/1/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/#/c/15080/1/src/Makefile.am at 3 PS1, Line 3: 8:0:2 is that safe with the new field that was added? probably, as it's compile compatible, -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a Gerrit-Change-Number: 15080 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:47:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:47:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:47:26 +0000 Subject: Change in ...libgtpnl[master]: debian: Adapt package name to lib's current major version In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/15085 ) Change subject: debian: Adapt package name to lib's current major version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I7d2fa50b6a17a598467f555558660ef2396c1744 Gerrit-Change-Number: 15085 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:47:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:47:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:47:36 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-d160-dirty_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/15086 ) Change subject: Bump version: 1.2.0.2-d160-dirty ? 1.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Icc0dca37a88ce213f9b80598ab89570bd81cf0e7 Gerrit-Change-Number: 15086 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:47:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:48:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:48:20 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing header netinet/in.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 ) Change subject: Transceiver: Add missing header netinet/in.h ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15087/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15087/1//COMMIT_MSG at 7 PS1, Line 7: Transceiver: Add missing header netinet/in.h you're adding an #include line, not the header file. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:48:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:48:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:48:31 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15088 ) Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:48:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:48:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:48:51 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-190b_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15089 ) Change subject: Bump version: 1.0.0.104-190b ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:48:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:48:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:48:55 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing header netinet/in.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 ) Change subject: Transceiver: Add missing header netinet/in.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:48:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:49:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:49:14 +0000 Subject: Change in ...osmo-pcap[master]: Require libosmocore 0.11.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15092 ) Change subject: Require libosmocore 0.11.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725 Gerrit-Change-Number: 15092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:49:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:49:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:49:29 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E2-ce06_=E2=86=92_0=2E1=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15093 ) Change subject: Bump version: 0.1.0.2-ce06 ? 0.1.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02 Gerrit-Change-Number: 15093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:49:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:49:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:49:39 +0000 Subject: Change in ...osmo-ggsn[master]: Require libosmocore 1.1.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 ) Change subject: Require libosmocore 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 Gerrit-Change-Number: 15098 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:49:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:50:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:50:07 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E49-0036-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 ) Change subject: Bump version: 1.3.0.49-0036-dirty ? 1.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 Gerrit-Change-Number: 15099 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:50:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:50:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:50:27 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E13=2E0=2E7-ffff_=E2=86=92_1=2E14=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/15100 ) Change subject: Bump version: 1.13.0.7-ffff ? 1.14.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/15100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Id7ef68f50fb951dfb0687977924115204f8482a6 Gerrit-Change-Number: 15100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:50:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:50:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:50:45 +0000 Subject: Change in ...osmo-bts[master]: configure.ac: Require libosmocore 1.2.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15101 ) Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If84c53d8192e8db98eb9439b898d83e94c5e5476 Gerrit-Change-Number: 15101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:50:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:51:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:51:04 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E1_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15102 ) Change subject: Bump version: 1.0.1 ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I708f6a63b51459d77368c48e115f64aaa6646bfd Gerrit-Change-Number: 15102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:51:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:51:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:51:10 +0000 Subject: Change in ...osmo-hlr[master]: configure.ac: Require libosmocore 1.2.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15103 ) Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iad03a8cf7a36bdc824ec2acc8fb8f9c27a1c0421 Gerrit-Change-Number: 15103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:51:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:51:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:51:24 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E49-e493-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15104 ) Change subject: Bump version: 1.0.0.49-e493-dirty ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If53bdb2e216cb98df4d5a482cbbf24096db536ed Gerrit-Change-Number: 15104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:51:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:51:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:51:44 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E26-2728_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 ) Change subject: Bump version: 1.0.0.26-2728 ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b Gerrit-Change-Number: 15105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:51:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:52:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:52:10 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E84-a2d10-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15107 ) Change subject: Bump version: 1.5.0.84-a2d10-dirty ? 1.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I57277c34bbab1fc9ea2be6a754d5a79786ce627d Gerrit-Change-Number: 15107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:52:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:52:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:52:14 +0000 Subject: Change in ...osmo-mgw[master]: configure.ac: Require libosmo-netif 0.6.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15106 ) Change subject: configure.ac: Require libosmo-netif 0.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 Gerrit-Change-Number: 15106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:52:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:52:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:52:43 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E14-92ea-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15108 ) Change subject: Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 Gerrit-Change-Number: 15108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:52:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:55:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:55:03 +0000 Subject: Change in ...osmo-dev[master]: add sysmobts-calib.py In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15074 ) Change subject: add sysmobts-calib.py ...................................................................... Patch Set 1: Code-Review+1 I'm missing a bit more of documntation what it does ("wrapper around the sysmobts-calib binary"), ... but that's not critical. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:55:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:55:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:55:17 +0000 Subject: Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15075 ) Change subject: run.sh: add comment to show how to enable MNCC udtrace ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:55:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:55:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:55:30 +0000 Subject: Change in ...osmo-dev[master]: osmo-bsc.cfg: remove 'as' config from cs7 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15076 ) Change subject: osmo-bsc.cfg: remove 'as' config from cs7 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0 Gerrit-Change-Number: 15076 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:55:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:55:53 +0000 Subject: Change in ...osmo-dev[master]: kamailio: fixes and tweaks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:55:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:56:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:56:31 +0000 Subject: Change in ...osmo-msc[master]: add msc_vlr tests for UMTS without ciphering In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15023 ) Change subject: add msc_vlr tests for UMTS without ciphering ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I54227f1f08c38c0bf69b9c48924669c4829b04b9 Gerrit-Change-Number: 15023 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 15:56:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:56:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:56:33 +0000 Subject: Change in ...osmo-msc[master]: do not force encryption on UTRAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15022 ) Change subject: do not force encryption on UTRAN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 Gerrit-Change-Number: 15022 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 07 Aug 2019 15:56:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:57:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:57:06 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15058 ) Change subject: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6782e416dbd8ee88d093cbef722b0c5084f3865c Gerrit-Change-Number: 15058 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:57:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:57:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:57:27 +0000 Subject: Change in ...osmo-msc[master]: do not force encryption on UTRAN In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15022 ) Change subject: do not force encryption on UTRAN ...................................................................... do not force encryption on UTRAN Remove the conditions that always enable encryption on UTRAN. We so far lack an explicit configuration for UTRAN encryption, and this patch does not add any either. Instead, whether UTRAN encryption is enabled is simply triggered on whether GERAN has A5 encryption enabled (A5/n with n > 0). Though GERAN and UTRAN encryption are not technically related at all, this makes UTRAN behave like GERAN for now, until we implement a proper separate configuration for UTRAN encryption. Adjust the msc_vlr_test_* configuration by setting the net->a5_encryption_mask such that the expected output remains unchanged. A subsequent patch (I54227f1f08c38c0bf69b9c48924669c4829b04b9) will add more tests, particularly cases of UTRAN without encryption. Adjust manual and vty doc. Related: OS#2783 Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 --- M doc/manuals/chapters/net.adoc M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.h 7 files changed, 48 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc index 431455d..4bf34a3 100644 --- a/doc/manuals/chapters/net.adoc +++ b/doc/manuals/chapters/net.adoc @@ -189,6 +189,10 @@ While authentication is always required on 3G, ciphering is optional. So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim -solution, ciphering is always enabled on 3G. +solution, ciphering is enabled on 3G exactly when ciphering is enabled on 2G, +i.e. when any cipher other than A5/0 is enabled in the configuration. If only +A5/0 is configured, ciphering will be disabled on both 2G and 3G. The future +aim is to add comprehensive configuration for 3G ciphering that is independent +from the 2G setting. OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G. diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index ee31747..cd37cff 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -375,7 +375,7 @@ net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -780,7 +780,7 @@ req->cm_service_type, mi-1, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1152,7 +1152,7 @@ net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, mi_lv, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 8ef48ff..5bf9701 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -148,7 +148,10 @@ cfg_net_encryption_cmd, "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]", "Encryption options\n" - "GSM A5 Air Interface Encryption\n" + "GSM A5 Air Interface Encryption." + " NOTE: as long as OsmoMSC lacks distinct configuration for 3G encryption," + " 3G encryption is enabled exactly when any 2G encryption is enabled." + " Hence configuring only A5/0 here switches off 3G encryption.\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index d73a5f8..62ea6c7 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -266,6 +266,8 @@ static void test_auth_use_twice_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 1, 1, true); comment_end(); } @@ -273,6 +275,8 @@ static void test_auth_use_twice_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 1, 1, true); comment_end(); } @@ -280,6 +284,8 @@ static void test_auth_use_infinitely_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, -1, 3, false); comment_end(); } @@ -287,6 +293,8 @@ static void test_auth_use_infinitely_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, -1, 3, false); comment_end(); } @@ -294,6 +302,8 @@ static void test_no_auth_reuse_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 0, 0, true); comment_end(); } @@ -301,6 +311,8 @@ static void test_no_auth_reuse_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 0, 0, true); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 065af25..cec2f8d 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -46,6 +46,7 @@ struct vlr_subscr *vsub; net->authentication_required = true; + net->a5_encryption_mask = A5_0_3; net->vlr->cfg.assign_tmsi = true; rx_from_ran = OSMO_RAT_UTRAN_IU; diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index a89b0d1..6f8fa01 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -306,6 +306,8 @@ static void test_umts_authen_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen(OSMO_RAT_GERAN_A); comment_end(); } @@ -313,6 +315,8 @@ static void test_umts_authen_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -544,6 +548,8 @@ static void test_umts_authen_resync_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_resync(OSMO_RAT_GERAN_A); comment_end(); } @@ -551,6 +557,8 @@ static void test_umts_authen_resync_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -644,6 +652,8 @@ static void test_umts_authen_too_short_res_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_too_short_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -651,6 +661,8 @@ static void test_umts_authen_too_short_res_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_short_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -744,6 +756,8 @@ static void test_umts_authen_too_long_res_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_too_long_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -751,6 +765,8 @@ static void test_umts_authen_too_long_res_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_long_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -849,6 +865,8 @@ static void test_umts_authen_only_sres_geran() { comment_start(); + /* A5/0 = no encryption */ + net->a5_encryption_mask = A5_0; _test_umts_authen_only_sres(OSMO_RAT_GERAN_A); comment_end(); } @@ -856,6 +874,8 @@ static void test_umts_authen_only_sres_utran() { comment_start(); + /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0_3; _test_umts_authen_only_sres(OSMO_RAT_UTRAN_IU); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 9df9cf0..4330ea8 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -32,6 +32,9 @@ #include #include +#define A5_0 (1 << 0) +#define A5_0_3 ((1 << 0) | (1 << 3)) + extern bool _log_lines; #define _log(fmt, args...) do { \ if (_log_lines) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7 Gerrit-Change-Number: 15022 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:57:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:57:27 +0000 Subject: Change in ...osmo-msc[master]: add msc_vlr tests for UMTS without ciphering In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15023 ) Change subject: add msc_vlr tests for UMTS without ciphering ...................................................................... add msc_vlr tests for UMTS without ciphering Following I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7, have tests for UMTS authentication both for cases with and without encryption. - Rename test_umts_authen_utran to test_umts_auth_ciph_utran() (uses encryption). - Again add test_umts_authen_utran() not using encryption. - Likewise with test_umts_authen_resync_utran(). Some permutations are still missing, like UMTS AKA on GERAN with encryption enabled; not bothering at the moment. Related: OS#2783 Change-Id: I54227f1f08c38c0bf69b9c48924669c4829b04b9 --- M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err 2 files changed, 966 insertions(+), 79 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 6f8fa01..1bf6cd2 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -122,23 +122,30 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); - VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "27497388b6cb044648f396aa155b95ef"); - ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "27497388b6cb044648f396aa155b95ef"); + ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + ms_sends_security_mode_complete(); + VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } @@ -190,22 +197,29 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts with a CM Service Accept"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "1159ec926a50e98c034a6b7d7c9f418d"); + ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */ + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + + btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); + ms_sends_security_mode_complete(); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts with a CM Service Accept"); gsup_expect_tx(NULL); ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */ VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "1159ec926a50e98c034a6b7d7c9f418d"); - ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */ - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); - - btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); - VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); } /* Release connection */ @@ -251,21 +265,28 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts and sends pending SMS"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "eb50e770ddcc3060101d2f43b6c2b884"); + ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */ + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + + btw("MS sends SecurityModeControl acceptance, VLR accepts and sends SMS"); + dtap_expect_tx(sms); + ms_sends_security_mode_complete(); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends pending SMS"); dtap_expect_tx(sms); ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */ VERBOSE_ASSERT(dtap_tx_confirmed, == true, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "eb50e770ddcc3060101d2f43b6c2b884"); - ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */ - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - - btw("MS sends SecurityModeControl acceptance, VLR accepts and sends SMS"); - dtap_expect_tx(sms); - ms_sends_security_mode_complete(); } btw("SMS was delivered, no requests pending for subscr"); @@ -315,6 +336,15 @@ static void test_umts_authen_utran() { comment_start(); + /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0; + _test_umts_authen(OSMO_RAT_UTRAN_IU); + comment_end(); +} + +static void test_umts_auth_ciph_utran() +{ + comment_start(); /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ net->a5_encryption_mask = A5_0_3; _test_umts_authen(OSMO_RAT_UTRAN_IU); @@ -489,23 +519,30 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (via_ran == OSMO_RAT_GERAN_A) { - btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); - VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - } else { - /* On UTRAN */ - btw("MS sends Authen Response, VLR accepts and sends SecurityModeControl"); - expect_security_mode_ctrl(NULL, "8a90c769b7272f3bb7a1c1fbb1ea9349"); - ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); - VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); - VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + if (net->a5_encryption_mask > 0x1) { + /* Encryption enabled */ + if (via_ran == OSMO_RAT_GERAN_A) { + btw("Test code not implemented"); + OSMO_ASSERT(false); + } else { + /* On UTRAN */ + btw("Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl"); + expect_security_mode_ctrl(NULL, "8a90c769b7272f3bb7a1c1fbb1ea9349"); + ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); + VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); + gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + ms_sends_security_mode_complete(); + VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + } + } else { + /* Encryption disabled */ + btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } @@ -557,6 +594,15 @@ static void test_umts_authen_resync_utran() { comment_start(); + /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ + net->a5_encryption_mask = A5_0; + _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); + comment_end(); +} + +static void test_umts_auth_ciph_resync_utran() +{ + comment_start(); /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ net->a5_encryption_mask = A5_0_3; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); @@ -884,8 +930,10 @@ msc_vlr_test_func_t msc_vlr_tests[] = { test_umts_authen_geran, test_umts_authen_utran, + test_umts_auth_ciph_utran, test_umts_authen_resync_geran, test_umts_authen_resync_utran, + test_umts_auth_ciph_resync_utran, test_umts_authen_too_short_res_geran, test_umts_authen_too_short_res_utran, test_umts_authen_too_long_res_geran, diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 63f1bba..cda55f5 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -56,7 +56,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -258,7 +258,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts with a CM Service Accept +- Encryption disabled. MS sends Authen Response, VLR accepts with a CM Service Accept MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -411,7 +411,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts and sends pending SMS +- Encryption disabled. MS sends Authen Response, VLR accepts and sends pending SMS MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (paging-response,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -620,6 +620,611 @@ DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) +DVLR set IMSI on subscriber; IMSI=901700000010650 id=901700000010650 +DVLR New subscr, IMSI: 901700000010650 +DREF VLR subscr IMSI-901700000010650 + active-conn: now used by 2 (_lu_fsm_associate_vsub,active-conn) +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DREF VLR subscr IMSI-901700000010650 - _lu_fsm_associate_vsub: now used by 1 (active-conn) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1_pre() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000000156f00362201039fa2f4e3d523d8619a73b4f65c3e14d21049b36efdf2208059a4f668f6fbe39231027497388b6cb044648f396aa155b95ef2410f64735036e5871319c679f4742a75ea125108704f5ba55f30000d2ee44b22c8ea9192708e229c19e791f2e4103622010c187a53a5e6b9d573cac7c74451fd46d210485aa31302208d3d50a000bf04f6e23101159ec926a50e98c034a6b7d7c9f418d2410df3a03d9ca5335641efc8e36d76cd20b25101843a645b98d00005b2d666af46c45d927087db47cf7f81e4dc703622010efa9c29a9742148d5c9070348716e1bb210469d5f9fb22083df176f0c29f1a3d2310eb50e770ddcc3060101d2f43b6c2b884241076542abce5ff9345b0e8947f4c6e019c2510f9375e6d41e1000096e7fe4ff1c27e392708706f996719ba609c03622010f023d5a3b24726e0631b64b3840f82532104d570c03f2208ec011be8919883d62310c4e58af4ba43f3bcd904e16984f086d724100593f65e752e5cb7f473862bda05aa0a2510541ff1f077270000c5ea00d658bc7e9a27083fd26072eaa2a04d036220102f8f90c780d6a9c0c53da7ac57b6707e2104b072446f220823f39f9f425ad6e6231065af0527fda95b0dc5ae4aa515cdf32f2410537c3b35a3b13b08d08eeb28098f45cc25104bf4e564f75300009bc796706bc6574427080edb0eadbea94ac20a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000010650) Received 5 auth tuples +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:UTRAN-Iu:LU: tuple use_count=1 key_seq=0 auth_types=0x3 and... +- ...rand=39fa2f4e3d523d8619a73b4f65c3e14d +- ...autn=8704f5ba55f30000d2ee44b22c8ea919 +- ...expecting res=e229c19e791f2e41 +DREF VLR subscr IMSI-901700000010650 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e791f2e41 (8 bytes) +DVLR SUBSCR(IMSI-901700000010650) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_ciph() +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f02801020a0101 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + gsup_tx_confirmed == 1 + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000000156f00804032443f20a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR IMSI:901700000010650 has MSISDN:42342 +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342) VLR: update for IMSI=901700000010650 (MSISDN=42342) +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF +- sending LU Accept for IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU, with TMSI 0x03020100 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Deallocated +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 1 +- a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl + llist_count(&msub_list) == 1 +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- even though the TMSI is not acked, we can already find the subscr with it +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 + _test_umts_authen: now used by 2 (active-conn,_test_umts_authen) + vsub != NULL == 1 + strcmp(vsub->imsi, imsi) == 0 + vsub->tmsi_new == 0x03020100 + vsub->tmsi == 0xffffffff +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - _test_umts_authen: now used by 1 (active-conn) +- MS sends TMSI Realloc Complete + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_TMSI_REALL_COMPL +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: TMSI Reallocation Completed +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_NEW_TMSI_ACK +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: Received Event LU_COMPL_VLR_E_NEW_TMSI_ACK +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + attached: now used by 2 (active-conn,attached) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - lu: now used by 1 (rx_from_ms) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (active-conn,attached) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: max total use count was 3 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- LU was successful, and the conn has already been closed + llist_count(&msub_list) == 0 + + +- after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_CM_SERV_REQ +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: Rx CM SERVICE REQUEST cm_service_type=Short-Messaging-Service +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: + cm_service_sms: now used by 2 (rx_from_ms,cm_service_sms) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + proc_arq_vlr_fn_init: now used by 2 (attached,proc_arq_vlr_fn_init) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + active-conn: now used by 3 (attached,proc_arq_vlr_fn_init,active-conn) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=1 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ: tuple use_count=1 key_seq=1 auth_types=0x3 and... +- ...rand=c187a53a5e6b9d573cac7c74451fd46d +- ...autn=1843a645b98d00005b2d666af46c45d9 +- ...expecting res=7db47cf7f81e4dc7 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) + cm_service_result_sent == 0 + auth_request_sent == 1 +- needs auth, not yet accepted +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- Encryption disabled. MS sends Authen Response, VLR accepts with a CM Service Accept + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH on UTRAN received RES: 7db47cf7f81e4dc7 (8 bytes) +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_ciph() +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN encode: DTAP on UTRAN-Iu +- DTAP --UTRAN-Iu--> MS: GSM48_MT_MM_CM_SERV_ACC: 0521 +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_sms) + cm_service_result_sent == 1 +- Concluding CM Service Request +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - cm_service_sms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (attached,active-conn,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (attached,active-conn) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){PR_ARQ_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: max total use count was 2 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- all requests serviced, conn has been released + llist_count(&msub_list) == 0 + + +- an SMS is sent, MS is paged +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + _test_umts_authen: now used by 2 (attached,_test_umts_authen) + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS-receiver: now used by 3 (attached,_test_umts_authen,SMS-receiver) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS: now used by 4 (attached,_test_umts_authen,SMS-receiver,SMS) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) New transaction +DLSMS SMC(0) instance created for network +DLSMS SMR(0) instance created for network. +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Going to send a MT SMS +DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE +DLSMS SMR(0) TX SMS RP-DATA +DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK +DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE +DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Initiating Paging due to MMSMS_EST_REQ +DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Starting paging + paging request (SIGNALLING_LOW_PRIO) to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 on UTRAN-Iu + strcmp(paging_expecting_imsi, vsub->imsi) == 0 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + Paging: now used by 5 (attached,_test_umts_authen,SMS-receiver,SMS,Paging) + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - _test_umts_authen: now used by 4 (attached,SMS-receiver,SMS,Paging) + paging_sent == 1 +- the subscriber and its pending request should remain +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + _test_umts_authen: now used by 5 (attached,SMS-receiver,SMS,Paging,_test_umts_authen) + llist_count(&vsub->cs.requests) == 1 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - _test_umts_authen: now used by 4 (attached,SMS-receiver,SMS,Paging) +- MS replies with Paging Response, and VLR sends Auth Request with third key + MSC <--UTRAN-Iu-- MS: GSM48_MT_RR_PAG_RESP + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP +DRR msc_a(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: Rx PAGING RESPONSE +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: + paging-response: now used by 2 (rx_from_ms,paging-response) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: Allocated +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + proc_arq_vlr_fn_init: now used by 5 (attached,SMS-receiver,SMS,Paging,proc_arq_vlr_fn_init) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + active-conn: now used by 6 (attached,SMS-receiver,SMS,Paging,proc_arq_vlr_fn_init,active-conn) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=2 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP: tuple use_count=1 key_seq=2 auth_types=0x3 and... +- ...rand=efa9c29a9742148d5c9070348716e1bb +- ...autn=f9375e6d41e1000096e7fe4ff1c27e39 +- ...expecting res=706f996719ba609c +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 5 (attached,SMS-receiver,SMS,Paging,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (paging-response) + auth_request_sent == 1 +- needs auth, not yet accepted +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- Encryption disabled. MS sends Authen Response, VLR accepts and sends pending SMS + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (paging-response,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = 706f996719ba609c) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH on UTRAN received RES: 706f996719ba609c (8 bytes) +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_AUTHENTICATED}: Removing from parent Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: Received Event PR_ARQ_E_AUTH_RES +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_ciph() +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2_post_vlr() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_pres() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_trace() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_post_imei() +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: proc_arq_fsm_done(PASSED) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_DONE +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Process Access Request result: PASSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Paging Response action (success) +DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Removing Paging Request +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) mmsms_paging_cb(success) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + sms: now used by 3 (paging-response,rx_from_ms,sms) +DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING +DLSMS SMC(0) send CP data +DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu +- DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 +- DTAP matches expected message +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - Paging: now used by 4 (attached,SMS-receiver,SMS,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - paging-response: now used by 2 (rx_from_ms,sms) +DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms) + dtap_tx_confirmed == 1 +- SMS was delivered, no requests pending for subscr +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + _test_umts_authen: now used by 5 (attached,SMS-receiver,SMS,active-conn,_test_umts_authen) + llist_count(&vsub->cs.requests) == 0 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - _test_umts_authen: now used by 4 (attached,SMS-receiver,SMS,active-conn) +- conn is still open to wait for SMS ack dance + llist_count(&msub_list) == 1 +- MS replies with CP-ACK for received SMS + MSC <--UTRAN-Iu-- MS: SMS:0x04 +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x04 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x04 +DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK +DLSMS SMC(0) received CP-ACK +DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms) + llist_count(&msub_list) == 1 +- MS also sends RP-ACK, MSC in turn sends CP-ACK for that + MSC <--UTRAN-Iu-- MS: SMS:0x01 +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x01 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x01 +DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED +DLSMS SMC(0) received CP-DATA +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 04 +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu +- DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904 +- DTAP matches expected message +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) MNSMS-DATA/EST-IND +DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK +DLSMS SMR(0) RX SMS RP-ACK +DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) RX SMS RP-ACK (MO) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS-receiver: now used by 3 (attached,SMS,active-conn) +DLSMS SMR(0) TX: MNSMS-REL-REQ +DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED +DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Got MMSMS_REL_REQ, destroying transaction. +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Freeing transaction +DLSMS SMR(0) clearing SMR instance +DLSMS SMC(0) clearing instance +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS: now used by 2 (attached,active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - sms: now used by 1 (rx_from_ms) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (attached,active-conn,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (attached,active-conn) + dtap_tx_confirmed == 1 + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DVLR Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){PR_ARQ_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: max total use count was 3 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- SMS is done, conn is gone + llist_count(&msub_list) == 0 + + +- subscriber detaches + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_IMSI_DETACH_IND + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_IMSI_DETACH_IND +DMM IMSI DETACH INDICATION: MI(IMSI)=901700000010650 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + gsm48_rx_mm_imsi_detach_ind: now used by 2 (attached,gsm48_rx_mm_imsi_detach_ind) +DMM IMSI DETACH for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + active-conn: now used by 3 (attached,gsm48_rx_mm_imsi_detach_ind,active-conn) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (attached,gsm48_rx_mm_imsi_detach_ind,active-conn,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,gsm48_rx_mm_imsi_detach_ind,active-conn) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - attached: now used by 2 (gsm48_rx_mm_imsi_detach_ind,active-conn) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - gsm48_rx_mm_imsi_detach_ind: now used by 1 (active-conn) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_CN_CLOSE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: Releasing: msc_a use is 1 (rx_from_ms) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 2 (active-conn,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 3 (active-conn,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 2 (active-conn,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 2 (rx_from_ms,wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 1 (active-conn) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: - rx_from_ms: now used by 1 (wait-Clear-Complete) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: max total use count was 2 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 0 (-) +DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 6) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone + llist_count(&msub_list) == 0 +===== test_umts_authen_utran: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 19 + +===== test_umts_auth_ciph_utran +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_LOC_UPD_REQUEST +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: USIM: old LAI: 1665-165-0 +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + mm_rx_loc_upd_req: now used by 2 (rx_from_ms,mm_rx_loc_upd_req) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) @@ -655,7 +1260,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -869,7 +1474,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -955,16 +1560,16 @@ llist_count(&vsub->cs.requests) == 0 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS-receiver: now used by 3 (attached,_test_umts_authen,SMS-receiver) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + SMS: now used by 4 (attached,_test_umts_authen,SMS-receiver,SMS) -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) New transaction +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) New transaction DLSMS SMC(0) instance created for network DLSMS SMR(0) instance created for network. -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Going to send a MT SMS +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) Going to send a MT SMS DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE DLSMS SMR(0) TX SMS RP-DATA DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) Initiating Paging due to MMSMS_EST_REQ +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) Initiating Paging due to MMSMS_EST_REQ DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Starting paging paging request (SIGNALLING_LOW_PRIO) to IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 on UTRAN-Iu strcmp(paging_expecting_imsi, vsub->imsi) == 0 @@ -1031,7 +1636,7 @@ DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (paging-response,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -1071,13 +1676,13 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Paging Response action (success) DPAG Paging: IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 for MT-SMS: Removing Paging Request -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000002 tid-0) mmsms_paging_cb(success) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref-0x40000003 tid-0) mmsms_paging_cb(success) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + sms: now used by 2 (paging-response,sms) DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING DLSMS SMC(0) send CP data DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 - DTAP matches expected message @@ -1095,7 +1700,7 @@ DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x04 -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x04 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) receiving SMS message SMS:0x04 DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK DLSMS SMC(0) received CP-ACK DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED @@ -1106,26 +1711,26 @@ DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: SMS SMS:0x01 -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) receiving SMS message SMS:0x01 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) receiving SMS message SMS:0x01 DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED DLSMS SMC(0) received CP-DATA -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) sending CP message (trans=0) -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) GSM4.11 TX 09 04 +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) sending CP message (trans=0) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) GSM4.11 TX 09 04 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on UTRAN-Iu - DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904 - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) MNSMS-DATA/EST-IND +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) MNSMS-DATA/EST-IND DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK DLSMS SMR(0) RX SMS RP-ACK DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) RX SMS RP-ACK (MO) +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) RX SMS RP-ACK (MO) DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS-receiver: now used by 3 (attached,SMS,active-conn) DLSMS SMR(0) TX: MNSMS-REL-REQ DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Got MMSMS_REL_REQ, destroying transaction. -DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000002 tid-0) Freeing transaction +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) Got MMSMS_REL_REQ, destroying transaction. +DLSMS trans(SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x40000003 tid-0) Freeing transaction DLSMS SMR(0) clearing SMR instance DLSMS SMC(0) clearing instance DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - SMS: now used by 2 (attached,active-conn) @@ -1226,7 +1831,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations - msub gone llist_count(&msub_list) == 0 -===== test_umts_authen_utran: SUCCESS +===== test_umts_auth_ciph_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 19 @@ -1313,7 +1918,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DBSSAP msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -1482,6 +2087,240 @@ DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth (no Ciph) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) +DVLR set IMSI on subscriber; IMSI=901700000010650 id=901700000010650 +DVLR New subscr, IMSI: 901700000010650 +DREF VLR subscr IMSI-901700000010650 + active-conn: now used by 2 (_lu_fsm_associate_vsub,active-conn) +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: Received Event MSC_A_EV_COMPLETE_LAYER_3_OK +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_AUTH_CIPH +DREF VLR subscr IMSI-901700000010650 - _lu_fsm_associate_vsub: now used by 1 (active-conn) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1_pre() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + lu_result_sent == 0 +- from HLR, rx _SEND_AUTH_INFO_RESULT; VLR sends Auth Req to MS +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000000156f00362201039fa2f4e3d523d8619a73b4f65c3e14d21049b36efdf2208059a4f668f6fbe39231027497388b6cb044648f396aa155b95ef2410f64735036e5871319c679f4742a75ea125108704f5ba55f30000d2ee44b22c8ea9192708e229c19e791f2e410a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000010650) Received 1 auth tuples +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_WAIT_RESP +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: got auth tuple: use_count=1 key_seq=0 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:UTRAN-Iu:LU: tuple use_count=1 key_seq=0 auth_types=0x3 and... +- ...rand=39fa2f4e3d523d8619a73b4f65c3e14d +- ...autn=8704f5ba55f30000d2ee44b22c8ea919 +- ...expecting res=e229c19e791f2e41 +DREF VLR subscr IMSI-901700000010650 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- MS sends Authen Failure with Resync cause, VLR sends GSUP to HLR to resync + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_FAIL +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + gsup_tx_confirmed == 1 + auth_request_sent == 0 + lu_result_sent == 0 +- HLR replies with new tuples +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000000156f0036220100f1feb1623e1bf626334e37ec448ac182104efde99da220814778c855c52373023108a90c769b7272f3bb7a1c1fbb1ea9349241043ffc1cf8c89a7fd6ab94bd8d6162cbf251002a83f62e9470000660d51afc75f169d27081df5f0b4f22b696e03622010ac21d34937b4e1142a2c757af294931921047818bfdc2208d175571f41f314a42310ff8edbceb6dd24799c77c3b9a6790c102410157c39022ca9d885a7f0766a7dfee44825108a43b91898e500002cf354c6f5d1f8c32708f748a7078f5018db0a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC}: Received Event VLR_AUTH_E_HLR_SAI_ACK +DVLR SUBSCR(IMSI-901700000010650) Received 2 auth tuples +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC}: state_chg to VLR_SUB_AS_WAIT_RESP_RESYNC +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: got auth tuple: use_count=1 key_seq=0 -- will use UMTS AKA (is_r99=yes, at->vec.auth_types=0x3) +- sending UMTS Auth Request for IMSI-901700000010650:UTRAN-Iu:LU: tuple use_count=1 key_seq=0 auth_types=0x3 and... +- ...rand=0f1feb1623e1bf626334e37ec448ac18 +- ...autn=02a83f62e9470000660d51afc75f169d +- ...expecting res=1df5f0b4f22b696e +DREF VLR subscr IMSI-901700000010650 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 + auth_request_sent == 1 + lu_result_sent == 0 +- Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_RESP +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM UMTS AUTHENTICATION RESPONSE (res = 1df5f0b4f22b696e) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: Received Event VLR_AUTH_E_MS_AUTH_RESP +DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: 1df5f0b4f22b696e (8 bytes) +DVLR SUBSCR(IMSI-901700000010650) AUTH established UMTS security context +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: Authentication terminating with result PASSED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP_RESYNC}: state_chg to VLR_SUB_AS_AUTHENTICATED +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_ciph() +DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN encode: COMMON_ID on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f02801020a0101 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTHENTICATED}: Deallocated +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) + gsup_tx_confirmed == 1 + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000000156f00804032443f20a0101 +DREF VLR subscr IMSI-901700000010650 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR IMSI:901700000010650 has MSISDN:42342 +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342) VLR: update for IMSI=901700000010650 (MSISDN=42342) +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000000156f00a0101 +DREF VLR subscr IMSI-901700000010650:MSISDN-42342 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF +- sending LU Accept for IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU, with TMSI 0x03020100 +DVLR upd_hlr_vlr_fsm(IMSI-901700000010650:UTRAN-Iu:LU){UPD_HLR_VLR_S_DONE}: Deallocated +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - vlr_gsup_rx: now used by 1 (active-conn) +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 1 +- a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl + llist_count(&msub_list) == 1 +msc_a_is_accepted() == false + requests shall be thwarted +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: CC GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: unknown 0x33 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: SMS SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Message not permitted for initial conn: SMS:0x01 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode error (rc=-13) for DTAP from MSC-I +- even though the TMSI is not acked, we can already find the subscr with it +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 + _test_umts_authen_resync: now used by 2 (active-conn,_test_umts_authen_resync) + vsub != NULL == 1 + strcmp(vsub->imsi, imsi) == 0 + vsub->tmsi_new == 0x03020100 + vsub->tmsi == 0xffffffff +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100 - _test_umts_authen_resync: now used by 1 (active-conn) +- MS sends TMSI Realloc Complete + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP +DRLL msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_TMSI_REALL_COMPL +DMM msc_a(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: TMSI Reallocation Completed +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSInew-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_NEW_TMSI_ACK +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: Received Event LU_COMPL_VLR_E_NEW_TMSI_ACK +DVLR SUBSCR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) VLR: update for IMSI=901700000010650 (MSISDN=42342) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + attached: now used by 2 (active-conn,attached) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_WAIT_TMSI_CNF}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR lu_compl_vlr_fsm(IMSI-901700000010650:MSISDN-42342:UTRAN-Iu:LU){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Received Event MSC_A_EV_AUTHENTICATED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: state_chg to MSC_A_ST_AUTHENTICATED +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - lu: now used by 1 (rx_from_ms) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + msc_a_fsm_releasing_onenter: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (active-conn,attached,msc_a_fsm_releasing_onenter) +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - msc_a_fsm_releasing_onenter: now used by 2 (active-conn,attached) + iu_release_sent == 1 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: RAN decode: CLEAR_COMPLETE +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: - wait-Clear-Complete: now used by 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASING}: state_chg to MSC_A_ST_RELEASED +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Released: msc_a use is 0 (-) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){VLR_ULA_S_DONE}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Removing from parent msub_fsm +DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: max total use count was 3 +DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) MSC-A terminated +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) 1 MSC-I still active +DMSC msub_fsm{active}: state_chg to terminating +DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU)) +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Removing from parent msub_fsm +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){0}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msub(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) Free +DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - active-conn: now used by 1 (attached) +DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations +- msub gone +- LU was successful, and the conn has already been closed + llist_count(&msub_list) == 0 +DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) +===== test_umts_authen_resync_utran: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 19 + +===== test_umts_auth_ciph_resync_utran +- Location Update request causes a GSUP Send Auth Info request to HLR + MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMSC msub_fsm{active}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: Allocated +DMSC msc_a{MSC_A_ST_VALIDATE_L3}: is child of msub_fsm +DMSC msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: state_chg to MSC_A_ST_VALIDATE_L3 +DMSC dummy_msc_i{0}: Allocated +DMSC dummy_msc_i{0}: is child of msub_fsm +DREF msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: + rx_from_ms: now used by 1 (rx_from_ms) +DIUCS msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: RAN decode: COMPL_L3 +DRLL msc_a(unknown:UTRAN-Iu:NONE){MSC_A_ST_VALIDATE_L3}: Dispatching 04.08 message: MM GSM48_MT_MM_LOC_UPD_REQUEST +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: LOCATION UPDATING REQUEST: MI=IMSI-901700000010650 LU-type=NORMAL +DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: USIM: old LAI: 1665-165-0 +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + mm_rx_loc_upd_req: now used by 2 (rx_from_ms,mm_rx_loc_upd_req) +DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_VALIDATE_L3}: + lu: now used by 3 (rx_from_ms,mm_rx_loc_upd_req,lu) +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: is child of msc_a(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: rev=R99 net=UTRAN Auth+Ciph DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA DREF VLR subscr unknown + _lu_fsm_associate_vsub: now used by 1 (_lu_fsm_associate_vsub) @@ -1545,7 +2384,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0 auth_request_sent == 1 lu_result_sent == 0 -- MS sends Authen Response, VLR accepts and sends SecurityModeControl +- Encryption enabled. MS sends Authen Response, VLR accepts and sends SecurityModeControl MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP @@ -1702,7 +2541,7 @@ - LU was successful, and the conn has already been closed llist_count(&msub_list) == 0 DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) -===== test_umts_authen_resync_utran: SUCCESS +===== test_umts_auth_ciph_resync_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 19 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I54227f1f08c38c0bf69b9c48924669c4829b04b9 Gerrit-Change-Number: 15023 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:57:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:57:27 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15058 ) Change subject: doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak ...................................................................... doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak - add SIP messages, taken from OS#1683 - change some wording and clarify some message ordering - have a separate sipcon1 and sipcon2 for the MO and MT sides Change-Id: I6782e416dbd8ee88d093cbef722b0c5084f3865c --- M doc/sequence_charts/mncc_fsm.msc 1 file changed, 57 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/sequence_charts/mncc_fsm.msc b/doc/sequence_charts/mncc_fsm.msc index ae5e0a2..45a77ca 100644 --- a/doc/sequence_charts/mncc_fsm.msc +++ b/doc/sequence_charts/mncc_fsm.msc @@ -1,84 +1,104 @@ msc { - hscale=2; - msc1[label="osmo-msc"], mncc1[label="MNCC FSM"], pbx[label="MNCC server (osmo-sip-connector)"], mncc2[label="MNCC FSM"], msc2[label="osmo-msc"]; + hscale=3; + msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], msc2[label="osmo-msc"]; - mncc1 note mncc1 [label="The typical progression of an outgoing call, i.e. a call initiated by osmo-msc, as - implemented in mncc_fsm.h, mncc_fsm.c"]; - mncc2 note mncc2 [label="The typical progression of an incoming call, i.e. a call initiated by the PBX, as - implemented in mncc_fsm.h, mncc_fsm.c"]; + msc1 note sipcon1 [label="MO call"]; + sipcon2 note msc2 [label="MT call"]; mncc1 abox mncc1 [label="MNCC_ST_NOT_STARTED"]; msc1 rbox msc1 [label="mncc_outgoing_start()"]; msc1 -> mncc1 [label="MNCC_EV_OUTGOING_START"]; mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_PROCEEDING"]; - mncc1 => pbx [label="MNCC_SETUP_IND - \n callref, IMSI, called and calling number"]; - mncc1 <= pbx [label="MNCC_RTP_CREATE + mncc1 => sipcon1 [label="MNCC_SETUP_IND + \n callref, IMSI, called and calling number, SDP"]; + sipcon1 => sip [label="SIP INVITE + \n from, to, SDP"]; + sipcon1 <= sip [label="SIP 100 Trying"]; + mncc1 <= sipcon1 [label="MNCC_RTP_CREATE \n callref"]; mncc1 rbox mncc1 [label="mncc_rx_rtp_create()"]; - mncc1 => pbx [label="MNCC_RTP_CREATE + mncc1 => sipcon1 [label="MNCC_RTP_CREATE \n callref, RTP IP address and port"]; - mncc1 <= pbx [label="MNCC_CALL_PROC_REQ + mncc1 <= sipcon1 [label="MNCC_CALL_PROC_REQ \n callref, RTP IP address and port"]; mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_COMPLETE"]; - msc2 <= pbx [label="MNCC_SETUP_REQ - \n callref, called and calling number"]; + sip => sipcon2 [label="SIP INVITE + \n from, to, SDP"]; + sipcon2 => sip [label="SIP 100 Trying"]; + msc2 <= sipcon2 [label="MNCC_SETUP_REQ + \n callref, called and calling number + \n SDP"]; mncc2 abox mncc2 [label="MNCC_ST_NOT_STARTED"]; msc2 rbox msc2 [label="mncc_incoming_start()"]; msc2 -> mncc2 [label="MNCC_EV_INCOMING_START"]; mncc2 abox mncc2 [label="MNCC_ST_INCOMING_WAIT_COMPLETE"]; - mncc2 => pbx [label="MNCC_CALL_CONF_IND - \n callref, bearer capabilities, cccap and IMSI"]; - mncc2 <= pbx [label="MNCC_RTP_CREATE + mncc2 => sipcon2 [label="MNCC_CALL_CONF_IND + \n callref, bearer capabilities, cccap and IMSI, SDP?"]; + mncc2 <= sipcon2 [label="MNCC_RTP_CREATE \n callref"]; mncc2 rbox mncc2 [label="mncc_rx_rtp_create()"]; - mncc2 => pbx [label="MNCC_RTP_CREATE - \n callref, RTP IP address and port"]; - mncc2 => pbx [label="MNCC_ALERT_IND + mncc2 => sipcon2 [label="MNCC_RTP_CREATE + \n callref, RTP IP address and port, SDP?"]; + mncc2 => sipcon2 [label="MNCC_ALERT_IND \n callref"]; + sipcon2 => sip [label="SIP 180 Ringing + \n SDP"]; - mncc1 <= pbx [label="MNCC_ALERT_REQ + sipcon1 <= sip [label="SIP 180 Ringing + \n SDP"]; + mncc1 <= sipcon1 [label="MNCC_ALERT_REQ \n callref and progress"]; + sipcon1 => sip [label="SIP PRACK 180 Ringing"]; + sipcon1 <= sip [label="SIP PRACK 200"]; - mncc2 => pbx [label="MNCC_SETUP_CNF - \n callref, imsi and connected number"]; - mncc2 <= pbx [label="MNCC_RTP_CONNECT - \n callref, RTP IP and port"]; - mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"]; - mncc2 <= pbx [label="MNCC_SETUP_COMPL_REQ - \n callref"]; - mncc2 abox mncc2 [label="MNCC_ST_TALKING"]; - - mncc1 <= pbx [label="MNCC_RTP_CONNECT + mncc1 <= sipcon1 [label="MNCC_RTP_CONNECT \n callref, RTP IP and port"]; mncc1 rbox mncc1 [label="mncc_rx_rtp_connect()"]; msc1 <- mncc1 [label="rtp_stream_set_remote_addr()"]; - mncc1 <= pbx [label="MNCC_SETUP_RSP + + mncc2 => sipcon2 [label="MNCC_SETUP_CNF + \n callref, imsi and connected number, SDP?"]; + sipcon2 => sip [label="SIP 200 OK + \n SDP"]; + mncc2 <= sipcon2 [label="MNCC_RTP_CONNECT + \n callref, RTP IP and port"]; + mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"]; + mncc2 <= sipcon2 [label="MNCC_SETUP_COMPL_REQ \n callref"]; - mncc1 => pbx [label="MNCC_SETUP_COMPL_IND + mncc2 abox mncc2 [label="MNCC_ST_TALKING"]; + + sipcon1 <= sip [label="SIP 200 OK INVITE"]; + mncc1 <= sipcon1 [label="MNCC_SETUP_RSP + \n callref"]; + mncc1 => sipcon1 [label="MNCC_SETUP_COMPL_IND \n callref"]; mncc1 abox mncc1 [label="MNCC_ST_TALKING"]; + sipcon1 => sip [label="SIP ACK"]; ...; ... [label="Call goes on for a while..."]; ...; mncc1 rbox mncc1 [label="mncc_release()"]; - mncc1 => pbx [label="MNCC_DISC_IND + mncc1 => sipcon1 [label="MNCC_DISC_IND \n callref and cause"]; mncc1 abox mncc1 [label="MNCC_ST_WAIT_RELEASE_ACK"]; - mncc1 <= pbx [label="MNCC_REL_REQ + sipcon1 => sip [label="SIP BYE"]; + sipcon1 <= sip [label="SIP 200 OK"]; + mncc1 <= sipcon1 [label="MNCC_REL_REQ \n callref and cause"]; - mncc2 <= pbx [label="MNCC_DISC_REQ + sip => sipcon2 [label="SIP BYE"]; + sip <= sipcon2 [label="SIP 200 OK"]; + mncc2 <= sipcon2 [label="MNCC_DISC_REQ \n callref and cause"]; - mncc2 => pbx [label="MNCC_REL_IND + mncc2 => sipcon2 [label="MNCC_REL_IND \n callref and cause"]; mncc2 abox mncc2 [label="terminated"]; - mncc1 => pbx [label="MNCC_REL_CNF + mncc1 => sipcon1 [label="MNCC_REL_CNF \n callref"]; mncc1 abox mncc1 [label="terminated"]; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6782e416dbd8ee88d093cbef722b0c5084f3865c Gerrit-Change-Number: 15058 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:57:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:57:28 +0000 Subject: Change in ...osmo-msc[master]: doc/sequence_charts: fix naming of mncc_fsm to mncc_call In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15059 ) Change subject: doc/sequence_charts: fix naming of mncc_fsm to mncc_call ...................................................................... doc/sequence_charts: fix naming of mncc_fsm to mncc_call mncc_fsm.[hc] were renamed to mncc_call.[hc] during patch review, which failed to carry through to this sequence chart. Also fix the MNCC_ST_* to MNCC_CALL_ST_* and MNCC_EV_* to MNCC_CALL_EV_*. Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203 --- M doc/sequence_charts/Makefile.am R doc/sequence_charts/mncc_call_fsm.msc 2 files changed, 14 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/sequence_charts/Makefile.am b/doc/sequence_charts/Makefile.am index b667a6f..f1775c8 100644 --- a/doc/sequence_charts/Makefile.am +++ b/doc/sequence_charts/Makefile.am @@ -6,17 +6,17 @@ EXTRA_DIST = \ inter_bsc_ho.msc \ inter_msc_ho.msc \ - mncc_fsm.msc \ + mncc_call_fsm.msc \ $(NULL) CLEANFILES = \ inter_bsc_ho.png \ inter_msc_ho.png \ - mncc_fsm.png \ + mncc_call_fsm.png \ $(NULL) msc: \ - $(builddir)/mncc_fsm.png \ + $(builddir)/mncc_call_fsm.png \ $(builddir)/inter_bsc_ho.png \ $(builddir)/inter_msc_ho.png \ $(NULL) diff --git a/doc/sequence_charts/mncc_fsm.msc b/doc/sequence_charts/mncc_call_fsm.msc similarity index 77% rename from doc/sequence_charts/mncc_fsm.msc rename to doc/sequence_charts/mncc_call_fsm.msc index 45a77ca..4a14ff7 100644 --- a/doc/sequence_charts/mncc_fsm.msc +++ b/doc/sequence_charts/mncc_call_fsm.msc @@ -1,15 +1,15 @@ msc { hscale=3; - msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], msc2[label="osmo-msc"]; + msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_call.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_call.c)"], msc2[label="osmo-msc"]; msc1 note sipcon1 [label="MO call"]; sipcon2 note msc2 [label="MT call"]; - mncc1 abox mncc1 [label="MNCC_ST_NOT_STARTED"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_NOT_STARTED"]; msc1 rbox msc1 [label="mncc_outgoing_start()"]; - msc1 -> mncc1 [label="MNCC_EV_OUTGOING_START"]; + msc1 -> mncc1 [label="MNCC_CALL_EV_OUTGOING_START"]; - mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_PROCEEDING"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_OUTGOING_WAIT_PROCEEDING"]; mncc1 => sipcon1 [label="MNCC_SETUP_IND \n callref, IMSI, called and calling number, SDP"]; sipcon1 => sip [label="SIP INVITE @@ -22,7 +22,7 @@ \n callref, RTP IP address and port"]; mncc1 <= sipcon1 [label="MNCC_CALL_PROC_REQ \n callref, RTP IP address and port"]; - mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_COMPLETE"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_OUTGOING_WAIT_COMPLETE"]; sip => sipcon2 [label="SIP INVITE \n from, to, SDP"]; @@ -30,10 +30,10 @@ msc2 <= sipcon2 [label="MNCC_SETUP_REQ \n callref, called and calling number \n SDP"]; - mncc2 abox mncc2 [label="MNCC_ST_NOT_STARTED"]; + mncc2 abox mncc2 [label="MNCC_CALL_ST_NOT_STARTED"]; msc2 rbox msc2 [label="mncc_incoming_start()"]; - msc2 -> mncc2 [label="MNCC_EV_INCOMING_START"]; - mncc2 abox mncc2 [label="MNCC_ST_INCOMING_WAIT_COMPLETE"]; + msc2 -> mncc2 [label="MNCC_CALL_EV_INCOMING_START"]; + mncc2 abox mncc2 [label="MNCC_CALL_ST_INCOMING_WAIT_COMPLETE"]; mncc2 => sipcon2 [label="MNCC_CALL_CONF_IND \n callref, bearer capabilities, cccap and IMSI, SDP?"]; mncc2 <= sipcon2 [label="MNCC_RTP_CREATE @@ -67,14 +67,14 @@ mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"]; mncc2 <= sipcon2 [label="MNCC_SETUP_COMPL_REQ \n callref"]; - mncc2 abox mncc2 [label="MNCC_ST_TALKING"]; + mncc2 abox mncc2 [label="MNCC_CALL_ST_TALKING"]; sipcon1 <= sip [label="SIP 200 OK INVITE"]; mncc1 <= sipcon1 [label="MNCC_SETUP_RSP \n callref"]; mncc1 => sipcon1 [label="MNCC_SETUP_COMPL_IND \n callref"]; - mncc1 abox mncc1 [label="MNCC_ST_TALKING"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_TALKING"]; sipcon1 => sip [label="SIP ACK"]; ...; @@ -84,7 +84,7 @@ mncc1 rbox mncc1 [label="mncc_release()"]; mncc1 => sipcon1 [label="MNCC_DISC_IND \n callref and cause"]; - mncc1 abox mncc1 [label="MNCC_ST_WAIT_RELEASE_ACK"]; + mncc1 abox mncc1 [label="MNCC_CALL_ST_WAIT_RELEASE_ACK"]; sipcon1 => sip [label="SIP BYE"]; sipcon1 <= sip [label="SIP 200 OK"]; mncc1 <= sipcon1 [label="MNCC_REL_REQ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203 Gerrit-Change-Number: 15059 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 15:58:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 15:58:42 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance 0 instead of 1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 ) Change subject: osmo_sccp_simple_client(): use sccp instance 0 instead of 1 ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15062/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15062/1//COMMIT_MSG at 9 PS1, Line 9: When using osmo_sccp_simple_client(), it will create an sccp instance if : one is not yet present. The sccp connection identifier starts with 0. : So the implicit created connection should use sccp connection 0 (the : first connection). wording is wrong, sorry. An SCCP instance is basically an entire SCCP stack with all its properties, including any number of actual SCCP connections. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 07 Aug 2019 15:58:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:00:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 16:00:22 +0000 Subject: Change in ...osmo-sip-connector[master]: Cosmetic: Logging and Comments, spelling and clarity changes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 ) Change subject: Cosmetic: Logging and Comments, spelling and clarity changes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a Gerrit-Change-Number: 15072 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 16:00:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:00:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 16:00:47 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle case where SIP side hangsup while MNCC is on hold In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 ) Change subject: Handle case where SIP side hangsup while MNCC is on hold ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 Gerrit-Change-Number: 15073 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 16:00:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:01:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 16:01:48 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels, clarify some messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels, clarify some messages ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 16:01:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:01:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 16:01:53 +0000 Subject: Change in ...osmo-sip-connector[master]: Cosmetic: Logging and Comments, spelling and clarity changes In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 ) Change subject: Cosmetic: Logging and Comments, spelling and clarity changes ...................................................................... Cosmetic: Logging and Comments, spelling and clarity changes Also removes a comment in sdp_create_file() about the IP address in o= and c= having to be the same. It is completely legal in SDP and often normal for the originator and the connection information IP to be different. Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a --- M src/call.c M src/mncc.c M src/sdp.c M src/sip.c M src/vty.c 5 files changed, 21 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/call.c b/src/call.c index 67207e5..9f593ea 100644 --- a/src/call.c +++ b/src/call.c @@ -169,6 +169,6 @@ mncc = (struct mncc_call_leg *) leg; return get_value_string(mncc_state_vals, mncc->state); default: - return "unknown call type"; + return "Unknown call type"; } } diff --git a/src/mncc.c b/src/mncc.c index 8f512d9..a60b104 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -50,7 +50,7 @@ struct mncc_call_leg *leg = data; struct call_leg *other_leg; - LOGP(DMNCC, LOGL_ERROR, "cmd(0x%x) never arrived for leg(%u)\n", + LOGP(DMNCC, LOGL_ERROR, "command(0x%x) never arrived for leg(%u)\n", leg->rsp_wanted, leg->callref); other_leg = call_leg_other(&leg->base); @@ -72,7 +72,7 @@ static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res) { if (leg->rsp_wanted != got_res) { - LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%s) but got(%s) for leg(%u)\n", + LOGP(DMNCC, LOGL_ERROR, "Wanted response(%s) but got(%s) for leg(%u)\n", osmo_mncc_name(leg->rsp_wanted), osmo_mncc_name(got_res), leg->callref); return; } @@ -141,7 +141,7 @@ rc = write(conn->fd.fd, mncc, sizeof(*mncc)); LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type)); if (rc != sizeof(*mncc)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref); + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref); close_connection(conn); } } @@ -164,12 +164,12 @@ rc = write(conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref); + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref); close_connection(conn); } } -/* Send a MNCC_RTP_CONNET to the MSC for the given call legs */ +/* Send a MNCC_RTP_CONNECT to the MSC for the given call legs */ static bool send_rtp_connect(struct mncc_call_leg *leg, struct call_leg *other) { struct gsm_mncc_rtp mncc = { 0, }; @@ -194,7 +194,7 @@ LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port); rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n", + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", leg->callref); close_connection(leg->conn); return false; @@ -206,7 +206,7 @@ struct mncc_call_leg *leg; - LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP with LEG Type (%u)\n", _leg->type); + LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP for LEG Type (%u)\n", _leg->type); if (_leg->type == CALL_TYPE_MNCC) { leg = (struct mncc_call_leg *) _leg; @@ -251,7 +251,7 @@ mncc_fill_header(&out_mncc, MNCC_ALERT_REQ, leg->callref); /* GSM 04.08 10.5.4.21 */ out_mncc.fields |= MNCC_F_PROGRESS; - out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSM?PLMNS */ + out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSM PLMNS */ out_mncc.progress.location = GSM48_CAUSE_LOC_PRN_S_LU; /* Private network serving the local user */ out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */ @@ -277,7 +277,7 @@ /* drop it directly, if not connected */ if (leg->conn->state != MNCC_READY) { LOGP(DMNCC, LOGL_DEBUG, - "MNCC not connected releasing leg leg(%u)\n", leg->callref); + "MNCC not connected releasing leg(%u)\n", leg->callref); return mncc_leg_release(leg); } @@ -422,7 +422,7 @@ struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); LOGP(DMNCC, LOGL_DEBUG, - "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", + "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", leg->callref, ip_addr, leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); @@ -658,7 +658,7 @@ return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) confirmend. creating RTP socket.\n", + "leg(%u) confirmed. creating RTP socket.\n", leg->callref); start_cmd_timer(leg, MNCC_RTP_CREATE); @@ -700,7 +700,7 @@ return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) is req hold.\n", leg->callref); + "leg(%u) is requesting hold.\n", leg->callref); other_leg = call_leg_other(&leg->base); other_leg->hold_call(other_leg); mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref); @@ -718,7 +718,7 @@ return; LOGP(DMNCC, LOGL_DEBUG, - "leg(%u) is req unhold.\n", leg->callref); + "leg(%u) is requesting unhold.\n", leg->callref); other_leg = call_leg_other(&leg->base); other_leg->retrieve_call(other_leg); mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); diff --git a/src/sdp.c b/src/sdp.c index 56a41f7..46330cd 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -243,7 +243,7 @@ "%s" "a=rtpmap:%d %s/8000\r\n" "%s", - ip_addr, ip_addr, /* never use diff. addr! */ + ip_addr, ip_addr, other->port, other->payload_type, fmtp_str ? fmtp_str : "", other->payload_type, diff --git a/src/sip.c b/src/sip.c index 350eb0b..327e90f 100644 --- a/src/sip.c +++ b/src/sip.c @@ -150,7 +150,7 @@ * not this place. It starts with the TCH/F vs. TCH/H selection based * on the offered codecs, and then RTP_CREATE should have it. So both * are GSM related... and do not belong here. Just pick the first codec - * so the IP addresss port and payload type is set. + * so the IP address, port and payload type is set. */ if (!sdp_extract_sdp(leg, sip, true)) { LOGP(DSIP, LOGL_ERROR, "leg(%p) no audio, releasing\n", leg); @@ -395,7 +395,7 @@ struct sip_call_leg *leg; struct call_leg *other; - LOGP(DSIP, LOGL_ERROR, "Canceled on leg(%p)\n", hmagic); + LOGP(DSIP, LOGL_ERROR, "Cancelled on leg(%p)\n", hmagic); leg = (struct sip_call_leg *) hmagic; other = call_leg_other(&leg->base); @@ -453,12 +453,12 @@ switch (leg->state) { case SIP_CC_INITIAL: - LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in int state\n", leg); + LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in initial state\n", leg); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); break; case SIP_CC_DLG_CNFD: - LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in cnfd state\n", leg); + LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in confirmed state\n", leg); if (leg->dir == SIP_DIR_MT) nua_cancel(leg->nua_handle, TAG_END()); else { @@ -471,7 +471,7 @@ break; case SIP_CC_CONNECTED: case SIP_CC_HOLD: - LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in con\n", leg); + LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in connected state.\n", leg); nua_bye(leg->nua_handle, TAG_END()); break; } diff --git a/src/vty.c b/src/vty.c index c11a976..ea76d46 100644 --- a/src/vty.c +++ b/src/vty.c @@ -129,7 +129,7 @@ DEFUN(cfg_sip_remote_addr, cfg_sip_remote_addr_cmd, "remote ADDR <1-65534>", - "Remore information\nSIP hostname\nport\n") + "Remote information\nSIP hostname\nport\n") { talloc_free((char *) g_app.sip.remote_addr); g_app.sip.remote_addr = talloc_strdup(tall_mncc_ctx, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a Gerrit-Change-Number: 15072 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:01:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 16:01:53 +0000 Subject: Change in ...osmo-sip-connector[master]: Handle case where SIP side hangsup while MNCC is on hold In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 ) Change subject: Handle case where SIP side hangsup while MNCC is on hold ...................................................................... Handle case where SIP side hangsup while MNCC is on hold Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 --- M src/mncc.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/mncc.c b/src/mncc.c index a60b104..d8545da 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -297,6 +297,7 @@ break; case MNCC_CC_PROCEEDING: case MNCC_CC_CONNECTED: + case MNCC_CC_HOLD: LOGP(DMNCC, LOGL_DEBUG, "Releasing call in non-initial leg(%u) cause(%s)\n", leg->callref, gsm48_cc_cause_name(leg->base.cause)); leg->base.in_release = true; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie32690e036180e6b80a1b59177c1a72a6fd78d15 Gerrit-Change-Number: 15073 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:02:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 7 Aug 2019 16:02:36 +0000 Subject: Change in ...osmo-sip-connector[master]: In hold/retrieve/reinvite, add check that other_leg exists In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 ) Change subject: In hold/retrieve/reinvite, add check that other_leg exists ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 Gerrit-Change-Number: 15079 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 16:02:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:28:18 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:28:18 +0000 Subject: Change in ...osmo-hlr[master]: configure.ac: Require libosmocore 1.2.0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15103 ) Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iad03a8cf7a36bdc824ec2acc8fb8f9c27a1c0421 Gerrit-Change-Number: 15103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:28:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:31:34 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:31:34 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E49-e493-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15104 ) Change subject: Bump version: 1.0.0.49-e493-dirty ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If53bdb2e216cb98df4d5a482cbbf24096db536ed Gerrit-Change-Number: 15104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:31:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:32:21 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:32:21 +0000 Subject: Change in ...osmo-bts[master]: configure.ac: Require libosmocore 1.2.0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15101 ) Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If84c53d8192e8db98eb9439b898d83e94c5e5476 Gerrit-Change-Number: 15101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:32:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:38:39 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:38:39 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E1_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15102 ) Change subject: Bump version: 1.0.1 ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I708f6a63b51459d77368c48e115f64aaa6646bfd Gerrit-Change-Number: 15102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:38:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:42:22 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:42:22 +0000 Subject: Change in ...osmo-ggsn[master]: Require libosmocore 1.1.0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 ) Change subject: Require libosmocore 1.1.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 Gerrit-Change-Number: 15098 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:42:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:46:14 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:46:14 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E49-0036-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 ) Change subject: Bump version: 1.3.0.49-0036-dirty ? 1.4.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 Gerrit-Change-Number: 15099 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:46:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:48:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:48:10 +0000 Subject: Change in ...osmo-mgw[master]: configure.ac: Require libosmo-netif 0.6.0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15106 ) Change subject: configure.ac: Require libosmo-netif 0.6.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 Gerrit-Change-Number: 15106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 16:48:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:48:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:48:40 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E84-a2d10-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15107 ) Change subject: Bump version: 1.5.0.84-a2d10-dirty ? 1.6.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I57277c34bbab1fc9ea2be6a754d5a79786ce627d Gerrit-Change-Number: 15107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:48:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:49:15 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:49:15 +0000 Subject: Change in ...osmo-pcap[master]: Require libosmocore 0.11.0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15092 ) Change subject: Require libosmocore 0.11.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725 Gerrit-Change-Number: 15092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:49:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:49:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:49:31 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E2-ce06_=E2=86=92_0=2E1=2E1?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15093 ) Change subject: Bump version: 0.1.0.2-ce06 ? 0.1.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02 Gerrit-Change-Number: 15093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:49:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:50:52 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:50:52 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing header netinet/in.h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 ) Change subject: Transceiver: Add missing header netinet/in.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:50:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 16:51:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 16:51:08 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15088 ) Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 16:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 17:07:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 17:07:31 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-190b_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15089 ) Change subject: Bump version: 1.0.0.104-190b ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 17:07:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 17:11:55 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 17:11:55 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E13=2E0=2E7-ffff_=E2=86=92_1=2E14=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/15100 ) Change subject: Bump version: 1.13.0.7-ffff ? 1.14.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/15100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Id7ef68f50fb951dfb0687977924115204f8482a6 Gerrit-Change-Number: 15100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 17:11:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 17:14:01 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 17:14:01 +0000 Subject: Change in ...libgtpnl[master]: debian: Adapt package name to lib's current major version In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/15085 ) Change subject: debian: Adapt package name to lib's current major version ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I7d2fa50b6a17a598467f555558660ef2396c1744 Gerrit-Change-Number: 15085 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 17:14:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 17:14:24 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 17:14:24 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-d160-dirty_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/15086 ) Change subject: Bump version: 1.2.0.2-d160-dirty ? 1.2.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Icc0dca37a88ce213f9b80598ab89570bd81cf0e7 Gerrit-Change-Number: 15086 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 17:14:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 18:43:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 18:43:34 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E109-caec1-dirty_=E2=86=92_1=2E5=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15109 Change subject: Bump version: 1.4.0.109-caec1-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.109-caec1-dirty ? 1.5.0 Change-Id: I4b73d0a83b1ed1a4dfd17066182820da5e401c9b --- M configure.ac M debian/changelog M debian/control 3 files changed, 146 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/15109/1 diff --git a/configure.ac b/configure.ac index 694a9a7..66492f5 100644 --- a/configure.ac +++ b/configure.ac @@ -44,15 +44,15 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.1) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) dnl checks for header files AC_HEADER_STDC diff --git a/debian/changelog b/debian/changelog index a4f4d40..8c9cde0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,138 @@ +osmo-bsc (1.5.0) unstable; urgency=medium + + [ Max ] + * LCLS: constify helper parameters + * LCLS: use libosmocore function to add status + * nanobts: use libosmocore's osmo_store*() for OML attr. patching + + [ Philipp Maier ] + * lchan_select: dont allow half rate EFR to be selected + * lchan_select: Do not unsolicitedly select a TCH/F + * bsc_vty: add vty command to display all lchans + * bsc_vty: add features to disable specific lchans via vty + * assignment_fsm: fix channel allocator preferences + * assignment_fsm: use activate.info.s15_s0 for ASS. COMPL. + * handover_fsm: copy old S15_S0 to new lchan + * osmo_bsc_msc: Use meaningful amr rate configuration on BTS level + * codec_pref: fix special handling for AMR rate configuration (S15-S0) + * lchan_fsm: make sure multi rate configuration is valid + * lchan_fsm: do not include 12.2k in active set on HR channels + * AMR: Signal usage of octet-aligned or bandwith-efficient mode to MSC + * lchan_fsm: add missing header file. + * osmo_bsc_bssap: check bssmap length field + * rest_octets: add Serving Cell Priority Parameters + + [ Neels Hofmeyr ] + * abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request + * handover_fsm: do not access conn->assignment.req, it may be outdated + * comments: clarify usage of conn.assignment and .handover scopes + * cosmetic: drop unused struct mgcp_ctx shadow + * incoming connect: don't crash if calling addr is missing + * log N-CONNECT from MSC + * Revert "assignment_fsm: Properly support assigning signalling mode TCH/x" + * fix log line end in assignment_fsm.c + * avoid use-after-free: on MGW endpoint dealloc, also forget it in conn->ho.* + * lchan activation: add explicit encryption info to activation + * Handover Request: also parse Chosen Algorithm IE, pass to lchan activation + * fix inter-BSC-HO-incoming for AoIP (1/2) + * use libosmocore osmo_tdef + * move mgw endpoint FSM to osmo-mgw.git + * fix inter-BSC-HO-incoming for AoIP (1/2) + * fix inter-BSC-HO-incoming for AoIP (2/2) + * abis_rsl.c: missing newlines on log lines + * doc/manuals: review and tweak handover docs + * make bsc_clear_request() static + * doc/manuals, vty doc: more handover doc clarifications + * remove double BSSMAP Clear on HO failure + * comment and VTY doc tweaks + * silence error for "invalid enum handover_scope value: none" + + [ Harald Welte ] + * gsm_data: Add gsm_bts_name() just like we have gsm_{trx,ts,lchan}_name() + * manual: It's not "A over SCCP" but "BSSAP over SCCP" + * manual: Add sections on 3G/4G neighbor cells + * manual: Re-order chapters in more logical order + * manual: s/OsmoNITB/OsmoBSC/ in examples; remove E1 based BTSs + * manual: Remove bogus "Control interface" sub-section in overview + * Implement CSFB "Fast Return" Handling at RR RELEASE + * OML: Fix encoded length value of OML GET ATTRIBUTES + * Make sure to default to AMR octet-aligned mode + * abis_rsl: Add support for extended CBCH to rsl_sms_cb_command() + * abis_rsl: Avoid "Unimplemented" log message for every CBCH LOAD IND + * abis_rsl: Fix log message about unimplemented common channel msg + * smscb: Allow transmit of SCHEDULE and DEFAULT SMSCB + * chan_alloc: Don't include CBCH channels in load computation + * keep per-BTS stat_items about RACH busy / RACH access percentage + * vty: Dump per-bts stat_item group in 'show bts' output + * Allow VTY to set the CCCH Load Indication Threshold + * rx_fail_evt_rep(): Don't recycle variable + * Re-introduce support for IPA-encapsulated MGCP + * logging: introduce LOG_BTS and LOG_TRX and use it everywhere + * vty: Fix typo in VTY command descrption -> description + + [ Pau Espin Pedrol ] + * ipaccess/Makefile.am: Remove unneeded libmgcp-client dep + * Move LCLS references from gsm_data to osmo_bsc_lcls + * Move msc related code from gsm_data to bsc_msc + * ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep + * net_init.c: remove unneeded header + * configure.ac: Add flag to enable/disable build of ipaccess related utils + * src/utils/Makefile.am: Drop unneeded sigtran and mgcp-client deps + * fix another log line end in assignment_fsm.c + * Drop unused old osmux leftover code + * vty: Add option to enable osmux towards MSC + * bssap: Detect MSC Osmux support on RESET (ACK) recv + * bssap: Announce Osmux support on RESET (ACK) send + * bssap: Parse Osmux CID on BSSAP Assign Req recv and use it in MGCP + * bssap: Feed Assign Complete with Osmux CID retrieved from MGW + * lcls: Fix MDCX with garbage on LCLS loop break + * Introduce msc_is_{sccplite,aoip}() helpers + * bsc: Append Osmux Support IE only on AoIP + * Remove extern declarations of libosmovty symbols + * bsc_subscr_conn_fsm: Use gscon_bssmap_clear() helper on send failure + * bsc_subscr_conn_fsm: Log Tx of BSSMAP Clear Request with cause + * doc: Add Osmux documentation to User Manual + * Remove undefined param passed to logging_vty_add_cmds + + [ Sylvain Munaut ] + * assignment_fsm: Properly support assigning signalling mode TCH/x + * assignment_fsm: Properly support assigning signalling mode TCH/x + + [ Vadim Yanitskiy ] + * abis_nm.c: use proper format specifiers for BTS / TRX number + * abis_nm.c: also print TRX number in abis_nm_get_attr() + * abis_nm.c: use abis_nm_ipa_magic from libosmocore + * abis_nm.c: use msgb_lv_put() to put abis_nm_ipa_magic + * abis_nm.c: fix broken logging in abis_nm_rx_ipacc() + * gsm_data.c: use REG_NOSUB flag of regcomp() + * osmo_bsc_lcls.c: cosmetic: make Coverity happy + * ipaccess-config: use POSIX regex for Unit ID format check + * handover_fsm.c: fix: prevent possible buffer overflow + + [ Daniel Willmann ] + * doc: Add generic counter chapter in manual + * manuals: Fix example config to reflect OsmoBSC commands + * Change comments/strings from OpenBSC to OsmoBSC + * gsm_data.h: Remove unused variable from OpenBSC times + * Revert "fix inter-BSC-HO-incoming for AoIP (1/2)" + * manuals: Update generated VTY reference and counters + * manuals: Add script to update vtr/counter documentation from docker + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * contrib/jenkins.sh: "maintainer-clean" after "publish" + * osmo-bsc.cfg: work with osmo-bts example cfg + + [ Eric Wild ] + * vty: adjust config name for unit-id + * turn -Werror=null-dereference into a warning + + [ Ruben Undheim ] + * Fix some spelling errors found by lintian + + -- Pau Espin Pedrol Wed, 07 Aug 2019 20:42:06 +0200 + osmo-bsc (1.4.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 7410193..a6b8c02 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ python-minimal, libcdk5-dev, libtalloc-dev, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.2.0), libosmo-sccp-dev (>= 0.10.0), libosmo-sigtran-dev (>= 0.10.0), - libosmo-abis-dev (>= 0.5.1), - libosmo-netif-dev (>= 0.3.0), - libosmo-mgcp-client-dev (>= 1.4.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.6.0), + libosmo-mgcp-client-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc.git -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b73d0a83b1ed1a4dfd17066182820da5e401c9b Gerrit-Change-Number: 15109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 18:46:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 18:46:53 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E2-6563_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15080 ) Change subject: Bump version: 0.5.0.2-6563 ? 0.6.0 ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15080/1/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/#/c/15080/1/src/Makefile.am at 3 PS1, Line 3: 8:0:2 > is that safe with the new field that was added? probably, as it's compile compatible, Good point. It breaks the ABI, so it's not compatible. Old programs will pass allocated structs being too small and libosmo-netif will write to wrong places. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a Gerrit-Change-Number: 15080 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 18:46:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:00:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:00:48 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E2-6563-dirty_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 to look at the new patch set (#2). Change subject: Bump version: 0.5.0.2-6563-dirty ? 0.6.0 ...................................................................... Bump version: 0.5.0.2-6563-dirty ? 0.6.0 Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmonetif8.install M src/Makefile.am 5 files changed, 17 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/80/15080/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a Gerrit-Change-Number: 15080 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:04:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:04:53 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E109-caec1-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15109 ) Change subject: Bump version: 1.4.0.109-caec1-dirty ? 1.5.0 ...................................................................... Patch Set 1: Expected failure, libosmo-netif 0.6.0 still in process of being released. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b73d0a83b1ed1a4dfd17066182820da5e401c9b Gerrit-Change-Number: 15109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:04:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:10:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:10:16 +0000 Subject: Change in ...osmo-pcu[master]: Require newer libosmocore to avoid compile failures In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 to look at the new patch set (#2). Change subject: Require newer libosmocore to avoid compile failures ...................................................................... Require newer libosmocore to avoid compile failures Older commit started using OSMO_IMSI_BUF_SIZE, only available in libosmocore 1.1.0 onwards, but forgot to increase the values in configure.ac. Fixes: 2c076bcb4dc1bc2ada340441c2f898c55318209f Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 --- M configure.ac M debian/control 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/15090/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 Gerrit-Change-Number: 15090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:10:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:10:16 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E88-3bcc_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 to look at the new patch set (#2). Change subject: Bump version: 0.6.0.88-3bcc ? 0.7.0 ...................................................................... Bump version: 0.6.0.88-3bcc ? 0.7.0 Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 --- M debian/changelog 1 file changed, 120 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/91/15091/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 Gerrit-Change-Number: 15091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:13:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:13:43 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing include netinet/in.h In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 to look at the new patch set (#2). Change subject: Transceiver: Add missing include netinet/in.h ...................................................................... Transceiver: Add missing include netinet/in.h Previous commit started using IPPROTO_UDP without including required include. Newer versions of libosmocore's osmocom/core/socket.h include that header so the define is present, but older versions of libosmocore (such as 0.12.0) don't, so let's include it explicitly (the correct thing to do). Fixes: b9d2515704ac83cacd88d0a73ecba30323df0b2d Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/15087/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:13:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:13:43 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 to look at the new patch set (#2). Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Require newer version of libosmocore to avoid build failure Older commit started using osmo_timerd_* APIs which are only available starting libosmocore 0.12.0, but configure.ac still states 0.11.0 is accepted, which is incorrect. Fixes: 4456b6f132437a95833e3a3d3353836331b9c8a0 Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/15088/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:13:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:13:43 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-72a7_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 to look at the new patch set (#2). Change subject: Bump version: 1.0.0.104-72a7 ? 1.1.0 ...................................................................... Bump version: 1.0.0.104-72a7 ? 1.1.0 Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 --- M debian/changelog 1 file changed, 126 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/15089/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:18:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 19:18:31 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing include netinet/in.h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 ) Change subject: Transceiver: Add missing include netinet/in.h ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 19:18:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:18:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:18:38 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E26-2728-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 to look at the new patch set (#2). Change subject: Bump version: 1.0.0.26-2728-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.26-2728-dirty ? 1.1.0 Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b --- M debian/changelog M debian/control M src/Makefile.am 3 files changed, 51 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/05/15105/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b Gerrit-Change-Number: 15105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:19:13 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 19:19:13 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15088 ) Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 19:19:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:19:30 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 19:19:30 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-72a7_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15089 ) Change subject: Bump version: 1.0.0.104-72a7 ? 1.1.0 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 19:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 19:21:05 +0000 Subject: Change in ...osmo-pcu[master]: Require newer libosmocore to avoid compile failures In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15090 ) Change subject: Require newer libosmocore to avoid compile failures ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 Gerrit-Change-Number: 15090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 19:21:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:21:17 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 7 Aug 2019 19:21:17 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E88-3bcc_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15091 ) Change subject: Bump version: 0.6.0.88-3bcc ? 0.7.0 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 Gerrit-Change-Number: 15091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 07 Aug 2019 19:21:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:24:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:24:16 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E14-92ea-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15108 to look at the new patch set (#2). Change subject: Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 ...................................................................... Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 --- M configure.ac M debian/changelog M debian/control M src/Makefile.am 4 files changed, 40 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/08/15108/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 Gerrit-Change-Number: 15108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:28:58 +0000 Subject: Change in ...osmo-ggsn[master]: Require libosmocore 1.1.0 In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 to look at the new patch set (#2). Change subject: Require libosmocore 1.1.0 ...................................................................... Require libosmocore 1.1.0 Older commit made use of gsm48_decode_bcd_number2(), which is available in libosmocore 1.1.0 onwards, but forgot to increase configure.ac requirements. Fixes: fb625041601c525c23c96482250157dddb0941a4 Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/98/15098/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 Gerrit-Change-Number: 15098 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:28:58 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E50-ea1c-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 to look at the new patch set (#2). Change subject: Bump version: 1.3.0.50-ea1c-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.50-ea1c-dirty ? 1.4.0 Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp5.install M debian/rules M gtp/Makefile.am 6 files changed, 72 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/99/15099/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 Gerrit-Change-Number: 15099 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:35:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:35:05 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E2-6563-dirty_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15080 ) Change subject: Bump version: 0.5.0.2-6563-dirty ? 0.6.0 ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15080/2/TODO-RELEASE File TODO-RELEASE: https://gerrit.osmocom.org/#/c/15080/2/TODO-RELEASE at a10 PS2, Line 10: I even wrote about ABI breakage here ;) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a Gerrit-Change-Number: 15080 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:35:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:35:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:35:09 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E2-6563-dirty_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15080 ) Change subject: Bump version: 0.5.0.2-6563-dirty ? 0.6.0 ...................................................................... Bump version: 0.5.0.2-6563-dirty ? 0.6.0 Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmonetif8.install M src/Makefile.am 5 files changed, 17 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 45ebb75..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif Add new field to struct osmux_out_handle Breaks ABI with older versions -libosmo-netif Add new API osmux_xfrm_output_init2 Deprecates old osmux_xfrm_output_init diff --git a/debian/changelog b/debian/changelog index e3b19c9..b3aba59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libosmo-netif (0.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmux: Extend osmux_out_handle and add new API to set rtp payload_type + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 20:59:51 +0200 + libosmo-netif (0.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index a9a486d..e1b2096 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ libdpkg-perl, git, doxygen, - libosmocore-dev, - libosmo-abis-dev, + libosmocore-dev (>= 1.0.0), + libosmo-abis-dev (>= 0.6.0), pkg-config, libpcap0.8-dev, libsctp-dev, @@ -22,7 +22,7 @@ Vcs-Git: git://git.osmocom.org/libosmo-netif.git Homepage: https://projects.osmocom.org/projects/libosmo-netif -Package: libosmonetif6 +Package: libosmonetif8 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -39,7 +39,7 @@ Depends: ${misc:Depends}, libosmocore-dev, libosmocore, - libosmonetif6 (= ${binary:Version}) + libosmonetif8 (= ${binary:Version}) Multi-Arch: same Description: Development headers for Osmocom network interface The libosmo-netif library is one of the libraries needed by the @@ -53,7 +53,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmonetif6, + libosmonetif8, libjs-jquery Description: Documentation for the Osmo network interface library The libosmo-netif library is one of the libraries needed by the @@ -66,7 +66,7 @@ Section: debug Architecture: any Priority: extra -Depends: libosmonetif6 (= ${binary:Version}), ${misc:Depends} +Depends: libosmonetif8 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Debug symbols for Osmocom network interface library The libosmo-netif library is one of the libraries needed by the diff --git a/debian/libosmonetif6.install b/debian/libosmonetif8.install similarity index 100% rename from debian/libosmonetif6.install rename to debian/libosmonetif8.install diff --git a/src/Makefile.am b/src/Makefile.am index 4d8b900..7acbd79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=7:0:1 +LIBVERSION=8:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3af3b7aaff5c6dc3ac94e942191e27af4bf5392a Gerrit-Change-Number: 15080 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:41:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:41:36 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E26-2728-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 ) Change subject: Bump version: 1.0.0.26-2728-dirty ? 1.1.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b Gerrit-Change-Number: 15105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:41:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:41:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:41:59 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E26-2728-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 ) Change subject: Bump version: 1.0.0.26-2728-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.26-2728-dirty ? 1.1.0 Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b --- M debian/changelog M debian/control M src/Makefile.am 3 files changed, 51 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 06496c1..5fb9cb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,51 @@ +libosmo-sccp (1.1.0) unstable; urgency=medium + + [ Max ] + * Don't use deprecated osmo_stream_cli_open2() + * osmo_ss7.c: fix typo + * OsmoSTP: enable statsd support + + [ Neels Hofmeyr ] + * debug log typo fix in sccp_scoc.c + * improve logging for rejected AS in xua_rkm.c + * add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree() + * add osmo_sccp_addr_cmp(), osmo_sccp_addr_ri_cmp() + + [ Harald Welte ] + * vty: Ensure to properly save route pointcode and mask when writing + * Store + show remote ip/port in dynamically created ASPs + * Fix output of route destination in 'show ss7 instance <0-15> route' + * sccp_scoc: Add more comments describing conn_id and local_ref members + * stp: Ensure telnet uses STP talloc context, not NULL context + + [ Oliver Smith ] + * Cosmetic: sccp_scoc: fix local reference comments + * sccp_scoc: move sccp_find_user() up + * sccp_scoc: conn_create{,_id}() user arg, not inst + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * contrib/jenkins.sh: "maintainer-clean" after "publish" + + [ Holger Hans Peter Freyther ] + * xudt: Implement address and data extraction + * udts/xudts: Attempt to implement unitdata service parsing + + [ Vadim Yanitskiy ] + * osmo-stp: register VTY commands for talloc context introspection + * osmo-stp: expose root talloc context to the VTY code + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update vty documentation + + [ Kira Obrezkova ] + * This patch fixes typos on which Lintian complains + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + + -- Pau Espin Pedrol Wed, 07 Aug 2019 21:17:59 +0200 + libosmo-sccp (1.0.0) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index cede17a..3417297 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.0.0), autoconf, automake, libtool, @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev (>= 0.3.0), + libosmo-netif-dev (>= 0.4.0), libsctp-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.7 diff --git a/src/Makefile.am b/src/Makefile.am index 56567d6..bdb225b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=3:0:0 +LIBVERSION=4:0:1 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b Gerrit-Change-Number: 15105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:45:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:45:00 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E14-92ea-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15108 ) Change subject: Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 Gerrit-Change-Number: 15108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:45:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:45:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:45:42 +0000 Subject: Change in ...osmo-pcu[master]: Require newer libosmocore to avoid compile failures In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15090 ) Change subject: Require newer libosmocore to avoid compile failures ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 Gerrit-Change-Number: 15090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:45:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:45:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:45:52 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E88-3bcc_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15091 ) Change subject: Bump version: 0.6.0.88-3bcc ? 0.7.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 Gerrit-Change-Number: 15091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:45:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:45:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:45:57 +0000 Subject: Change in ...osmo-pcu[master]: Require newer libosmocore to avoid compile failures In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15090 ) Change subject: Require newer libosmocore to avoid compile failures ...................................................................... Require newer libosmocore to avoid compile failures Older commit started using OSMO_IMSI_BUF_SIZE, only available in libosmocore 1.1.0 onwards, but forgot to increase the values in configure.ac. Fixes: 2c076bcb4dc1bc2ada340441c2f898c55318209f Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 --- M configure.ac M debian/control 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 149162e..5ecd133 100644 --- a/configure.ac +++ b/configure.ac @@ -74,10 +74,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.1.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/debian/control b/debian/control index 9ff9d88..497788c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 0.10.1), + libosmocore-dev (>= 1.1.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Homepage: http://osmocom.org/projects/osmopcu -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf5f276a092c695a5f077551d9784652c2289424 Gerrit-Change-Number: 15090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:45:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:45:58 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E88-3bcc_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15091 ) Change subject: Bump version: 0.6.0.88-3bcc ? 0.7.0 ...................................................................... Bump version: 0.6.0.88-3bcc ? 0.7.0 Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 --- M debian/changelog 1 file changed, 120 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index ac9c6a8..13e88c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,123 @@ +osmo-pcu (0.7.0) unstable; urgency=medium + + [ Rafael Diniz ] + * Added support for daemonize to osmo-pcu. + * Fix help message formatting of osmo-pcu. + + [ Max ] + * Don't install pcuif_proto.h header + * Move C include to proper place + * Add define for dummy burst string + * Add encoding tests for Immediate Assignment + * Clarify write_immediate_assignment() signature + * Restructure IA Rest Octets encoders + * Rewrite Packet Downlink Assignment + * Rewrite EGPRS Packet Uplink IA Rest Octets for MBA + * Rewrite EGPRS Packet Uplink IA Rest Octets for SBA + * MCS: internalize 'family' parameter + * EDGE tests: reduce code duplication + * MCS: remove dead code + * EDGE tests: remove no-op check + * Use msgb_eq_data_print() in tests + * Tighten lqual table limits check + * Enable LGLOBAL logging for TBF tests + * Log (M)CS UL update errors + * MCS: move Coding Scheme enum outside of class definition + * Make get_retx_mcs() into regular function + * MCS: remove unused function + * Debian: bump copyright year + * Use unique NSEI/BVCI/NSVCI in TBF tests + * MS store: move test helper to unit test + * Explicitly clean up BTS singleton + * MCS: move HeaderType enum outside of class definition + * MCS: use value_string for conversion + * TBF-DL: log MCS as string + * Fix TA index encoder + * MCS: move Mode enum outside of class definition + * MCS: add mcs_is_*() helpers + * MCS: add Channel Coding Command encoder + * Fix Channel Coding Command for MCS + * Rewrite Packet Uplink IA Rest Octets for MBA + * Rewrite Packet Uplink IA Rest Octets for SBA + * Use Timing Advance Index in UL assignments + * TBF: update MCS counters + * TBF-DL: cosmetic update for helper routines + * Update IA Rest Octets encoding + * TS alloc: expand tests log + * vty: add commands to show TBF of a certain kind + * Update MCS selection for retransmission + * cosmetic: use const pointer for bts_data + * Add test for MS mode and (M)CS settings + * Use libosmocore for IMSI parsing + + [ Harald Welte ] + * Mark gprs_ns_reconnect() as static (not used outside of C file) + * Optionally Use the NS Sub-Network-Service (SNS) on Gb + * pcu_l1_if: Fix erroneous endian-swapping of the CellID + * Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP + * gprs_debug: Use named initializers and explicit array indicies + * bssgp: Fix dead code: PDUT_STATUS can never reach this part + + [ JF Dionne ] + * encoding: Fixes TMSI vs MI bit selection in repeated page info + + [ Oliver Smith ] + * tests: use -no-install libtool flag to avoid ./lt-* scripts + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Daniel Willmann ] + * Include pdch.h in bts.h even if we're not compiling C++ + * oc2g: Remove custom alarms + * oc2g: Change log type (Litecell15->Oc2g) + * jenkins.sh: Add oc2g build support + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update VTY documentation + + [ Jean-Francois Dionne ] + * Initial commit for OC-2G support. + + [ Minh-Quang Nguyen ] + * OC-2G: Fix missing header + * OC-2G: Fix TA adjustment + * OC-2G: Always use positive TA information provided in PH-RA-IND + + [ Alexander Couzens ] + * gprs_bssgp_pcu: make gprs_bssgp_ns_cb public + * gprs_bssgp_pcu: explicit allocate & initialize bssgp_nsi instance + * encoding: correct encoding of CRBB in ACK/NACK when not byte aligned + * encoding: use `/* */` for comments instead of `#if 0 #endif` + * egprs_rlc_compression: fix white spaces + * tests/BitcompTest: fix wording in log message + * rlc: replace int with uint16_t + * Encoding: drop struct gprs_rlcmac_bts* from all functions + * decompress_crbb: add length argument for search_runlen + * Encoding: write_packet_ack_nack_desc_egprs: don't use a reference for rest_bits + * bts.cpp: ensure left-shift operation does not exceed uint32_t + * Encoding: use uint16_t when interacting with the window object + * Encoding: ACK/NACK: always encode with length field present + + [ Keith ] + * Cosmetic: Osmcoom -> Osmocom + + [ Vadim Yanitskiy ] + * src/pcu_l1_if.cpp: fix: properly pass measurements from PCUIF + * gprs_bssgp_pcu_rx_dl_ud(): fix: BSSGP_IE_IMSI is optional + * gprs_bssgp_pcu.cpp: check return code of gsm48_mi_to_string() + * gprs_bssgp_pcu_rx_dl_ud(): use OSMO_IMSI_BUF_SIZE + + [ Thorsten Alteholz ] + * fix spelling errors detected by lintian + + [ Eric Wild ] + * ubsan: fix shift + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require newer libosmocore to avoid compile failures + + -- Pau Espin Pedrol Wed, 07 Aug 2019 21:09:53 +0200 + osmo-pcu (0.6.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I98719f38c490b70983f2dca24ef743abc00b7d28 Gerrit-Change-Number: 15091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:47:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:47:25 +0000 Subject: Change in ...libusrp[master]: Remove trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15081 ) Change subject: Remove trailing whitespace ...................................................................... Remove trailing whitespace Change-Id: I8b6b8781c95a4930b89e5c5462d322cf04ccda67 --- M Makefile.am M configure.ac 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 4dcbb92..a9baf62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,23 +1,23 @@ # # Copyright 2003 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# include $(top_srcdir)/Makefile.common diff --git a/configure.ac b/configure.ac index ac486bc..fc1933c 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl AX_BOOST_UNIT_TEST_FRAMEWORK dnl AX_BOOST_WSERIALIZATION -# Allow user to choose whether to generate SWIG/Python +# Allow user to choose whether to generate SWIG/Python # Default is enabled AC_ARG_ENABLE([python], [AS_HELP_STRING([--enable-python], -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I8b6b8781c95a4930b89e5c5462d322cf04ccda67 Gerrit-Change-Number: 15081 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:47:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:47:25 +0000 Subject: Change in ...libusrp[master]: Use release helper from libosmocore In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15082 ) Change subject: Use release helper from libosmocore ...................................................................... Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I3aaa768a9c7afda11852521c548352244bf141ac --- M Makefile.am A TODO-RELEASE M configure.ac 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index a9baf62..553747e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,5 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ usrp.pc + + at RELMAKE@ diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac index fc1933c..ec86209 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,10 @@ AC_CONFIG_MACRO_DIRS([m4]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + AC_PROG_CXX LT_INIT([pic-only disable-static]) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3aaa768a9c7afda11852521c548352244bf141ac Gerrit-Change-Number: 15082 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:47:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:47:26 +0000 Subject: Change in ...libusrp[master]: configure.ac: Use git-version-gen In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15083 ) Change subject: configure.ac: Use git-version-gen ...................................................................... configure.ac: Use git-version-gen Change-Id: Ib5458af1df08eec82339b4e7f7696b9c390a3078 --- M configure.ac A git-version-gen 2 files changed, 155 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index ec86209..3f02c14 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,7 @@ -AC_INIT([libusrp], [3.4.2]) +AC_INIT([libusrp], + m4_esyscmd([./git-version-gen .tarball-version]), + [openbsc at lists.osmocom.org]) + AM_INIT_AUTOMAKE([foreign subdir-objects silent-rules]) AM_SILENT_RULES([yes]) diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib5458af1df08eec82339b4e7f7696b9c390a3078 Gerrit-Change-Number: 15083 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:47:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:47:26 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibusrp=5Bmaster=5D=3A_Bump_version=3A_3=2E4=2E2=2E17-1489_=E2=86=92_3=2E4=2E3?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15084 ) Change subject: Bump version: 3.4.2.17-1489 ? 3.4.3 ...................................................................... Bump version: 3.4.2.17-1489 ? 3.4.3 Change-Id: I7f3ace74e30aba8609f435e76256badd93fb0220 --- M debian/changelog 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 1ce0ac4..877cc76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +libusrp (3.4.3) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * build: use correct python version in generate_regs.py + * debian/rules: Don't overwrite .tarball-version + * build_eeprom.py: Fix build for distros with python3 as default + * edit-gpif: Fix build for distros with python3 as default + * Remove trailing whitespace + * Use release helper from libosmocore + * configure.ac: Use git-version-gen + + [ Harald Welte ] + * firmware: Fix include directory path names + * firmware: Port to more modern SDCC syntax. + * Re-enable build of usrp FX2 firmware + * debian: Make sure the FX2 firmware is packaged + * debian: Add 'sdcc' package to BuildDepends + + [ Max ] + * Add config for git-review + + [ Alexander Huemer ] + * usrp2: firmware: ignore .lk build artifacts + * Avoid compiler warning 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]' + + [ Oliver Smith ] + * firmware/src/usrp2/Makefile.am: fix "distcheck" + * contrib/jenkins.sh: run "make {distcheck,maintainer-clean}" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 12:12:21 +0200 + libusrp (3.4.2) unstable; urgency=medium * Initial release -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I7f3ace74e30aba8609f435e76256badd93fb0220 Gerrit-Change-Number: 15084 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:48:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:48:33 +0000 Subject: Change in ...libgtpnl[master]: debian: Adapt package name to lib's current major version In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libgtpnl/+/15085 ) Change subject: debian: Adapt package name to lib's current major version ...................................................................... debian: Adapt package name to lib's current major version Current LIBVERSION is 1:1:1 (current:revision:age), so major=current-age makes it be major=0: libgtpnl0. It can bee seen in current osmocom debian repos that libgtpnl1 package contains libgtpnl.so.0. Let's set package name accordingly. Change-Id: I7d2fa50b6a17a598467f555558660ef2396c1744 --- M debian/control R debian/libgtpnl0.install 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/debian/control b/debian/control index af83842..3128f3e 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libgtpnl.git;a=summary Homepage: https://projects.osmocom.org/projects/openggsn -Package: libgtpnl1 +Package: libgtpnl0 Section: libs Architecture: any Multi-Arch: same @@ -29,7 +29,7 @@ Multi-Arch: same Section: libdevel Depends: libmnl-dev, - libgtpnl1 (= ${binary:Version}), + libgtpnl0 (= ${binary:Version}), ${misc:Depends} Description: Development headers for Linux kernel GTP-U netlink library The header files provided by this package may be used to develop @@ -40,6 +40,6 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libgtpnl1 (= ${binary:Version}), +Depends: libgtpnl0 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for Linux kernel GTP-U netlink library diff --git a/debian/libgtpnl1.install b/debian/libgtpnl0.install similarity index 100% rename from debian/libgtpnl1.install rename to debian/libgtpnl0.install -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I7d2fa50b6a17a598467f555558660ef2396c1744 Gerrit-Change-Number: 15085 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:48:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:48:33 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-d160-dirty_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libgtpnl/+/15086 ) Change subject: Bump version: 1.2.0.2-d160-dirty ? 1.2.1 ...................................................................... Bump version: 1.2.0.2-d160-dirty ? 1.2.1 Change-Id: Icc0dca37a88ce213f9b80598ab89570bd81cf0e7 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index 6499958..9e8e6c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libgtpnl (1.2.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * debian/rules: Don't overwrite .tarball-version + * debian: Adapt package name to lib's current major version + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 12:29:04 +0200 + libgtpnl (1.2.0) unstable; urgency=medium * Fix CTRL_ATTR_FAMILY_ID attribute size -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/15086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Icc0dca37a88ce213f9b80598ab89570bd81cf0e7 Gerrit-Change-Number: 15086 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:49:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:49:20 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing include netinet/in.h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 ) Change subject: Transceiver: Add missing include netinet/in.h ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:49:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:49:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:49:48 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15088 ) Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:49:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:49:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:49:56 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-72a7_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15089 ) Change subject: Bump version: 1.0.0.104-72a7 ? 1.1.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:49:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:50:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:50:00 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Add missing include netinet/in.h In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15087 ) Change subject: Transceiver: Add missing include netinet/in.h ...................................................................... Transceiver: Add missing include netinet/in.h Previous commit started using IPPROTO_UDP without including required include. Newer versions of libosmocore's osmocom/core/socket.h include that header so the define is present, but older versions of libosmocore (such as 0.12.0) don't, so let's include it explicitly (the correct thing to do). Fixes: b9d2515704ac83cacd88d0a73ecba30323df0b2d Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index b12a498..4da1876 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -24,6 +24,7 @@ */ #include +#include #include // std::setprecision #include #include "Transceiver.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67ddf550f3a7fc6a650e1e1d9bde0bbb28785104 Gerrit-Change-Number: 15087 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:50:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:50:01 +0000 Subject: Change in ...osmo-trx[master]: Require newer version of libosmocore to avoid build failure In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15088 ) Change subject: Require newer version of libosmocore to avoid build failure ...................................................................... Require newer version of libosmocore to avoid build failure Older commit started using osmo_timerd_* APIs which are only available starting libosmocore 0.12.0, but configure.ac still states 0.11.0 is accepted, which is incorrect. Fixes: 4456b6f132437a95833e3a3d3353836331b9c8a0 Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index f2664ed..fa9cf8d 100644 --- a/configure.ac +++ b/configure.ac @@ -75,9 +75,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/control b/debian/control index 8ff59f0..750f7b9 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libtalloc-dev, libusrp-dev, liblimesuite-dev, - libosmocore-dev (>= 0.10.0), + libosmocore-dev (>= 0.12.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-trx -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I71743b8a10edb10af51ad8e9289c53e432199b97 Gerrit-Change-Number: 15088 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:50:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:50:02 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E104-72a7_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15089 ) Change subject: Bump version: 1.0.0.104-72a7 ? 1.1.0 ...................................................................... Bump version: 1.0.0.104-72a7 ? 1.1.0 Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 --- M debian/changelog 1 file changed, 126 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index dc20ec8..c88b703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,129 @@ +osmo-trx (1.1.0) unstable; urgency=medium + + [ Sylvain Munaut ] + * arm/convolve: Fix the vfp4 real convolution for h_len=12 + * convolve: Remove support for step, offset parameters + * tests: Rework the convolve_test + * tests: Re-enable the convolve_test by default + * sigProcLib: Add C/I (Carrier-to-Interference ratio) computation + + [ Vadim Yanitskiy ] + * VTY: add extended (11-bit) RACH detection toggle + * doc/configuration.adoc: fix incorrect number of physical RF channels for B210 + * driveTxPriorityQueue(): cosmetic: use proper type for TDMA TN + * driveTxPriorityQueue(): use trxd_hdr_common for message parsing + * driveTxPriorityQueue(): check if message header format is supported + * driveTxPriorityQueue(): enrich logging message + * trxd_fill_common(): fix TRXD header version coding + * manuals/configuration.adoc: fix copy-paste error in config example + + [ Pau Espin Pedrol ] + * osmo-trx: Avoid handling signals after shutdown triggered + * osmo-trx: Use signalfd to serialize signals in main thread ctx + * osmo-trx: Check return code of osmo_fd_register + * lms: flush_recv: alloc buf on stack instead of heap + * lms: Improve log during flush recv error + * cosmetic: Threads.h: Remove trailing whitespace + * Move duplicated thread_enable_cancel to CommonLibs + * lms: Log underrun/overrun events + * lms: Remove references to ALERT loglevel + * lms: Remove unused var m_last_tx_overruns + * lms: Catch and log dropped packets by HW during recv + * cosmetic: uhd: Move smpl_buf out of UHDDevice, move UHDDevice class definition to .h + * uhd: smpl_buf: Drop UHD specifics out back to UHDDevice + * uhd: smpl_buf: Use TIMESTAMP type in str_status + * cosmetic: uhd: Use loglevel ERROR instead of ERR + * uhd: Avoid reallocation of buffers every read + * Move smpl_buf out of uhd dir to re-use it in other devices + * device: Drop unused numberRead/numberWritten APIs + * smpl_buf: Remove unused clk_rt variable + * smpl_buf: Remove unused clk_rt variable (fixup) + * smpl_buf: Remove dbg log line with duplicated info + * Introduce LOGCHAN macro to standarize logging channel info + * smpl_buf: Move it to device/common and create libdevice_common.la + * lms: Use smpl_buf to recover from timestamp jumps + * lms: Fix stream_stats checks with droppedPackets + * Add rate_ctr support to store/retrieve SDR errors through VTY + * Rename and move STOP signal from Transceiver to main + * doc: vty: Update trx_vty_reference.xml + * lms: Drop unusued variable masterClockRate + * lms: Fix stream_stats checks with overrun/underrun + * Add VTY commands to set error ctr thresholds + * Remove AUTHORS file + * trx_{vty,rate_ctr}: Set proper license AGPLv3+ + * Introduce structs to encode TRXD packets + * Transceiver: refactor: gather uplink burst parameters in struct + * Transceiver: Drop unused rssi_valid struct field + * Transceiver: Move nbits burst size calculation to pullRadioVector() + * Transceiver: Move calculation of normalized values (rssiOffset) to pullRadioVector() + * Transceiver: Move soft bits normalization to pullRadioVector() + * Transceiver: Drop use of GSM::Time from trx_ul_burst_ind + * Transceiver: Get rid of SoftVector in struct trx_ul_burst_ind + * Transceiver: replace UDPSocket with libosmocore socket API + * Transceiver: Avoid noise calculation formula in 2 branches in pullRadioVector + * Transceiver: Simplify code on early error return when calling detectAnyBurst + * Transceiver: pullRadioVector(): Move initialization of var to start of function + * Transceiver: Support pulling idle frames in pullRadioVector() + * sigProcLib: detectAnyBurst() family: Use struct to gather all out params + * sigProcLib: detectAnyBurst(): make TSC used to detect burst available to caller + * Logger: global Log mutex is now available from C code + * Transceiver: Move out TRXD socket send code to prepare for TRXDv1 + * Transceiver: Support SETFORMAT command + * Transceiver: Support TRXD v1 + * Transceiver: Initialize mExtRACH in constructor + * debian/copyright: Remove non existent radioInterfaceDiversity.cpp from list + * debian/copyright: Update wrong paths in license list + * debian/copyright: Add missing file Utils.* to LGPL-2.1+ list + * cosmetic: Fix trailing whitespace in several files + * Add SPDX annotation + * Bind CTRL port to IP addr specified in VTY config + * Transceiver: Store TRXD version per channel + * Transceiver: Clean up code passing parameters to threads + * Remove empty ChangeLog fnd NEWS files + * Remove unused autogen.sh + * radioInterface: Clarify how underruns are handled driving a radioDevice + * usrp1: don't check for non-null underrun pointer + * jenkins.sh: Workaround libusrp build race conditon + * lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr + * Move inband-signaling-usb documentation to UserManual + * Move matlab files under utils/matlab + * Move Transceiver52/README to UserManual + * Move README.DFEsymbolspaced to utils/matlab + * Move std_inband.rbf under device/usrp1/ dir + * Drop old README information, provide new updated README + * Transceiver: Add missing include netinet/in.h + * Require newer version of libosmocore to avoid build failure + + [ Tom Tsou ] + * multi-ARFCN: fix maximum number of carriers limitation + + [ Harald Welte ] + * use BSC_FD_READ and not OSMO_FD_READ + * proto_trxd.c: Use bit-wise AND, not boolean AND + * Timeval: Restore output stream flags after changing them + * ChannelizerBase: fix initialization of class members + * CorrelationSequence: fix initialization of class members + * radioInterface.cpp: Fix missing member initialization of RadioInterface() + + [ Joachim Steiger ] + * lms: Remove wrong unused code copied from -uhd + * lms: move LMS_EnableChannel from Start/Stop to Open/Close device + * lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start + * lms: add device type detection and device specific gains + * lms: properly call close if set_antennas() fails, add some comments + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Eric Wild ] + * Add option to set stack size in config file, default == 0 == OS default + + [ Ruben Undheim ] + * Fix spelling discovered by lintian + + -- Pau Espin Pedrol Wed, 07 Aug 2019 21:12:56 +0200 + osmo-trx (1.0.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifd5abfb03015e9233814eb9d843ce2e218987283 Gerrit-Change-Number: 15089 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:50:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:50:54 +0000 Subject: Change in ...osmo-ggsn[master]: Require libosmocore 1.1.0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 ) Change subject: Require libosmocore 1.1.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 Gerrit-Change-Number: 15098 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:50:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:51:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:51:21 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E50-ea1c-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 ) Change subject: Bump version: 1.3.0.50-ea1c-dirty ? 1.4.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 Gerrit-Change-Number: 15099 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:51:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:51:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:51:24 +0000 Subject: Change in ...osmo-ggsn[master]: Require libosmocore 1.1.0 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 ) Change subject: Require libosmocore 1.1.0 ...................................................................... Require libosmocore 1.1.0 Older commit made use of gsm48_decode_bcd_number2(), which is available in libosmocore 1.1.0 onwards, but forgot to increase configure.ac requirements. Fixes: fb625041601c525c23c96482250157dddb0941a4 Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 7b985b9..4c39681 100644 --- a/configure.ac +++ b/configure.ac @@ -138,9 +138,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.1.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/control b/debian/control index 272fd79..3392f83 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ pkg-config, libdpkg-perl, git, dh-autoreconf, - libosmocore-dev (>= 0.8.0), + libosmocore-dev (>= 1.1.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 Vcs-Browser: http://git.osmocom.org/osmo-ggsn/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89b37be55fc4ba22b90e9aab9a5989573df2ae38 Gerrit-Change-Number: 15098 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:51:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:51:24 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E50-ea1c-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 ) Change subject: Bump version: 1.3.0.50-ea1c-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.50-ea1c-dirty ? 1.4.0 Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp5.install M debian/rules M gtp/Makefile.am 6 files changed, 72 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index a3d63ac..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libgtp Several new APIs added see I653cbdc185165592d985e3efab6e3f1add97877b -libgtp API (non-used externally) pdp_init modified see I653cbdc185165592d985e3efab6e3f1add97877b -libgtp Several pdp_* APIs marked as deprecated see I653cbdc185165592d985e3efab6e3f1add97877b diff --git a/debian/changelog b/debian/changelog index 21bd8ff..921875a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +osmo-ggsn (1.4.0) unstable; urgency=medium + + [ Max ] + * Don't return error on normal shutdown + + [ Harald Welte ] + * process_pco() const-ify 'apn' argument + * ggsn: Remove magic numbers from pco_contains_proto() + * ggsn: const-ify input / read-only arguments of PCO related functions + * ggsn: Remove magic numbers from ipcp_contains_option() + * ggsn: Fix build_ipcp_pco() in presence of invalid IPCP content + * ggsn.c: Refactor PCO processing during PDP activation + * ggsn: Add minimalistic PAP support + * ggsn: More logging from PCO handling (e.g. in case of malconfiguration) + * sgsnemu: Fix format string argument count + + [ Vadim Yanitskiy ] + * osmo-ggsn: fix VTY command for getting PDP contexts by APN + * osmo-ggsn: add VTY command to show PDP context by IPv4 + * osmo-ggsn: check result of osmo_apn_to_str() + * osmo-ggsn: print requested / actual APN in PDP info + * osmo-ggsn: properly show subscriber's MSISDN in the VTY + + [ Pau Espin Pedrol ] + * ggsn: Drop unused param force in apn_stop() + * gtp: Document spec reasoning drop of Rx DeleteCtxReq + * ggsn: Start gtp retrans timer during startup + * gtp: Take queue_resp into account to schedule retrans timer + * gtp: Fix typo dublicate->duplicate + * pdp: Introduce new API pdp_count_secondary + * gtp_create_pdp_ind: simplify code by reordering and compacting parsing + * gtp: Refactor code to use gtp_freepdp(_teardown) APIs + * cosmetic: gtp: Document free pdp ctx in non-teardown scenario + * gtp: Re-arrange free pdp ctx code in non-teardown scenario + * pdp: Drop unused code for haship + * cosmetic: gtp.h: Remove trailing whitespaces + * ggsn: Fix undefined behaviour shifting beyond sign bit + * gtp: Introduce new pdp APIs (and deprecate old ones) to support multiple GSN + * gtp: Make use of new libgtp APIs with multi-gsn support + * ggsn_vty_reference.xml: Update from last code changes + * ggsn: vty: Require ggsn param in cmd + * sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one + * cosmetic: gtp: queue: remove trailing whitespace + * gtp: Add missing headers + * gtp: queue.c: Document queue APIs + * gtp: queue: Add unit test queue_test + * ggsn: Avoid unaligned mem access reading PCO proto id + * ggsn: Use structures instead of raw arrays when parsing ipcp_hdr + * configure.ac: Replace obosolete macro AC_CANONICAL_SYSTEM + * configure.ac: Use brackets in AC_INIT params + * configure.ac: Use prefered AC_CONFIG_HEADERS over AM_CONFIG_HEADER + * configure.ac: some versions of linux/if.h require including sys/socket.h + * sgsnemu: Fix unaligned pointer access during ip/icmp checksum + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require libosmocore 1.1.0 + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * ggsn: Use gtp_delete_context_req2() everywhere + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + + -- Pau Espin Pedrol Wed, 07 Aug 2019 21:28:30 +0200 + osmo-ggsn (1.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 3392f83..9a5ed58 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp4 +Package: libgtp5 Architecture: any Multi-Arch: same Section: libs @@ -42,7 +42,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp4 (= ${binary:Version}) + libgtp5 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -55,7 +55,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -66,7 +66,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp4.install b/debian/libgtp5.install similarity index 100% rename from debian/libgtp4.install rename to debian/libgtp5.install diff --git a/debian/rules b/debian/rules index d0f5935..cdb2480 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp4 --dbg-package=libgtp-dbg + dh_strip -plibgtp5 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals diff --git a/gtp/Makefile.am b/gtp/Makefile.am index d6c8c62..20255f7 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=4:0:0 +LIBVERSION=5:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5ca7ada037a9b91c3b747cea6d83654d0b9afed3 Gerrit-Change-Number: 15099 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:52:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:52:30 +0000 Subject: Change in ...osmo-pcap[master]: Require libosmocore 0.11.0 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15092 ) Change subject: Require libosmocore 0.11.0 ...................................................................... Require libosmocore 0.11.0 Building against older versions fail for different reasons, newest one being due to osmo_init_logging2 being added in 0.11.0. Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 95c5270..2511b37 100644 --- a/configure.ac +++ b/configure.ac @@ -115,9 +115,9 @@ AC_SUBST([PCAP_CFLAGS]) dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(LIBZMQ, libzmq >= 3.2.2) PKG_CHECK_MODULES(LIBGNUTLS, gnutls) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725 Gerrit-Change-Number: 15092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:52:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:52:31 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E2-ce06_=E2=86=92_0=2E1=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcap/+/15093 ) Change subject: Bump version: 0.1.0.2-ce06 ? 0.1.1 ...................................................................... Bump version: 0.1.0.2-ce06 ? 0.1.1 Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index f2da97e..168df55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-pcap (0.1.1) unstable; urgency=medium + + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require libosmocore 0.11.0 + + -- Pau Espin Pedrol Wed, 07 Aug 2019 13:12:47 +0200 + osmo-pcap (0.1.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/15093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02 Gerrit-Change-Number: 15093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:53:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:53:22 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E13=2E0=2E7-ffff_=E2=86=92_1=2E14=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libsmpp34/+/15100 ) Change subject: Bump version: 1.13.0.7-ffff ? 1.14.0 ...................................................................... Bump version: 1.13.0.7-ffff ? 1.14.0 Change-Id: Id7ef68f50fb951dfb0687977924115204f8482a6 --- M TODO-RELEASE M debian/changelog M src/Makefile.am 3 files changed, 24 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index bbc1495..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libsmpp34 smpp34_heap Adding new API/ABI to override memory allocator diff --git a/debian/changelog b/debian/changelog index b8459ad..3c07045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +libsmpp34 (1.14.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * debian/rules: Don't overwrite .tarball-version + + [ Neels Hofmeyr ] + * esme.c: mark switch statement fall-thru for coverity + + [ Stefan Sperling ] + * fix use of partly initialized struct in tcp test + + [ Vadim Yanitskiy ] + * configure.ac: enable kernel style compile messages + + [ Harald Welte ] + * Allow application to override default heap allocator + * bind_receiver_test: Fix "unused value" of writing addr_ton twice + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + + -- Pau Espin Pedrol Wed, 07 Aug 2019 14:48:06 +0200 + libsmpp34 (1.13.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] diff --git a/src/Makefile.am b/src/Makefile.am index 55097c4..5958c38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=1:0:0 +LIBVERSION=2:0:1 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/15100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Id7ef68f50fb951dfb0687977924115204f8482a6 Gerrit-Change-Number: 15100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:54:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:54:15 +0000 Subject: Change in ...osmo-bts[master]: configure.ac: Require libosmocore 1.2.0 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15101 ) Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... configure.ac: Require libosmocore 1.2.0 Some commits started using libosmocore APIs osmo_gsm48_rest_octets_si3_encode() and lapdm_channel_init2(), which are only available in latest libosmocore release 1.2.0. Let's update configure.ac accordingly. Fixes: 1e96e31c106aed9192ed9ea78ff1a711464390d7 Fixes: 46d62b984a10b3966d8a0d0a435d4efab0e9c500 Change-Id: If84c53d8192e8db98eb9439b898d83e94c5e5476 --- M configure.ac 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 15c4259..b70d934 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If84c53d8192e8db98eb9439b898d83e94c5e5476 Gerrit-Change-Number: 15101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:54:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:54:16 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E1_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15102 ) Change subject: Bump version: 1.0.1 ? 1.1.0 ...................................................................... Bump version: 1.0.1 ? 1.1.0 Change-Id: I708f6a63b51459d77368c48e115f64aaa6646bfd --- M debian/changelog 1 file changed, 187 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index a33d21f..5cb0f0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,190 @@ +osmo-bts (1.1.0) unstable; urgency=medium + + [ Daniel Willmann ] + * Rename oc2g config file to match new naming scheme + * dump_docs: Use new config file naming scheme + * systemd: Install OC2G service files with autotools + * doc/examples: Install OC2G config files with autotools + * osmo-bts-oc2g: Fix status LED responsibilities + * osmo-bts-lc15: Change LED behaviour to be the same as oc2g + * manuals: Add script to regenerate counter/vty documentation + * manuals: Add counter documentation + * manuals: Update vty documentation + + [ Harald Welte ] + * Bump version: 0.8.1.199-5c93-dirty ? 1.0.0 + * scheduler_trx: Fix erroneous multiply-by-four + * OML: some more comments on what functions do + * OML: Return attributes in ACK/NACK messages + * OML: Ensure MOs are initialized with valid "Administrative State' + * OML: Don't overwrite MO instance before oml_tx_failure_event_rep() + * OML: remove double-logging on oml_tx_failure_event_rep() + * OML: send proper OML alerts in case of errors + * OML: Reduce code duplication in down_mom/down_fom + * OML: Report short messages even for invalid TRX numbers in down_fom() + * OML: Use 'const struct abis_oml_mo *' whenever users only read + * OML: Reject segmented OML messages + * OML: Properly reject short messages and truncate over-long messages + * OML: Work around OsmoBSC sending "GET ATTRIBUTES" with short length + * OML: Store merged attributes of IPA OML Managed Objects + * OML: Don't advertise baseband transceiver as UNLOCKED at startup + * OC-2G: Nominal transmit power is 25 dBm, not 40 + * rsl.c: Add missing #include of gsm0808.h + * Forward GPRS SUSPEND REQ from DCCH to PCU socket + * handle NULL return from rate_ctr_group_alloc() + * rsl: Send RSL Error Report in case of unknown/unsupported msg_type + * rsl: Include Channel Nr and Link ID in Error reports whenever possible + * RSL: Reject RLL messages for lchans that are not active yet + * RSL: Fix off-by-one error when parsing SACCH INFO IE in RSL CHAN ACT + * cbch: Implement handling of "Schedule" message + * cbch: Refactor get_smscb_block() / remove smscb_msg.next_seg + * cbch: Log every RSL SMSCB COMMAND with type and number of blocks + * cbch: Implement support for DEFAULT message + * cbch: Fix memory leak and send error message on invalid SMSCB command + * cbch: Support Extended CBCH + * cbch: Keep SMSCB queue length counter + * manual: We now support RSL CBCH LOAD INDICATION + * manual: SMSCB BROADCAST COMMAND has no limitations anymore + * README.md: Mention LimeSDR as SDR device + * sysmo: Fix "nominal power" / BS power display in VTY + * cbch: Add counters; queue length limits and CBCH LOAD reporting + * cbch: Improve verbosity and extend logging; Always indicate BASIC/EXTD CBCH + * Use LOGPLCHAN whenever possible + * rsl.adoc: DELETE INDICATION is implemented since Feb '18 + * RSL: Fix logic about fixed/dynamic MS power control in MS POWER COMMAND + * rsl: Implement parsing of BS Power Control message + * rsl: MS POWER COCNTROL isn't (only) about "forcing" power levels + * load_indication: Fix missing re-set of RACH parameters + * l1sap: Correctly count RACH slots in calc_exprd_rach_frames() + * l1sap: Fix calculation of expired RACH slots in case of missing frame numbers + * oml: Print more context from FOM Header or using MO + * oml: Have one generic log message for all transmitted messages + * Add severity to OML FAILURE EVENT REPORT + * Fix passing of RR SUSPEND REQ from DCCH to PCU socket + * clear GPRS indicator in SI3 while PCU is disconnected + * trx: Update documentation for fn-advance and rts-advance + * l1sap: Compute statistics on FN advance in PH-RTS.ind + * [correctly] use the LAPDm T200 values received via OML + * Update T200 timer default values + * lapdm: Use new libosmocore API to ensure per-channel-type N200 values + * sysmo/l1_if.c: Annotate fall-through in switch statement + * osmo-bts-trx: Don't increment rssi_valid_count twice + * osmo-bts-trx: Don't attemtp to adjust MS power if fixed + * scheduler_trx: Handle negative return of gsm0503_tch_hr_decode() + + [ Vadim Yanitskiy ] + * common/vty.c: fix 'cfg_phy_no_inst_cmd' command description + * common/oml.c: fix: properly push abis_nm_ipa_magic + * common/pcu_sock.c: fix possible memleaks in pcu_sock_read() + * common/oml.c: constify argument 'trx' of handle_attrs_trx() + * common/oml.c: use proper NACK reason in oml_tx_attr_resp() + * common/oml.c: use proper OML object for Get Attribute Response + * common/oml.c: fix total length calculation in cleanup_attr_msg() + * common/l1sap.c: fix: add missing new line to a debug message + * common/rsl.c: fix size argument in memcmp() call + * common/rsl.c: fix unaligned pointers in rsl_add_rtp_stats() + * common/paging.c: fix unaligned pointer access + * common/oml.c: introduce and use both LOGPFOH and DEBUGPFOH + * common/oml.c: use proper format specifier for uint16_t + * common/oml.c: fix broken debug print in down_mom() + * common/oml.c: refactor Get Attribute Response message generation + * common/oml.c: fix: properly encode NM_ATT_SW_CONFIG + * osmo-bts-trx: distinguish 11-bit Access Bursts by synch. sequence + * osmo-bts-sysmo: fix: indicate BTS_FEAT_CBCH support on OML + * README.md: remove OS#1865 from 'Known limitations' + * common/rsl.c: fix NULL-pointer dereference in rsl_rx_rll() + * osmo-bts-trx/trx_if.c: dropping Tx bursts is a noticeable event + * osmo-bts-trx/l1_if.h: drop unused ho_rach_detect from trx_l1h + * osmo-bts/scheduler.h: cosmetic: use bool for ho_rach_detect + * common/rsl.c: RSL_IE_HANDO_REF is mandatory for handover CHAN ACT + * common/bts.c: bts_supports_cm(): take care about GSM48_CMODE_SIGN + * Use #define RSL_CHAN_RACH for RSL Channel Number of RACH + * common/scheduler.c: refactor description of TRXC_* lchans + * osmo-bts-trx/trx_if.c: use osmo_loadXXbe() for TDMA FN and ToA256 + * osmo-bts-trx/trx_if.c: rename and clarify TRX_MAX_BURST_LEN + * osmo-bts-trx/trx_if.c: introduce TRXD header version handling + * osmo-bts-trx/trx_if.c: introduce TRXD header version 0x01 support + * osmo-bts-trx/trx_if.c: drop RSSI / ToA debugging code + * osmo-bts-trx/trx_if.c: properly describe TRXD messages in logs + * osmo-bts-trx/trx_if.c: add TRXD header version negotiation + * osmo-bts-trx/trx_if.c: encode actual TRXD header version + * osmo-bts-trx/scheduler: pass trx_ul_burst_ind to lchan handlers + * osmo-bts/scheduler: provide actual C/I values to OsmoPCU + * osmo-bts-trx/scheduler: rx_rach_fn(): use optional TSC info from TRX + * osmo-bts-trx/scheduler: rx_rach_fn(): clarify handover RACH handling + * osmo-bts-trx/scheduler: rx_rach_fn(): enrich debug message + * common/rsl.c: fix: properly handle SI3 Rest Octets + * Clarify and refactor link quality (C/I) handling + * Move Access Burst link quality handling to L1SAP + * osmo-bts-trx/scheduler: rx_rach_fn(): provide actual C/I ratio to L1SAP + * osmo-bts-trx/scheduler: rx_data_fn(): provide actual C/I ratio to L1SAP + + [ Max ] + * osmo-bts-trx: add extended (11-bit) RACH support + * Log lchan kind on PCU-related error + * Enable statsd support + * Make gsm_pchan2chan_nr() static + * Constify pcu_rx_*() parameters + + [ Philipp Maier ] + * scheduler_trx: use stored fn for pdtch data indications + * oc2g: remove unused define constant FACTORY_ROM_PATH + * lc15: remove unused define constant FACTORY_ROM_PATH + * oml: make oml_tx_failure_event_rep() public + * oc2gbts_mgr_vty: remove calls to vty_install_default() + * oc2g: l1if: delay trx initialization to avoid race condition + * oc2gbts_mgr: use msgb_talloc_ctx_init() instead of msgb_set_talloc_ctx() + * oc2g: generate failure event report in case of bad calibration + * oc2g: change log level for calibration file errors to FATAL + * vty: add function gsmnet_from_vty() to vty.h + * main: remove wrong call to oml_fail_rep() on SIGUSR1/2 and SIGABRT + * oml: use oml_tx_failure_event_rep() instead of oml_fail_rep() + * oml: use oml_tx_failure_event_rep() instead of signals to SS_FAIL + * l1_if: add include for missing header file + * oc2gbts_mgr_calib: don't use fsync() on *FILE pointer + * oc2gbts_mgr_calib: do not return NULL on integer function + * oc2gbts_mgr: use osmo_init_logging2() instead of osmo_init_logging() + * pcu_sock: use %zu conversion specifier for printing sizeof() result + + [ Pau Espin Pedrol ] + * oc2g: Fix compilation error (comment mark inside comment) + * oc2g: Add get_hwversion_desc to header file + * oc2g: Cleanup of get_hwversion_desc + * oc2g: led_sleep_cb: pass correct ptr to llist_move_tail + * oc2g: fsync requires fd instead of file stream + * oc2g: Remove unused variables + * oc2g: Remove unused static function + * oc2g: vty: Compilation error fixes due to commented code + * contrib: Remove deprecated screen script helpers + * bts-trx: trx_if.c: Introduce logging macro LOGPPHI + * gsm_data_shared.h: Remove unused loc_list from struct gsm_bts + * bts: Bypass T200 DCCH values for CCCH + * bts-trx: Introduce VTY command osmotrx trxd-max-version + * trx: Use LOGPPHI instead of LOGP in some more messages + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * configure.ac: Require libosmocore 1.2.0 + + [ Alexander Huemer ] + * Remove 11-bit RACH support from 'Known Limitations' + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * Revert "debian: create -doc subpackage with pdf manuals" + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Neels Hofmeyr ] + * lc15,sysmo,oc2g: fix dsp-trace-flag command + + [ Eric Wild ] + * revert changes to T200 + * RSL: Fix fixed MS power control in RSL CHAN ACTIV + + [ Thorsten Alteholz ] + * fix spelling stuff mentioned by lintian + + -- Pau Espin Pedrol Wed, 07 Aug 2019 15:59:02 +0200 + osmo-bts (1.0.0) unstable; urgency=medium [ Stefan Sperling ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I708f6a63b51459d77368c48e115f64aaa6646bfd Gerrit-Change-Number: 15102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:55:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:55:14 +0000 Subject: Change in ...osmo-hlr[master]: configure.ac: Require libosmocore 1.2.0 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15103 ) Change subject: configure.ac: Require libosmocore 1.2.0 ...................................................................... configure.ac: Require libosmocore 1.2.0 Current code uses GSM23003_MSISDN_MAX_DIGITS, which is only available in libosmocore 1.2.0 onwards. Let's update configure.ac accordingly. Fixes: 2e403d6c3f0caa4fd40e8cab8acd6586deadfdf8 Change-Id: Iad03a8cf7a36bdc824ec2acc8fb8f9c27a1c0421 --- M configure.ac 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index ef703f2..993d4d5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iad03a8cf7a36bdc824ec2acc8fb8f9c27a1c0421 Gerrit-Change-Number: 15103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:55:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:55:14 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E49-e493-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15104 ) Change subject: Bump version: 1.0.0.49-e493-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.49-e493-dirty ? 1.1.0 Change-Id: If53bdb2e216cb98df4d5a482cbbf24096db536ed --- M debian/changelog 1 file changed, 66 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index ecb36d3..0b89abe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +osmo-hlr (1.1.0) unstable; urgency=medium + + [ Oliver Smith ] + * docs: running: document --db-upgrade + * Add IMEI column to subscriber table + * Optionally store IMEI in subscriber table + * VTY tests: fill DB before running test + * VTY: integrate IMEI + * hlr.c: replace deprecated osmo_gsup_get_err_msg_type() + * hlr.c: move hlr_ctx to the top + * tests: use -no-install libtool flag to avoid ./lt-* scripts + * Cosmetic: gsup_route_find: comment addr, addrlen + * USSD: save MO USSD's originating MSC's vlr_number + * USSD: don't use gsm0480_msgb_alloc_name() + * hlr.c: forward GSUP messages between clients + * db_hlr.c: db_subscr_create(): add flags argument + * db_hlr.c: add db_subscr_exists_by_imsi() + * Create subscribers on demand + * Document subscribers create on demand feature + * debian: create -doc subpackage with pdf manuals + * db_test: set timezone to work around mktime bug + * db_hlr: zero-initialize "struct tm" + * rx_check_imei_req(): fix IMEI bounds checking + * contrib/jenkins.sh: run "make maintainer-clean" + * VTY: add subscriber update network-access-mode + * manuals: improve subscribers create on demand + * gitignore: ignore everything generated in db_test + * db_auc.c: verify hex key sizes read from DB + + [ Max ] + * Log ip:port when adding GSUP routes + * Add link to project wiki to .service file + * Enable statsd support + + [ Vadim Yanitskiy ] + * hlr.c: properly terminate the process on SIGTERM + * hlr.c: fix: also store the session state in read_cb_forward() + * hlr.c: fix: properly print the original message type in read_cb_forward() + * hlr.c: check the presence of msgb->l2h in read_cb() + * hlr.c: fix possible msgb memleaks in read_cb() + * db_hlr.c: add db_subscr_exists_by_msisdn() + * src/db.h: use GSM23003_MSISDN_MAX_DIGITS for MSISDN buffer size + * src/hlr.c: fix deprecation warning: use gsm48_decode_bcd_number2() + * hlr_ussd.c: fix: properly pass invokeID in handle_ussd_own_msisdn() + * hlr_ussd.c: rx_proc_ss_req(): fix NULL pointer dereference + * build: fix mess with 'db_test_SOURCES' and 'db_test_LDADD' + * tests/db_test: close the database when test is finished + * src/db.c: integrate SQLite3 with talloc allocator + + [ Neels Hofmeyr ] + * USSD: fix routing to multiple MSC + * fix error logging for GSUP route + * add missing error log: invalid IMSI + * osmo-hlr: allow configuring db path from cfg file + * use new OSMO_IMSI_BUF_SIZE + + [ Daniel Willmann ] + * manuals: Add script to update vty/counter documentation from docker + * manuals: Update vty documentation + + [ Pau Espin Pedrol ] + * Remove undefined param passed to logging_vty_add_cmds + * configure.ac: Require libosmocore 1.2.0 + + -- Pau Espin Pedrol Wed, 07 Aug 2019 16:14:23 +0200 + osmo-hlr (1.0.0) unstable; urgency=medium [ Stefan Sperling ] -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If53bdb2e216cb98df4d5a482cbbf24096db536ed Gerrit-Change-Number: 15104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:56:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:56:16 +0000 Subject: Change in ...osmo-mgw[master]: configure.ac: Require libosmo-netif 0.6.0 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15106 ) Change subject: configure.ac: Require libosmo-netif 0.6.0 ...................................................................... configure.ac: Require libosmo-netif 0.6.0 Current code uses APIs like osmux_xfrm_output_init2() and osmo_amr_*(), that are only available in libosmo-netif 0.6.0 onwards. Let's update configure.ac accordingly. Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index b4858c4..124f1e6 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bc0196bb6b5c5e5cf96935422fd56c4582ed7f5 Gerrit-Change-Number: 15106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:56:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:56:17 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E84-a2d10-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15107 ) Change subject: Bump version: 1.5.0.84-a2d10-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.84-a2d10-dirty ? 1.6.0 Change-Id: I57277c34bbab1fc9ea2be6a754d5a79786ce627d --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmo-mgcp-client6.install M src/libosmo-mgcp-client/Makefile.am 5 files changed, 109 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 14cb163..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,6 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -libosmo-mgcp-client add struct members AMR SDP/fmtp parameter generation -libosmo-mgcp-client add struct members Osmux use+cid fields to struct mgcp_msg and mgcp_conn_peer -libosmo-mgcp-client add struct members Osmux use+cid fields to struct mgcp_response_head diff --git a/debian/changelog b/debian/changelog index c1708fa..2259eac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,109 @@ +osmo-mgw (1.6.0) unstable; urgency=medium + + [ Oliver Smith ] + * Cosmetic: fix spaces/tabs in mgcp_requests[] + * Inactive connection cleanup (disabled by default) + * debian: create -doc subpackage with pdf manuals + * vty: allow 0 as conn-timeout to disable it + * vty: update desc of conn-timeout + * manuals: update VTY documentation + * "make dist" fix for: no rule to make mgcp_common.h + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Philipp Maier ] + * Add option to GSM HR frames to RFC5593 representation + * mgcp_sdp: cosmetic: correct typo in comment + * mgco_client: cosmetic: remove excess whitespace + * mgcp_sdp: mgcp_sdp.c does not include own header file + * mgcp_sdp: untangle parsing of a= parameters + * mgcp_network: use mgcp_rtp_codec in downlink format callback + * AMR: Add function to convert between bw-effient and octet aligned mode + + [ Neels Hofmeyr ] + * log: don't spam with "can not patch PT" messages + * mgcp client: allow setting conn mode for CRCX and MDCX + * make codec_table public as osmo_mgcpc_codec_names + * move MGW endpoint FSM from osmo-bsc to here + * fix: multiple initial CRCX + * constify map_codec_to_pt() ptmap arg + + [ Pau Espin Pedrol ] + * mgcp-client: whitespace cleanup in mgcp_client.c + * mgcp-client: Sanitize implementation of mgcp_client_rtpbridge_wildcard + * libosmo-mgcp: Use trunk type during endpoint allocation + * cosmetic: Fix typos in comment + * cosmetic: tests: mgcp_client_test: clean trailing whitespace + * mgcp_msg: Log faulty line on Osmux parsing error + * cosmetic: handle_modify_con: Fix indentation level + * Introduce log fmt helpers LOGPENDP and LOGPCONN + * create_response_with_sdp: Fix inclusion of X-Osmux + * osmux: Cleanup of CID alloc pool APIs + * mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check + * osmux: Log osmux socket during osmux_init + * mgcp-cli: Change osmo_mgcpc_ep_fsm name to avoid collision with old osmo-bsc + * osmux: Document func and return different rc upon osmux init failure + * osmux: Fix reception of legacy dummy payloads + * osmux: Use LOGPCONN in several log calls + * cosmetic: mgcp_udp_send: Document port param is in network byte order + * cosmetic: osmux: Document network byte order in port variable + * vty: Allow enabling Osmux + * osmux: Allocate CID during CRCX + * osmux: Introduce mgcp_conn_rtp_is_osmux() helper + * osmux: Mark conn_rtp->type as osmux during CRCX + * mgcp-cli: Allow submitting X-Osmux on CRCX request + * mgcp-cli: Parse X-Osmux on CRCX response + * osmux: Handle Osmux MGCP extension in MDCX messages + * mgcp-cli: Allow submitting X-Osmux on MDCX request + * mgcp-cli: Parse X-Osmux on MDCX response + * osmux: Drop unneeded OSMUX_STATE_NEGOTIATING + * mgcp-cli: endpoint_fsm: Add API to retrieve Osmux CID from MGW + * osmux: Provide correct local port during mgcp resp + * osmux: Use remote port to send osmux frames + * osmux: Improve logging around osmux enabling events + * osmux: Delay osmux enable of conn until remote addr is configured by MDCX + * osmux: Redo read/write osmux glue code to have data routed correctly + * mgw, mgcp-li: Handle X-Osmux param name as case insensitive + * osmux: Use DUMMY ft msg as per Osmux spec + * osmux: Fix loopback for Osmux connections + * osmux: Fix CID release for non-enabled connections + * osmux: Fix hardcoded rtp payload_type 98 in osmux conn + * mgcp-cli: Validate osmux cid value during mgcp_msg_gen + * mgw: Support uppercase LCO options + * mgw: Support lowercase header parameters + * mgcp-cli: Support lowercase header parameters + * mgw: Support receiving uppercase connection mode + * mgw: Support receiving lowercase LCO codec + * mgw: Make check of duplicated LCO fields case insensitive + * mgw: Allow receiving lowercase MGCP header keyword + * mgw: Allow receiving lowercase X-Osmo-Ign Callid field + * mgw: Allow receiving uppercase noanswer keyword + * doc: X-Osmo-IGN: small formatting and typo fixes + * doc: Add Osmux documentation to OsmoMGW User Manual + * Catch unsigned integer MGCP parsing errors with strtoul + * Fix return variable of strtoul() + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * configure.ac: Require libosmo-netif 0.6.0 + + [ Alexander Couzens ] + * mgcp_internal: LOGPENDP: ensure *endp is not NULL + + [ Harald Welte ] + * handle NULL return of rate_ctr_group_alloc() + * update .gitignore + * mgcp_sdp: Don't check if an unsigned int is below 0 + + [ Vadim Yanitskiy ] + * configure.ac: drop useless check for -fvisibility=hidden + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update vty/counter documentation + + [ Hoernchen ] + * turn -Werror=null-dereference into a warning + + -- Pau Espin Pedrol Wed, 07 Aug 2019 16:52:58 +0200 + osmo-mgw (1.5.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 8e0e079..aeceeac 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client5 +Package: libosmo-mgcp-client6 Section: libs Architecture: any Multi-Arch: same @@ -32,7 +32,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client5 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client6 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities Package: osmo-mgw-doc diff --git a/debian/libosmo-mgcp-client5.install b/debian/libosmo-mgcp-client6.install similarity index 100% rename from debian/libosmo-mgcp-client5.install rename to debian/libosmo-mgcp-client6.install diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 1529853..8f5513a 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -20,7 +20,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=5:0:0 +MGCP_CLIENT_LIBVERSION=6:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I57277c34bbab1fc9ea2be6a754d5a79786ce627d Gerrit-Change-Number: 15107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:57:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:57:34 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E14-92ea-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15108 ) Change subject: Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 ...................................................................... Bump version: 0.4.0.14-92ea-dirty ? 0.5.0 Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 --- M configure.ac M debian/changelog M debian/control M src/Makefile.am 4 files changed, 40 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index dc3d1eb..4293635 100644 --- a/configure.ac +++ b/configure.ac @@ -33,12 +33,12 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.2.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.12.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.12.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.12.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.3.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.10.0) PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 26f7525..cdf7a94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +osmo-iuh (0.5.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * ranap_msg_factory.h: fix enum def within function signature + * osmo-hnbgw: fix cmdline: do not force-disable colored logging + * osmo-hnbgw: set a proper talloc ctx for logging + * osmo-hnbgw: logging tweaks + * osmo-hnbgw: reply with RESET ACK when receiving a RESET + + [ Oliver Smith ] + * tests: use -no-install libtool flag to avoid ./lt-* scripts + * contrib/jenkins.sh: run "make maintainer-clean" + * osmo-hnbgw.cfg: set local-ip to 0.0.0.0 + + [ Harald Welte ] + * iu_client: Implement transmission of ResetAcknowledge + * ranap_msg_factory: Fix criticality of PDUs + + [ Thorsten Alteholz ] + * spelling stuff found by lintian + + [ Daniel Willmann ] + * Add VTY reference manual + * jenkins: Enable manual publishing and building + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + + -- Pau Espin Pedrol Wed, 07 Aug 2019 21:23:57 +0200 + osmo-iuh (0.4.0) unstable; urgency=medium [ Bernhard M. Wiedemann ] diff --git a/debian/control b/debian/control index b453eea..7e760acb 100644 --- a/debian/control +++ b/debian/control @@ -11,10 +11,9 @@ git, libasn1c-dev, libsctp-dev, - libosmo-netif-dev, - libosmocore-dev, - libosmo-netif-dev, - libosmo-sigtran-dev (>= 0.8.0), + libosmocore-dev (>= 0.12.0), + libosmo-netif-dev (>= 0.3.0), + libosmo-sigtran-dev (>= 0.10.0), python (>= 2.7) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-iuh.git diff --git a/src/Makefile.am b/src/Makefile.am index 586c689..928092f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # build the shared RANAP library # -RANAP_LIBVERSION=2:1:0 +RANAP_LIBVERSION=2:2:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I53c1743eda203bf075f93f891e336ca4ec6866a8 Gerrit-Change-Number: 15108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:58:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:58:51 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E109-caec1-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15109 ) Change subject: Bump version: 1.4.0.109-caec1-dirty ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b73d0a83b1ed1a4dfd17066182820da5e401c9b Gerrit-Change-Number: 15109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 19:58:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 19:59:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 19:59:34 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E109-caec1-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15109 ) Change subject: Bump version: 1.4.0.109-caec1-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.109-caec1-dirty ? 1.5.0 Change-Id: I4b73d0a83b1ed1a4dfd17066182820da5e401c9b --- M configure.ac M debian/changelog M debian/control 3 files changed, 146 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 694a9a7..66492f5 100644 --- a/configure.ac +++ b/configure.ac @@ -44,15 +44,15 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.1) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) dnl checks for header files AC_HEADER_STDC diff --git a/debian/changelog b/debian/changelog index a4f4d40..8c9cde0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,138 @@ +osmo-bsc (1.5.0) unstable; urgency=medium + + [ Max ] + * LCLS: constify helper parameters + * LCLS: use libosmocore function to add status + * nanobts: use libosmocore's osmo_store*() for OML attr. patching + + [ Philipp Maier ] + * lchan_select: dont allow half rate EFR to be selected + * lchan_select: Do not unsolicitedly select a TCH/F + * bsc_vty: add vty command to display all lchans + * bsc_vty: add features to disable specific lchans via vty + * assignment_fsm: fix channel allocator preferences + * assignment_fsm: use activate.info.s15_s0 for ASS. COMPL. + * handover_fsm: copy old S15_S0 to new lchan + * osmo_bsc_msc: Use meaningful amr rate configuration on BTS level + * codec_pref: fix special handling for AMR rate configuration (S15-S0) + * lchan_fsm: make sure multi rate configuration is valid + * lchan_fsm: do not include 12.2k in active set on HR channels + * AMR: Signal usage of octet-aligned or bandwith-efficient mode to MSC + * lchan_fsm: add missing header file. + * osmo_bsc_bssap: check bssmap length field + * rest_octets: add Serving Cell Priority Parameters + + [ Neels Hofmeyr ] + * abis_rsl: Fix TCH-as-SDCCH allocation on Channel Request + * handover_fsm: do not access conn->assignment.req, it may be outdated + * comments: clarify usage of conn.assignment and .handover scopes + * cosmetic: drop unused struct mgcp_ctx shadow + * incoming connect: don't crash if calling addr is missing + * log N-CONNECT from MSC + * Revert "assignment_fsm: Properly support assigning signalling mode TCH/x" + * fix log line end in assignment_fsm.c + * avoid use-after-free: on MGW endpoint dealloc, also forget it in conn->ho.* + * lchan activation: add explicit encryption info to activation + * Handover Request: also parse Chosen Algorithm IE, pass to lchan activation + * fix inter-BSC-HO-incoming for AoIP (1/2) + * use libosmocore osmo_tdef + * move mgw endpoint FSM to osmo-mgw.git + * fix inter-BSC-HO-incoming for AoIP (1/2) + * fix inter-BSC-HO-incoming for AoIP (2/2) + * abis_rsl.c: missing newlines on log lines + * doc/manuals: review and tweak handover docs + * make bsc_clear_request() static + * doc/manuals, vty doc: more handover doc clarifications + * remove double BSSMAP Clear on HO failure + * comment and VTY doc tweaks + * silence error for "invalid enum handover_scope value: none" + + [ Harald Welte ] + * gsm_data: Add gsm_bts_name() just like we have gsm_{trx,ts,lchan}_name() + * manual: It's not "A over SCCP" but "BSSAP over SCCP" + * manual: Add sections on 3G/4G neighbor cells + * manual: Re-order chapters in more logical order + * manual: s/OsmoNITB/OsmoBSC/ in examples; remove E1 based BTSs + * manual: Remove bogus "Control interface" sub-section in overview + * Implement CSFB "Fast Return" Handling at RR RELEASE + * OML: Fix encoded length value of OML GET ATTRIBUTES + * Make sure to default to AMR octet-aligned mode + * abis_rsl: Add support for extended CBCH to rsl_sms_cb_command() + * abis_rsl: Avoid "Unimplemented" log message for every CBCH LOAD IND + * abis_rsl: Fix log message about unimplemented common channel msg + * smscb: Allow transmit of SCHEDULE and DEFAULT SMSCB + * chan_alloc: Don't include CBCH channels in load computation + * keep per-BTS stat_items about RACH busy / RACH access percentage + * vty: Dump per-bts stat_item group in 'show bts' output + * Allow VTY to set the CCCH Load Indication Threshold + * rx_fail_evt_rep(): Don't recycle variable + * Re-introduce support for IPA-encapsulated MGCP + * logging: introduce LOG_BTS and LOG_TRX and use it everywhere + * vty: Fix typo in VTY command descrption -> description + + [ Pau Espin Pedrol ] + * ipaccess/Makefile.am: Remove unneeded libmgcp-client dep + * Move LCLS references from gsm_data to osmo_bsc_lcls + * Move msc related code from gsm_data to bsc_msc + * ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep + * net_init.c: remove unneeded header + * configure.ac: Add flag to enable/disable build of ipaccess related utils + * src/utils/Makefile.am: Drop unneeded sigtran and mgcp-client deps + * fix another log line end in assignment_fsm.c + * Drop unused old osmux leftover code + * vty: Add option to enable osmux towards MSC + * bssap: Detect MSC Osmux support on RESET (ACK) recv + * bssap: Announce Osmux support on RESET (ACK) send + * bssap: Parse Osmux CID on BSSAP Assign Req recv and use it in MGCP + * bssap: Feed Assign Complete with Osmux CID retrieved from MGW + * lcls: Fix MDCX with garbage on LCLS loop break + * Introduce msc_is_{sccplite,aoip}() helpers + * bsc: Append Osmux Support IE only on AoIP + * Remove extern declarations of libosmovty symbols + * bsc_subscr_conn_fsm: Use gscon_bssmap_clear() helper on send failure + * bsc_subscr_conn_fsm: Log Tx of BSSMAP Clear Request with cause + * doc: Add Osmux documentation to User Manual + * Remove undefined param passed to logging_vty_add_cmds + + [ Sylvain Munaut ] + * assignment_fsm: Properly support assigning signalling mode TCH/x + * assignment_fsm: Properly support assigning signalling mode TCH/x + + [ Vadim Yanitskiy ] + * abis_nm.c: use proper format specifiers for BTS / TRX number + * abis_nm.c: also print TRX number in abis_nm_get_attr() + * abis_nm.c: use abis_nm_ipa_magic from libosmocore + * abis_nm.c: use msgb_lv_put() to put abis_nm_ipa_magic + * abis_nm.c: fix broken logging in abis_nm_rx_ipacc() + * gsm_data.c: use REG_NOSUB flag of regcomp() + * osmo_bsc_lcls.c: cosmetic: make Coverity happy + * ipaccess-config: use POSIX regex for Unit ID format check + * handover_fsm.c: fix: prevent possible buffer overflow + + [ Daniel Willmann ] + * doc: Add generic counter chapter in manual + * manuals: Fix example config to reflect OsmoBSC commands + * Change comments/strings from OpenBSC to OsmoBSC + * gsm_data.h: Remove unused variable from OpenBSC times + * Revert "fix inter-BSC-HO-incoming for AoIP (1/2)" + * manuals: Update generated VTY reference and counters + * manuals: Add script to update vtr/counter documentation from docker + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * contrib/jenkins.sh: "maintainer-clean" after "publish" + * osmo-bsc.cfg: work with osmo-bts example cfg + + [ Eric Wild ] + * vty: adjust config name for unit-id + * turn -Werror=null-dereference into a warning + + [ Ruben Undheim ] + * Fix some spelling errors found by lintian + + -- Pau Espin Pedrol Wed, 07 Aug 2019 20:42:06 +0200 + osmo-bsc (1.4.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 7410193..a6b8c02 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ python-minimal, libcdk5-dev, libtalloc-dev, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.2.0), libosmo-sccp-dev (>= 0.10.0), libosmo-sigtran-dev (>= 0.10.0), - libosmo-abis-dev (>= 0.5.1), - libosmo-netif-dev (>= 0.3.0), - libosmo-mgcp-client-dev (>= 1.4.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.6.0), + libosmo-mgcp-client-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc.git -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b73d0a83b1ed1a4dfd17066182820da5e401c9b Gerrit-Change-Number: 15109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 7 21:53:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 7 Aug 2019 21:53:09 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control Sample output for current osmo-msc master: Releasing 1.3.1.191-7ea0d -> 1.4.0... ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: exiting due to previous errors make: *** [osmo-release.mk:9: release] Error 1 Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 --- M osmo-release.sh 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/15110/1 diff --git a/osmo-release.sh b/osmo-release.sh index e9602aa..eab5040 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -21,6 +21,46 @@ echo "$major" } +# Make sure that depedency requirement versions match in configure.ac vs debian/control. +#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," +check_configureac_debctrl_deps_match() { + return_error=0 + configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") + echo "$configureac_list" | \ + { while read -r dep ver; do + + debctrl_match="$(grep -e "${dep}-dev" ${GIT_TOPDIR}/debian/control | grep ">=")" + debctrl_match_count="$(echo "$debctrl_match" | grep -c ">=")" + if [ "z$debctrl_match_count" != "z0" ]; then + #echo "Dependency <$dep, $ver> from configure.ac matched in debian/control! ($debctrl_match_count)" + if [ "z$debctrl_match_count" != "z1" ]; then + echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!" + else # 1 match: + parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g") + debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g") + debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2) + if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" != "z$debctrl_ver" ]; then + echo "ERROR: configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!" + return_error=1 + #else + # echo "OK: configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>" + fi + fi + fi + done + if [ $return_error -ne 0 ]; then + exit 1 + fi + } + + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + echo "ERROR: exiting due to previous errors" + exit 1 + fi + echo "OK: dependency specific versions in configure.ac and debian/control match" +} + BUMPVER=`command -v bumpversion` GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -40,6 +80,8 @@ echo "Releasing $VERSION -> $NEW_VER..." +check_configureac_debctrl_deps_match + if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then echo "ERROR: Before releasing, please modify some of the libversions: $LIBVERS" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 00:09:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 00:09:15 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: fix missing event for IMEISV Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15111 Change subject: vlr_lu_fsm: fix missing event for IMEISV ...................................................................... vlr_lu_fsm: fix missing event for IMEISV Event VLR_ULA_E_ID_IMEISV is listed as permitted in VLR_ULA_S_WAIT_LU_COMPL, but is missing from the switch() on the incoming event. So, sending an IMEISV identity during the WAIT_LU_COMPL state would crash osmo-msc. When receiving an IMEISV, vlr_subscr_set_imeisv() in turn calls vlr_subscr_set_imei(), so as far as the lu_fsm is concerned, receiving an IMEISV is identical to receiving an IMEI, and it can continue to send a Check IMEI request to the HLR. Thus simply add VLR_ULA_E_ID_IMEISV to the VLR_ULA_E_ID_IMEI switch case. Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/15111/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 87bf7a5..454709f 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1253,6 +1253,7 @@ LU_COMPL_VLR_E_NEW_TMSI_ACK, NULL); break; case VLR_ULA_E_ID_IMEI: + case VLR_ULA_E_ID_IMEISV: /* Got the IMEI from ME, now send it to HLR */ vlr_subscr_tx_req_check_imei(lfp->vsub); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad Gerrit-Change-Number: 15111 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 7 02:42:11 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 07 Aug 2019 02:42:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d4b777e4a80a_7cea2ad01a4d85f420919c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 105s] libcommon/source/usb.c:692:15: error: redefinition of 'i' [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was here [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 105s] ^ [ 105s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' failed [ 105s] make[2]: *** [obj/simtrace/flash_usb.o] Error 1 [ 105s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 105s] Makefile:11: recipe for target 'fw-simtrace-trace' failed [ 105s] make[1]: *** [fw-simtrace-trace] Error 2 [ 105s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 105s] dh_auto_build: make -j1 returned exit code 2 [ 105s] debian/rules:4: recipe for target 'build' failed [ 105s] make: *** [build] Error 2 [ 105s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 105s] [ 105s] lamb12 failed "build simtrace2_0.5.1.34.e026.dsc" at Wed Aug 7 02:41:55 UTC 2019. [ 105s] [ 105s] ### VM INTERACTION START ### [ 108s] [ 96.192874] sysrq: SysRq : Power Off [ 108s] [ 96.233822] reboot: Power down [ 108s] ### VM INTERACTION END ### [ 108s] [ 108s] lamb12 failed "build simtrace2_0.5.1.34.e026.dsc" at Wed Aug 7 02:41:59 UTC 2019. [ 108s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 7 03:00:03 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 07 Aug 2019 03:00:03 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4b781adec8c_7cea2ad01a4d85f42138dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Raspbian_9.0/armv7l Package network:osmocom:latest/libosmo-netif failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 684s] | #define HAVE_DLFCN_H 1 [ 684s] | #define LT_OBJDIR ".libs/" [ 684s] | #define STDC_HEADERS 1 [ 684s] | #define HAVE_EXECINFO_H 1 [ 684s] | #define HAVE_SYS_SELECT_H 1 [ 684s] | #define HAVE_SYS_SOCKET_H 1 [ 684s] | #define HAVE_SYSLOG_H 1 [ 684s] | #define HAVE_CTYPE_H 1 [ 684s] | #define HAVE_LIBSCTP 1 [ 684s] | #define HAVE_PCAP_H 1 [ 684s] | [ 684s] | configure: exit 0 [ 684s] [ 684s] debian/rules:27: recipe for target 'override_dh_auto_test' failed [ 684s] make[1]: *** [override_dh_auto_test] Error 1 [ 684s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 684s] debian/rules:13: recipe for target 'build' failed [ 684s] make: *** [build] Error 2 [ 684s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 684s] [ 684s] obs-arm-5 failed "build libosmo-netif_0.5.0.dsc" at Wed Aug 7 02:59:52 UTC 2019. [ 684s] [ 684s] ### VM INTERACTION START ### [ 687s] [ 649.826123] sysrq: SysRq : Power Off [ 687s] [ 649.940201] reboot: Power down [ 688s] ### VM INTERACTION END ### [ 688s] [ 688s] obs-arm-5 failed "build libosmo-netif_0.5.0.dsc" at Wed Aug 7 02:59:56 UTC 2019. [ 688s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 7 03:10:37 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 07 Aug 2019 03:10:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5d4b786abe7a_7cea2ad01a4d85f42151ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 93s] | #define HAVE_STDLIB_H 1 [ 93s] | #define HAVE_STRING_H 1 [ 93s] | #define HAVE_MEMORY_H 1 [ 93s] | #define HAVE_STRINGS_H 1 [ 93s] | #define HAVE_INTTYPES_H 1 [ 93s] | #define HAVE_STDINT_H 1 [ 93s] | #define HAVE_UNISTD_H 1 [ 93s] | #define HAVE_DLFCN_H 1 [ 93s] | #define LT_OBJDIR ".libs/" [ 93s] | #define PACKAGE "osmo-hlr" [ 93s] | #define VERSION "1.0.0" [ 93s] | #define STDC_HEADERS 1 [ 93s] | [ 93s] | configure: exit 0 [ 93s] [ 93s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 93s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 93s] make: *** [debian/rules:7: build] Error 2 [ 93s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 93s] [ 93s] sheep81 failed "build osmo-hlr_1.0.0.dsc" at Wed Aug 7 03:10:19 UTC 2019. [ 93s] [ 93s] ### VM INTERACTION START ### [ 96s] [ 87.127880] sysrq: SysRq : Power Off [ 96s] [ 87.134495] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] sheep81 failed "build osmo-hlr_1.0.0.dsc" at Wed Aug 7 03:10:23 UTC 2019. [ 96s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 7 03:20:37 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 07 Aug 2019 03:20:37 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5d4b78abd1d60_7cea2ad01a4d85f4217163@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 77s] libcommon/source/usb.c:692:15: error: redefinition of 'i' [ 77s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 77s] ^ [ 77s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was here [ 77s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 77s] ^ [ 77s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 77s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 77s] ^ [ 77s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' failed [ 77s] make[2]: *** [obj/simtrace/flash_usb.o] Error 1 [ 77s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 77s] Makefile:11: recipe for target 'fw-simtrace-trace' failed [ 77s] make[1]: *** [fw-simtrace-trace] Error 2 [ 77s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 77s] dh_auto_build: make -j1 returned exit code 2 [ 77s] debian/rules:4: recipe for target 'build' failed [ 77s] make: *** [build] Error 2 [ 77s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 77s] [ 77s] sheep83 failed "build simtrace2_0.5.1.34.e026.dsc" at Wed Aug 7 03:20:17 UTC 2019. [ 77s] [ 77s] ### VM INTERACTION START ### [ 80s] [ 72.915188] sysrq: SysRq : Power Off [ 80s] [ 72.920655] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] sheep83 failed "build simtrace2_0.5.1.34.e026.dsc" at Wed Aug 7 03:20:20 UTC 2019. [ 80s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 8 03:58:14 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 8 Aug 2019 03:58:14 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: fix missing event for IMEISV In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15111 ) Change subject: vlr_lu_fsm: fix missing event for IMEISV ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad Gerrit-Change-Number: 15111 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 08 Aug 2019 03:58:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 8 02:12:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:12:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d4ba3cbb52e3_7cea2ad01a4d85f45980ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 190s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 190s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 190s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 190s] Makefile:380: recipe for target 'check-recursive' failed [ 190s] make[4]: *** [check-recursive] Error 1 [ 190s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 190s] Makefile:499: recipe for target 'check-recursive' failed [ 190s] make[3]: *** [check-recursive] Error 1 [ 190s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 190s] Makefile:790: recipe for target 'check' failed [ 190s] make[2]: *** [check] Error 2 [ 190s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 190s] dh_auto_test: make -j1 check returned exit code 2 [ 190s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 190s] make[1]: *** [override_dh_auto_test] Error 1 [ 190s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 190s] debian/rules:17: recipe for target 'build' failed [ 190s] make: *** [build] Error 2 [ 190s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 190s] [ 190s] lamb03 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:12:22 UTC 2019. [ 190s] [ 190s] ### VM INTERACTION START ### [ 193s] [ 179.404588] sysrq: SysRq : Power Off [ 193s] [ 179.412860] reboot: Power down [ 193s] ### VM INTERACTION END ### [ 193s] [ 193s] lamb03 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:12:26 UTC 2019. [ 193s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:12:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:12:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d4ba3cb706b_7cea2ad01a4d85f459791a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 161s] #define HAVE_MEMORY_H 1 [ 161s] #define HAVE_STRINGS_H 1 [ 161s] #define HAVE_INTTYPES_H 1 [ 161s] #define HAVE_STDINT_H 1 [ 161s] #define HAVE_UNISTD_H 1 [ 161s] #define HAVE_DLFCN_H 1 [ 161s] #define LT_OBJDIR ".libs/" [ 161s] #define STDC_HEADERS 1 [ 161s] #define HAVE_BYTESWAP_H 1 [ 161s] #define TIME_WITH_SYS_TIME 1 [ 161s] [ 161s] configure: exit 1 [ 161s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 161s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 161s] make[1]: *** [override_dh_auto_configure] Error 255 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] debian/rules:6: recipe for target 'build' failed [ 161s] make: *** [build] Error 2 [ 161s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 161s] [ 161s] build84 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:12:15 UTC 2019. [ 161s] [ 161s] ### VM INTERACTION START ### [ 164s] [ 154.925427] sysrq: SysRq : Power Off [ 164s] [ 154.930749] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] build84 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:12:19 UTC 2019. [ 164s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:13:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:13:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5d4ba3cf57651_7cea2ad01a4d85f4598132@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/i586 Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 219s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 219s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 219s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 219s] Makefile:380: recipe for target 'check-recursive' failed [ 219s] make[4]: *** [check-recursive] Error 1 [ 219s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 219s] Makefile:499: recipe for target 'check-recursive' failed [ 219s] make[3]: *** [check-recursive] Error 1 [ 219s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 219s] Makefile:790: recipe for target 'check' failed [ 219s] make[2]: *** [check] Error 2 [ 219s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 219s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 219s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 219s] make[1]: *** [override_dh_auto_test] Error 1 [ 219s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 219s] debian/rules:17: recipe for target 'build' failed [ 219s] make: *** [build] Error 2 [ 219s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 219s] [ 219s] lamb20 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:13:03 UTC 2019. [ 219s] [ 219s] ### VM INTERACTION START ### [ 222s] [ 207.680468] sysrq: SysRq : Power Off [ 222s] [ 207.688174] reboot: Power down [ 222s] ### VM INTERACTION END ### [ 222s] [ 222s] lamb20 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:13:06 UTC 2019. [ 222s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:13:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:13:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5d4ba3cfcb275_7cea2ad01a4d85f4598254@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_8.0/i586 Package network:osmocom:latest/osmo-mgw failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 232s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 232s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 232s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 232s] Makefile:368: recipe for target 'check-recursive' failed [ 232s] make[4]: *** [check-recursive] Error 1 [ 232s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 232s] Makefile:488: recipe for target 'check-recursive' failed [ 232s] make[3]: *** [check-recursive] Error 1 [ 232s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 232s] Makefile:779: recipe for target 'check' failed [ 232s] make[2]: *** [check] Error 2 [ 232s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 232s] dh_auto_test: make -j1 check returned exit code 2 [ 232s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 232s] make[1]: *** [override_dh_auto_test] Error 1 [ 232s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 232s] debian/rules:17: recipe for target 'build' failed [ 232s] make: *** [build] Error 2 [ 232s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 232s] [ 232s] morla3 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:13:06 UTC 2019. [ 232s] [ 232s] ### VM INTERACTION START ### [ 233s] Powering off. [ 233s] [ 217.410341] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] morla3 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:13:08 UTC 2019. [ 233s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:14:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:14:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5d4ba3d272ee3_7cea2ad01a4d85f45983f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 238s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 238s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 238s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 238s] Makefile:380: recipe for target 'check-recursive' failed [ 238s] make[4]: *** [check-recursive] Error 1 [ 238s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 238s] Makefile:499: recipe for target 'check-recursive' failed [ 238s] make[3]: *** [check-recursive] Error 1 [ 238s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 238s] Makefile:790: recipe for target 'check' failed [ 238s] make[2]: *** [check] Error 2 [ 238s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 238s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 238s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 238s] make[1]: *** [override_dh_auto_test] Error 1 [ 238s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 238s] debian/rules:17: recipe for target 'build' failed [ 238s] make: *** [build] Error 2 [ 238s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 238s] [ 238s] obs-arm-8 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:13:56 UTC 2019. [ 238s] [ 238s] ### VM INTERACTION START ### [ 241s] [ 228.083939] sysrq: Power Off [ 241s] [ 228.140604] reboot: Power down [ 241s] ### VM INTERACTION END ### [ 241s] [ 241s] obs-arm-8 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:13:59 UTC 2019. [ 241s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:14:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:14:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba3e0363ba_7cea2ad01a4d85f459852@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 238s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 238s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 238s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 238s] Makefile:380: recipe for target 'check-recursive' failed [ 238s] make[4]: *** [check-recursive] Error 1 [ 238s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 238s] Makefile:499: recipe for target 'check-recursive' failed [ 238s] make[3]: *** [check-recursive] Error 1 [ 238s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 238s] Makefile:790: recipe for target 'check' failed [ 238s] make[2]: *** [check] Error 2 [ 238s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 238s] dh_auto_test: make -j1 check returned exit code 2 [ 238s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 238s] make[1]: *** [override_dh_auto_test] Error 1 [ 238s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 238s] debian/rules:17: recipe for target 'build' failed [ 238s] make: *** [build] Error 2 [ 238s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 238s] [ 238s] lamb52 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:14:38 UTC 2019. [ 238s] [ 238s] ### VM INTERACTION START ### [ 241s] [ 226.092591] sysrq: SysRq : Power Off [ 241s] [ 226.107481] reboot: Power down [ 241s] ### VM INTERACTION END ### [ 241s] [ 241s] lamb52 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:14:42 UTC 2019. [ 241s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:15:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:15:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba3e2b6bdb_7cea2ad01a4d85f4598611@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 201s] #define HAVE_MEMORY_H 1 [ 201s] #define HAVE_STRINGS_H 1 [ 201s] #define HAVE_INTTYPES_H 1 [ 201s] #define HAVE_STDINT_H 1 [ 201s] #define HAVE_UNISTD_H 1 [ 201s] #define HAVE_DLFCN_H 1 [ 201s] #define LT_OBJDIR ".libs/" [ 201s] #define STDC_HEADERS 1 [ 201s] #define HAVE_BYTESWAP_H 1 [ 201s] #define TIME_WITH_SYS_TIME 1 [ 201s] [ 201s] configure: exit 1 [ 201s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 201s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 201s] make[1]: *** [override_dh_auto_configure] Error 255 [ 201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 201s] debian/rules:6: recipe for target 'build' failed [ 201s] make: *** [build] Error 2 [ 201s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 201s] [ 201s] lamb07 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:15:11 UTC 2019. [ 201s] [ 201s] ### VM INTERACTION START ### [ 204s] [ 189.552416] sysrq: SysRq : Power Off [ 204s] [ 189.559057] reboot: Power down [ 204s] ### VM INTERACTION END ### [ 204s] [ 204s] lamb07 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:15:15 UTC 2019. [ 204s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:15:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:15:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5d4ba3e3b1d19_7cea2ad01a4d85f459875b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_18.10/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 342s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 347s] # Make absolutely sure that the %.check target is updated. [ 347s] touch osmomgw-usermanual.check [ 347s] # Do print the WARNING output but return error if any was found [ 347s] # (grep -v would omit the WARNING output from the log). [ 347s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 347s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 347s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 347s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 347s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 347s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 347s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 347s] make[2]: *** [Makefile:793: check] Error 2 [ 347s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 347s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 347s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 347s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 347s] make: *** [debian/rules:17: build] Error 2 [ 347s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 347s] [ 347s] lamb61 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:15:22 UTC 2019. [ 347s] [ 347s] ### VM INTERACTION START ### [ 350s] [ 334.480370] sysrq: SysRq : Power Off [ 350s] [ 334.494897] reboot: Power down [ 350s] ### VM INTERACTION END ### [ 350s] [ 350s] lamb61 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:15:26 UTC 2019. [ 350s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:16:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:16:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba3e7b0668_7cea2ad01a4d85f459898f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 347s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 352s] # Make absolutely sure that the %.check target is updated. [ 352s] touch osmomgw-usermanual.check [ 352s] # Do print the WARNING output but return error if any was found [ 352s] # (grep -v would omit the WARNING output from the log). [ 352s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 352s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 352s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 352s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 352s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 352s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 352s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 352s] make[2]: *** [Makefile:793: check] Error 2 [ 352s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 352s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 352s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 352s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 352s] make: *** [debian/rules:17: build] Error 2 [ 352s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 352s] [ 352s] build36 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:16:08 UTC 2019. [ 352s] [ 352s] ### VM INTERACTION START ### [ 355s] [ 336.065363] sysrq: SysRq : Power Off [ 355s] [ 336.106145] reboot: Power down [ 356s] ### VM INTERACTION END ### [ 356s] [ 356s] build36 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:16:12 UTC 2019. [ 356s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:16:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:16:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5d4ba3e964935_7cea2ad01a4d85f4599047@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_8.0/i586 Package network:osmocom:latest/osmo-bsc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 154s] #include [ 154s] ^ [ 154s] compilation terminated. [ 154s] Makefile:612: recipe for target 'assignment_fsm.o' failed [ 154s] make[4]: *** [assignment_fsm.o] Error 1 [ 154s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 154s] Makefile:393: recipe for target 'all-recursive' failed [ 154s] make[3]: *** [all-recursive] Error 1 [ 154s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 154s] Makefile:436: recipe for target 'all-recursive' failed [ 154s] make[2]: *** [all-recursive] Error 1 [ 154s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 154s] Makefile:367: recipe for target 'all' failed [ 154s] make[1]: *** [all] Error 2 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] dh_auto_build: make -j1 returned exit code 2 [ 154s] debian/rules:45: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 154s] [ 154s] build80 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:16:28 UTC 2019. [ 154s] [ 154s] ### VM INTERACTION START ### [ 155s] Powering off. [ 155s] [ 144.554818] reboot: Power down [ 155s] ### VM INTERACTION END ### [ 155s] [ 155s] build80 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:16:29 UTC 2019. [ 155s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:16:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:16:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5d4ba3e77bc3_7cea2ad01a4d85f4598819@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_18.10/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 300s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 305s] # Make absolutely sure that the %.check target is updated. [ 305s] touch osmomgw-usermanual.check [ 305s] # Do print the WARNING output but return error if any was found [ 305s] # (grep -v would omit the WARNING output from the log). [ 305s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 305s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 305s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 305s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 305s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 305s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 305s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 305s] make[2]: *** [Makefile:793: check] Error 2 [ 305s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 305s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 305s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 305s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 305s] make: *** [debian/rules:17: build] Error 2 [ 305s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 305s] [ 305s] lamb11 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:16:03 UTC 2019. [ 305s] [ 305s] ### VM INTERACTION START ### [ 308s] [ 293.539425] sysrq: SysRq : Power Off [ 308s] [ 293.545443] reboot: Power down [ 308s] ### VM INTERACTION END ### [ 308s] [ 308s] lamb11 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:16:07 UTC 2019. [ 308s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:16:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:16:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_10/i586 In-Reply-To: References: Message-ID: <5d4ba3eba7bd_7cea2ad01a4d85f45991e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_10/i586 Package network:osmocom:latest/osmo-mgw failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 421s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 426s] # Make absolutely sure that the %.check target is updated. [ 426s] touch osmomgw-usermanual.check [ 426s] # Do print the WARNING output but return error if any was found [ 426s] # (grep -v would omit the WARNING output from the log). [ 426s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 426s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 426s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 426s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 426s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 426s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 426s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 426s] make[2]: *** [Makefile:793: check] Error 2 [ 426s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 426s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 426s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 426s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 426s] make: *** [debian/rules:17: build] Error 2 [ 426s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 426s] [ 426s] lamb01 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:16:40 UTC 2019. [ 426s] [ 426s] ### VM INTERACTION START ### [ 429s] [ 409.194756] sysrq: SysRq : Power Off [ 429s] [ 409.210767] reboot: Power down [ 429s] ### VM INTERACTION END ### [ 429s] [ 429s] lamb01 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:16:43 UTC 2019. [ 429s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:17:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:17:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d4ba3ec99458_7cea2ad01a4d85f459924c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 202s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 202s] assignment_fsm.c:26:58: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 202s] compilation terminated. [ 202s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 202s] make[4]: *** [assignment_fsm.o] Error 1 [ 202s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 202s] Makefile:405: recipe for target 'all-recursive' failed [ 202s] make[3]: *** [all-recursive] Error 1 [ 202s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 202s] Makefile:448: recipe for target 'all-recursive' failed [ 202s] make[2]: *** [all-recursive] Error 1 [ 202s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 202s] Makefile:380: recipe for target 'all' failed [ 202s] make[1]: *** [all] Error 2 [ 202s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 202s] dh_auto_build: make -j1 returned exit code 2 [ 202s] debian/rules:45: recipe for target 'build' failed [ 202s] make: *** [build] Error 2 [ 202s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 202s] [ 202s] lamb04 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:16:58 UTC 2019. [ 202s] [ 202s] ### VM INTERACTION START ### [ 205s] [ 192.899209] sysrq: SysRq : Power Off [ 205s] [ 192.908799] reboot: Power down [ 206s] ### VM INTERACTION END ### [ 206s] [ 206s] lamb04 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:17:02 UTC 2019. [ 206s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:17:51 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:17:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba3f01cb26_7cea2ad01a4d85f45993cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 19s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 21s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 25s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 25s] 2nd stage started in virtual machine [ 26s] machine type: x86_64 [ 26s] Linux version: 4[ 4.007902] sysrq: SysRq : Changing Loglevel [ 26s] .12.14-lp151.28.[ 4.009485] sysrq: Loglevel set to 4 [ 26s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 26s] Increasing log level from now on... [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] [ 26s] failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:09:06 UTC 2019. [ 26s] [ 26s] ### VM INTERACTION START ### [ 29s] [ 7.159074] sysrq: SysRq : Power Off [ 29s] [ 7.165296] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:09:10 UTC 2019. [ 29s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:17:52 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:17:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5d4ba400c6b20_7cea2ad01a4d85f45994bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 420s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 420s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 420s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 420s] Makefile:368: recipe for target 'check-recursive' failed [ 420s] make[4]: *** [check-recursive] Error 1 [ 420s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 420s] Makefile:488: recipe for target 'check-recursive' failed [ 420s] make[3]: *** [check-recursive] Error 1 [ 420s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 420s] Makefile:779: recipe for target 'check' failed [ 420s] make[2]: *** [check] Error 2 [ 420s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 420s] dh_auto_test: make -j1 check returned exit code 2 [ 420s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 420s] make[1]: *** [override_dh_auto_test] Error 1 [ 420s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 420s] debian/rules:17: recipe for target 'build' failed [ 420s] make: *** [build] Error 2 [ 420s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 420s] [ 420s] lamb10 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:17:44 UTC 2019. [ 420s] [ 420s] ### VM INTERACTION START ### [ 421s] Powering off. [ 421s] [ 363.886274] reboot: Power down [ 421s] ### VM INTERACTION END ### [ 421s] [ 421s] lamb10 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:17:46 UTC 2019. [ 421s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:18:09 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:18:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba402b1897_7cea2ad01a4d85f45995e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 15s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4[ 3.391300] sysrq: SysRq : Changing Loglevel [ 20s] .12.14-lp151.28.[ 3.392449] sysrq: Loglevel set to 4 [ 20s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] [ 21s] failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:08:40 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 6.459939] sysrq: SysRq : Power Off [ 24s] [ 6.468279] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb09 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:08:43 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:18:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:18:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5d4ba40370b68_7cea2ad01a4d85f4599662@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 478s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 478s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 478s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 478s] Makefile:380: recipe for target 'check-recursive' failed [ 478s] make[4]: *** [check-recursive] Error 1 [ 478s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 478s] Makefile:499: recipe for target 'check-recursive' failed [ 478s] make[3]: *** [check-recursive] Error 1 [ 478s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 478s] Makefile:790: recipe for target 'check' failed [ 478s] make[2]: *** [check] Error 2 [ 478s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 478s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 478s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 478s] make[1]: *** [override_dh_auto_test] Error 1 [ 478s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 478s] debian/rules:17: recipe for target 'build' failed [ 478s] make: *** [build] Error 2 [ 478s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 478s] [ 478s] lamb27 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:18:04 UTC 2019. [ 478s] [ 478s] ### VM INTERACTION START ### [ 481s] [ 462.105620] sysrq: SysRq : Power Off [ 481s] [ 462.114847] reboot: Power down [ 481s] ### VM INTERACTION END ### [ 481s] [ 481s] lamb27 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:18:08 UTC 2019. [ 481s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:19:17 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:19:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5d4ba409e904f_7cea2ad01a4d85f45997e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_18.10/x86_64 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 464s] #define HAVE_STDLIB_H 1 [ 464s] #define HAVE_STRING_H 1 [ 464s] #define HAVE_MEMORY_H 1 [ 464s] #define HAVE_STRINGS_H 1 [ 464s] #define HAVE_INTTYPES_H 1 [ 464s] #define HAVE_STDINT_H 1 [ 464s] #define HAVE_UNISTD_H 1 [ 464s] #define HAVE_DLFCN_H 1 [ 464s] #define LT_OBJDIR ".libs/" [ 464s] #define STDC_HEADERS 1 [ 464s] #define HAVE_BYTESWAP_H 1 [ 464s] #define TIME_WITH_SYS_TIME 1 [ 464s] [ 464s] configure: exit 1 [ 464s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 464s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 2 [ 464s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 464s] make: *** [debian/rules:6: build] Error 2 [ 464s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 464s] [ 464s] morla3 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:19:05 UTC 2019. [ 464s] [ 464s] ### VM INTERACTION START ### [ 467s] [ 444.451861] sysrq: SysRq : Power Off [ 467s] [ 444.707068] reboot: Power down [ 467s] ### VM INTERACTION END ### [ 468s] [ 468s] morla3 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:19:10 UTC 2019. [ 468s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:19:17 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:19:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5d4ba40a5c080_7cea2ad01a4d85f4599854@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/i586 Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 290s] #define HAVE_MEMORY_H 1 [ 290s] #define HAVE_STRINGS_H 1 [ 290s] #define HAVE_INTTYPES_H 1 [ 290s] #define HAVE_STDINT_H 1 [ 290s] #define HAVE_UNISTD_H 1 [ 290s] #define HAVE_DLFCN_H 1 [ 290s] #define LT_OBJDIR ".libs/" [ 290s] #define STDC_HEADERS 1 [ 290s] #define HAVE_BYTESWAP_H 1 [ 290s] #define TIME_WITH_SYS_TIME 1 [ 290s] [ 290s] configure: exit 1 [ 290s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 290s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 290s] make[1]: *** [override_dh_auto_configure] Error 2 [ 290s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 290s] debian/rules:6: recipe for target 'build' failed [ 290s] make: *** [build] Error 2 [ 290s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 290s] [ 290s] lamb52 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:19:08 UTC 2019. [ 290s] [ 290s] ### VM INTERACTION START ### [ 293s] [ 275.902619] sysrq: SysRq : Power Off [ 293s] [ 275.927946] reboot: Power down [ 293s] ### VM INTERACTION END ### [ 293s] [ 293s] lamb52 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:19:11 UTC 2019. [ 293s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:19:34 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:19:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <5d4ba40c87fd4_7cea2ad01a4d85f45999d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 443s] #define HAVE_STDLIB_H 1 [ 443s] #define HAVE_STRING_H 1 [ 443s] #define HAVE_MEMORY_H 1 [ 443s] #define HAVE_STRINGS_H 1 [ 443s] #define HAVE_INTTYPES_H 1 [ 443s] #define HAVE_STDINT_H 1 [ 443s] #define HAVE_UNISTD_H 1 [ 443s] #define HAVE_DLFCN_H 1 [ 443s] #define LT_OBJDIR ".libs/" [ 443s] #define STDC_HEADERS 1 [ 443s] #define HAVE_BYTESWAP_H 1 [ 443s] #define TIME_WITH_SYS_TIME 1 [ 443s] [ 443s] configure: exit 1 [ 443s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 443s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 2 [ 443s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 443s] make: *** [debian/rules:6: build] Error 2 [ 443s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 443s] [ 443s] cloud125 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:19:24 UTC 2019. [ 443s] [ 443s] ### VM INTERACTION START ### [ 446s] [ 410.147399] sysrq: SysRq : Power Off [ 446s] [ 410.166446] reboot: Power down [ 448s] ### VM INTERACTION END ### [ 448s] [ 448s] cloud125 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:19:30 UTC 2019. [ 448s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:20:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:20:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4ba41ee9e2e_7cea2ad01a4d85f4600048@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 229s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 232s] # Make absolutely sure that the %.check target is updated. [ 232s] touch osmomgw-usermanual.check [ 232s] # Do print the WARNING output but return error if any was found [ 232s] # (grep -v would omit the WARNING output from the log). [ 232s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 232s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 232s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 232s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 232s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 232s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 232s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 232s] make[2]: *** [Makefile:793: check] Error 2 [ 232s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 232s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 232s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 232s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 232s] make: *** [debian/rules:17: build] Error 2 [ 232s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 232s] [ 232s] sheep84 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:19:52 UTC 2019. [ 232s] [ 232s] ### VM INTERACTION START ### [ 235s] [ 223.484705] sysrq: SysRq : Power Off [ 235s] [ 223.488939] reboot: Power down [ 235s] ### VM INTERACTION END ### [ 235s] [ 235s] sheep84 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:19:55 UTC 2019. [ 235s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:20:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:20:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5d4ba41fe1ac6_7cea2ad01a4d85f460019d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 400s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 400s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 400s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 400s] Makefile:380: recipe for target 'check-recursive' failed [ 400s] make[4]: *** [check-recursive] Error 1 [ 400s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 400s] Makefile:499: recipe for target 'check-recursive' failed [ 400s] make[3]: *** [check-recursive] Error 1 [ 400s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 400s] Makefile:790: recipe for target 'check' failed [ 400s] make[2]: *** [check] Error 2 [ 400s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 400s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 400s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 400s] make[1]: *** [override_dh_auto_test] Error 1 [ 400s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 400s] debian/rules:17: recipe for target 'build' failed [ 400s] make: *** [build] Error 2 [ 400s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 400s] [ 400s] lamb58 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:19:58 UTC 2019. [ 400s] [ 400s] ### VM INTERACTION START ### [ 403s] [ 384.668223] sysrq: SysRq : Power Off [ 404s] [ 384.749687] reboot: Power down [ 404s] ### VM INTERACTION END ### [ 404s] [ 404s] lamb58 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:20:02 UTC 2019. [ 404s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:20:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:20:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4ba42085898_7cea2ad01a4d85f4600282@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 418s] #define HAVE_STDLIB_H 1 [ 418s] #define HAVE_STRING_H 1 [ 418s] #define HAVE_MEMORY_H 1 [ 418s] #define HAVE_STRINGS_H 1 [ 418s] #define HAVE_INTTYPES_H 1 [ 418s] #define HAVE_STDINT_H 1 [ 418s] #define HAVE_UNISTD_H 1 [ 418s] #define HAVE_DLFCN_H 1 [ 418s] #define LT_OBJDIR ".libs/" [ 418s] #define STDC_HEADERS 1 [ 418s] #define HAVE_BYTESWAP_H 1 [ 418s] #define TIME_WITH_SYS_TIME 1 [ 418s] [ 418s] configure: exit 1 [ 418s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 418s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255 [ 418s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 418s] make: *** [debian/rules:6: build] Error 2 [ 418s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 419s] [ 419s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:23:51 UTC 2019. [ 419s] [ 419s] ### VM INTERACTION START ### [ 422s] [ 400.652104] sysrq: SysRq : Power Off [ 422s] [ 400.658641] reboot: Power down [ 422s] ### VM INTERACTION END ### [ 422s] [ 422s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:23:56 UTC 2019. [ 422s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:20:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:20:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5d4ba421b5d3e_7cea2ad01a4d85f460039d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 402s] #define HAVE_MEMORY_H 1 [ 402s] #define HAVE_STRINGS_H 1 [ 402s] #define HAVE_INTTYPES_H 1 [ 402s] #define HAVE_STDINT_H 1 [ 402s] #define HAVE_UNISTD_H 1 [ 402s] #define HAVE_DLFCN_H 1 [ 402s] #define LT_OBJDIR ".libs/" [ 402s] #define STDC_HEADERS 1 [ 402s] #define HAVE_BYTESWAP_H 1 [ 402s] #define TIME_WITH_SYS_TIME 1 [ 402s] [ 402s] configure: exit 1 [ 402s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 402s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 402s] make[1]: *** [override_dh_auto_configure] Error 2 [ 402s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 402s] debian/rules:6: recipe for target 'build' failed [ 402s] make: *** [build] Error 2 [ 402s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 402s] [ 402s] lamb19 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:20:15 UTC 2019. [ 402s] [ 402s] ### VM INTERACTION START ### [ 405s] [ 380.574453] sysrq: SysRq : Power Off [ 405s] [ 380.585144] reboot: Power down [ 405s] ### VM INTERACTION END ### [ 405s] [ 405s] lamb19 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:20:18 UTC 2019. [ 405s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:20:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:20:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5d4ba4222b5db_7cea2ad01a4d85f4600466@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_10/aarch64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 536s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 552s] # Make absolutely sure that the %.check target is updated. [ 552s] touch osmomgw-usermanual.check [ 552s] # Do print the WARNING output but return error if any was found [ 552s] # (grep -v would omit the WARNING output from the log). [ 552s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 552s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 552s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 552s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 552s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 552s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 552s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 552s] make[2]: *** [Makefile:793: check] Error 2 [ 552s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 552s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 552s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 552s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 552s] make: *** [debian/rules:17: build] Error 2 [ 552s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 552s] [ 552s] obs-arm-4 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:20:20 UTC 2019. [ 552s] [ 552s] ### VM INTERACTION START ### [ 555s] [ 515.805055] sysrq: SysRq : Power Off [ 555s] [ 515.808180] reboot: Power down [ 555s] ### VM INTERACTION END ### [ 555s] [ 555s] obs-arm-4 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:20:23 UTC 2019. [ 555s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:20:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:20:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba424f0db2_7cea2ad01a4d85f460068b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 216s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 216s] assignment_fsm.c:26:58: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 216s] compilation terminated. [ 216s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 216s] make[4]: *** [assignment_fsm.o] Error 1 [ 216s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 216s] Makefile:405: recipe for target 'all-recursive' failed [ 216s] make[3]: *** [all-recursive] Error 1 [ 216s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 216s] Makefile:448: recipe for target 'all-recursive' failed [ 216s] make[2]: *** [all-recursive] Error 1 [ 216s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 216s] Makefile:380: recipe for target 'all' failed [ 216s] make[1]: *** [all] Error 2 [ 216s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 216s] dh_auto_build: make -j1 returned exit code 2 [ 216s] debian/rules:45: recipe for target 'build' failed [ 216s] make: *** [build] Error 2 [ 216s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 216s] [ 217s] lamb25 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:20:53 UTC 2019. [ 217s] [ 217s] ### VM INTERACTION START ### [ 220s] [ 199.832691] sysrq: SysRq : Power Off [ 220s] [ 199.856834] reboot: Power down [ 220s] ### VM INTERACTION END ### [ 220s] [ 220s] lamb25 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:20:57 UTC 2019. [ 220s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:21:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:21:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5d4ba4256c9f0_7cea2ad01a4d85f46007f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_9.0/i586 Package network:osmocom:latest/osmo-bsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 329s] #include [ 329s] ^ [ 329s] compilation terminated. [ 329s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 329s] make[4]: *** [assignment_fsm.o] Error 1 [ 329s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 329s] Makefile:405: recipe for target 'all-recursive' failed [ 329s] make[3]: *** [all-recursive] Error 1 [ 329s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 329s] Makefile:448: recipe for target 'all-recursive' failed [ 329s] make[2]: *** [all-recursive] Error 1 [ 329s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 329s] Makefile:380: recipe for target 'all' failed [ 329s] make[1]: *** [all] Error 2 [ 329s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 329s] dh_auto_build: make -j1 returned exit code 2 [ 329s] debian/rules:45: recipe for target 'build' failed [ 329s] make: *** [build] Error 2 [ 329s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 329s] [ 329s] lamb08 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:20:57 UTC 2019. [ 329s] [ 330s] ### VM INTERACTION START ### [ 333s] [ 317.272640] sysrq: SysRq : Power Off [ 333s] [ 317.287530] reboot: Power down [ 333s] ### VM INTERACTION END ### [ 333s] [ 333s] lamb08 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:21:01 UTC 2019. [ 333s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:21:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:21:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba427680bd_7cea2ad01a4d85f4600815@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 275s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 277s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 277s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 277s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 277s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 277s] #include [ 277s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 277s] compilation terminated. [ 277s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 277s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 277s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 277s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 277s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 277s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 277s] make[1]: *** [Makefile:380: all] Error 2 [ 277s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 277s] dh_auto_build: make -j1 returned exit code 2 [ 277s] make: *** [debian/rules:45: build] Error 2 [ 277s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 277s] [ 277s] build83 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:21:29 UTC 2019. [ 277s] [ 277s] ### VM INTERACTION START ### [ 280s] [ 270.630965] sysrq: SysRq : Power Off [ 280s] [ 270.638575] reboot: Power down [ 280s] ### VM INTERACTION END ### [ 280s] [ 280s] build83 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:21:33 UTC 2019. [ 280s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:22:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:22:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5d4ba42a1dad9_7cea2ad01a4d85f46010c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 459s] configure:8798: checking for ar [ 459s] configure:8814: found /usr/bin/ar [ 459s] configure:8825: result: ar [ 459s] configure:8862: checking for archiver @FILE support [ 459s] configure:8879: g++ -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.cpp >&5 [ 459s] configure:8879: $? = 0 [ 459s] configure:8882: ar cru libconftest.a @conftest.lst >&5 [ 459s] ar: `u' modifier ignored since `D' is the default (see `U') [ 459s] configure:8885: $? = 0 [ 459s] configure:8890: ar cru libconftest.a @conftest.lst >&5 [ 459s] ar: `u' modifier ignored since `D' is the default (see `U') [ 459s] ar: conftest.o: No such file or directory [ 459s] configure:8893: $? = 1 [ 459s] configure:8905: result: @ [ 459s] configure:8963: checking for strip [ 459s] configure:8979: found /usr/bin/strip [ 459s] configure:8990: result: strip [ 459s] configure:9062: checking for ranlib [ 459s] configure:9078: found /usr/bin/ranlib [ 459s] configure:9089: result: ranlib [ 459s] configure:9191: checking command to parse /usr/bin/nm -B output from gcc object [ 459s] configure:9344: g++ -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.cpp >&5 [ 459s] configure:9347: $? = 0 [ 461s] c[ 427.878907] sysrq: SysRq : Power Off [ 461s] [ 427.904659] reboot: Power down [ 461s] ### VM INTERACTION END ### [ 461s] [ 461s] obs-arm-3 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:22:10 UTC 2019. [ 461s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:22:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:22:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_10/i586 In-Reply-To: References: Message-ID: <5d4ba42b26f02_7cea2ad01a4d85f4601152@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_10/i586 Package network:osmocom:latest/osmo-trx failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 508s] #define HAVE_STDLIB_H 1 [ 508s] #define HAVE_STRING_H 1 [ 508s] #define HAVE_MEMORY_H 1 [ 508s] #define HAVE_STRINGS_H 1 [ 508s] #define HAVE_INTTYPES_H 1 [ 508s] #define HAVE_STDINT_H 1 [ 508s] #define HAVE_UNISTD_H 1 [ 508s] #define HAVE_DLFCN_H 1 [ 508s] #define LT_OBJDIR ".libs/" [ 508s] #define STDC_HEADERS 1 [ 508s] #define HAVE_BYTESWAP_H 1 [ 508s] #define TIME_WITH_SYS_TIME 1 [ 508s] [ 508s] configure: exit 1 [ 508s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 508s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 2 [ 508s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 508s] make: *** [debian/rules:6: build] Error 2 [ 508s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 508s] [ 508s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:22:19 UTC 2019. [ 508s] [ 508s] ### VM INTERACTION START ### [ 512s] [ 473.009462] sysrq: SysRq : Power Off [ 512s] [ 473.073403] reboot: Power down [ 512s] ### VM INTERACTION END ### [ 512s] [ 512s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:22:23 UTC 2019. [ 512s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:23:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:23:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5d4ba42f8503_7cea2ad01a4d85f460143f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 286s] #include [ 286s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 286s] compilation terminated. [ 286s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 286s] make[4]: *** [assignment_fsm.o] Error 1 [ 286s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 286s] Makefile:405: recipe for target 'all-recursive' failed [ 286s] make[3]: *** [all-recursive] Error 1 [ 286s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 286s] Makefile:448: recipe for target 'all-recursive' failed [ 286s] make[2]: *** [all-recursive] Error 1 [ 286s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 286s] Makefile:380: recipe for target 'all' failed [ 286s] make[1]: *** [all] Error 2 [ 286s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 286s] dh_auto_build: make -j1 returned exit code 2 [ 286s] debian/rules:45: recipe for target 'build' failed [ 286s] make: *** [build] Error 2 [ 286s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 286s] [ 286s] sheep84 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:23:18 UTC 2019. [ 286s] [ 286s] ### VM INTERACTION START ### [ 289s] [ 279.057198] sysrq: SysRq : Power Off [ 289s] [ 279.062402] reboot: Power down [ 289s] ### VM INTERACTION END ### [ 289s] [ 289s] sheep84 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:23:22 UTC 2019. [ 289s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:23:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:23:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5d4ba42f521f6_7cea2ad01a4d85f460155c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 486s] #define HAVE_MEMORY_H 1 [ 486s] #define HAVE_STRINGS_H 1 [ 486s] #define HAVE_INTTYPES_H 1 [ 486s] #define HAVE_STDINT_H 1 [ 486s] #define HAVE_UNISTD_H 1 [ 486s] #define HAVE_DLFCN_H 1 [ 486s] #define LT_OBJDIR ".libs/" [ 486s] #define STDC_HEADERS 1 [ 486s] #define HAVE_BYTESWAP_H 1 [ 486s] #define TIME_WITH_SYS_TIME 1 [ 486s] [ 486s] configure: exit 1 [ 486s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 486s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 486s] make[1]: *** [override_dh_auto_configure] Error 2 [ 486s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 486s] debian/rules:6: recipe for target 'build' failed [ 486s] make: *** [build] Error 2 [ 486s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 486s] [ 486s] lamb16 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:23:18 UTC 2019. [ 486s] [ 486s] ### VM INTERACTION START ### [ 489s] [ 458.221531] sysrq: SysRq : Power Off [ 489s] [ 458.313899] reboot: Power down [ 489s] ### VM INTERACTION END ### [ 489s] [ 489s] lamb16 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:23:22 UTC 2019. [ 489s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:24:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:24:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <5d4ba43e70dc6_7cea2ad01a4d85f4601780@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 881s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 888s] # Make absolutely sure that the %.check target is updated. [ 888s] touch osmomgw-usermanual.check [ 888s] # Do print the WARNING output but return error if any was found [ 888s] # (grep -v would omit the WARNING output from the log). [ 888s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 888s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 888s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 888s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 888s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 888s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 888s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 888s] make[2]: *** [Makefile:793: check] Error 2 [ 888s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 888s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 888s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 888s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 888s] make: *** [debian/rules:17: build] Error 2 [ 888s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 888s] [ 888s] lamb59 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:24:22 UTC 2019. [ 888s] [ 888s] ### VM INTERACTION START ### [ 892s] [ 850.627546] sysrq: SysRq : Power Off [ 892s] [ 850.651983] reboot: Power down [ 892s] ### VM INTERACTION END ### [ 892s] [ 892s] lamb59 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:24:26 UTC 2019. [ 892s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:24:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:24:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5d4ba440afe91_7cea2ad01a4d85f460199f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_10/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 840s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 845s] # Make absolutely sure that the %.check target is updated. [ 845s] touch osmomgw-usermanual.check [ 846s] # Do print the WARNING output but return error if any was found [ 846s] # (grep -v would omit the WARNING output from the log). [ 846s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 846s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 846s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 846s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 846s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 846s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 846s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 846s] make[2]: *** [Makefile:793: check] Error 2 [ 846s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 846s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 846s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 846s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 846s] make: *** [debian/rules:17: build] Error 2 [ 846s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 846s] [ 846s] lamb56 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:24:52 UTC 2019. [ 846s] [ 846s] ### VM INTERACTION START ### [ 849s] [ 799.885395] sysrq: SysRq : Power Off [ 849s] [ 799.891203] reboot: Power down [ 849s] ### VM INTERACTION END ### [ 849s] [ 849s] lamb56 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:24:56 UTC 2019. [ 849s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:25:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:25:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba4423e14b_7cea2ad01a4d85f46020b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 438s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 438s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 438s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 438s] Makefile:380: recipe for target 'check-recursive' failed [ 438s] make[4]: *** [check-recursive] Error 1 [ 438s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 438s] Makefile:499: recipe for target 'check-recursive' failed [ 438s] make[3]: *** [check-recursive] Error 1 [ 438s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 438s] Makefile:790: recipe for target 'check' failed [ 438s] make[2]: *** [check] Error 2 [ 438s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 438s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 438s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 438s] make[1]: *** [override_dh_auto_test] Error 1 [ 438s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 438s] debian/rules:17: recipe for target 'build' failed [ 438s] make: *** [build] Error 2 [ 439s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 439s] [ 439s] cloud116 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:25:16 UTC 2019. [ 439s] [ 439s] ### VM INTERACTION START ### [ 442s] [ 405.516714] sysrq: SysRq : Power Off [ 442s] [ 405.532387] reboot: Power down [ 442s] ### VM INTERACTION END ### [ 442s] [ 442s] cloud116 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:25:20 UTC 2019. [ 442s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:25:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:25:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5d4ba44310a45_7cea2ad01a4d85f4602122@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_18.10/i586 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 582s] #define HAVE_STDLIB_H 1 [ 582s] #define HAVE_STRING_H 1 [ 582s] #define HAVE_MEMORY_H 1 [ 582s] #define HAVE_STRINGS_H 1 [ 582s] #define HAVE_INTTYPES_H 1 [ 582s] #define HAVE_STDINT_H 1 [ 582s] #define HAVE_UNISTD_H 1 [ 582s] #define HAVE_DLFCN_H 1 [ 582s] #define LT_OBJDIR ".libs/" [ 582s] #define STDC_HEADERS 1 [ 582s] #define HAVE_BYTESWAP_H 1 [ 582s] #define TIME_WITH_SYS_TIME 1 [ 582s] [ 582s] configure: exit 1 [ 582s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 582s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 2 [ 582s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 582s] make: *** [debian/rules:6: build] Error 2 [ 582s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 582s] [ 582s] cloud106 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:25:25 UTC 2019. [ 582s] [ 582s] ### VM INTERACTION START ### [ 586s] [ 525.138589] sysrq: SysRq : Power Off [ 586s] [ 525.161094] reboot: Power down [ 588s] ### VM INTERACTION END ### [ 588s] [ 588s] cloud106 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:25:31 UTC 2019. [ 588s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:25:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:25:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5d4ba443820c6_7cea2ad01a4d85f4602274@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_10/aarch64 Package network:osmocom:latest/osmo-trx failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 631s] ac_cv_env_LIBOSMOCTRL_LIBS_value= [ 631s] ac_cv_env_LIBOSMOVTY_CFLAGS_set= [ 631s] ac_cv_env_LIBOSMOVTY_CFLAGS_value= [ 631s] ac_cv_env_LIBOSMOVTY_LIBS_set= [ 631s] ac_cv_env_LIBOSMOVTY_LIBS_value= [ 631s] ac_cv_env_LIBS_set= [ 631s] ac_cv_env_LIBS_value= [ 631s] ac_cv_env_LIBUSB_CFLAGS_set= [ 631s] ac_cv_env_LIBUSB_CFLAGS_value= [ 631s] ac_cv_env_LIBUSB_LIBS_set= [ 631s] ac_cv_env_LIBUSB_LIBS_value= [ 631s] ac_cv_env_LMS_CFLAGS_set= [ 631s] ac_cv_env_LMS_CFLAGS_value= [ 631s] ac_cv_env_LMS_LIBS_set= [ 631s] ac_cv_env_LMS_LIBS_value= [ 631s] ac_cv_env_LT_SYS_LIBRARY_PATH_set= [ 631s] ac_cv_env_LT_SYS_LIBRARY_PATH_value= [ 631s] ac_cv_env_OSMO_GSM_MANUALS_DIR_set= [ 631s] ac_cv_env_OSMO_GSM_MANUALS_DIR_value= [ 631s] ac_cv_env_PKG_CONFIG_LIBDIR_set= [ 631s] ac_cv_env_PKG_CONFIG_LIBDIR_value= [ 631s] ac_cv_env_PKG_CONFIG_PATH_set= [ 631s] ac_cv_env_PKG_CONFIG_PATH_value= [ 633s] ac_cv_env_PKG_CONFIG_set[ 598.803797] sysrq: Power Off [ 633s] [ 598.884682] reboot: Power down [ 634s] ### VM INTERACTION END ### [ 634s] [ 634s] obs-arm-9 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:25:34 UTC 2019. [ 634s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:26:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:26:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5d4ba444b2a41_7cea2ad01a4d85f4602352@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_18.10/i586 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 538s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 541s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 541s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 541s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 541s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 541s] #include [ 541s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 541s] compilation terminated. [ 541s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 541s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 541s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 541s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 541s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 541s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 541s] make[1]: *** [Makefile:380: all] Error 2 [ 541s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 541s] dh_auto_build: make -j1 returned exit code 2 [ 541s] make: *** [debian/rules:45: build] Error 2 [ 541s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 541s] [ 541s] build76 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:25:51 UTC 2019. [ 541s] [ 541s] ### VM INTERACTION START ### [ 545s] [ 529.250441] sysrq: SysRq : Power Off [ 545s] [ 529.257039] reboot: Power down [ 545s] ### VM INTERACTION END ### [ 545s] [ 545s] build76 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:25:55 UTC 2019. [ 545s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:26:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:26:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5d4ba44622973_7cea2ad01a4d85f46024d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 266s] #include [ 266s] ^ [ 266s] compilation terminated. [ 267s] Makefile:612: recipe for target 'assignment_fsm.o' failed [ 267s] make[4]: *** [assignment_fsm.o] Error 1 [ 267s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 267s] Makefile:393: recipe for target 'all-recursive' failed [ 267s] make[3]: *** [all-recursive] Error 1 [ 267s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 267s] Makefile:436: recipe for target 'all-recursive' failed [ 267s] make[2]: *** [all-recursive] Error 1 [ 267s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 267s] Makefile:367: recipe for target 'all' failed [ 267s] make[1]: *** [all] Error 2 [ 267s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 267s] dh_auto_build: make -j1 returned exit code 2 [ 267s] debian/rules:45: recipe for target 'build' failed [ 267s] make: *** [build] Error 2 [ 267s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 267s] [ 267s] lamb19 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:26:15 UTC 2019. [ 267s] [ 267s] ### VM INTERACTION START ### [ 268s] Powering off. [ 268s] [ 252.162534] reboot: Power down [ 268s] ### VM INTERACTION END ### [ 268s] [ 268s] lamb19 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:26:16 UTC 2019. [ 268s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:26:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:26:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5d4ba44872f44_7cea2ad01a4d85f460275b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 284s] #include [ 284s] ^ [ 284s] compilation terminated. [ 284s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 284s] make[4]: *** [assignment_fsm.o] Error 1 [ 284s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 284s] Makefile:405: recipe for target 'all-recursive' failed [ 284s] make[3]: *** [all-recursive] Error 1 [ 284s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 284s] Makefile:448: recipe for target 'all-recursive' failed [ 284s] make[2]: *** [all-recursive] Error 1 [ 284s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 284s] Makefile:380: recipe for target 'all' failed [ 284s] make[1]: *** [all] Error 2 [ 284s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 284s] dh_auto_build: make -j1 returned exit code 2 [ 284s] debian/rules:45: recipe for target 'build' failed [ 284s] make: *** [build] Error 2 [ 284s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 284s] [ 284s] lamb05 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:26:30 UTC 2019. [ 284s] [ 284s] ### VM INTERACTION START ### [ 287s] [ 271.336955] sysrq: SysRq : Power Off [ 287s] [ 271.358290] reboot: Power down [ 287s] ### VM INTERACTION END ### [ 287s] [ 287s] lamb05 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:26:34 UTC 2019. [ 287s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:26:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:26:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5d4ba44930189_7cea2ad01a4d85f460281d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 688s] #include [ 688s] ^ [ 688s] compilation terminated. [ 688s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 688s] make[4]: *** [assignment_fsm.o] Error 1 [ 688s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 688s] Makefile:405: recipe for target 'all-recursive' failed [ 688s] make[3]: *** [all-recursive] Error 1 [ 688s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 688s] Makefile:448: recipe for target 'all-recursive' failed [ 688s] make[2]: *** [all-recursive] Error 1 [ 688s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 688s] Makefile:380: recipe for target 'all' failed [ 688s] make[1]: *** [all] Error 2 [ 688s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 688s] dh_auto_build: make -j1 returned exit code 2 [ 688s] debian/rules:45: recipe for target 'build' failed [ 688s] make: *** [build] Error 2 [ 688s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 688s] [ 688s] obs-arm-3 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:26:39 UTC 2019. [ 688s] [ 688s] ### VM INTERACTION START ### [ 691s] [ 662.250692] sysrq: SysRq : Power Off [ 691s] [ 662.270199] reboot: Power down [ 691s] ### VM INTERACTION END ### [ 691s] [ 691s] obs-arm-3 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:26:42 UTC 2019. [ 691s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:27:51 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:27:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba44d791b9_7cea2ad01a4d85f4603216@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 796s] #define HAVE_STDLIB_H 1 [ 796s] #define HAVE_STRING_H 1 [ 796s] #define HAVE_MEMORY_H 1 [ 796s] #define HAVE_STRINGS_H 1 [ 796s] #define HAVE_INTTYPES_H 1 [ 796s] #define HAVE_STDINT_H 1 [ 796s] #define HAVE_UNISTD_H 1 [ 796s] #define HAVE_DLFCN_H 1 [ 796s] #define LT_OBJDIR ".libs/" [ 796s] #define STDC_HEADERS 1 [ 796s] #define HAVE_BYTESWAP_H 1 [ 796s] #define TIME_WITH_SYS_TIME 1 [ 796s] [ 796s] configure: exit 1 [ 796s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 796s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 2 [ 796s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 796s] make: *** [debian/rules:6: build] Error 2 [ 796s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 796s] [ 796s] lamb26 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:27:43 UTC 2019. [ 796s] [ 796s] ### VM INTERACTION START ### [ 799s] [ 759.603040] sysrq: SysRq : Power Off [ 799s] [ 759.610152] reboot: Power down [ 799s] ### VM INTERACTION END ### [ 799s] [ 799s] lamb26 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:27:46 UTC 2019. [ 799s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:29:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:29:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_10/i586 In-Reply-To: References: Message-ID: <5d4ba45f49e0b_7cea2ad01a4d85f4603756@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_10/i586 Package network:osmocom:latest/osmo-bsc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 722s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 725s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 725s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 725s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 725s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 725s] #include [ 725s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 725s] compilation terminated. [ 725s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 725s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 725s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 725s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 725s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 725s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 725s] make[1]: *** [Makefile:380: all] Error 2 [ 725s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 725s] dh_auto_build: make -j1 returned exit code 2 [ 725s] make: *** [debian/rules:45: build] Error 2 [ 725s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 725s] [ 725s] cloud116 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:29:34 UTC 2019. [ 725s] [ 725s] ### VM INTERACTION START ### [ 728s] [ 637.336571] sysrq: SysRq : Power Off [ 728s] [ 637.345186] reboot: Power down [ 730s] ### VM INTERACTION END ### [ 730s] [ 730s] cloud116 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:29:40 UTC 2019. [ 730s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:30:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:30:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4ba460ac311_7cea2ad01a4d85f4603868@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 201s] Building format(s) --all. [ 205s] This may take some time... done. [ 206s] [401/419] installing texlive-lang-greek-2019.20190710-1 [ 212s] Processing triggers for tex-common (6.12) ... [ 212s] Running mktexlsr. This may take some time... done. [ 212s] Running updmap-sys. This may take some time... done. [ 212s] Running mktexlsr /var/lib/texmf ... done. [ 213s] Building latex-based formats --byhyphen language.dat. [ 215s] This may take some time... done. [ 215s] Building e-tex based formats --byhyphen language.def. [ 217s] This may take some time... done. [ 217s] [402/419] installing initscripts-2.95-4 [ 217s] 12fe1992accd3a3977b4d8985ebeea9e /etc/rc.local.dpkg-old [ 218s] invoke-rc.d: could not determine current runlevel [ 218s] invoke-rc.d: policy-rc.d denied execution of start. [ 218s] Processing triggers for man-db (2.8.6.1-1) ... [ 218s] [403/419] installing python-nwdiag-1.0.4+dfsg-1 [ 219s] Processing triggers for man-db (2.8.6.1-1) ... [ 219s] [404/419] installing python-apt-1.8.4 [ 220s] [405/419] installing graphviz-2.40.1-7 [ 220s] Processing triggers for man-db (2.8.6.1-1) ... [ 221s] [406/419] installing texlive-bibtex-extra-2019.20190710-1 [ 226s] Processing triggers for tex-common (6.12) ... [ 226s] Running mktexlsr. This may take some time... done. [ 227s] Processing triggers for man-db (2.8.6.1-1) ... [ 227s] [407/419] installing texlive-latex-recommended-2019.20190710-1 [ 229s] Processing triggers for tex-common (6.12) ... [ 229s] Running mktexlsr. This may take some time... done. [ 229s] Processing triggers for man-db (2.8.6.1-1) ... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:30:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:30:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5d4ba463d23b7_7cea2ad01a4d85f4603913@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_18.10/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 643s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 645s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 645s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 645s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 646s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 646s] #include [ 646s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 646s] compilation terminated. [ 646s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 646s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 646s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 646s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 646s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 646s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 646s] make[1]: *** [Makefile:380: all] Error 2 [ 646s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 646s] dh_auto_build: make -j1 returned exit code 2 [ 646s] make: *** [debian/rules:45: build] Error 2 [ 646s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 646s] [ 646s] cloud125 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:30:44 UTC 2019. [ 646s] [ 646s] ### VM INTERACTION START ### [ 649s] [ 592.405867] sysrq: SysRq : Power Off [ 649s] [ 592.450908] reboot: Power down [ 650s] ### VM INTERACTION END ### [ 650s] [ 650s] cloud125 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:30:49 UTC 2019. [ 650s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:33:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:33:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5d4ba47e7865c_7cea2ad01a4d85f46040b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_10/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 431s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 433s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 433s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 434s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 434s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 434s] #include [ 434s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 434s] compilation terminated. [ 434s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 434s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 434s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 434s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 434s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 434s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 434s] make[1]: *** [Makefile:380: all] Error 2 [ 434s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 434s] dh_auto_build: make -j1 returned exit code 2 [ 434s] make: *** [debian/rules:45: build] Error 2 [ 434s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 434s] [ 434s] lamb53 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:33:06 UTC 2019. [ 434s] [ 434s] ### VM INTERACTION START ### [ 437s] [ 416.685447] sysrq: SysRq : Power Off [ 437s] [ 416.707160] reboot: Power down [ 437s] ### VM INTERACTION END ### [ 437s] [ 437s] lamb53 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:33:10 UTC 2019. [ 437s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:33:51 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:33:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <5d4ba481a29de_7cea2ad01a4d85f46041c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 541s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 542s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 542s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 542s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 542s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 542s] #include [ 542s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 542s] compilation terminated. [ 542s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 542s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 542s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 542s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 542s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 542s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 542s] make[1]: *** [Makefile:380: all] Error 2 [ 542s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 542s] dh_auto_build: make -j1 returned exit code 2 [ 542s] make: *** [debian/rules:45: build] Error 2 [ 542s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 542s] [ 542s] build77 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:33:45 UTC 2019. [ 542s] [ 542s] ### VM INTERACTION START ### [ 546s] [ 530.389794] sysrq: SysRq : Power Off [ 546s] [ 530.393475] reboot: Power down [ 546s] ### VM INTERACTION END ### [ 546s] [ 546s] build77 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:33:49 UTC 2019. [ 546s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:35:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:35:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5d4ba488768f1_7cea2ad01a4d85f4604323@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_10/aarch64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 727s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 732s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 733s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 733s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 733s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 733s] #include [ 733s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 733s] compilation terminated. [ 733s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 733s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 733s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 733s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 733s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 733s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 733s] make[1]: *** [Makefile:380: all] Error 2 [ 733s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 733s] dh_auto_build: make -j1 returned exit code 2 [ 733s] make: *** [debian/rules:45: build] Error 2 [ 733s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 733s] [ 733s] obs-arm-7 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:35:28 UTC 2019. [ 733s] [ 733s] ### VM INTERACTION START ### [ 737s] [ 707.166191] sysrq: Power Off [ 737s] [ 707.172752] reboot: Power down [ 737s] ### VM INTERACTION END ### [ 737s] [ 737s] obs-arm-7 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:35:32 UTC 2019. [ 737s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:38:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:38:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5d4ba4a0323bd_7cea2ad01a4d85f4604680@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_10/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 503s] #define HAVE_STDLIB_H 1 [ 503s] #define HAVE_STRING_H 1 [ 503s] #define HAVE_MEMORY_H 1 [ 503s] #define HAVE_STRINGS_H 1 [ 503s] #define HAVE_INTTYPES_H 1 [ 503s] #define HAVE_STDINT_H 1 [ 503s] #define HAVE_UNISTD_H 1 [ 503s] #define HAVE_DLFCN_H 1 [ 503s] #define LT_OBJDIR ".libs/" [ 503s] #define STDC_HEADERS 1 [ 503s] #define HAVE_BYTESWAP_H 1 [ 503s] #define TIME_WITH_SYS_TIME 1 [ 503s] [ 503s] configure: exit 1 [ 503s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 503s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 2 [ 503s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 503s] make: *** [debian/rules:6: build] Error 2 [ 503s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 503s] [ 503s] morla3 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:38:25 UTC 2019. [ 503s] [ 503s] ### VM INTERACTION START ### [ 506s] [ 480.003189] sysrq: SysRq : Power Off [ 506s] [ 480.017127] reboot: Power down [ 506s] ### VM INTERACTION END ### [ 506s] [ 506s] morla3 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:38:29 UTC 2019. [ 506s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:39:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:39:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba4b6b9d6c_7cea2ad01a4d85f4604783@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 693s] #include [ 693s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 693s] compilation terminated. [ 693s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 693s] make[4]: *** [assignment_fsm.o] Error 1 [ 693s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 693s] Makefile:405: recipe for target 'all-recursive' failed [ 693s] make[3]: *** [all-recursive] Error 1 [ 693s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 693s] Makefile:448: recipe for target 'all-recursive' failed [ 693s] make[2]: *** [all-recursive] Error 1 [ 693s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 693s] Makefile:380: recipe for target 'all' failed [ 693s] make[1]: *** [all] Error 2 [ 693s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 693s] dh_auto_build: make -j1 returned exit code 2 [ 693s] debian/rules:45: recipe for target 'build' failed [ 693s] make: *** [build] Error 2 [ 693s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 693s] [ 693s] lamb12 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:39:40 UTC 2019. [ 693s] [ 693s] ### VM INTERACTION START ### [ 696s] [ 652.585414] sysrq: SysRq : Power Off [ 696s] [ 652.602980] reboot: Power down [ 697s] ### VM INTERACTION END ### [ 697s] [ 697s] lamb12 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 02:39:45 UTC 2019. [ 697s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:45:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:45:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba4df282b3_7cea2ad01a4d85f46052e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 8s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 10s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 15s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 15s] 2nd stage started in virtual machine [ 15s] machine type: x86_64 [ 15s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 15s] Increasing log level from now on... [ 15s] [ 5.214227] sysrq: SysRq : Changing Loglevel [ 15s] [ 5.214829] sysrq: Loglevel set to 4 [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] [ 15s] failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:09:20 UTC 2019. [ 15s] [ 15s] ### VM INTERACTION START ### [ 18s] [ 8.253887] sysrq: SysRq : Power Off [ 18s] [ 8.255663] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] build73 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:09:23 UTC 2019. [ 18s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:46:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:46:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5d4ba4e9b350c_7cea2ad01a4d85f46054c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 1493s] #define HAVE_MEMORY_H 1 [ 1493s] #define HAVE_STRINGS_H 1 [ 1493s] #define HAVE_INTTYPES_H 1 [ 1493s] #define HAVE_STDINT_H 1 [ 1493s] #define HAVE_UNISTD_H 1 [ 1493s] #define HAVE_DLFCN_H 1 [ 1493s] #define LT_OBJDIR ".libs/" [ 1493s] #define STDC_HEADERS 1 [ 1493s] #define HAVE_BYTESWAP_H 1 [ 1493s] #define TIME_WITH_SYS_TIME 1 [ 1493s] [ 1493s] configure: exit 1 [ 1493s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 1493s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 1493s] make[1]: *** [override_dh_auto_configure] Error 2 [ 1493s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1493s] debian/rules:6: recipe for target 'build' failed [ 1493s] make: *** [build] Error 2 [ 1493s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1493s] [ 1493s] lamb22 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:46:51 UTC 2019. [ 1493s] [ 1493s] ### VM INTERACTION START ### [ 1496s] [ 1386.666448] sysrq: SysRq : Power Off [ 1496s] [ 1386.686408] reboot: Power down [ 1496s] ### VM INTERACTION END ### [ 1496s] [ 1496s] lamb22 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 02:46:55 UTC 2019. [ 1496s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:51:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:51:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d4ba4ffb653e_7cea2ad01a4d85f4606024@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Raspbian_10/armv7l Package network:osmocom:latest/osmo-mgw failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 527s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 538s] # Make absolutely sure that the %.check target is updated. [ 538s] touch osmomgw-usermanual.check [ 538s] # Do print the WARNING output but return error if any was found [ 538s] # (grep -v would omit the WARNING output from the log). [ 538s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 538s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 538s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 538s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 538s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 538s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 538s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 538s] make[2]: *** [Makefile:793: check] Error 2 [ 538s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 538s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 538s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 538s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 538s] make: *** [debian/rules:17: build] Error 2 [ 538s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 538s] [ 538s] armbuild24 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:51:06 UTC 2019. [ 538s] [ 538s] ### VM INTERACTION START ### [ 541s] [ 517.342534] sysrq: SysRq : Power Off [ 541s] [ 517.361662] reboot: Power down [ 542s] ### VM INTERACTION END ### [ 542s] [ 542s] armbuild24 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:51:10 UTC 2019. [ 542s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 02:51:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 02:51:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_10/armv7l In-Reply-To: References: Message-ID: <5d4ba500af13e_7cea2ad01a4d85f46061e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_10/armv7l Package network:osmocom:latest/osmo-mgw failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 807s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 814s] # Make absolutely sure that the %.check target is updated. [ 814s] touch osmomgw-usermanual.check [ 814s] # Do print the WARNING output but return error if any was found [ 814s] # (grep -v would omit the WARNING output from the log). [ 814s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 814s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 814s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 814s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 814s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 814s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 814s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 814s] make[2]: *** [Makefile:793: check] Error 2 [ 814s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 814s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 814s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 814s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 814s] make: *** [debian/rules:17: build] Error 2 [ 814s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 814s] [ 814s] obs-arm-6 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:51:12 UTC 2019. [ 814s] [ 814s] ### VM INTERACTION START ### [ 817s] [ 752.680300] sysrq: SysRq : Power Off [ 817s] [ 752.708716] reboot: Power down [ 819s] ### VM INTERACTION END ### [ 819s] [ 819s] obs-arm-6 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 02:51:17 UTC 2019. [ 819s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:41 +0000 Subject: Build failure of network:osmocom:latest/osmocom-latest in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba69d27edd_7cea2ad01a4d85f462264e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmocom-latest/Debian_Testing/x86_64 Package network:osmocom:latest/osmocom-latest failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 19s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 19s] 2nd stage started in virtual machine [ 19s] machine type: x86_64 [ 19s] [ 3.541094] sysrq: SysRq : Changing Loglevel [ 19s] [ 3.541979] sysrq: Loglevel set to 4 [ 19s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 19s] Increasing log level from now on... [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] [ 19s] failed "build osmocom-latest_0.0.0.dsc" at Thu Aug 8 04:06:25 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 23s] [ 6.632392] sysrq: SysRq : Power Off [ 23s] [ 6.638609] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb24 failed "build osmocom-latest_0.0.0.dsc" at Thu Aug 8 04:06:29 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:59 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba69f824d2_7cea2ad01a4d85f46231ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Testing/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 16s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 17s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 22s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 22s] 2nd stage started in virtual machine [ 22s] machine type: x86_64 [ 22s] Linux version: 4[ 3.490062] sysrq: SysRq : Changing Loglevel [ 22s] [ 3.491951] sysrq: Loglevel set to 4 [ 22s] .12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 22s] Increasing log level from now on... [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] [ 22s] failed "build libusrp_3.4.2.20190807.dsc" at Thu Aug 8 04:06:50 UTC 2019. [ 22s] [ 22s] ### VM INTERACTION START ### [ 25s] [ 6.567471] sysrq: SysRq : Power Off [ 25s] [ 6.575746] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb57 failed "build libusrp_3.4.2.20190807.dsc" at Thu Aug 8 04:06:53 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:41 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba69e88ef8_7cea2ad01a4d85f462296e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_Testing/x86_64 Package network:osmocom:nightly/limesuite failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 9s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 14s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 14s] 2nd stage started in virtual machine [ 14s] machine type: x86_64 [ 14s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 14s] Increasing log level from now on... [ 14s] [ 2.961156] sysrq: SysRq : Changing Loglevel [ 14s] [ 2.962179] sysrq: Loglevel set to 4 [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] [ 14s] failed "build limesuite_19.04.0-1.dsc" at Thu Aug 8 04:06:32 UTC 2019. [ 14s] [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.016505] sysrq: SysRq : Power Off [ 17s] [ 6.022754] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] sheep83 failed "build limesuite_19.04.0-1.dsc" at Thu Aug 8 04:06:36 UTC 2019. [ 17s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:41 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba69c8424e_7cea2ad01a4d85f46225c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Testing/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 8s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 9s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 15s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 15s] 2nd stage started in virtual machine [ 15s] machine type: x86_64 [ 15s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 15s] Increasing log level from now on... [ 15s] [ 5.837152] sysrq: SysRq : Changing Loglevel [ 15s] [ 5.837980] sysrq: Loglevel set to 4 [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 16s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 16s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 16s] [ 16s] failed "build osmocom-nightly_0.0.0.20190807.dsc" at Thu Aug 8 04:06:23 UTC 2019. [ 16s] [ 16s] ### VM INTERACTION START ### [ 19s] [ 8.885267] sysrq: SysRq : Power Off [ 19s] [ 8.887087] reboot: Power down [ 19s] ### VM INTERACTION END ### [ 19s] [ 19s] build79 failed "build osmocom-nightly_0.0.0.20190807.dsc" at Thu Aug 8 04:06:27 UTC 2019. [ 19s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:41 +0000 Subject: Build failure of network:osmocom:latest/libusrp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba69dec664_7cea2ad01a4d85f46228b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libusrp/Debian_Testing/x86_64 Package network:osmocom:latest/libusrp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libusrp Last lines of build log: [ 9s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 14s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 14s] 2nd stage started in virtual machine [ 14s] machine type: x86_64 [ 14s] Linux version: 4[ 3.006416] sysrq: SysRq : Changing Loglevel [ 14s] .12.14-lp151.28.[ 3.007102] sysrq: Loglevel set to 4 [ 14s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 14s] Increasing log level from now on... [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] [ 14s] failed "build libusrp_3.4.3.dsc" at Thu Aug 8 04:06:28 UTC 2019. [ 14s] [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.059185] sysrq: SysRq : Power Off [ 17s] [ 6.066897] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] sheep84 failed "build libusrp_3.4.3.dsc" at Thu Aug 8 04:06:33 UTC 2019. [ 17s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a01e1be_7cea2ad01a4d85f46232a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 10s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 14s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 14s] 2nd stage started in virtual machine [ 14s] machine type: x86_64 [ 14s] [ 2.972399] sysrq: SysRq : Changing Loglevel [ 14s] [ 2.973074] sysrq: Loglevel set to 4 [ 14s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 14s] Increasing log level from now on... [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] [ 14s] failed "build osmo-gsm-manuals-dev_0.1.1.9.5275.dsc" at Thu Aug 8 04:06:36 UTC 2019. [ 14s] [ 14s] ### VM INTERACTION START ### [ 18s] [ 6.029944] sysrq: SysRq : Power Off [ 18s] [ 6.035820] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] sheep84 failed "build osmo-gsm-manuals-dev_0.1.1.9.5275.dsc" at Thu Aug 8 04:06:41 UTC 2019. [ 18s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:59 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a06b886_7cea2ad01a4d85f46233ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Testing/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 11s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] Linux version: 4[ 3.438380] sysrq: SysRq : Changing Loglevel [ 17s] .12.14-lp151.28.[ 3.440333] sysrq: Loglevel set to 4 [ 17s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build orcania_1.2.9-5.dsc" at Thu Aug 8 04:06:38 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.519220] sysrq: SysRq : Power Off [ 20s] [ 6.525289] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb25 failed "build orcania_1.2.9-5.dsc" at Thu Aug 8 04:06:41 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:41 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba69da0b25_7cea2ad01a4d85f462276f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Testing/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 11s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] Linux version: 4[ 3.430999] sysrq: SysRq : Changing Loglevel [ 17s] .12.14-lp151.28.[ 3.432758] sysrq: Loglevel set to 4 [ 17s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build libasn1c_0.9.31.4.cd14.dsc" at Thu Aug 8 04:06:29 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.518405] sysrq: SysRq : Power Off [ 20s] [ 6.527217] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb15 failed "build libasn1c_0.9.31.4.cd14.dsc" at Thu Aug 8 04:06:32 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a1a9fc8_7cea2ad01a4d85f462359@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 12s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] Linux version: 4.12.14-lp151.28.[ 3.344598] sysrq: SysRq : Changing Loglevel [ 17s] 10-default #1 SM[ 3.346436] sysrq: Loglevel set to 4 [ 17s] P Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build osmo-python-tests_0.0.9.20190807.dsc" at Thu Aug 8 04:06:45 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.427064] sysrq: SysRq : Power Off [ 20s] [ 6.435729] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb74 failed "build osmo-python-tests_0.0.9.20190807.dsc" at Thu Aug 8 04:06:48 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:06:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:06:59 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a121328_7cea2ad01a4d85f4623427@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 13s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 19s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 19s] 2nd stage started in virtual machine [ 19s] machine type: x86_64 [ 19s] Linux version: 4[ 3.905630] sysrq: SysRq : Changing Loglevel [ 19s] .12.14-lp151.28.[ 3.906967] sysrq: Loglevel set to 4 [ 19s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 19s] Increasing log level from now on... [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] [ 19s] failed "build rtl-sdr_0.5.4.15.8183.dsc" at Thu Aug 8 04:06:41 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.027812] sysrq: SysRq : Power Off [ 22s] [ 7.035677] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb18 failed "build rtl-sdr_0.5.4.15.8183.dsc" at Thu Aug 8 04:06:45 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:00 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:00 +0000 Subject: Build failure of network:osmocom:nightly/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a27008b_7cea2ad01a4d85f46236ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/Debian_Testing/x86_64 Package network:osmocom:nightly/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: [ 15s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 17s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 25s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 25s] 2nd stage started in virtual machine [ 26s] machine type: x86_64 [ 26s] [ 7.764871] sysrq: SysRq : Changing Loglevel [ 26s] [ 7.765759] sysrq: Loglevel set to 4 [ 26s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 26s] Increasing log level from now on... [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] [ 26s] failed "build orcania_1.2.9-5.dsc" at Thu Aug 8 04:06:53 UTC 2019. [ 26s] [ 26s] ### VM INTERACTION START ### [ 29s] [ 11.074247] sysrq: SysRq : Power Off [ 29s] [ 11.111285] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] lamb62 failed "build orcania_1.2.9-5.dsc" at Thu Aug 8 04:06:57 UTC 2019. [ 29s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a2eed7f_7cea2ad01a4d85f46237d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 13s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 19s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 19s] 2nd stage started in virtual machine [ 19s] machine type: x86_64 [ 19s] Linux version: 4[ 3.727871] sysrq: SysRq : Changing Loglevel [ 19s] .12.14-lp151.28.[ 3.728892] sysrq: Loglevel set to 4 [ 19s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 19s] Increasing log level from now on... [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] [ 19s] failed "build osmo-sysmon_0.2.0.dsc" at Thu Aug 8 04:07:11 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 6.826693] sysrq: SysRq : Power Off [ 22s] [ 6.833273] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb56 failed "build osmo-sysmon_0.2.0.dsc" at Thu Aug 8 04:07:15 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:16 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a392596_7cea2ad01a4d85f46238a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Testing/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 13s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 13s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 19s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 19s] 2nd stage started in virtual machine [ 19s] machine type: x86_64 [ 19s] Linux version: 4[ 3.557102] sysrq: SysRq : Changing Loglevel [ 19s] .12.14-lp151.28.[ 3.558169] sysrq: Loglevel set to 4 [ 19s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 19s] Increasing log level from now on... [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] [ 19s] failed "build eclipse-titan_6.5.0-1.dsc" at Thu Aug 8 04:06:59 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 6.633291] sysrq: SysRq : Power Off [ 22s] [ 6.640081] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb20 failed "build eclipse-titan_6.5.0-1.dsc" at Thu Aug 8 04:07:02 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:16 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a42269d_7cea2ad01a4d85f4623937@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Testing/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 32s] booting kvm... [ 32s] ### VM INTERACTION START ### [ 32s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3000 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 34s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 34s] Booting from ROM... [ 40s] c[?7l### VM INTERACTION END ### [ 40s] 2nd stage started in virtual machine [ 41s] [ 6.596972] sysrq: SysRq : Changing Loglevel [ 41s] [ 6.598404] sysrq: Loglevel set to 4 [ 41s] machine type: x86_64 [ 41s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 41s] Increasing log level from now on... [ 41s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 41s] [ 41s] failed "build libasn1c_0.9.32.dsc" at Thu Aug 8 04:06:59 UTC 2019. [ 41s] [ 42s] ### VM INTERACTION START ### [ 45s] [ 10.025718] sysrq: SysRq : Power Off [ 45s] [ 10.048222] reboot: Power down [ 45s] ### VM INTERACTION END ### [ 45s] [ 45s] cloud111 failed "build libasn1c_0.9.32.dsc" at Thu Aug 8 04:07:03 UTC 2019. [ 45s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:16 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a51db7b_7cea2ad01a4d85f4624043@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 11s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] [ 3.426568] sysrq: SysRq : Changing Loglevel [ 17s] [ 3.427323] sysrq: Loglevel set to 4 [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build simtrace2_0.5.1.34.e026.dsc" at Thu Aug 8 04:07:09 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.499188] sysrq: SysRq : Power Off [ 20s] [ 6.507030] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb10 failed "build simtrace2_0.5.1.34.e026.dsc" at Thu Aug 8 04:07:12 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a572648_7cea2ad01a4d85f4624146@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 12s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] [ 3.570420] sysrq: SysRq : Changing Loglevel [ 17s] [ 3.571319] sysrq: Loglevel set to 4 [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build osmo-sysmon_0.2.0.dsc" at Thu Aug 8 04:07:09 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.653895] sysrq: SysRq : Power Off [ 20s] [ 6.660961] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb07 failed "build osmo-sysmon_0.2.0.dsc" at Thu Aug 8 04:07:12 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a5bc420_7cea2ad01a4d85f4624279@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 12s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] [ 3.445855] sysrq: SysRq : Changing Loglevel [ 17s] [ 3.446731] sysrq: Loglevel set to 4 [ 17s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build osmo-sip-connector_1.2.0.dsc" at Thu Aug 8 04:07:09 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.525898] sysrq: SysRq : Power Off [ 20s] [ 6.538646] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb28 failed "build osmo-sip-connector_1.2.0.dsc" at Thu Aug 8 04:07:13 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:33 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a669559_7cea2ad01a4d85f46243ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Testing/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 21s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 21s] 2nd stage started in virtual machine [ 21s] machine type: x86_64 [ 21s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:[ 4.986270] sysrq: SysRq : Changing Loglevel [ 21s] 59:31 UTC 2019 ([ 4.987224] sysrq: Loglevel set to 4 [ 21s] 0ab03b7) [ 21s] Increasing log level from now on... [ 21s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] [ 21s] failed "build simtrace2_0.5.1.dsc" at Thu Aug 8 04:07:16 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 8.147726] sysrq: SysRq : Power Off [ 24s] [ 8.162625] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb03 failed "build simtrace2_0.5.1.dsc" at Thu Aug 8 04:07:19 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a739659_7cea2ad01a4d85f462456c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 2200 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 19s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 24s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 24s] 2nd stage started in virtual machine [ 25s] machine type: x86_64 [ 25s] Linux version: 4[ 5.287091] sysrq: SysRq : Changing Loglevel [ 25s] [ 5.287816] sysrq: Loglevel set to 4 [ 25s] .12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 25s] Increasing log level from now on... [ 25s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] [ 25s] failed "build osmo-pcap_0.1.0.1.210e.dsc" at Thu Aug 8 04:07:19 UTC 2019. [ 25s] [ 25s] ### VM INTERACTION START ### [ 28s] [ 8.601679] sysrq: SysRq : Power Off [ 28s] [ 8.658112] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] build33 failed "build osmo-pcap_0.1.0.1.210e.dsc" at Thu Aug 8 04:07:22 UTC 2019. [ 28s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a781bb7_7cea2ad01a4d85f462461a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 34s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 43s] booting kvm... [ 43s] ### VM INTERACTION START ### [ 43s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3000 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 44s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 49s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 49s] 2nd stage started in virtual machine [ 50s] machine type: x86_64 [ 50s] [ 6.003520] sysrq: SysRq : Changing Loglevel [ 50s] [ 6.004940] sysrq: Loglevel set to 4 [ 50s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 50s] Increasing log level from now on... [ 51s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 51s] [ 51s] failed "build osmo-gsm-manuals-dev_0.1.1.dsc" at Thu Aug 8 04:07:19 UTC 2019. [ 51s] [ 51s] ### VM INTERACTION START ### [ 54s] [ 9.410893] sysrq: SysRq : Power Off [ 54s] [ 9.416214] reboot: Power down [ 54s] ### VM INTERACTION END ### [ 54s] [ 54s] cloud114 failed "build osmo-gsm-manuals-dev_0.1.1.dsc" at Thu Aug 8 04:07:23 UTC 2019. [ 54s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a7c722c_7cea2ad01a4d85f4624770@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 43s] [ OK ] Closed udev Control Socket. [ 43s] Starting Cleanup udevd DB... [ 43s] [ OK ] Started Cleanup udevd DB. [ 43s] [ OK ] Reached target Switch Root. [ 43s] Starting Switch Root... [ 45s] ### VM INTERACTION END ### [ 45s] 2nd stage started in virtual machine [ 46s] machine type: x86_64 [ 46s] [ 17.438859] sysrq: SysRq : Changing Loglevel [ 46s] [ 17.440256] sysrq: Loglevel set to 4 [ 46s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 46s] Increasing log level from now on... [ 47s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 47s] [ 47s] failed "build osmo-fl2k_0.1.1.13.fb20.dsc" at Thu Aug 8 04:07:19 UTC 2019. [ 47s] [ 47s] ### VM INTERACTION START ### [ 50s] [ 20.827498] sysrq: SysRq : Power Off [ 50s] [ 20.870692] reboot: Power down [ 50s] ### VM INTERACTION END ### [ 50s] [ 50s] cloud113 failed "build osmo-fl2k_0.1.1.13.fb20.dsc" at Thu Aug 8 04:07:23 UTC 2019. [ 50s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:33 +0000 Subject: Build failure of network:osmocom:latest/limesuite in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6a81cb30_7cea2ad01a4d85f462481d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/limesuite/Debian_Testing/x86_64 Package network:osmocom:latest/limesuite failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest limesuite Last lines of build log: [ 26s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 37s] booting kvm... [ 37s] ### VM INTERACTION START ### [ 37s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3000 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 38s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 44s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 44s] 2nd stage started in virtual machine [ 46s] machine type: x86_64 [ 46s] [ 7.036719] sysrq: SysRq : Changing Loglevel [ 46s] [ 7.038121] sysrq: Loglevel set to 4 [ 46s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 46s] Increasing log level from now on... [ 46s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 46s] [ 46s] failed "build limesuite_19.04.0-1.dsc" at Thu Aug 8 04:07:20 UTC 2019. [ 46s] [ 46s] ### VM INTERACTION START ### [ 49s] [ 10.434699] sysrq: SysRq : Power Off [ 49s] [ 10.440516] reboot: Power down [ 50s] ### VM INTERACTION END ### [ 50s] [ 50s] cloud123 failed "build limesuite_19.04.0-1.dsc" at Thu Aug 8 04:07:25 UTC 2019. [ 50s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6aa5f8d0_7cea2ad01a4d85f462502b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4[ 3.733001] sysrq: SysRq : Changing Loglevel [ 20s] .12.14-lp151.28.[ 3.734110] sysrq: Loglevel set to 4 [ 20s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] [ 20s] failed "build osmo-sip-connector_1.2.0.20.a2b7.dsc" at Thu Aug 8 04:07:33 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 6.830119] sysrq: SysRq : Power Off [ 23s] [ 6.836776] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb58 failed "build osmo-sip-connector_1.2.0.20.a2b7.dsc" at Thu Aug 8 04:07:36 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6ab23e8b_7cea2ad01a4d85f462517c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] [ 3.340537] sysrq: SysRq : Changing Loglevel [ 20s] [ 3.341376] sysrq: Loglevel set to 4 [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] [ 20s] failed "build osmo-hlr_1.0.0.49.e493.dsc" at Thu Aug 8 04:07:34 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 6.429803] sysrq: SysRq : Power Off [ 23s] [ 6.438265] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb25 failed "build osmo-hlr_1.0.0.49.e493.dsc" at Thu Aug 8 04:07:37 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6ac9bab1_7cea2ad01a4d85f46252f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 15s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 2200 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 18s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 23s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 23s] 2nd stage started in virtual machine [ 23s] machine type: x86_64 [ 23s] [ 4.639494] sysrq: SysRq : Changing Loglevel [ 23s] [ 4.640081] sysrq: Loglevel set to 4 [ 23s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 23s] Increasing log level from now on... [ 23s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] [ 23s] failed "build osmo-bts_0.8.1.359.b4d8.dsc" at Thu Aug 8 04:07:34 UTC 2019. [ 23s] [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.852178] sysrq: SysRq : Power Off [ 26s] [ 7.856368] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] build31 failed "build osmo-bts_0.8.1.359.b4d8.dsc" at Thu Aug 8 04:07:37 UTC 2019. [ 26s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:50 +0000 Subject: Build failure of network:osmocom:nightly/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6ad25282_7cea2ad01a4d85f46253b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/yder/Debian_Testing/x86_64 Package network:osmocom:nightly/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly yder Last lines of build log: [ 10s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 12s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 18s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 18s] 2nd stage started in virtual machine [ 18s] machine type: x86_64 [ 18s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 18s] Increasing log level from now on... [ 18s] [ 5.770649] sysrq: SysRq : Changing Loglevel [ 18s] [ 5.771491] sysrq: Loglevel set to 4 [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] [ 18s] failed "build yder_1.4.4-4.1.dsc" at Thu Aug 8 04:07:37 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 8.827084] sysrq: SysRq : Power Off [ 21s] [ 8.829307] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] build70 failed "build yder_1.4.4-4.1.dsc" at Thu Aug 8 04:07:40 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6af706a9_7cea2ad01a4d85f4625434@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: [ 21s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 30s] booting kvm... [ 31s] ### VM INTERACTION START ### [ 31s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3000 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 32s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 37s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 37s] 2nd stage started in virtual machine [ 39s] machine type: x86_64 [ 39s] Linux version: 4.12.14-lp151.28.[ 6.339688] sysrq: SysRq : Changing Loglevel [ 39s] [ 6.341743] sysrq: Loglevel set to 4 [ 39s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 39s] Increasing log level from now on... [ 39s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 39s] [ 39s] failed "build osmo-pcap_0.1.1.dsc" at Thu Aug 8 04:07:43 UTC 2019. [ 39s] [ 39s] ### VM INTERACTION START ### [ 43s] [ 9.772308] sysrq: SysRq : Power Off [ 43s] [ 9.814295] reboot: Power down [ 43s] ### VM INTERACTION END ### [ 43s] [ 43s] cloud105 failed "build osmo-pcap_0.1.1.dsc" at Thu Aug 8 04:07:47 UTC 2019. [ 43s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:07:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:07:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b0c0e4_7cea2ad01a4d85f462557f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 13s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 19s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 19s] 2nd stage started in virtual machine [ 19s] machine type: x86_64 [ 19s] Linux version: 4[ 3.351640] sysrq: SysRq : Changing Loglevel [ 19s] .12.14-lp151.28.[ 3.353906] sysrq: Loglevel set to 4 [ 19s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 19s] Increasing log level from now on... [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] [ 19s] failed "build osmo-pcu_0.6.0.87.cd2a.dsc" at Thu Aug 8 04:07:30 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 6.427600] sysrq: SysRq : Power Off [ 22s] [ 6.436777] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb11 failed "build osmo-pcu_0.6.0.87.cd2a.dsc" at Thu Aug 8 04:07:33 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:07 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b0eda44_7cea2ad01a4d85f46256dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Testing/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 16s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 25s] booting kvm... [ 25s] ### VM INTERACTION START ### [ 25s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3000 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 26s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 31s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 31s] 2nd stage started in virtual machine [ 33s] machine type: x86_64 [ 33s] Linux version: 4[ 6.112886] sysrq: SysRq : Changing Loglevel [ 33s] [ 6.114345] sysrq: Loglevel set to 4 [ 33s] .12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 33s] Increasing log level from now on... [ 33s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 33s] [ 33s] failed "build yder_1.4.4-4.1.dsc" at Thu Aug 8 04:07:49 UTC 2019. [ 33s] [ 33s] ### VM INTERACTION START ### [ 36s] [ 9.444952] sysrq: SysRq : Power Off [ 36s] [ 9.462300] reboot: Power down [ 36s] ### VM INTERACTION END ### [ 36s] [ 36s] cloud113 failed "build yder_1.4.4-4.1.dsc" at Thu Aug 8 04:07:53 UTC 2019. [ 36s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b1d79d9_7cea2ad01a4d85f46258cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 9s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 14s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 14s] 2nd stage started in virtual machine [ 14s] machine type: x86_64 [ 14s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 14s] Increasing log level from now on... [ 14s] [ 3.036772] sysrq: SysRq : Changing Loglevel [ 14s] [ 3.037361] sysrq: Loglevel set to 4 [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 14s] [ 14s] failed "build osmo-pcu_0.7.0.dsc" at Thu Aug 8 04:07:58 UTC 2019. [ 14s] [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.101966] sysrq: SysRq : Power Off [ 17s] [ 6.108912] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] sheep81 failed "build osmo-pcu_0.7.0.dsc" at Thu Aug 8 04:08:02 UTC 2019. [ 17s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b18dce3_7cea2ad01a4d85f46257de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] [ 3.434560] sysrq: SysRq : Changing Loglevel [ 20s] [ 3.435484] sysrq: Loglevel set to 4 [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] [ 20s] failed "build osmo-mgw_1.5.0.83.f54eb.dsc" at Thu Aug 8 04:07:59 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 6.521006] sysrq: SysRq : Power Off [ 23s] [ 6.526997] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb16 failed "build osmo-mgw_1.5.0.83.f54eb.dsc" at Thu Aug 8 04:08:02 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:07 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b22f17f_7cea2ad01a4d85f4625912@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Testing/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 13s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 18s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 18s] 2nd stage started in virtual machine [ 19s] machine type: x86_64 [ 19s] [ 3.682550] sysrq: SysRq : Changing Loglevel [ 19s] [ 3.683372] sysrq: Loglevel set to 4 [ 19s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 19s] Increasing log level from now on... [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 19s] [ 19s] failed "build openbsc_1.3.0.dsc" at Thu Aug 8 04:07:59 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 6.755982] sysrq: SysRq : Power Off [ 22s] [ 6.765453] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb57 failed "build openbsc_1.3.0.dsc" at Thu Aug 8 04:08:03 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b37b85_7cea2ad01a4d85f46260ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4[ 3.456181] sysrq: SysRq : Changing Loglevel [ 20s] .12.14-lp151.28.[ 3.457287] sysrq: Loglevel set to 4 [ 20s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] [ 20s] failed "build osmo-hlr_1.1.0.dsc" at Thu Aug 8 04:08:10 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 6.539874] sysrq: SysRq : Power Off [ 23s] [ 6.548473] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb10 failed "build osmo-hlr_1.1.0.dsc" at Thu Aug 8 04:08:13 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b362417_7cea2ad01a4d85f462616c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 14s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4[ 3.320641] sysrq: SysRq : Changing Loglevel [ 20s] .12.14-lp151.28.[ 3.321719] sysrq: Loglevel set to 4 [ 20s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] [ 20s] failed "build osmo-bts_1.1.0.dsc" at Thu Aug 8 04:08:13 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 6.393432] sysrq: SysRq : Power Off [ 23s] [ 6.401134] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb24 failed "build osmo-bts_1.1.0.dsc" at Thu Aug 8 04:08:16 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:41 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b42c25a_7cea2ad01a4d85f462625e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_Testing/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 12s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 18s] machine type: x86_64 [ 18s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 18s] Increasing log level from now on... [ 18s] [ 3.281457] sysrq: SysRq : Changing Loglevel [ 18s] [ 3.282294] sysrq: Loglevel set to 4 [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] [ 18s] failed "build openbsc_1.3.0.20190807.dsc" at Thu Aug 8 04:08:28 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 6.365123] sysrq: SysRq : Power Off [ 21s] [ 6.372975] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb51 failed "build openbsc_1.3.0.20190807.dsc" at Thu Aug 8 04:08:31 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:41 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b497f63_7cea2ad01a4d85f462635c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 12s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 17s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 17s] 2nd stage started in virtual machine [ 17s] machine type: x86_64 [ 17s] [ 3.288275] sysrq: SysRq : Changing Loglevel [ 17s] Linux version: 4[ 3.289595] sysrq: Loglevel set to 4 [ 17s] .12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 17s] Increasing log level from now on... [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 17s] [ 17s] failed "build ulfius_2.5.2-4.1.dsc" at Thu Aug 8 04:08:29 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.367296] sysrq: SysRq : Power Off [ 20s] [ 6.376241] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb74 failed "build ulfius_2.5.2-4.1.dsc" at Thu Aug 8 04:08:32 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:41 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b4e2e19_7cea2ad01a4d85f4626494@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 12s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 18s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 18s] 2nd stage started in virtual machine [ 18s] machine type: x86_64 [ 18s] [ 3.610539] sysrq: SysRq : Changing Loglevel [ 18s] Linux version: 4[ 3.611296] sysrq: Loglevel set to 4 [ 18s] .12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 18s] Increasing log level from now on... [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 18s] [ 18s] failed "build ulfius_2.5.2-4.1.dsc" at Thu Aug 8 04:08:30 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 6.697818] sysrq: SysRq : Power Off [ 21s] [ 6.705456] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb59 failed "build ulfius_2.5.2-4.1.dsc" at Thu Aug 8 04:08:33 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b540419_7cea2ad01a4d85f46265ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 17s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 18s] booting kvm... [ 18s] ### VM INTERACTION START ### [ 18s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 19s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 23s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 23s] 2nd stage started in virtual machine [ 23s] machine type: x86_64 [ 23s] [ 3.561975] sysrq: SysRq : Changing Loglevel [ 23s] [ 3.563479] sysrq: Loglevel set to 4 [ 23s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 23s] Increasing log level from now on... [ 23s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 23s] [ 23s] failed "build osmo-sgsn_1.4.0.39.e456e.dsc" at Thu Aug 8 04:08:32 UTC 2019. [ 23s] [ 23s] ### VM INTERACTION START ### [ 26s] [ 6.630304] sysrq: SysRq : Power Off [ 26s] [ 6.638346] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 27s] lamb56 failed "build osmo-sgsn_1.4.0.39.e456e.dsc" at Thu Aug 8 04:08:36 UTC 2019. [ 27s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b59e4f9_7cea2ad01a4d85f4626687@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 15s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 20s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 20s] 2nd stage started in virtual machine [ 20s] machine type: x86_64 [ 20s] Linux version: 4[ 3.391300] sysrq: SysRq : Changing Loglevel [ 20s] .12.14-lp151.28.[ 3.392449] sysrq: Loglevel set to 4 [ 20s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 20s] Increasing log level from now on... [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 20s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 21s] [ 21s] failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:08:40 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 6.459939] sysrq: SysRq : Power Off [ 24s] [ 6.468279] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb09 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:08:43 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b660d68_7cea2ad01a4d85f46268c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 8s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 12s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 12s] 2nd stage started in virtual machine [ 12s] machine type: x86_64 [ 12s] Linux version: 4[ 2.996682] sysrq: SysRq : Changing Loglevel [ 12s] .12.14-lp151.28.[ 2.998318] sysrq: Loglevel set to 4 [ 12s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 12s] Increasing log level from now on... [ 12s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 12s] [ 12s] failed "build osmo-sgsn_1.4.1.dsc" at Thu Aug 8 04:08:46 UTC 2019. [ 12s] [ 12s] ### VM INTERACTION START ### [ 15s] [ 6.062168] sysrq: SysRq : Power Off [ 15s] [ 6.068801] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] sheep84 failed "build osmo-sgsn_1.4.1.dsc" at Thu Aug 8 04:08:50 UTC 2019. [ 16s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b61f1e1_7cea2ad01a4d85f4626773@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 16s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 17s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 22s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 22s] 2nd stage started in virtual machine [ 22s] machine type: x86_64 [ 22s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 ([ 3.948936] sysrq: SysRq : Changing Loglevel [ 22s] 0ab03b7) [ 22s] Increa[ 3.949953] sysrq: Loglevel set to 4 [ 22s] sing log level from now on... [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] [ 22s] failed "build osmo-bsc_1.4.0.109.caec1.dsc" at Thu Aug 8 04:08:45 UTC 2019. [ 22s] [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.021892] sysrq: SysRq : Power Off [ 25s] [ 7.028137] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb05 failed "build osmo-bsc_1.4.0.109.caec1.dsc" at Thu Aug 8 04:08:49 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:08:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:08:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b6a75bf_7cea2ad01a4d85f462692e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 16s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8000 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 18s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 22s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 22s] 2nd stage started in virtual machine [ 22s] machine type: x86_64 [ 22s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 22s] Increasing log level from now on... [ 22s] [ 3.556137] sysrq: SysRq : Changing Loglevel [ 22s] [ 3.557061] sysrq: Loglevel set to 4 [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] [ 22s] failed "build osmo-msc_1.3.1.187.75bdb.dsc" at Thu Aug 8 04:08:47 UTC 2019. [ 22s] [ 22s] ### VM INTERACTION START ### [ 25s] [ 6.636268] sysrq: SysRq : Power Off [ 25s] [ 6.640898] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] morla5 failed "build osmo-msc_1.3.1.187.75bdb.dsc" at Thu Aug 8 04:08:50 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:09:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:09:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b7ad563_7cea2ad01a4d85f462713d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 19s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 21s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 25s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 25s] 2nd stage started in virtual machine [ 26s] machine type: x86_64 [ 26s] Linux version: 4[ 4.007902] sysrq: SysRq : Changing Loglevel [ 26s] .12.14-lp151.28.[ 4.009485] sysrq: Loglevel set to 4 [ 26s] 10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 26s] Increasing log level from now on... [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 26s] [ 26s] failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:09:06 UTC 2019. [ 26s] [ 26s] ### VM INTERACTION START ### [ 29s] [ 7.159074] sysrq: SysRq : Power Off [ 29s] [ 7.165296] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:09:10 UTC 2019. [ 29s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:09:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:09:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b836be9_7cea2ad01a4d85f462729c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 8s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 13s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 13s] 2nd stage started in virtual machine [ 13s] machine type: x86_64 [ 13s] Linux version: 4.12.14-lp151.28.[ 3.109012] sysrq: SysRq : Changing Loglevel [ 13s] 10-default #1 SM[ 3.110417] sysrq: Loglevel set to 4 [ 13s] P Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 13s] Increasing log level from now on... [ 13s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 13s] [ 13s] failed "build osmo-msc_1.4.0.dsc" at Thu Aug 8 04:09:18 UTC 2019. [ 13s] [ 13s] ### VM INTERACTION START ### [ 16s] [ 6.164594] sysrq: SysRq : Power Off [ 16s] [ 6.170496] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] sheep81 failed "build osmo-msc_1.4.0.dsc" at Thu Aug 8 04:09:21 UTC 2019. [ 16s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:09:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:09:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b87b987_7cea2ad01a4d85f46273c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 8s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 10s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 15s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 15s] 2nd stage started in virtual machine [ 15s] machine type: x86_64 [ 15s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 15s] Increasing log level from now on... [ 15s] [ 5.214227] sysrq: SysRq : Changing Loglevel [ 15s] [ 5.214829] sysrq: Loglevel set to 4 [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 15s] [ 15s] failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:09:20 UTC 2019. [ 15s] [ 15s] ### VM INTERACTION START ### [ 18s] [ 8.253887] sysrq: SysRq : Power Off [ 18s] [ 8.255663] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] build73 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:09:23 UTC 2019. [ 18s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:09:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:09:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6b9173fb_7cea2ad01a4d85f46274dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 16s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 17s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 22s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 22s] 2nd stage started in virtual machine [ 22s] machine type: x86_64 [ 22s] [ 3.921142] sysrq: SysRq : Changing Loglevel [ 22s] [ 3.921995] sysrq: Loglevel set to 4 [ 22s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 22s] Increasing log level from now on... [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 22s] [ 22s] failed "build osmo-remsim_0.2.1.2.a008.dsc" at Thu Aug 8 04:09:16 UTC 2019. [ 22s] [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.030008] sysrq: SysRq : Power Off [ 25s] [ 7.048573] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb22 failed "build osmo-remsim_0.2.1.2.a008.dsc" at Thu Aug 8 04:09:20 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:10:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:10:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6baa29b2_7cea2ad01a4d85f4627621@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 18s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 19s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 20s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 25s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 25s] 2nd stage started in virtual machine [ 25s] machine type: x86_64 [ 25s] Linux version: 4[ 4.387605] sysrq: SysRq : Changing Loglevel [ 25s] .12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 25s] Increasing log level from now on... [ 25s] [ 4.398487] sysrq: Loglevel set to 4 [ 25s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 25s] [ 25s] failed "build osmo-trx_1.0.0.102.c7ac.dsc" at Thu Aug 8 04:10:04 UTC 2019. [ 25s] [ 25s] ### VM INTERACTION START ### [ 29s] [ 7.521358] sysrq: SysRq : Power Off [ 29s] [ 7.539391] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] lamb18 failed "build osmo-trx_1.0.0.102.c7ac.dsc" at Thu Aug 8 04:10:09 UTC 2019. [ 29s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:10:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:10:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4ba6bcd862e_7cea2ad01a4d85f4627730@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 28s] objdump: /boot/vmlinuz: warning: ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section .bss [ 46s] booting kvm... [ 47s] ### VM INTERACTION START ### [ 47s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/vmlinuz -initrd /boot/initrd -append root=/dev/sda rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3000 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device ide-hd,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device ide-hd,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 48s] c[?7lSeaBIOS (version rel-1.12.0-0-ga698c89-prebuilt.qemu.org) [ 54s] Booting from ROM..c[?7l### VM INTERACTION END ### [ 54s] 2nd stage started in virtual machine [ 56s] machine type: x86_64 [ 56s] [ 7.291229] sysrq: SysRq : Changing Loglevel [ 56s] [ 7.292659] sysrq: Loglevel set to 4 [ 56s] Linux version: 4.12.14-lp151.28.10-default #1 SMP Sat Jul 13 17:59:31 UTC 2019 (0ab03b7) [ 56s] Increasing log level from now on... [ 56s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 56s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 56s] mkdir: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 56s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 56s] mount: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 56s] mkswap: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 56s] swapon: error while loading shared libraries: libpcre2-8.so.0: cannot open shared object file: No such file or directory [ 57s] [ 57s] failed "build osmo-remsim_0.2.1.dsc" at Thu Aug 8 04:10:20 UTC 2019. [ 57s] [ 57s] ### VM INTERACTION START ### [ 60s] [ 10.936233] sysrq: SysRq : Power Off [ 60s] [ 10.969770] reboot: Power down [ 60s] ### VM INTERACTION END ### [ 60s] [ 60s] cloud128 failed "build osmo-remsim_0.2.1.dsc" at Thu Aug 8 04:10:24 UTC 2019. [ 60s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:20:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:20:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4ba6cddc369_7cea2ad01a4d85f4628036@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 229s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 232s] # Make absolutely sure that the %.check target is updated. [ 232s] touch osmomgw-usermanual.check [ 232s] # Do print the WARNING output but return error if any was found [ 232s] # (grep -v would omit the WARNING output from the log). [ 232s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 232s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 232s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 232s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 232s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 232s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 232s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 232s] make[2]: *** [Makefile:793: check] Error 2 [ 232s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 232s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 232s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 232s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 232s] make: *** [debian/rules:17: build] Error 2 [ 232s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 232s] [ 232s] sheep84 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:19:52 UTC 2019. [ 232s] [ 232s] ### VM INTERACTION START ### [ 235s] [ 223.484705] sysrq: SysRq : Power Off [ 235s] [ 223.488939] reboot: Power down [ 235s] ### VM INTERACTION END ### [ 235s] [ 235s] sheep84 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:19:55 UTC 2019. [ 235s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:24:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:24:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4ba6d3a78e_7cea2ad01a4d85f462836d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 418s] #define HAVE_STDLIB_H 1 [ 418s] #define HAVE_STRING_H 1 [ 418s] #define HAVE_MEMORY_H 1 [ 418s] #define HAVE_STRINGS_H 1 [ 418s] #define HAVE_INTTYPES_H 1 [ 418s] #define HAVE_STDINT_H 1 [ 418s] #define HAVE_UNISTD_H 1 [ 418s] #define HAVE_DLFCN_H 1 [ 418s] #define LT_OBJDIR ".libs/" [ 418s] #define STDC_HEADERS 1 [ 418s] #define HAVE_BYTESWAP_H 1 [ 418s] #define TIME_WITH_SYS_TIME 1 [ 418s] [ 418s] configure: exit 1 [ 418s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 418s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255 [ 418s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 418s] make: *** [debian/rules:6: build] Error 2 [ 418s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 419s] [ 419s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:23:51 UTC 2019. [ 419s] [ 419s] ### VM INTERACTION START ### [ 422s] [ 400.652104] sysrq: SysRq : Power Off [ 422s] [ 400.658641] reboot: Power down [ 422s] ### VM INTERACTION END ### [ 422s] [ 422s] lamb62 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:23:56 UTC 2019. [ 422s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:24:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:24:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4ba6d442483_7cea2ad01a4d85f46284a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_9.0/armv7l Package network:osmocom:latest/osmo-mgw failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 740s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 740s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 740s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 740s] Makefile:380: recipe for target 'check-recursive' failed [ 740s] make[4]: *** [check-recursive] Error 1 [ 740s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 740s] Makefile:499: recipe for target 'check-recursive' failed [ 740s] make[3]: *** [check-recursive] Error 1 [ 740s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 740s] Makefile:790: recipe for target 'check' failed [ 740s] make[2]: *** [check] Error 2 [ 740s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 740s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 740s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 740s] make[1]: *** [override_dh_auto_test] Error 1 [ 740s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 740s] debian/rules:17: recipe for target 'build' failed [ 740s] make: *** [build] Error 2 [ 740s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 740s] [ 740s] armbuild04 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:24:46 UTC 2019. [ 740s] [ 740s] ### VM INTERACTION START ### [ 743s] [ 653.193663] sysrq: SysRq : Power Off [ 743s] [ 653.220764] reboot: Power down [ 743s] ### VM INTERACTION END ### [ 743s] [ 743s] armbuild04 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:24:49 UTC 2019. [ 743s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:28:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:28:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4ba6f563eca_7cea2ad01a4d85f4628885@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 364s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 365s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 366s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 366s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 366s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 366s] #include [ 366s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 366s] compilation terminated. [ 366s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 366s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 366s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 366s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 366s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 366s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 366s] make[1]: *** [Makefile:380: all] Error 2 [ 366s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 366s] dh_auto_build: make -j1 returned exit code 2 [ 366s] make: *** [debian/rules:45: build] Error 255 [ 366s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 366s] [ 366s] lamb01 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:28:25 UTC 2019. [ 366s] [ 366s] ### VM INTERACTION START ### [ 369s] [ 352.723686] sysrq: SysRq : Power Off [ 369s] [ 352.732255] reboot: Power down [ 369s] ### VM INTERACTION END ### [ 369s] [ 369s] lamb01 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:28:28 UTC 2019. [ 369s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:29:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:29:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4ba6f6d6064_7cea2ad01a4d85f46289c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-mgw failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 440s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:86: recipe for target 'osmomgw-usermanual.check' failed [ 440s] make[5]: *** [osmomgw-usermanual.check] Error 1 [ 440s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 440s] Makefile:380: recipe for target 'check-recursive' failed [ 440s] make[4]: *** [check-recursive] Error 1 [ 440s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 440s] Makefile:499: recipe for target 'check-recursive' failed [ 440s] make[3]: *** [check-recursive] Error 1 [ 440s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 440s] Makefile:790: recipe for target 'check' failed [ 440s] make[2]: *** [check] Error 2 [ 440s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 440s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 440s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 440s] make[1]: *** [override_dh_auto_test] Error 1 [ 440s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 440s] debian/rules:17: recipe for target 'build' failed [ 440s] make: *** [build] Error 2 [ 440s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 440s] [ 440s] armbuild02 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:29:33 UTC 2019. [ 440s] [ 440s] ### VM INTERACTION START ### [ 443s] [ 413.455705] sysrq: SysRq : Power Off [ 443s] [ 413.459021] reboot: Power down [ 443s] ### VM INTERACTION END ### [ 443s] [ 443s] armbuild02 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 04:29:36 UTC 2019. [ 443s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:30:07 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:30:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d4ba6f798b63_7cea2ad01a4d85f46290ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Raspbian_10/armv7l Package network:osmocom:latest/osmo-bsc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 1018s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 1023s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 1024s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 1025s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 1025s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 1025s] #include [ 1025s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 1025s] compilation terminated. [ 1025s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 1025s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 1025s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 1025s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1025s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 1025s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1025s] make[1]: *** [Makefile:380: all] Error 2 [ 1025s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1025s] dh_auto_build: make -j1 returned exit code 2 [ 1025s] make: *** [debian/rules:45: build] Error 2 [ 1025s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1026s] [ 1026s] obs-arm-5 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:29:51 UTC 2019. [ 1026s] [ 1026s] ### VM INTERACTION START ### [ 1029s] [ 958.538898] sysrq: SysRq : Power Off [ 1029s] [ 958.559685] reboot: Power down [ 1030s] ### VM INTERACTION END ### [ 1030s] [ 1030s] obs-arm-5 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:29:55 UTC 2019. [ 1030s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:31:16 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:31:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4ba6f9647e8_7cea2ad01a4d85f462934c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_9.0/armv7l Package network:osmocom:latest/osmo-trx failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 455s] #define HAVE_MEMORY_H 1 [ 455s] #define HAVE_STRINGS_H 1 [ 455s] #define HAVE_INTTYPES_H 1 [ 455s] #define HAVE_STDINT_H 1 [ 455s] #define HAVE_UNISTD_H 1 [ 455s] #define HAVE_DLFCN_H 1 [ 455s] #define LT_OBJDIR ".libs/" [ 455s] #define STDC_HEADERS 1 [ 455s] #define HAVE_BYTESWAP_H 1 [ 455s] #define TIME_WITH_SYS_TIME 1 [ 455s] [ 455s] configure: exit 1 [ 455s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 455s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 455s] make[1]: *** [override_dh_auto_configure] Error 2 [ 455s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 455s] debian/rules:6: recipe for target 'build' failed [ 455s] make: *** [build] Error 2 [ 455s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 455s] [ 455s] armbuild21 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:31:02 UTC 2019. [ 455s] [ 455s] ### VM INTERACTION START ### [ 457s] [ 434.496320] sysrq: SysRq : Power Off [ 457s] [ 434.497633] reboot: Power down [ 458s] ### VM INTERACTION END ### [ 458s] [ 458s] armbuild21 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:31:06 UTC 2019. [ 458s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:32:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:32:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4ba70abbc86_7cea2ad01a4d85f46294e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-trx failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 550s] #define HAVE_MEMORY_H 1 [ 550s] #define HAVE_STRINGS_H 1 [ 550s] #define HAVE_INTTYPES_H 1 [ 550s] #define HAVE_STDINT_H 1 [ 550s] #define HAVE_UNISTD_H 1 [ 550s] #define HAVE_DLFCN_H 1 [ 550s] #define LT_OBJDIR ".libs/" [ 550s] #define STDC_HEADERS 1 [ 550s] #define HAVE_BYTESWAP_H 1 [ 550s] #define TIME_WITH_SYS_TIME 1 [ 550s] [ 550s] configure: exit 1 [ 550s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 550s] debian/rules:12: recipe for target 'override_dh_auto_configure' failed [ 550s] make[1]: *** [override_dh_auto_configure] Error 2 [ 550s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 550s] debian/rules:6: recipe for target 'build' failed [ 550s] make: *** [build] Error 2 [ 550s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 550s] [ 550s] armbuild22 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:32:39 UTC 2019. [ 550s] [ 550s] ### VM INTERACTION START ### [ 553s] [ 528.372943] sysrq: SysRq : Power Off [ 553s] [ 528.557031] reboot: Power down [ 554s] ### VM INTERACTION END ### [ 554s] [ 554s] armbuild22 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:32:44 UTC 2019. [ 554s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:41:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:41:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d4ba818eb273_7cea2ad01a4d85f4629758@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Raspbian_10/armv7l Package network:osmocom:latest/osmo-trx failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 648s] ac_cv_path_SED=/bin/sed [ 648s] ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config [ 648s] ac_cv_path_install='/usr/bin/install -c' [ 648s] ac_cv_path_lt_DD=/bin/dd [ 648s] ac_cv_path_mkdir=/bin/mkdir [ 648s] ac_cv_prog_AWK=gawk [ 648s] ac_cv_prog_CPP='gcc -E' [ 648s] ac_cv_prog_CXXCPP='g++ -E' [ 648s] ac_cv_prog_ac_ct_AR=ar [ 648s] ac_cv_prog_ac_ct_CC=gcc [ 648s] ac_cv_prog_ac_ct_CXX=g++ [ 648s] ac_cv_prog_ac_ct_DLLTOOL=dlltool [ 648s] ac_cv_prog_ac_ct_OBJDUMP=objdump [ 648s] ac_cv_prog_ac_ct_RANLIB=ranlib [ 648s] ac_cv_prog_ac_ct_STRIP=strip [ 648s] ac_cv_prog_cc_c89= [ 648s] ac_cv_prog_cc_g=yes [ 648s] ac_cv_prog_cxx_g=yes [ 648s] ac_cv_prog_make_make_set=yes [ 648s] ac_cv_target=arm-unknown-linux-gnueabihf [ 648s] ac_cv_type_size_t=yes [ 648s] am_cv_CCAS_dependencies_compiler_type=none [ 648s] am_cv_CC_dependencies_compiler_type=none [ 650s] am_cv_CXX_dependencies_[ 601.394977] sysrq: SysRq : Power Off [ 650s] [ 601.429817] reboot: Power down [ 650s] ### VM INTERACTION END ### [ 651s] [ 651s] armbuild01 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:41:18 UTC 2019. [ 651s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:45:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:45:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4ba9071d8a9_7cea2ad01a4d85f462984b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-bsc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 727s] #include [ 727s] ^ [ 727s] compilation terminated. [ 727s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 727s] make[4]: *** [assignment_fsm.o] Error 1 [ 727s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 727s] Makefile:405: recipe for target 'all-recursive' failed [ 727s] make[3]: *** [all-recursive] Error 1 [ 727s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 727s] Makefile:448: recipe for target 'all-recursive' failed [ 727s] make[2]: *** [all-recursive] Error 1 [ 727s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 727s] Makefile:380: recipe for target 'all' failed [ 727s] make[1]: *** [all] Error 2 [ 727s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 727s] dh_auto_build: make -j1 returned exit code 2 [ 727s] debian/rules:45: recipe for target 'build' failed [ 727s] make: *** [build] Error 2 [ 727s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 727s] [ 727s] armbuild01 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:45:34 UTC 2019. [ 727s] [ 727s] ### VM INTERACTION START ### [ 730s] [ 693.087317] sysrq: SysRq : Power Off [ 730s] [ 693.089200] reboot: Power down [ 730s] ### VM INTERACTION END ### [ 731s] [ 731s] armbuild01 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:45:37 UTC 2019. [ 731s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:46:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:46:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_10/armv7l In-Reply-To: References: Message-ID: <5d4ba944df0fc_7cea2ad01a4d85f463002a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_10/armv7l Package network:osmocom:latest/osmo-trx failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 792s] | #define PACKAGE_NAME "osmo-trx" [ 792s] | #define PACKAGE_TARNAME "osmo-trx" [ 792s] | #define PACKAGE_VERSION "1.1.0" [ 792s] | #define PACKAGE_STRING "osmo-trx 1.1.0" [ 792s] | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 792s] | #define PACKAGE_URL "" [ 792s] | #define PACKAGE "osmo-trx" [ 792s] | #define VERSION "1.1.0" [ 792s] | #define HAVE_CXX11 1 [ 792s] | #define STDC_HEADERS 1 [ 792s] | #define HAVE_SYS_TYPES_H 1 [ 792s] | #define HAVE_SYS_STAT_H 1 [ 792s] | #define HAVE_STDLIB_H 1 [ 792s] | #define HAVE_STRING_H 1 [ 792s] | #define HAVE_MEMORY_H 1 [ 792s] | #define HAVE_STRINGS_H 1 [ 792s] | #define HAVE_INTTYPES_H 1 [ 792s] | #define HAVE_STDINT_H 1 [ 792s] | #define HAVE_UNISTD_H 1 [ 792s] | #define HAVE_DLFCN_H 1 [ 792s] | #define LT_OBJDIR ".libs/" [ 792s] | #define STDC_HEADERS 1 [ 792s] | #define HAVE_BYTESWAP_H 1 [ 794s] | #defi[ 749.115408] sysrq: SysRq : Power Off [ 794s] [ 749.116633] reboot: Power down [ 795s] ### VM INTERACTION END ### [ 795s] [ 795s] armbuild01 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 04:46:57 UTC 2019. [ 795s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:47:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:47:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5d4ba98214d4c_7cea2ad01a4d85f46301d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_9.0/armv7l Package network:osmocom:latest/osmo-bsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 1031s] #include [ 1031s] ^ [ 1031s] compilation terminated. [ 1031s] Makefile:623: recipe for target 'assignment_fsm.o' failed [ 1031s] make[4]: *** [assignment_fsm.o] Error 1 [ 1031s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 1031s] Makefile:405: recipe for target 'all-recursive' failed [ 1031s] make[3]: *** [all-recursive] Error 1 [ 1031s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1031s] Makefile:448: recipe for target 'all-recursive' failed [ 1031s] make[2]: *** [all-recursive] Error 1 [ 1031s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1031s] Makefile:380: recipe for target 'all' failed [ 1031s] make[1]: *** [all] Error 2 [ 1031s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1031s] dh_auto_build: make -j1 returned exit code 2 [ 1031s] debian/rules:45: recipe for target 'build' failed [ 1031s] make: *** [build] Error 2 [ 1031s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 1031s] [ 1031s] obs-arm-5 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:47:30 UTC 2019. [ 1031s] [ 1031s] ### VM INTERACTION START ### [ 1035s] [ 998.673837] sysrq: SysRq : Power Off [ 1035s] [ 998.706456] reboot: Power down [ 1035s] ### VM INTERACTION END ### [ 1035s] [ 1035s] obs-arm-5 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:47:33 UTC 2019. [ 1035s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 04:50:26 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 04:50:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_10/armv7l In-Reply-To: References: Message-ID: <5d4baa19f2564_7cea2ad01a4d85f46302f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_10/armv7l Package network:osmocom:latest/osmo-bsc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 1116s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 1120s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 1122s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 1122s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 1122s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 1122s] #include [ 1122s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 1122s] compilation terminated. [ 1122s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 1122s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 1122s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 1122s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1122s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 1122s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1122s] make[1]: *** [Makefile:380: all] Error 2 [ 1122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1122s] dh_auto_build: make -j1 returned exit code 2 [ 1122s] make: *** [debian/rules:45: build] Error 2 [ 1122s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1122s] [ 1122s] obs-arm-5 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:50:13 UTC 2019. [ 1122s] [ 1122s] ### VM INTERACTION START ### [ 1126s] [ 1041.278855] sysrq: SysRq : Power Off [ 1126s] [ 1041.296921] reboot: Power down [ 1127s] ### VM INTERACTION END ### [ 1127s] [ 1127s] obs-arm-5 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 04:50:18 UTC 2019. [ 1127s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 8 05:10:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 05:10:35 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: fix missing event for IMEISV In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15111 ) Change subject: vlr_lu_fsm: fix missing event for IMEISV ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad Gerrit-Change-Number: 15111 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 05:10:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 05:11:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 05:11:01 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 ) Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 05:11:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 06:21:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 8 Aug 2019 06:21:40 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 ) Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 06:21:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 08:21:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 08:21:07 +0000 Subject: Change in ...simtrace2[master]: Fix builds on Ubuntu 16.04 Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/15112 Change subject: Fix builds on Ubuntu 16.04 ...................................................................... Fix builds on Ubuntu 16.04 The most recent commits introduced 'C99' syntax by declaring variables inside the 'for' statement itself, rather than before. This resulted in compile failures in the Ubuntu 16.04 builds on build.opensuse.org: [ 105s] libcommon/source/usb.c: In function 'SIMtrace_USB_Initialize': [ 105s] libcommon/source/usb.c:679:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:679:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 105s] libcommon/source/usb.c:686:15: error: redefinition of 'i' [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:679:15: note: previous definition of 'i' was here [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:686:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:692:15: error: redefinition of 'i' [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was here [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 105s] ^ [ 105s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' faile Change-Id: Ibdb837ac105664484b10873c2c0d9561051b1c2a --- M firmware/libcommon/source/usb.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/12/15112/1 diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 3efb9fc..9d3072f 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -653,7 +653,7 @@ void SIMtrace_USB_Initialize(void) { - + unsigned int i; /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ #ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; @@ -676,20 +676,20 @@ char device_id_string[32 + 1]; snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x", device_id[0], device_id[1], device_id[2], device_id[3]); - for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { + for (i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { usb_string_serial[2 + 2 * i] = device_id_string[i]; } // put version into USB string usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1); usb_string_version[1] = USBGenericDescriptor_STRING; - for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { + for (i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { usb_string_version[2 + i * 2 + 0] = git_version[i]; usb_string_version[2 + i * 2 + 1] = 0; } // fill extended USB strings - for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { + for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { usb_strings_extended[i] = usb_strings[i]; } usb_strings_extended[SERIAL_STR] = usb_string_serial; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibdb837ac105664484b10873c2c0d9561051b1c2a Gerrit-Change-Number: 15112 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 8 08:25:17 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 08:25:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4bdc789e0be_7cea2ad01a4d85f46618ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 258s] #define HAVE_STDLIB_H 1 [ 258s] #define HAVE_STRING_H 1 [ 258s] #define HAVE_MEMORY_H 1 [ 258s] #define HAVE_STRINGS_H 1 [ 258s] #define HAVE_INTTYPES_H 1 [ 258s] #define HAVE_STDINT_H 1 [ 258s] #define HAVE_UNISTD_H 1 [ 258s] #define HAVE_DLFCN_H 1 [ 258s] #define LT_OBJDIR ".libs/" [ 258s] #define STDC_HEADERS 1 [ 258s] #define HAVE_BYTESWAP_H 1 [ 258s] #define TIME_WITH_SYS_TIME 1 [ 258s] [ 258s] configure: exit 1 [ 258s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 258s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255 [ 258s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 258s] make: *** [debian/rules:6: build] Error 2 [ 258s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 258s] [ 258s] sheep84 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 08:25:00 UTC 2019. [ 258s] [ 258s] ### VM INTERACTION START ### [ 261s] [ 247.651174] sysrq: SysRq : Power Off [ 261s] [ 247.657024] reboot: Power down [ 261s] ### VM INTERACTION END ### [ 261s] [ 261s] sheep84 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 08:25:03 UTC 2019. [ 261s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 08:31:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 08:31:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4bde015086f_7cea2ad01a4d85f46622db@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 309s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 313s] # Make absolutely sure that the %.check target is updated. [ 313s] touch osmomgw-usermanual.check [ 313s] # Do print the WARNING output but return error if any was found [ 313s] # (grep -v would omit the WARNING output from the log). [ 313s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 313s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 313s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 313s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 313s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 313s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 313s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 313s] make[2]: *** [Makefile:793: check] Error 2 [ 313s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 313s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 313s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 313s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 313s] make: *** [debian/rules:17: build] Error 2 [ 313s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 313s] [ 313s] lamb14 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 08:31:24 UTC 2019. [ 313s] [ 314s] ### VM INTERACTION START ### [ 317s] [ 299.717929] sysrq: SysRq : Power Off [ 317s] [ 299.724966] reboot: Power down [ 317s] ### VM INTERACTION END ### [ 317s] [ 317s] lamb14 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 08:31:28 UTC 2019. [ 317s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 08:38:24 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 08:38:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4bdf89d4a06_7cea2ad01a4d85f4663335@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 381s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 382s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 383s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 383s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 383s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 383s] #include [ 383s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 383s] compilation terminated. [ 383s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 383s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 383s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 383s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 383s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 383s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 383s] make[1]: *** [Makefile:380: all] Error 2 [ 383s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 383s] dh_auto_build: make -j1 returned exit code 2 [ 383s] make: *** [debian/rules:45: build] Error 255 [ 383s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 383s] [ 383s] lamb13 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 08:38:11 UTC 2019. [ 383s] [ 383s] ### VM INTERACTION START ### [ 386s] [ 368.356590] sysrq: SysRq : Power Off [ 386s] [ 368.364770] reboot: Power down [ 386s] ### VM INTERACTION END ### [ 386s] [ 386s] lamb13 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 08:38:15 UTC 2019. [ 386s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 8 09:53:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 09:53:17 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 ) Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15110/1/osmo-release.sh File osmo-release.sh: https://gerrit.osmocom.org/#/c/15110/1/osmo-release.sh at 27 PS1, Line 27: return_error=0 I think this return_error should go inside the {} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 09:53:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 09:54:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 09:54:00 +0000 Subject: Change in ...simtrace2[master]: Fix builds on Ubuntu 16.04 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/15112 ) Change subject: Fix builds on Ubuntu 16.04 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibdb837ac105664484b10873c2c0d9561051b1c2a Gerrit-Change-Number: 15112 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 09:54:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:06:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:06:56 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15110 to look at the new patch set (#2). Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control Sample output for current osmo-msc master: Releasing 1.3.1.191-7ea0d -> 1.4.0... ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: exiting due to previous errors make: *** [osmo-release.mk:9: release] Error 1 Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 --- M osmo-release.sh 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/15110/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:08:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:08:23 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E9-5275_=E2=86=92_0=2E2=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15113 Change subject: Bump version: 0.1.1.9-5275 ? 0.2.0 ...................................................................... Bump version: 0.1.1.9-5275 ? 0.2.0 Change-Id: I0d1981a1b049bf5a5272210e8553698a6e1571da --- M debian/changelog 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/13/15113/1 diff --git a/debian/changelog b/debian/changelog index 65f1046..4b35c12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +osmo-gsm-manuals-dev (0.2.0) unstable; urgency=medium + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + * tests: pick up subdirs inside common/chapters + * Makefile.asciidoc.inc: always run verbose asciidoc + * Makefile.asciidoc.inc: warnings check not default + + [ Pau Espin Pedrol ] + * Makefile.asciidoc.inc: Export commondir attribute to asciidoc files + * common: Introduce Osmux documentation + * common: trx_if.adoc: Improve documentation + * common: trx_if.adoc: Add documentation about TRXDv1 and SETFORMAT + + [ Daniel Willmann ] + * counters-overview: Add a section about the stats reporter + + -- Pau Espin Pedrol Thu, 08 Aug 2019 12:07:24 +0200 + osmo-gsm-manuals-dev (0.1.1) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15113 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: I0d1981a1b049bf5a5272210e8553698a6e1571da Gerrit-Change-Number: 15113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:11:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:11:30 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels, clarify some messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels, clarify some messages ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 08 Aug 2019 10:11:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:11:59 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 10:11:59 +0000 Subject: Change in ...osmo-sip-connector[master]: Logging: Make use of Levels, clarify some messages In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 ) Change subject: Logging: Make use of Levels, clarify some messages ...................................................................... Logging: Make use of Levels, clarify some messages Up to now most logging is on LDEBUG, lets make more use of Log Levels. reserve NOTICE for unusual events INFO: normal call setup/teardown DEBUG, well.. it's DEBUG * BYE is not an Error. * 4XX or 5XX response to INVITE is not an Error don't log as such. * 183 does not necessarily mean "ringing". Change those log messages for clarity. Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe --- M src/mncc.c M src/sip.c 2 files changed, 20 insertions(+), 20 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/mncc.c b/src/mncc.c index d8545da..739f50b 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -422,7 +422,7 @@ /* TODO.. now we can continue with the call */ struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DMNCC, LOGL_DEBUG, + LOGP(DMNCC, LOGL_INFO, "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", leg->callref, ip_addr, leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); @@ -515,7 +515,7 @@ memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); - LOGP(DMNCC, LOGL_DEBUG, + LOGP(DMNCC, LOGL_INFO, "Created call(%u) with MNCC leg(%u) IMSI(%.16s)\n", call->id, leg->callref, data->imsi); @@ -624,7 +624,7 @@ if (!leg) return; - LOGP(DMNCC, LOGL_NOTICE, "leg(%u) is now connected.\n", leg->callref); + LOGP(DMNCC, LOGL_INFO, "leg(%u) is now connected.\n", leg->callref); stop_cmd_timer(leg, MNCC_SETUP_COMPL_IND); leg->state = MNCC_CC_CONNECTED; } diff --git a/src/sip.c b/src/sip.c index 327e90f..103eb33 100644 --- a/src/sip.c +++ b/src/sip.c @@ -76,7 +76,7 @@ if (status == 183) sdp_extract_sdp(leg, sip, false); - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg); + LOGP(DSIP, LOGL_INFO, "leg(%p) is now progressing.\n", leg); other->ring_call(other); } @@ -98,7 +98,7 @@ return; } - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id); + LOGP(DSIP, LOGL_INFO, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id); leg->state = SIP_CC_CONNECTED; other->connect_call(other); nua_ack(leg->nua_handle, TAG_END()); @@ -112,7 +112,7 @@ const char *from = NULL, *to = NULL; char ip_addr[INET_ADDRSTRLEN]; - LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); + LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); if (!sdp_screen_sdp(sip)) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); @@ -161,7 +161,7 @@ } struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", + LOGP(DSIP, LOGL_INFO, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", ip_addr, leg->base.port, leg->base.payload_type); @@ -190,7 +190,7 @@ uint16_t port = leg->base.port; char ip_addr[INET_ADDRSTRLEN]; - LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id); + LOGP(DSIP, LOGL_INFO, "re-INVITE for call %s\n", sip->sip_call_id->i_id); struct call_leg *other = call_leg_other(&leg->base); if (!sdp_get_sdp_mode(sip, &mode)) { @@ -209,7 +209,7 @@ struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port); + LOGP(DSIP, LOGL_DEBUG, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port); if (mode == sdp_sendonly) { /* SIP side places call on HOLD */ @@ -226,9 +226,9 @@ } struct in_addr net = { .s_addr = leg->base.ip }; inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port); + LOGP(DSIP, LOGL_DEBUG, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port); if (ip != leg->base.ip || port != leg->base.port) { - LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n"); + LOGP(DSIP, LOGL_INFO, "re-INVITE changes media connection.\n"); if (other->update_rtp) other->update_rtp(leg->base.call->remote); } @@ -343,13 +343,13 @@ else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown SIP status(%d), releasing.\n", leg, status); + LOGP(DSIP, LOGL_INFO, "INVITE got status(%d), releasing leg(%p).\n", status, leg); nua_cancel(leg->nua_handle, TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); if (other) { - LOGP(DSIP, LOGL_DEBUG, "Releasing other leg (%p) with status(%d)\n", other, status); + LOGP(DSIP, LOGL_INFO, "Releasing MNCC leg (%p) with status(%d)\n", other, status); other->cause = status2cause(status); other->release_call(other); } @@ -365,7 +365,7 @@ } else if (event == nua_r_bye || event == nua_r_cancel) { /* our bye or hang up is answered */ struct sip_call_leg *leg = (struct sip_call_leg *) hmagic; - LOGP(DSIP, LOGL_NOTICE, "leg(%p) got resp to %s\n", + LOGP(DSIP, LOGL_INFO, "leg(%p) got resp to %s\n", leg, event == nua_r_bye ? "bye" : "cancel"); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); @@ -374,7 +374,7 @@ struct sip_call_leg *leg = (struct sip_call_leg *) hmagic; struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_ERROR, "leg(%p) got bye, releasing.\n", leg); + LOGP(DSIP, LOGL_INFO, "leg(%p) got bye, releasing.\n", leg); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); @@ -382,7 +382,7 @@ other->release_call(other); } else if (event == nua_i_invite) { /* new incoming leg or re-INVITE */ - LOGP(DSIP, LOGL_NOTICE, "Processing INVITE Call-ID: %s\n", sip->sip_call_id->i_id); + LOGP(DSIP, LOGL_INFO, "Processing INVITE Call-ID: %s\n", sip->sip_call_id->i_id); if (status == 100) { struct sip_call_leg *leg = sip_find_leg(nh); @@ -395,7 +395,7 @@ struct sip_call_leg *leg; struct call_leg *other; - LOGP(DSIP, LOGL_ERROR, "Cancelled on leg(%p)\n", hmagic); + LOGP(DSIP, LOGL_INFO, "Cancelled on leg(%p)\n", hmagic); leg = (struct sip_call_leg *) hmagic; other = call_leg_other(&leg->base); @@ -447,18 +447,18 @@ * to help us here. */ - LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause)); + LOGP(DSIP, LOGL_INFO, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause)); cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text); snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); switch (leg->state) { case SIP_CC_INITIAL: - LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in initial state\n", leg); + LOGP(DSIP, LOGL_INFO, "Cancelling leg(%p) in initial state\n", leg); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); break; case SIP_CC_DLG_CNFD: - LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in confirmed state\n", leg); + LOGP(DSIP, LOGL_INFO, "Cancelling leg(%p) in confirmed state\n", leg); if (leg->dir == SIP_DIR_MT) nua_cancel(leg->nua_handle, TAG_END()); else { -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe Gerrit-Change-Number: 15078 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:12:00 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 10:12:00 +0000 Subject: Change in ...osmo-sip-connector[master]: In hold/retrieve/reinvite, add check that other_leg exists In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 ) Change subject: In hold/retrieve/reinvite, add check that other_leg exists ...................................................................... In hold/retrieve/reinvite, add check that other_leg exists We should always check that the other leg did not somehow dissapear before accessing it. Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 --- M src/mncc.c M src/sip.c 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/mncc.c b/src/mncc.c index 739f50b..f5a44d5 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -703,6 +703,12 @@ LOGP(DMNCC, LOGL_DEBUG, "leg(%u) is requesting hold.\n", leg->callref); other_leg = call_leg_other(&leg->base); + if (!other_leg) { + LOGP(DMNCC, LOGL_ERROR, "leg(%u) other leg gone!\n", + leg->callref); + mncc_send(leg->conn, MNCC_HOLD_REJ, leg->callref); + return; + } other_leg->hold_call(other_leg); mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref); leg->state = MNCC_CC_HOLD; @@ -721,6 +727,14 @@ LOGP(DMNCC, LOGL_DEBUG, "leg(%u) is requesting unhold.\n", leg->callref); other_leg = call_leg_other(&leg->base); + if (!other_leg) { + /* The SIP leg went away while we were holding! */ + LOGP(DMNCC, LOGL_ERROR, "leg(%u) other leg gone!\n", + leg->callref); + mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); + mncc_call_leg_release(&leg->base); + return; + } other_leg->retrieve_call(other_leg); mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref); /* In case of call waiting/swap, At this point we need to tell the MSC to send diff --git a/src/sip.c b/src/sip.c index 103eb33..2b28b4e 100644 --- a/src/sip.c +++ b/src/sip.c @@ -193,6 +193,13 @@ LOGP(DSIP, LOGL_INFO, "re-INVITE for call %s\n", sip->sip_call_id->i_id); struct call_leg *other = call_leg_other(&leg->base); + + if (!other) { + LOGP(DMNCC, LOGL_ERROR, "leg(%p) other leg gone!\n", leg); + sip_release_call(&leg->base); + return; + } + if (!sdp_get_sdp_mode(sip, &mode)) { /* re-INVITE with no SDP. * We should respond with SDP reflecting current session @@ -540,6 +547,11 @@ OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); leg = (struct sip_call_leg *) _leg; other_leg = call_leg_other(&leg->base); + if (!other_leg) { + LOGP(DMNCC, LOGL_ERROR, "leg(%p) other leg gone!\n", leg); + sip_release_call(&leg->base); + return; + } char *sdp = sdp_create_file(leg, other_leg, sdp_sendonly); nua_invite(leg->nua_handle, NUTAG_MEDIA_ENABLE(0), @@ -557,6 +569,11 @@ OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); leg = (struct sip_call_leg *) _leg; other_leg = call_leg_other(&leg->base); + if (!other_leg) { + LOGP(DMNCC, LOGL_ERROR, "leg(%p) other leg gone!\n", leg); + sip_release_call(&leg->base); + return; + } char *sdp = sdp_create_file(leg, other_leg, sdp_sendrecv); nua_invite(leg->nua_handle, NUTAG_MEDIA_ENABLE(0), -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I947aab6c0cc5019929bde1c7012e1a8c3d3472a5 Gerrit-Change-Number: 15079 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:12:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:12:03 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E9-5275_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15113 ) Change subject: Bump version: 0.1.1.9-5275 ? 0.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15113 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: I0d1981a1b049bf5a5272210e8553698a6e1571da Gerrit-Change-Number: 15113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 10:12:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:12:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:12:06 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E9-5275_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15113 ) Change subject: Bump version: 0.1.1.9-5275 ? 0.2.0 ...................................................................... Bump version: 0.1.1.9-5275 ? 0.2.0 Change-Id: I0d1981a1b049bf5a5272210e8553698a6e1571da --- M debian/changelog 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 65f1046..4b35c12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +osmo-gsm-manuals-dev (0.2.0) unstable; urgency=medium + + [ Oliver Smith ] + * contrib/jenkins.sh: run "make maintainer-clean" + * tests: pick up subdirs inside common/chapters + * Makefile.asciidoc.inc: always run verbose asciidoc + * Makefile.asciidoc.inc: warnings check not default + + [ Pau Espin Pedrol ] + * Makefile.asciidoc.inc: Export commondir attribute to asciidoc files + * common: Introduce Osmux documentation + * common: trx_if.adoc: Improve documentation + * common: trx_if.adoc: Add documentation about TRXDv1 and SETFORMAT + + [ Daniel Willmann ] + * counters-overview: Add a section about the stats reporter + + -- Pau Espin Pedrol Thu, 08 Aug 2019 12:07:24 +0200 + osmo-gsm-manuals-dev (0.1.1) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15113 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: I0d1981a1b049bf5a5272210e8553698a6e1571da Gerrit-Change-Number: 15113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:20:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:20:19 +0000 Subject: Change in ...libusrp[master]: debian/rules: Don't delete .tarball-version Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15114 Change subject: debian/rules: Don't delete .tarball-version ...................................................................... debian/rules: Don't delete .tarball-version No other osmocom project does it. Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4 --- M debian/rules 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/14/15114/1 diff --git a/debian/rules b/debian/rules index 5835e95..c00c435 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ override_dh_clean: dh_clean - rm -f tests/package.m4 tests/testsuite .version .tarball-version + rm -f tests/package.m4 tests/testsuite .version override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4 Gerrit-Change-Number: 15114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:32:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:32:18 +0000 Subject: Change in ...libusrp[master]: Fix UNKNOWN version in make dist Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15115 Change subject: Fix UNKNOWN version in make dist ...................................................................... Fix UNKNOWN version in make dist Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 --- M Makefile.am 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/15/15115/1 diff --git a/Makefile.am b/Makefile.am index 553747e..eb149d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ EXTRA_DIST += \ usrp.pc.in \ usrp.iss.in \ - usrp.inf + usrp.inf \ + .version SUBDIRS = host fpga doc firmware @@ -34,4 +35,10 @@ pkgconfig_DATA = \ usrp.pc +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 Gerrit-Change-Number: 15115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:32:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:32:18 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibusrp=5Bmaster=5D=3A_Bump_version=3A_3=2E4=2E3=2E2-8646_=E2=86=92_3=2E4=2E4?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15116 Change subject: Bump version: 3.4.3.2-8646 ? 3.4.4 ...................................................................... Bump version: 3.4.3.2-8646 ? 3.4.4 Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/16/15116/1 diff --git a/debian/changelog b/debian/changelog index 877cc76..a62e533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libusrp (3.4.4) unstable; urgency=medium + + * debian/rules: Don't delete .tarball-version + * Fix UNKNOWN version in make dist + + -- Pau Espin Pedrol Thu, 08 Aug 2019 12:31:57 +0200 + libusrp (3.4.3) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 Gerrit-Change-Number: 15116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 8 10:43:03 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 10:43:03 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4bfcd5be688_7cea2ad01a4d85f4708810@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 336s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 340s] # Make absolutely sure that the %.check target is updated. [ 341s] touch osmomgw-usermanual.check [ 341s] # Do print the WARNING output but return error if any was found [ 341s] # (grep -v would omit the WARNING output from the log). [ 341s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 341s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 341s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 341s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 341s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 341s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 341s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 341s] make[2]: *** [Makefile:793: check] Error 2 [ 341s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 341s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 341s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 341s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 341s] make: *** [debian/rules:17: build] Error 2 [ 341s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 341s] [ 341s] cloud106 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 10:42:35 UTC 2019. [ 341s] [ 341s] ### VM INTERACTION START ### [ 343s] [ 309.639854] sysrq: SysRq : Power Off [ 343s] [ 309.647067] reboot: Power down [ 346s] ### VM INTERACTION END ### [ 347s] [ 347s] cloud106 failed "build osmo-mgw_1.6.0.dsc" at Thu Aug 8 10:42:42 UTC 2019. [ 347s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 10:43:37 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 10:43:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4bfcf377300_7cea2ad01a4d85f4708961@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 725s] #define HAVE_STDLIB_H 1 [ 725s] #define HAVE_STRING_H 1 [ 725s] #define HAVE_MEMORY_H 1 [ 725s] #define HAVE_STRINGS_H 1 [ 725s] #define HAVE_INTTYPES_H 1 [ 725s] #define HAVE_STDINT_H 1 [ 725s] #define HAVE_UNISTD_H 1 [ 725s] #define HAVE_DLFCN_H 1 [ 725s] #define LT_OBJDIR ".libs/" [ 725s] #define STDC_HEADERS 1 [ 725s] #define HAVE_BYTESWAP_H 1 [ 725s] #define TIME_WITH_SYS_TIME 1 [ 725s] [ 725s] configure: exit 1 [ 725s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 725s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255 [ 725s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 725s] make: *** [debian/rules:6: build] Error 2 [ 725s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 725s] [ 725s] lamb60 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 10:43:17 UTC 2019. [ 725s] [ 725s] ### VM INTERACTION START ### [ 729s] [ 665.150030] sysrq: SysRq : Power Off [ 729s] [ 665.159490] reboot: Power down [ 729s] ### VM INTERACTION END ### [ 729s] [ 729s] lamb60 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 10:43:21 UTC 2019. [ 729s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 8 10:54:46 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 08 Aug 2019 10:54:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4bff857eb3e_7cea2ad01a4d85f47130f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 374s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 375s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 375s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 375s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 376s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 376s] #include [ 376s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 376s] compilation terminated. [ 376s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 376s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 376s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 376s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 376s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 376s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 376s] make[1]: *** [Makefile:380: all] Error 2 [ 376s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 376s] dh_auto_build: make -j1 returned exit code 2 [ 376s] make: *** [debian/rules:45: build] Error 255 [ 376s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 376s] [ 376s] lamb27 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 10:54:28 UTC 2019. [ 376s] [ 376s] ### VM INTERACTION START ### [ 379s] [ 358.743454] sysrq: SysRq : Power Off [ 379s] [ 358.756472] reboot: Power down [ 379s] ### VM INTERACTION END ### [ 379s] [ 379s] lamb27 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 10:54:32 UTC 2019. [ 379s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 8 10:59:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 10:59:47 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Check patches under debian/patches apply Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15117 Change subject: osmo-release.sh: Check patches under debian/patches apply ...................................................................... osmo-release.sh: Check patches under debian/patches apply Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439 --- M osmo-release.sh 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/15117/1 diff --git a/osmo-release.sh b/osmo-release.sh index 38f238d..a779a26 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -61,6 +61,22 @@ echo "OK: dependency specific versions in configure.ac and debian/control match" } +# Make sure that patches under debian/patches/ apply: +check_debian_patch_apply() { + if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then + return + fi + for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do + git apply --check $patch + if [ $? -ne 0 ]; then + echo "ERROR: patch no longer applies! $patch" + exit 1 + else + echo "OK: patch applies: $patch" + fi + done +} + BUMPVER=`command -v bumpversion` GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -81,6 +97,7 @@ echo "Releasing $VERSION -> $NEW_VER..." check_configureac_debctrl_deps_match +check_debian_patch_apply if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439 Gerrit-Change-Number: 15117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:00:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 11:00:55 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0-dirty_=E2=86=92_1=2E1=2E1?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15118 Change subject: Bump version: 1.1.0-dirty ? 1.1.1 ...................................................................... Bump version: 1.1.0-dirty ? 1.1.1 Patch release to have debian/patches/build-for-debian8.patch applying correctly again. Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb --- M debian/changelog M debian/patches/build-for-debian8.patch 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/15118/1 diff --git a/debian/changelog b/debian/changelog index c88b703..96cd208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-trx (1.1.1) unstable; urgency=medium + + * UNRELEASED + + -- Pau Espin Pedrol Thu, 08 Aug 2019 13:00:05 +0200 + osmo-trx (1.1.0) unstable; urgency=medium [ Sylvain Munaut ] diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index 6b917c4..cce063c 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, - libosmocore-dev (>= 0.10.0), + libosmocore-dev (>= 0.12.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb Gerrit-Change-Number: 15118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:29:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:29:36 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Check patches under debian/patches apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15117 ) Change subject: osmo-release.sh: Check patches under debian/patches apply ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439 Gerrit-Change-Number: 15117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:29:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:29:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:29:48 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 ) Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 11:29:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:29:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:29:50 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu... In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 ) Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control ...................................................................... osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control Sample output for current osmo-msc master: Releasing 1.3.1.191-7ea0d -> 1.4.0... ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: configure.ac does NOT match debian/control ! ERROR: exiting due to previous errors make: *** [osmo-release.mk:9: release] Error 1 Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 --- M osmo-release.sh 1 file changed, 42 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index e9602aa..38f238d 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -21,6 +21,46 @@ echo "$major" } +# Make sure that depedency requirement versions match in configure.ac vs debian/control. +#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," +check_configureac_debctrl_deps_match() { + configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") + echo "$configureac_list" | \ + { return_error=0 + while read -r dep ver; do + + debctrl_match="$(grep -e "${dep}-dev" ${GIT_TOPDIR}/debian/control | grep ">=")" + debctrl_match_count="$(echo "$debctrl_match" | grep -c ">=")" + if [ "z$debctrl_match_count" != "z0" ]; then + #echo "Dependency <$dep, $ver> from configure.ac matched in debian/control! ($debctrl_match_count)" + if [ "z$debctrl_match_count" != "z1" ]; then + echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!" + else # 1 match: + parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g") + debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g") + debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2) + if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" != "z$debctrl_ver" ]; then + echo "ERROR: configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!" + return_error=1 + #else + # echo "OK: configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>" + fi + fi + fi + done + if [ $return_error -ne 0 ]; then + exit 1 + fi + } + + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + echo "ERROR: exiting due to previous errors" + exit 1 + fi + echo "OK: dependency specific versions in configure.ac and debian/control match" +} + BUMPVER=`command -v bumpversion` GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -40,6 +80,8 @@ echo "Releasing $VERSION -> $NEW_VER..." +check_configureac_debctrl_deps_match + if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then echo "ERROR: Before releasing, please modify some of the libversions: $LIBVERS" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:29:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:29:50 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Check patches under debian/patches apply In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15117 ) Change subject: osmo-release.sh: Check patches under debian/patches apply ...................................................................... osmo-release.sh: Check patches under debian/patches apply Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439 --- M osmo-release.sh 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 38f238d..a779a26 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -61,6 +61,22 @@ echo "OK: dependency specific versions in configure.ac and debian/control match" } +# Make sure that patches under debian/patches/ apply: +check_debian_patch_apply() { + if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then + return + fi + for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do + git apply --check $patch + if [ $? -ne 0 ]; then + echo "ERROR: patch no longer applies! $patch" + exit 1 + else + echo "OK: patch applies: $patch" + fi + done +} + BUMPVER=`command -v bumpversion` GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -81,6 +97,7 @@ echo "Releasing $VERSION -> $NEW_VER..." check_configureac_debctrl_deps_match +check_debian_patch_apply if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439 Gerrit-Change-Number: 15117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:30:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:30:03 +0000 Subject: Change in ...libusrp[master]: debian/rules: Don't delete .tarball-version In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15114 ) Change subject: debian/rules: Don't delete .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4 Gerrit-Change-Number: 15114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:30:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:30:08 +0000 Subject: Change in ...libusrp[master]: Fix UNKNOWN version in make dist In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15115 ) Change subject: Fix UNKNOWN version in make dist ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 Gerrit-Change-Number: 15115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:30:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:30:14 +0000 Subject: Change in ...libusrp[master]: debian/rules: Don't delete .tarball-version In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15114 ) Change subject: debian/rules: Don't delete .tarball-version ...................................................................... debian/rules: Don't delete .tarball-version No other osmocom project does it. Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4 --- M debian/rules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 5835e95..c00c435 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ override_dh_clean: dh_clean - rm -f tests/package.m4 tests/testsuite .version .tarball-version + rm -f tests/package.m4 tests/testsuite .version override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4 Gerrit-Change-Number: 15114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:30:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:30:14 +0000 Subject: Change in ...libusrp[master]: Fix UNKNOWN version in make dist In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15115 ) Change subject: Fix UNKNOWN version in make dist ...................................................................... Fix UNKNOWN version in make dist Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 --- M Makefile.am 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 553747e..eb149d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ EXTRA_DIST += \ usrp.pc.in \ usrp.iss.in \ - usrp.inf + usrp.inf \ + .version SUBDIRS = host fpga doc firmware @@ -34,4 +35,10 @@ pkgconfig_DATA = \ usrp.pc +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 Gerrit-Change-Number: 15115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:30:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:30:18 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibusrp=5Bmaster=5D=3A_Bump_version=3A_3=2E4=2E3=2E2-8646_=E2=86=92_3=2E4=2E4?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15116 ) Change subject: Bump version: 3.4.3.2-8646 ? 3.4.4 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 Gerrit-Change-Number: 15116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 11:30:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 8 Aug 2019 11:30:35 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0-dirty_=E2=86=92_1=2E1=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15118 ) Change subject: Bump version: 1.1.0-dirty ? 1.1.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb Gerrit-Change-Number: 15118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 12:01:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 12:01:07 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Elibusrp=5Bmaster=5D=3A_Bump_version=3A_3=2E4=2E3=2E2-8646_=E2=86=92_3=2E4=2E4?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15116 ) Change subject: Bump version: 3.4.3.2-8646 ? 3.4.4 ...................................................................... Bump version: 3.4.3.2-8646 ? 3.4.4 Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 877cc76..a62e533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libusrp (3.4.4) unstable; urgency=medium + + * debian/rules: Don't delete .tarball-version + * Fix UNKNOWN version in make dist + + -- Pau Espin Pedrol Thu, 08 Aug 2019 12:31:57 +0200 + libusrp (3.4.3) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 Gerrit-Change-Number: 15116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 12:01:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 12:01:59 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0-dirty_=E2=86=92_1=2E1=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15118 ) Change subject: Bump version: 1.1.0-dirty ? 1.1.1 ...................................................................... Bump version: 1.1.0-dirty ? 1.1.1 Patch release to have debian/patches/build-for-debian8.patch applying correctly again. Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb --- M debian/changelog M debian/patches/build-for-debian8.patch 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index c88b703..96cd208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-trx (1.1.1) unstable; urgency=medium + + * UNRELEASED + + -- Pau Espin Pedrol Thu, 08 Aug 2019 13:00:05 +0200 + osmo-trx (1.1.0) unstable; urgency=medium [ Sylvain Munaut ] diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index 6b917c4..cce063c 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, - libosmocore-dev (>= 0.10.0), + libosmocore-dev (>= 0.12.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb Gerrit-Change-Number: 15118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 12:21:26 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 12:21:26 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: fix missing event for IMEISV In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15111 ) Change subject: vlr_lu_fsm: fix missing event for IMEISV ...................................................................... vlr_lu_fsm: fix missing event for IMEISV Event VLR_ULA_E_ID_IMEISV is listed as permitted in VLR_ULA_S_WAIT_LU_COMPL, but is missing from the switch() on the incoming event. So, sending an IMEISV identity during the WAIT_LU_COMPL state would crash osmo-msc. When receiving an IMEISV, vlr_subscr_set_imeisv() in turn calls vlr_subscr_set_imei(), so as far as the lu_fsm is concerned, receiving an IMEISV is identical to receiving an IMEI, and it can continue to send a Check IMEI request to the HLR. Thus simply add VLR_ULA_E_ID_IMEISV to the VLR_ULA_E_ID_IMEI switch case. Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 87bf7a5..454709f 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1253,6 +1253,7 @@ LU_COMPL_VLR_E_NEW_TMSI_ACK, NULL); break; case VLR_ULA_E_ID_IMEI: + case VLR_ULA_E_ID_IMEISV: /* Got the IMEI from ME, now send it to HLR */ vlr_subscr_tx_req_check_imei(lfp->vsub); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad Gerrit-Change-Number: 15111 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:03 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:03 +0000 Subject: Change in ...osmo-dev[master]: add sysmobts-calib.py In-Reply-To: References: Message-ID: Hello pespin, keith, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 to look at the new patch set (#2). Change subject: add sysmobts-calib.py ...................................................................... add sysmobts-calib.py Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 --- A sysmobts-calib.py 1 file changed, 200 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/74/15074/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:07 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:07 +0000 Subject: Change in ...osmo-dev[master]: run.sh: drop -M mncc-socket option from osmo-msc cmdline Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/15119 Change subject: run.sh: drop -M mncc-socket option from osmo-msc cmdline ...................................................................... run.sh: drop -M mncc-socket option from osmo-msc cmdline Since commit [1], the MNCC socket path is configured in the .cfg file. There is no need to pass the -M option to osmo-msc on the cmdline anymore. Also, the udtrace example to launch osmo-msc in run.sh includes a '| tee' so that the -M would be passed as option to tee and breaks that example. [1] cbdd7180a667c2b536ce13d06fa43f61eba215b0 / Ie6352c584c0fce57c617387160c285abf40a5f90 Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e --- M net/templates/run.sh 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/19/15119/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 97592eb..1697429 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -85,7 +85,6 @@ if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" - msc="$msc -M ${MSC_MNCC_SOCKET}" # Require kamailio (PATH hack is needed for Debian) kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e Gerrit-Change-Number: 15119 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:03 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:03 +0000 Subject: Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace In-Reply-To: References: Message-ID: Hello pespin, keith, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 to look at the new patch set (#2). Change subject: run.sh: add comment to show how to enable MNCC udtrace ...................................................................... run.sh: add comment to show how to enable MNCC udtrace Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 --- M net/templates/run.sh 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/75/15075/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:45 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:45 +0000 Subject: Change in ...osmo-dev[master]: kamailio: fixes and tweaks In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks ...................................................................... kamailio: fixes and tweaks This is what I did to get external MNCC with kamailio to work. (As before, only change MSC_MNCC from "internal" to "external ..." in config_* to enable use of kamailio as external MNCC.) Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 --- M net/templates/kamailio.cfg M net/templates/run.sh 2 files changed, 10 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/net/templates/kamailio.cfg b/net/templates/kamailio.cfg index c5b0bf2..b0e2bf3 100644 --- a/net/templates/kamailio.cfg +++ b/net/templates/kamailio.cfg @@ -102,8 +102,8 @@ loadmodule "xlog.so" loadmodule "sanity.so" # loadmodule "ctl.so" -loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" +# loadmodule "cfg_rpc.so" +# loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_NAT diff --git a/net/templates/run.sh b/net/templates/run.sh index 1697429..a42ec52 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -133,15 +133,9 @@ read enter_to_close echo Closing... -if [ "x${MSC_MNCC}" != "xinternal" ]; then - kill %13 %14 - killall osmo-sip-connector - killall kamailio -fi - #ssh bts neels/stop_remote.sh -kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 +kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 killall osmo-msc killall osmo-bsc killall osmo-gbproxy @@ -153,6 +147,13 @@ sudo killall tcpdump killall osmo-ggsn +if [ "x${MSC_MNCC}" != "xinternal" ]; then + # 'killall' seems to work only with the shortened name + killall osmo-sip-connec + killall kamailio +fi + + set +e cp *.cfg "$logdir"/ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:46 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:46 +0000 Subject: Change in ...osmo-dev[master]: osmo-bsc.cfg: remove 'as' config from cs7 In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15076 ) Change subject: osmo-bsc.cfg: remove 'as' config from cs7 ...................................................................... osmo-bsc.cfg: remove 'as' config from cs7 It's not needed and causes confusion with routing-keys when more BSCs show up. Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0 --- M net/templates/osmo-bsc.cfg 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg index 7741b26..10aa0e3 100644 --- a/net/templates/osmo-bsc.cfg +++ b/net/templates/osmo-bsc.cfg @@ -20,9 +20,6 @@ cs7 instance 0 point-code ${BSC_PC} asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 4 ${BSC_PC} network network country code ${MCC} mobile network code ${MNC} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0 Gerrit-Change-Number: 15076 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:46 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:46 +0000 Subject: Change in ...osmo-dev[master]: run.sh: drop -M mncc-socket option from osmo-msc cmdline In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15119 ) Change subject: run.sh: drop -M mncc-socket option from osmo-msc cmdline ...................................................................... run.sh: drop -M mncc-socket option from osmo-msc cmdline Since commit [1], the MNCC socket path is configured in the .cfg file. There is no need to pass the -M option to osmo-msc on the cmdline anymore. Also, the udtrace example to launch osmo-msc in run.sh includes a '| tee' so that the -M would be passed as option to tee and breaks that example. [1] cbdd7180a667c2b536ce13d06fa43f61eba215b0 / Ie6352c584c0fce57c617387160c285abf40a5f90 Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e --- M net/templates/run.sh 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/net/templates/run.sh b/net/templates/run.sh index 97592eb..1697429 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -85,7 +85,6 @@ if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" - msc="$msc -M ${MSC_MNCC_SOCKET}" # Require kamailio (PATH hack is needed for Debian) kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e Gerrit-Change-Number: 15119 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:47 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:47 +0000 Subject: Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15075 ) Change subject: run.sh: add comment to show how to enable MNCC udtrace ...................................................................... run.sh: add comment to show how to enable MNCC udtrace Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 --- M net/templates/run.sh 1 file changed, 6 insertions(+), 0 deletions(-) diff --git a/net/templates/run.sh b/net/templates/run.sh index 3244b11..97592eb 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -66,6 +66,12 @@ hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" +# To enable udtrace on osmo-msc MNCC socket, use this with adjusted /path/to/udtrace: +# - LD_LIBRARY_PATH allows linking to titan if udtrace was compiled with titan support. +# - LD_PRELOAD of libasan allows building osmo-msc with the sanitize.opts. +# - the tee saves the stderr logging as well as the udtrace output to new file current_log/osmo-msc.out, since udtrace +# will not show in osmo-msc.log +#msc="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/path/to/udtrace/libudtrace.so osmo-msc 2>&1 | tee -a current_log/osmo-msc.out" gbproxy="osmo-gbproxy" sgsn="osmo-sgsn" ggsn="osmo-ggsn" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:44:47 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 13:44:47 +0000 Subject: Change in ...osmo-dev[master]: add sysmobts-calib.py In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15074 ) Change subject: add sysmobts-calib.py ...................................................................... add sysmobts-calib.py Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 --- A sysmobts-calib.py 1 file changed, 200 insertions(+), 0 deletions(-) diff --git a/sysmobts-calib.py b/sysmobts-calib.py new file mode 100755 index 0000000..d22223c --- /dev/null +++ b/sysmobts-calib.py @@ -0,0 +1,200 @@ +#!/usr/bin/env python3 +doc = '''Remotely do a clock calibration of a sysmoBTS. + +You need is ssh root access to the BTS, and an antenna connected to the NWL. + +Remotely goes through the steps to obtain a OCXO calibration value from netlisten. +- Obtain the current calibration value from /etc/osmocom/osmo-bts-sysmo.cfg. +- Stop the osmo-bts-sysmo.service. +- Do a scan to get the strongest received ARFCN. +- Run n passes of sysmobts-calib (default: 7) to obtain an average calibration val. +- Write this calibration value back to /etc/osmocom/osmo-bts-sysmo.cfg. +- Start osmo-bts-sysmo.service. +''' + +import sys +import subprocess +import re +import shlex +import argparse + +calib_val_re = re.compile(r'clock-calibration +([0-9]+)') +result_re = re.compile('The calibration value is: ([0-9]*)') + +class Globals: + orig_calib_val = None + calib_val = None + bts = 'bts0' + band = '900' + arfcn = None + +def error(*msgs): + sys.stderr.write(''.join(str(m) for m in msgs)) + sys.stderr.write('\n') + exit(1) + +def log(*msgs): + print(''.join(str(m) for m in msgs)) + +def cmd_to_str(cmd): + return ' '.join(shlex.quote(c) for c in cmd) + +def call_output(*cmd): + cmd = ('ssh', Globals.bts,) + cmd + log('+ %s' % cmd_to_str(cmd)) + sys.stdout.flush() + sys.stderr.flush() + p = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE) + o,e = p.communicate() + return o.decode('utf-8') + +def call(*cmd): + o = call_output(*cmd) + if o: + log(o) + +def reload_dsp(): + #call('/bin/sh', '-c', r"'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s'") + # systemd service contains the DSP reload commands in the ExecStopPost. + # So starting and stopping the service is the easy way to reload the DSP. + call('systemctl', 'start', 'osmo-bts-sysmo') + call('systemctl', 'stop', 'osmo-bts-sysmo') + +def get_cfg_calib_val(): + o = call_output('grep', 'clock-calibration', '/etc/osmocom/osmo-bts-sysmo.cfg') + if not o: + return None + o = o.strip() + m = calib_val_re.match(o) + if not m: + return None + return m.group(1) + +def set_cfg_calib_val(calib_val): + if get_cfg_calib_val() is None: + call('sed', '-i', "'s/^ instance 0$/&\\n clock-calibration %s/'" % calib_val, '/etc/osmocom/osmo-bts-sysmo.cfg'); + else: + call('sed', '-i', "'s/clock-calibration.*$/clock-calibration %s/'" % calib_val, '/etc/osmocom/osmo-bts-sysmo.cfg'); + + now = get_cfg_calib_val() + if now != calib_val: + print('Failed to set calibration value, set manually in osmo-bts-sysmo.cfg') + print('phy 0\n instance 0\n clock-calibration %s' % calib_val) + + +def ask(*question, valid_answers=('*',)): + while True: + print('\n' + '\n '.join(question)) + + answer = sys.stdin.readline().strip() + for v in valid_answers: + if v == answer: + return answer + if v == '*': + return answer + if v == '+' and len(answer): + return answer + +def call_sysmobts_calib(mode, *args): + o = call_output('sysmobts-calib', '-c', 'ocxo', '-s', 'netlisten', '-b', Globals.band, '-i', Globals.calib_val, '-m', mode, *args) + log(o) + reload_dsp() + return o + +def int_be_one(string): + val = int(string) + if val < 1: + raise argparse.ArgumentTypeError('value must be at least 1') + return val + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description=doc) + parser.add_argument('-b', '--band', dest='band', default=None, + help='Which GSM band to scan and calibrate to (850, 900, 1800, 1900)') + parser.add_argument('-a', '--arfcn', dest='arfcn', default=None, + help="Don't scan, directly use this ARFCN to calibrate to") + parser.add_argument('-i', '--initial-clock-correction', dest='calib_val', default=None, + help='Clock calibration value to start out with. If omitted, this is obtained from' + ' /etc/osmocom/osmo-bts-sysmo.cfg from the BTS file system.') + parser.add_argument('-I', '--set-clock-correction', dest='set_calib_val', default=None, + help="Don't scan or calibrate, just set the given value in the config file") + parser.add_argument('-G', '--get-clock-correction', dest='get_calib_val', default=False, action='store_true', + help="Don't scan or calibrate, just read the given value in the config file") + parser.add_argument('-n', '--passes', dest='passes', default=7, type=int_be_one, + help="How many times to run sysmobts-calib to obtain a resulting calibration value average") + parser.add_argument('args', nargs=1, help='Hostname (SSH) to reach the BTS at') + + cmdline = parser.parse_args() + + Globals.bts = cmdline.args[0] + if cmdline.band: + Globals.band = cmdline.band + + if cmdline.set_calib_val: + set_cfg_calib_val(cmdline.set_calib_val) + exit(0) + + if cmdline.get_calib_val: + print(get_cfg_calib_val()) + exit(0) + + Globals.orig_calib_val = cmdline.calib_val + if Globals.orig_calib_val is None: + Globals.orig_calib_val = get_cfg_calib_val() or '0' + Globals.calib_val = Globals.orig_calib_val + + print('Starting out with clock calibration value %s' % Globals.calib_val) + + #call('systemctl', 'stop', 'osmo-bts-sysmo') + reload_dsp() + + if cmdline.arfcn: + Globals.arfcn = cmdline.arfcn + else: + arfcns = call_sysmobts_calib('scan') + best_arfcn_line = arfcns.splitlines()[-1] + Globals.arfcn = best_arfcn_line.split(':')[0].split(' ')[-1] + try: + int(Globals.arfcn) + except: + error('Error while scanning bands') + + print('Using ARFCN %r' % Globals.arfcn) + + collected_values = [] + + passes = cmdline.passes + if passes < 1: + passes = 1 + + for i in range(passes): + print('\npass %d of %d' % (i+1, passes)) + o = call_sysmobts_calib('calibrate', '-a', Globals.arfcn) + for m in result_re.finditer(o): + collected_values.append(int(m.group(1))) + + collected_values = list(sorted(collected_values)) + print(collected_values) + if not collected_values: + continue + + best_values = collected_values + if len(best_values) > 3: + best_values = best_values[1:-1] + + avg = sum(best_values) / len(best_values) + Globals.calib_val = str(int(avg)) + print('clock-calibration: started with %s, current=%s' % + (Globals.orig_calib_val, Globals.calib_val)) + + print('RESULT:', Globals.calib_val, ' (was %s)' % Globals.orig_calib_val) + + cfg_calib_val = get_cfg_calib_val() + if Globals.calib_val != cfg_calib_val: + a = ask('osmo-bts-sysmo.cfg currently has %s\nmodify osmo-bts-sysmo.cfg to clock-calibration %s? (ok, no)' + % (cfg_calib_val, Globals.calib_val), + valid_answers=('ok', 'no', '')) + if a == 'ok': + set_cfg_calib_val(Globals.calib_val) + call('systemctl', 'start', 'osmo-bts-sysmo') +# vim: shiftwidth=4 expandtab tabstop=4 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 13:55:41 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 13:55:41 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c 6 files changed, 69 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index e926b3f..e0d6a6c 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -253,6 +253,9 @@ /* Whether we want to use Osmux against BSCs. Controlled via VTY */ enum osmux_usage use_osmux; + + /* Whether to use call waiting on the network */ + uint8_t callwaiting; }; struct osmo_esme; diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 69cd652..b173f31 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -138,7 +138,8 @@ }; - +struct gsm_trans *trans_find_cc_by_vsub(const struct gsm_network *net, + struct vlr_subscr *vsub); struct gsm_trans *trans_find_by_type(const struct msc_a *msc_a, enum trans_type type); struct gsm_trans *trans_find_by_id(const struct msc_a *msc_a, enum trans_type type, uint8_t trans_id); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 03830de..37d0a07 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1803,6 +1803,7 @@ int i, rc = 0; struct msc_a *msc_a = NULL; struct gsm_trans *trans = NULL; + struct gsm_trans *_trans = NULL; const struct gsm_mncc *data; /* handle special messages */ @@ -1874,6 +1875,21 @@ /* update the subscriber we deal with */ log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + /* If subscriber is BUSY and we do not DO call in call or "call-waiting" */ + if (!net->callwaiting) { + _trans = trans_find_cc_by_vsub(net, vsub); + if (_trans && _trans->cc.state != GSM_CSTATE_NULL) { + LOG_TRANS_CAT(_trans, DCC, LOGL_NOTICE, + "rx '%s' for subscriber %s with trans state %d (%s)" + " rejecting with USER_BUSY\n", + get_mncc_name(msg->msg_type), data->called.number, + _trans->cc.state, + gsm48_cc_state_name(_trans->cc.state)); + return mncc_release_ind(net, NULL, data->callref, + GSM48_CAUSE_LOC_PRN_S_LU, + GSM48_CC_CAUSE_USER_BUSY); + } + } /* If subscriber is not "attached" */ if (!vsub->lu_complete) { LOG_TRANS_CAT(trans, DCC, LOGL_ERROR, "rx %s for subscriber that is not attached: %s\n", diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 5bf9701..13b9687 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -292,6 +292,29 @@ return CMD_SUCCESS; } +DEFUN(cfg_net_call_wait, cfg_net_call_wait_cmd, + "callwaiting", + "Enable Call Waiting on the Network\n") +{ + struct gsm_network *net = vty->index; + + net->callwaiting = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_net_no_call_wait, cfg_net_no_call_wait_cmd, + "no callwaiting", + NO_STR + "Disable Call Waiting on the Network\n") +{ + struct gsm_network *net = vty->index; + + net->callwaiting = false; + + return CMD_SUCCESS; +} + static int config_write_net(struct vty *vty) { int i; @@ -333,6 +356,11 @@ gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); } + if (gsmnet->callwaiting) + vty_out(vty, " callwaiting%s", VTY_NEWLINE); + else + vty_out(vty, " no callwaiting%s", VTY_NEWLINE); + return CMD_SUCCESS; } @@ -1902,6 +1930,8 @@ install_element(GSMNET_NODE, &cfg_net_no_timezone_cmd); install_element(GSMNET_NODE, &cfg_net_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_no_per_loc_upd_cmd); + install_element(GSMNET_NODE, &cfg_net_call_wait_cmd); + install_element(GSMNET_NODE, &cfg_net_no_call_wait_cmd); install_element(CONFIG_NODE, &cfg_msc_cmd); install_node(&msc_node, config_write_msc); diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index ebdaced..8ffb0d7 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -36,6 +36,23 @@ void _gsm411_sms_trans_free(struct gsm_trans *trans); void _gsm911_nc_ss_trans_free(struct gsm_trans *trans); +/*! Find a Call Control transaction by Subscriber + * \param[in] net Network in which we should search + * \param[in] vsub subscriber to match + * \returns Matching transaction, if any + */ +struct gsm_trans *trans_find_cc_by_vsub(const struct gsm_network *net, + struct vlr_subscr *vsub) +{ + struct gsm_trans *trans; + + llist_for_each_entry(trans, &net->trans_list, entry) { + if (trans->vsub == vsub && trans->cc.state > 0) + return trans; + } + return NULL; +} + struct gsm_trans *trans_find_by_type(const struct msc_a *msc_a, enum trans_type type) { struct gsm_trans *trans; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 1083271..1a1b05b 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -216,6 +216,7 @@ mgcp_client_conf_init(&net->mgw.conf); net->mgw.tdefs = g_mgw_tdefs; + net->callwaiting = true; return net; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:01:33 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 14:01:33 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Patch Set 1: (1 comment) > Build Failed > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-msc/1824/ : > FAILURE Aw boo. It built for me. https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1806 PS1, Line 1806: struct gsm_trans *_trans = NULL; Not sure about this, but I got a segfault (in other code path) while testing, wasn't sure if it was due to my redefining trans below, so I left it here. As far as i can make out, if the code path continues, we are going to trans = trans_alloc() anyway. but may be something I'm doing wring here with memory. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Comment-Date: Thu, 08 Aug 2019 14:01:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:05:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 14:05:35 +0000 Subject: Change in ...osmo-msc[master]: Fix dependency version requirements Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 Change subject: Fix dependency version requirements ...................................................................... Fix dependency version requirements libosmocore 1.1.0 0e8df1c7e48bcae2285c7c138bd50f932049bd24 osmo_use_count() Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb libosmocore 1.2.0 cdac620579b5bf44970b5f4bb11734fdfdf5bf59 GSM23003_MSISDN_MAX_DIGITS Fixes: 8b0737fa71ea4b04cee8dc61c79a1f93779e66dc libosmo-sccp 1.1.0 21ff9ae4264de159784a59ce4421365007bde08d osmo_sccp_addr_ri_cmp() Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 osmo-mgw 1.6.0 538d2c53d90074267e7a70a90c773baa03d6ec04 mgcp_client_endpoint_fsm.h Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 libosmo-netif 0.6.0 needed by osmo-mgw 1.6.0 libsmpp34 1.14.0 required due to needed heap allocation function overrides from smpp34_heap.h Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 --- M configure.ac M debian/control 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/15121/1 diff --git a/configure.ac b/configure.ac index bb8fb39..5aa652d 100644 --- a/configure.ac +++ b/configure.ac @@ -35,15 +35,15 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) old_LIBS=$LIBS @@ -91,7 +91,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then - PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) + PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.14.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") diff --git a/debian/control b/debian/control index 887e386..f7a336a 100644 --- a/debian/control +++ b/debian/control @@ -13,17 +13,17 @@ libdbd-sqlite3, libsctp-dev, libtalloc-dev, - libsmpp34-dev (>= 1.12), - libasn1c-dev (>= 0.9.28), - libosmocore-dev (>= 0.10.0), - libosmo-sccp-dev, - libosmo-sigtran-dev (>= 0.8.0), - libosmo-abis-dev, - libosmo-mgcp-client-dev (>= 1.1.0), - libosmo-gsup-client-dev (>= 0.2.1), - libosmo-netif-dev (>= 0.1.0), - libosmo-ranap-dev (>= 0.2.0), - osmo-gsm-manuals-dev + libsmpp34-dev (>= 1.14.0), + libasn1c-dev (>= 0.9.30), + libosmocore-dev (>= 1.2.0), + libosmo-sccp-dev (>= 1.1.0), + libosmo-sigtran-dev (>= 1.1.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-mgcp-client-dev (>= 1.6.0), + libosmo-gsup-client-dev (>= 1.0.0), + libosmo-netif-dev (>= 0.6.0), + libosmo-ranap-dev (>= 0.3.0), + osmo-gsm-manuals-dev (>= 0.2.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-msc.git Vcs-Browser: https://git.osmocom.org/osmo-msc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:05:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 14:05:36 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0_=E2=86=92_1=2E5=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15122 Change subject: Bump version: 1.4.0 ? 1.5.0 ...................................................................... Bump version: 1.4.0 ? 1.5.0 Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 --- M debian/changelog 1 file changed, 227 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/15122/1 diff --git a/debian/changelog b/debian/changelog index 8aec381..ec9671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,230 @@ +osmo-msc (1.5.0) unstable; urgency=medium + + [ Max ] + * Handle LCLS-NOTIFICATION message from BSS + * Various logging fixes + * VLR tests: use msgb_eq_data_print() for comparison + * transaction: drop meaningless ti_flag of trans_assign_trans_id() + * transaction: clarify magic 0xff transaction ID + + [ Vadim Yanitskiy ] + * transaction.c: cosmetic: use 'default' branch in trans_free() + * libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces + * transaction: change arguments of trans_find_by_sm_rp_mr() + * libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions + * libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() + * libmsc/gsm_04_80.c: use gsm0480_create_release_complete() + * libmsc/gsm_04_80.c: add msc_send_ussd_release_complete_cause() + * libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' + * transaction: fix description of trans_assign_trans_id() + * transaction.h: use #pragma once as include guard + * libmsc/gsm_09_11.c: implement guard timer for NCSS sessions + * libmsc/ran_conn.c: add missing 'break' to OSMO_RAT_EUTRAN_SGS + * libmsc/sgs_iface.c: fix SGS_STATE_NS11 counter reference + * libmsc/sgs_vty.c: always write server address and VLR name + * libmsc/msc_vty.c: drop dead comparison against null + * libmsc/sgs_iface.c: fix copy-paste error + * libmsc/sgs_iface.c: register sgs_vlr_reset_fsm on DSO load + * libmsc/sgs_vty.c: don't print SGs socket error twice + * libmsc: fix: properly initialize the SGs server + * libmsc/sms_queue.c: fix memleak in smsq_take_next_sms() + * tests/sms_queue: track the use of NULL talloc memory contexts + * msc/gsm_data.h: drop unused SMS_HDR_SIZE macro + * configure.ac: drop rudimentary check for -fvisibility=hidden + * configure.ac: drop useless SQLite3 dependency + * libmsc/db.c: print info about database name and libdbi version + * libmsc/gsm_04_11.c: clarify implicit CP-ACK handling + * libmsc/ran_peer.c: fix msgb memleak in ran_peer_rx_reset() + * libmsc/gsm_04_11.c: properly handle TP-User-Data-Length + * libmsc/gsm_04_11.c: fix double init of both SMR and SMC FSMs + * libmsc/gsm_04_11.c: cosmetic: restructure gsm411_mm_send() + * libmsc/gsm_04_08.c: fix: print proper length value + * libmsc/gsm_04_08.c: refactor CM Service Request parsing + * libmsc/gsm_04_08.c: clarify IMEI rejection in gsm48_rx_mm_serv_req() + * libmsc/gsm_04_11_gsup.c: cosmetic: drop useless variable + * tests/.../Makefile.am avoid redundant linkage with librt + * libmsc/sgs_server.c: do not override rc in case of SCTP_SHUTDOWN_EVENT + * libmsc/msc_ho.c: fix unreacheable check of MSC-T role allocation + * libmsc/msc_a.c: fix possible NULL-pointer dereferences + * sms_queue_test: assert return value of osmo_use_count_get_put() + * libmsc/gsm_04_11.c: fix NULL-pointer dereference in gsm340_rx_tpdu() + * libmsc/ran_msg_a.c: avoid ternary operator in struct initialization + * libmsc/ran_msg_a.c: refactor ran_a_decode_lcls_notification() + * libmsc/ran_msg_a.c: prevent chosen_encryption->key buffer overrun + * libmsc/mncc_call.c: fix uninitialized access of stack memory + * libmsc/ran_peer.c: fix msgb memleaks in ran_peer_down_paging() + * libmsc/ran_peer.c: avoid unreasonable use of goto in ran_peer_down_paging() + * libmsc/msc_vty.c: fix: use msub_for_vsub() in subscr_dump_full_vty() + * libmsc/msc_vty.c: fix documentation of 'show subscriber id' + * libmsc/msc_vty.c: use llist_count() in subscr_dump_full_vty() + * libmsc/rtp_stream.c: prevent NULL-pointer dereference + * libmsc/gsm_04_11.c: properly handle MMTS indication + * transaction: accept trans_type enum in trans_log_subsys() + * Use GSM23003_MSISDN_MAX_DIGITS from libosmogsm + * libmsc/msc_vty.c: refactor 'show subscr / conn / trans' commands + * libmsc/msc_vty.c: do not abuse strlen() to check char buffers + * tests: share stubs.h from msc_vlr_test as stubs.c + * Introduce initial unit test for db_sms_* API + * libmsc/db.c: fix storing SMS with empty TP-User-Data + * debian/control: add missing libdbd-sqlite3 to Build-Depends + * libmsc/db.c: fix potential integer overflow + * libmsc/db.c: introduce and use parse_sm_ud_from_result() + * libmsc/db.c: warn user about SMS text truncation + * libmsc/db.c: get rid of hard-coded SMS expiry threshold + * libmsc/mncc_builtin.c: drop dummy switch in int_mncc_recv() + * libmsc/gsm_0(4|9)_11_gsup.c: print error message if subscr is not known + * gsup_client_mux_tx_error_reply(): fix: do not override IMSI + * gsup_client_mux_tx_error_reply(): fix: do not omit session IEs + * gsup_client_mux_tx_error_reply(): fix: do not omit message class IE + * gsup_client_mux_tx_error_reply(): fix: do not omit SM-RP-MR IE + * libmsc/gsm_09_11.c: fix: return trans from establish_nc_ss_trans() + * libmsc/gsm_09_11.c: send GSUP PROS_SS ERROR message when needed + * libmsc/gsm_04_08.c: clean up unused leftover includes + * libmsc/msc_a.c: fix: remove dummy allstate_action of msc_a_fsm + * libmsc/paging.c: avoid double zero-initialization + * libmsc/paging.c: cosmetic: actually use default branch of switch + * libmsc/paging.c: cosmetic: remove leading space in log line + * libmsc/gsm_09_11.c: do not abuse LOG_TRANS() and early trans allocation + * libmsc/gsm_09_11.c: log network-originated session establishment error + * libmsc/gsm_09_11.c: drop rudimentary vsub->cgi.lai.lac check + * libmsc/gsm_09_11.c: drop meaningless check for concurrent paging + * libmsc/msc_net_init.c: pass pointer to gsm_network directly + * libmsc/gsm_09_11.c: inform HLR/EUSE if Paging has failed + * libmsc/gsm_09_11.c: properly handle OSMO_GSUP_MSGT_PROC_SS_ERROR + * libmsc/gsm_09_11.c: avoid double zero-initialization of gsup_msg + * libmsc/gsm_09_11.c: fix broken reference counting for vsub + * libmsc/gsm_09_11.c: do not abuse LOG_TRANS() in gsm0911_rcv_nc_ss() + * libmsc/gsm_09_11.c: do not suppress rc of gsup_client_mux_tx() + * tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear() + * libvlr/vlr.c: do not expire subscribers if periodic LU is disabled + * gsm_04_11_gsup.c: fix broken reference counting for vsub + * libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans() + * libmsc/ran_msg_iu.c: fix: properly handle SAPI IE of RANAP_DirectTransfer + * Fix: add missing semicolons to OSMO_ASSERT statements + * libmsc/msc_vty.c: print subscriber expiration time + + [ Harald Welte ] + * Add SGs Interface + * debian: depend on libsctp-dev + * configure.ac: Check for libsctp + * a_iface: Centralize/wrap BSSAP / N-DATA transmission + * a_iface: use 'const' qualifier for ran_conn whenever possible + * a_iface: Fix hexdumping of N-DATA.req + * a_iface: OSMO_ASSERT() if we ever want to send BSSAP with invalid length + * smpp_smsc: Call destroy_tlv() when using build_tlv() + * smpp: Make libsmpp34 use talloc for its allocations + * msub_check_for_release(): Initialize msc_role_a_c + * SMPP: Don't accept password or system-id exceeding spec length + * Iu: Send SMS over SAPI-3 + + [ Philipp Maier ] + * a_iface: Include CSFB Indication into BSSMAP CLEAR COMMAND + * silent_call: use osmo_strlcpy() instead of strncpy() + * msc_vty: add missing header file + * vlr_sgs: fix SGs IMSI detech from non EPS services + * vlr_sgs: start lu expiration timer on sgs eps detach + * sgs_iface: fix nullpointer dereference + * vlr_sgs_fsm: make sure vsub is marked used when LA is present + * sgs_iface: detect and react to VLR/HLR failure + + [ Oliver Smith ] + * debian: depend on libdbd-sqlite3 + * vlr_lu_fsm.c: assert for invalid events + * vty: make retrieve-imeisv-early configurable + * vlr: fix IMEI length + * vlr: when setting IMEISV, also set IMEI + * vlr: optionally send IMEI early to HLR + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * vlr_lu_fsm.c: don't send LU reject twice + + [ Keith ] + * Don't deliver alert notifications to ESME not yet bound. + * Write configuration correctly from vty (alert notifications) + + [ Neels Hofmeyr ] + * use only accepted ran_conns for new transactions + * gsm_04_11_gsup.c: drop unused conn lookup + * SMS queue: properly log failed attempts number + * vty: add cmd subscriber ID sms delete-all + * vlr_subscr_name(): use OSMO_STRBUF + * enable osmo_fsm_term_safely(), apply logging changes + * sms queue: avoid repeated Paging for a failed SMS + * vlr_subscr: use osmo_use_count + * add LOG_TRANS, proper context for all transactions + * gsm_04_08_cc: improve logging for CC trans + * smpp: fix vlr_subscr use count bugs + * vlr subscr get/put: also check against NULL + * fix various missing line endings in logging + * gsm_04_11: use gsm48_decode_bcd_number2(), evaluate rc + * large refactoring: support inter-BSC and inter-MSC Handover + * GSUP: include terminating nul in inter-MSC source/destination name + * rename bscconfig.h to config.h, cleanup + * fix regression: fix internal MNCC operation + * vty/cfg: add missing write-back of inter-BSC and inter-MSC HO config + * comment: apply function renames to message cycle explanation + * ran_a_make_handover_request(): allow no encryption + * make msc_a_vsub() and others NULL-safe + * no HO call forwarding if no RTP stream + * LOG_TRANS: store subsys in trans, unify USSD logging back to DMM + * call_leg: remove unused event MSC_EV_CALL_LEG_RTP_RELEASED + * call_leg: document the parent_event_* items + * add DSS logging category + * silence error messages about HANDOVER_END not permitted + * build osmo-msc: add "missing" LIBASN1C_LIBS + * minor comments in msc_vty.c + * manual: adjust and fix auth and ciph docs + * do not force encryption on UTRAN + * add msc_vlr tests for UMTS without ciphering + * doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak + * doc/sequence_charts: fix naming of mncc_fsm to mncc_call + * vlr_lu_fsm: fix missing event for IMEISV + + [ Sylvain Munaut ] + * libmsc: Allow different channel types to be requested as silent calls + * libvlr: Allow 2G auth tuples to be re-used without going through AUTH + * make LOG_TRANS() NULL-safe again + + [ Pau Espin Pedrol ] + * debian/control: Fix typo + * sms_queue: Print dest msisdn instead of unknown subscriber + * ran_peer: Move rx_reset_ack logic into its own func + * vty: Add option to enable osmux towards BSCs + * bssap: Detect BSC Osmux support on RESET (ACK) recv + * a_iface: Announce Osmux support on RESET (ACK) send + * Request Osmux CID and forward it in Assign Req and Assign Compl + * db: Fix call to mempcy with NULL src ptr + * db_sms_test: Do not print exact memcmp result + * db_sms_test: Remove libdbi expected driver load errors + * sms_queue.c: Improve misleading log line + * doc: Add Osmux documentation to User Manual + * Remove undefined param passed to logging_vty_add_cmds + * Fix dependency version requirements + + [ Omar Ramadan ] + * Allow MME name preformatted as FQDN in SGsAP + + [ Alexander Couzens ] + * remove msc specific db counters + * replace osmo_counter with stat_items + + [ Eric Wild ] + * libvlr: fix sgsn tmsi creation, replace constant with define + * turn -Werror=null-dereference into a warning + + [ Daniel Willmann ] + * manuals: Add script to update vty/counter documentation from docker + * manuals: Update counter/vty documentation + * manuals: Include overview chapter about counters + + [ Thorsten Alteholz ] + * fix spelling detected by lintian + + [ Keith Whyte ] + * Set coding in mncc_set_cause() + + -- Pau Espin Pedrol Thu, 08 Aug 2019 16:01:38 +0200 + osmo-msc (1.3.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 Gerrit-Change-Number: 15122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:19:19 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 14:19:19 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Patch Set 1: Code-Review-1 (11 comments) build failure: you need to adjust the vty transcript test that failed. You added the 'callwaiting' vty option, and the transcript test didn't expect that to appear. https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG at 22 PS1, Line 22: of call waiting. would be nice to briefly mention or reference issues of the unpredictable behavior https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h at 258 PS1, Line 258: uint8_t callwaiting; rather use bool https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/transaction.h File include/osmocom/msc/transaction.h: https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/transaction.h at 142 PS1, Line 142: struct vlr_subscr *vsub); Instead of adding this I would suggest the caller use trans_find_by_type(msc_a_for_vsub(vsub, true), TRANS_CC); (to avoid API clutter) https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1806 PS1, Line 1806: struct gsm_trans *_trans = NULL; > Not sure about this, but I got a segfault (in other code path) while testing, wasn't sure if it was [?] as I read the code there shouldn't be a segfault, but it is better style to use a separate variable indeed. Rather declare the separate variable at the start of the "if (!net->callwaiting)" scope because it isn't used elsewhere, and rather name it like existing_cc_trans or something to clarify. https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1879 PS1, Line 1879: if (!net->callwaiting) { (put the trans var decl here) https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1880 PS1, Line 1880: _trans = trans_find_cc_by_vsub(net, vsub); (use trans_find_by_type() here, see below) https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1886 PS1, Line 1886: _trans->cc.state, cosmetic: no need to log both the state number and the gsm48_cc_state_name(), just the name is enough https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1894 PS1, Line 1894: if (!vsub->lu_complete) { would make sense to keep this check before the callwaiting check. It's higher up the priority of reject reasons. so... (read below) https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1902 PS1, Line 1902: } <-- MARKER (see below) https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c at 1917 PS1, Line 1917: msc_a = msc_a_for_vsub(vsub, true); and here is an msc_a already. So I would suggest: - move this msc_a = msc_a_for_vsub() up to "MARKER" above. - put the net->callwaiting check right below that - use trans_find_by_type(msc_a, TRANS_CC) instead of adding API https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/msc_vty.c at 360 PS1, Line 360: vty_out(vty, " callwaiting%s", VTY_NEWLINE); (we often don't write back the default, so could only write 'no callwaiting' in case it is false) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 14:19:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:26:31 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 14:26:31 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG at 7 PS1, Line 7: Implements a global switch on the network to disable call waiting. minor style: in general, always use the imperative form, "implement"; shorter even would be: "add 'no callwaiting'" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 14:26:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:27:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 14:27:39 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h at 258 PS1, Line 258: uint8_t callwaiting; > rather use bool call_waiting -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 14:27:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:31:04 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 14:31:04 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#2). Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 7 files changed, 71 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:37:24 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 14:37:24 +0000 Subject: Change in ...osmo-msc[master]: Fix dependency version requirements In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG at 10 PS1, Line 10: Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb hmm, using the commit tag syntax is maybe not such a good idea? The "Fixes: " tag at the beginning of a line is often used to reference an open issue that gets fixed by this patch. I guess it would be better to omit the ':' to not confuse with that. Also I'm not sure what you mean by "Fixes:" -- is this an osmo-msc commit hash? Maybe "introduced in ..."? https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG at 24 PS1, Line 24: also: add missing version to libosmo-abis in debian/ fix libosmo-ranap version in debian/, out of sync with configure.ac -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 14:37:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:41:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 14:41:39 +0000 Subject: Change in ...osmo-msc[master]: Fix dependency version requirements In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG at 10 PS1, Line 10: Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb > hmm, using the commit tag syntax is maybe not such a good idea? The "Fixes: " tag at the beginning o [?] Yes that's the osmo-msc hash. The hash on the other line is the commit in the library where that functionality was made available. Format here is not really important, it was a plus adding this information here since I already had the information while looking which versions were needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 14:41:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:47:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 14:47:20 +0000 Subject: Change in ...osmo-sgsn[master]: Require newer versions of dependencies Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 Change subject: Require newer versions of dependencies ...................................................................... Require newer versions of dependencies New APIs only available since libgtp 1.4.0 are needed, and in turn that libgtp version requires newer libosmocore 1.1.0. osmo-sgsn itself requires libosmocore 1.2.0 since it uses GSM23003_TMSI_SGSN_MASK. Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae --- M configure.ac M debian/control 2 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/23/15123/1 diff --git a/configure.ac b/configure.ac index a7d3717..02dcf05 100644 --- a/configure.ac +++ b/configure.ac @@ -39,12 +39,12 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) @@ -61,7 +61,7 @@ AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.3.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.4.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/control b/debian/control index 9ad95a1..df1f070 100644 --- a/debian/control +++ b/debian/control @@ -10,17 +10,17 @@ automake, libtool, pkg-config, - libasn1c-dev, libtalloc-dev, libc-ares-dev, - libgtp-dev, - libosmocore-dev, - libosmo-abis-dev, - libosmo-ranap-dev, - libosmo-sccp-dev, - libosmo-sigtran-dev, - libosmo-netif-dev, - libosmo-gsup-client-dev, + libgtp-dev (>= 1.4.0), + libosmocore-dev (>= 1.2.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.4.0), + libosmo-gsup-client-dev (>= 1.0.0), + libasn1c-dev (>= 0.9.30), + libosmo-ranap-dev (>= 0.4.0), + libosmo-sigtran-dev (>= 1.0.0), + libosmo-sccp-dev (>= 1.0.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git @@ -32,14 +32,14 @@ Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks +Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks Package: osmo-sgsn-dbg Section: debug Architecture: any Multi-Arch: same Depends: osmo-sgsn (= ${binary:Version}), ${misc:Depends} -Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks +Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks Package: osmo-gtphub Architecture: any -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae Gerrit-Change-Number: 15123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 14:47:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 14:47:21 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E1_=E2=86=92_1=2E5=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 Change subject: Bump version: 1.4.1 ? 1.5.0 ...................................................................... Bump version: 1.4.1 ? 1.5.0 Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2 --- M debian/changelog 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/24/15124/1 diff --git a/debian/changelog b/debian/changelog index 5461745..02ec236 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +osmo-sgsn (1.5.0) unstable; urgency=medium + + [ Max ] + * Improve 'show subscriber cache' vty command + * GMM: permit VLR_ANSWERED event in attach FSM + * Fix IMSI padding in imsi-acl + + [ Harald Welte ] + * gbproxy_test: Fix test expectations of gprs_ns_rcvmsg() + * LLC XID: Fix string representation of N201_U + * LLC: Don't blindly assume all LLC frames have data payload + * LLC: Avoid NOTICE message on LLC NULL + * gprs_llc: Correctly refuse any ABM command (SABM, DISC) with DM + * LLC: Store the XID inside the LLC Entity, not LLC Mgmg Entity + * gb_proxy.h: Add missing comments; improve comments + * gb_proxy: cosmetic: Use 'bool' in data structures where applicable + + [ efistokl ] + * gsm0408_rcv_gmm: send Iu-ReleaseCommand upon receiving Attach Complete. + * gprs_gmm: send Service Reject when no PDP ctxs are available. + + [ Alexander Couzens ] + * gprs_gmm: reintroduce calling gsm48_gmm_authorize when not handling GMM Attach Requests + * gbproxy: parse dtap GSM48_MT_GSM_DEACT_PDP_REQ|ACK + + [ Pau Espin Pedrol ] + * gprs_sndcp_comp_free: Replace ifelse with switch and better handling of error + * sgsn: vty: Improve log warning content with spec section + * Document max retransmit times for T3395 + * sgsn: Fix echo timer not started upon first pdp ctx created + * sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API + * sgsn: Have authentication required on by default + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require newer versions of dependencies + + [ Keith ] + * Echo zero byte XID-Field of Type L3_PAR + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * osmo-gtphub.cfg: fix conflict with osmo-sgsn.cfg + * osmo-gbproxy.cfg: fix conflict with osmo-sgsn.cfg + + [ Vadim Yanitskiy ] + * doc/manuals/vty: regenerate sgsn_vty_reference.xml + * osmo-sgsn: add VTY parameter to toggle authentication + * sgsn_mm_ctx_find_ggsn_ctx(): fix: always set gsm_cause + + [ Eric Wild ] + * replace magic tmsi constant with define + * turn -Werror=null-dereference into a warning + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update vty/counter documentation + * Add/fix help string for version option + * osmo-sgsn: Fix outdated information in usermanual + * configuration.adoc: Small fixes + * configuration.adoc: Add a section about encryption + + [ Ruben Undheim ] + * Spelling fixes + + -- Pau Espin Pedrol Thu, 08 Aug 2019 16:46:31 +0200 + osmo-sgsn (1.4.0) unstable; urgency=medium [ Alexander Couzens ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2 Gerrit-Change-Number: 15124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:04:40 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:04:40 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#3). Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 6 files changed, 57 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:04:57 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:04:57 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h at 258 PS1, Line 258: uint8_t callwaiting; > rather use bool oops, I thought I did.. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:04:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:06:05 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:06:05 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#4). Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:07:54 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:07:54 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#5). Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:08:34 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:08:34 +0000 Subject: Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#6). Change subject: Implements a global switch on the network to disable call waiting. ...................................................................... Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:11:48 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:11:48 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#7). Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:11:56 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:11:56 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG at 22 PS1, Line 22: of call waiting. > would be nice to briefly mention or reference issues of the unpredictable behavior I think I'll just drop this explaination and leave it as a feature. it stands. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:11:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:29:49 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 15:29:49 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#8). Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:33:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:33:28 +0000 Subject: Change in ...openbsc[master]: debian/control: Match dependency versions against configure.ac Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/15125 Change subject: debian/control: Match dependency versions against configure.ac ...................................................................... debian/control: Match dependency versions against configure.ac Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 --- M debian/control 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/25/15125/1 diff --git a/debian/control b/debian/control index 557467e..b9008ef 100644 --- a/debian/control +++ b/debian/control @@ -6,16 +6,16 @@ autotools-dev, autoconf-archive, pkg-config, - libosmocore-dev, - libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, dh-systemd (>= 1.5), - libosmo-abis-dev, - libosmo-netif-dev, + libsmpp34-dev (>= 1.13.0), + libosmocore-dev (>= 1.0.1), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.4.0), + libosmo-sccp-dev (>= 1.0.0), libdbd-sqlite3, - libpcap-dev, - libsmpp34-dev + libpcap-dev Standards-Version: 3.9.8 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 Gerrit-Change-Number: 15125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:33:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:33:28 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eopenbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E5-38ea_=E2=86=92_1=2E3=2E1?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/15126 Change subject: Bump version: 1.3.0.5-38ea ? 1.3.1 ...................................................................... Bump version: 1.3.0.5-38ea ? 1.3.1 Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0 --- M debian/changelog 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/15126/1 diff --git a/debian/changelog b/debian/changelog index 51bc211..ec4e072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +openbsc (1.3.1) unstable; urgency=medium + + [ Daniel Willmann ] + * manuals: Update osmonitb counter/vty documentation + * manuals: Generate vty/counter documentation for osmo-bscnat + + [ Pau Espin Pedrol ] + * nat: Remove unused func bsc_vty_init() + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * debian/control: Match dependency versions against configure.ac + + -- Pau Espin Pedrol Thu, 08 Aug 2019 17:32:51 +0200 + openbsc (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0 Gerrit-Change-Number: 15126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:38:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:38:01 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... osmo-release.sh: Support releasing openbsc.git openbsc's directory structure is a bit different (has most stuff inside an extra subdir). Let's account for that. Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 --- M osmo-release.sh 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/15127/1 diff --git a/osmo-release.sh b/osmo-release.sh index a779a26..d99745e 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -24,7 +24,12 @@ # Make sure that depedency requirement versions match in configure.ac vs debian/control. #eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," check_configureac_debctrl_deps_match() { - configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") + if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then + configureac_file="openbsc/configure.ac" + else + configureac_file="configure.ac" + fi + configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") echo "$configureac_list" | \ { return_error=0 while read -r dep ver; do @@ -163,7 +168,7 @@ fi gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" dch -r -m --distribution "unstable" "" -git add debian/changelog +git add ${GIT_TOPDIR}/debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty git commit --amend # let the user add extra information to the release commit. git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:53:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:53:14 +0000 Subject: Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0.0 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 Change subject: Require newer libosmocore 1.0.0.0 ...................................................................... Require newer libosmocore 1.0.0.0 Use of osmo_mncc_name() requires libosmocore 0.12.0 Use of gsm48_cc_cause_name() requires libosmocore 1.0.0 Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/28/15128/1 diff --git a/configure.ac b/configure.ac index 407bd9e..5fe30f0 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE(sanitize, diff --git a/debian/control b/debian/control index 38de657..bac9b13 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, - libosmocore-dev, libsofia-sip-ua-glib-dev, libsofia-sip-ua-dev, dh-systemd (>= 1.5), dh-autoreconf, + libosmocore-dev (>= 1.0.0), osmo-gsm-manuals-dev Standards-Version: 3.8.4 Homepage: https://osmocom.org/projects/osmo-sip-conector/wiki -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:53:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:53:14 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E25-7304_=E2=86=92_1=2E3=2E0?= Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 Change subject: Bump version: 1.2.0.25-7304 ? 1.3.0 ...................................................................... Bump version: 1.2.0.25-7304 ? 1.3.0 Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c --- M debian/changelog 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/29/15129/1 diff --git a/debian/changelog b/debian/changelog index 8e570cb..c73771c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +osmo-sip-connector (1.3.0) unstable; urgency=medium + + [ Keith ] + * Support International Caller ID + * Support Emergency Calling + * Add media mode parameter to sdp_create_file() + * Handle SIP re-INVITEs + * Prepare to support MO Call HOLD + * Add support for MNCC HOLD/RETRIEVE + * Only send update to MNCC if media info changed. + * IPs stored in the call struct are NETWORK byte order + * Following from previous commit, assume other->ip is network byte order + * inet_ntoa() is deprecated, use inet_ntop() instead + * Fix bug with MO calls not connecting. + * Define hold/retrieve functions for MO calls + * Cosmetic: Logging and Comments, spelling and clarity changes + * Handle case where SIP side hangsup while MNCC is on hold + * Logging: Make use of Levels, clarify some messages + * In hold/retrieve/reinvite, add check that other_leg exists + + [ Harald Welte ] + * cosmetic: use OSMO_STRLCPY_ARRAY() instead of osmo_strlcpy() + * MNCC: Do not continue with B leg if A leg is cancelled. + + [ Rafael Diniz ] + * Added daemonize feature to osmo-sip-connector + + [ Daniel Willmann ] + * Properly indent config file + + [ Oliver Smith ] + * Cosmetic: debian: build-depends in multiple lines + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require newer libosmocore 1.0.0.0 + + -- Pau Espin Pedrol Thu, 08 Aug 2019 17:52:51 +0200 + osmo-sip-connector (1.2.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c Gerrit-Change-Number: 15129 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:55:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:55:17 +0000 Subject: Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 to look at the new patch set (#2). Change subject: Require newer libosmocore 1.0.0 ...................................................................... Require newer libosmocore 1.0.0 Use of osmo_mncc_name() requires libosmocore 0.12.0 Use of gsm48_cc_cause_name() requires libosmocore 1.0.0 Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/28/15128/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:55:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:55:17 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E25-ff8a_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 ) Change subject: Bump version: 1.2.0.25-ff8a ? 1.3.0 ...................................................................... Bump version: 1.2.0.25-ff8a ? 1.3.0 Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c --- M debian/changelog 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/29/15129/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c Gerrit-Change-Number: 15129 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:57:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:57:39 +0000 Subject: Change in ...osmo-msc[master]: Fix dependency version requirements In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:57:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:57:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:57:46 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15122 ) Change subject: Bump version: 1.4.0 ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 Gerrit-Change-Number: 15122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:57:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:57:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:57:49 +0000 Subject: Change in ...osmo-msc[master]: Fix dependency version requirements In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements ...................................................................... Fix dependency version requirements libosmocore 1.1.0 0e8df1c7e48bcae2285c7c138bd50f932049bd24 osmo_use_count() Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb libosmocore 1.2.0 cdac620579b5bf44970b5f4bb11734fdfdf5bf59 GSM23003_MSISDN_MAX_DIGITS Fixes: 8b0737fa71ea4b04cee8dc61c79a1f93779e66dc libosmo-sccp 1.1.0 21ff9ae4264de159784a59ce4421365007bde08d osmo_sccp_addr_ri_cmp() Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 osmo-mgw 1.6.0 538d2c53d90074267e7a70a90c773baa03d6ec04 mgcp_client_endpoint_fsm.h Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 libosmo-netif 0.6.0 needed by osmo-mgw 1.6.0 libsmpp34 1.14.0 required due to needed heap allocation function overrides from smpp34_heap.h Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 --- M configure.ac M debian/control 2 files changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index bb8fb39..5aa652d 100644 --- a/configure.ac +++ b/configure.ac @@ -35,15 +35,15 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) old_LIBS=$LIBS @@ -91,7 +91,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then - PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) + PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.14.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") diff --git a/debian/control b/debian/control index 887e386..f7a336a 100644 --- a/debian/control +++ b/debian/control @@ -13,17 +13,17 @@ libdbd-sqlite3, libsctp-dev, libtalloc-dev, - libsmpp34-dev (>= 1.12), - libasn1c-dev (>= 0.9.28), - libosmocore-dev (>= 0.10.0), - libosmo-sccp-dev, - libosmo-sigtran-dev (>= 0.8.0), - libosmo-abis-dev, - libosmo-mgcp-client-dev (>= 1.1.0), - libosmo-gsup-client-dev (>= 0.2.1), - libosmo-netif-dev (>= 0.1.0), - libosmo-ranap-dev (>= 0.2.0), - osmo-gsm-manuals-dev + libsmpp34-dev (>= 1.14.0), + libasn1c-dev (>= 0.9.30), + libosmocore-dev (>= 1.2.0), + libosmo-sccp-dev (>= 1.1.0), + libosmo-sigtran-dev (>= 1.1.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-mgcp-client-dev (>= 1.6.0), + libosmo-gsup-client-dev (>= 1.0.0), + libosmo-netif-dev (>= 0.6.0), + libosmo-ranap-dev (>= 0.3.0), + osmo-gsm-manuals-dev (>= 0.2.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-msc.git Vcs-Browser: https://git.osmocom.org/osmo-msc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:57:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:57:49 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15122 ) Change subject: Bump version: 1.4.0 ? 1.5.0 ...................................................................... Bump version: 1.4.0 ? 1.5.0 Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 --- M debian/changelog 1 file changed, 227 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8aec381..ec9671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,230 @@ +osmo-msc (1.5.0) unstable; urgency=medium + + [ Max ] + * Handle LCLS-NOTIFICATION message from BSS + * Various logging fixes + * VLR tests: use msgb_eq_data_print() for comparison + * transaction: drop meaningless ti_flag of trans_assign_trans_id() + * transaction: clarify magic 0xff transaction ID + + [ Vadim Yanitskiy ] + * transaction.c: cosmetic: use 'default' branch in trans_free() + * libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces + * transaction: change arguments of trans_find_by_sm_rp_mr() + * libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions + * libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() + * libmsc/gsm_04_80.c: use gsm0480_create_release_complete() + * libmsc/gsm_04_80.c: add msc_send_ussd_release_complete_cause() + * libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' + * transaction: fix description of trans_assign_trans_id() + * transaction.h: use #pragma once as include guard + * libmsc/gsm_09_11.c: implement guard timer for NCSS sessions + * libmsc/ran_conn.c: add missing 'break' to OSMO_RAT_EUTRAN_SGS + * libmsc/sgs_iface.c: fix SGS_STATE_NS11 counter reference + * libmsc/sgs_vty.c: always write server address and VLR name + * libmsc/msc_vty.c: drop dead comparison against null + * libmsc/sgs_iface.c: fix copy-paste error + * libmsc/sgs_iface.c: register sgs_vlr_reset_fsm on DSO load + * libmsc/sgs_vty.c: don't print SGs socket error twice + * libmsc: fix: properly initialize the SGs server + * libmsc/sms_queue.c: fix memleak in smsq_take_next_sms() + * tests/sms_queue: track the use of NULL talloc memory contexts + * msc/gsm_data.h: drop unused SMS_HDR_SIZE macro + * configure.ac: drop rudimentary check for -fvisibility=hidden + * configure.ac: drop useless SQLite3 dependency + * libmsc/db.c: print info about database name and libdbi version + * libmsc/gsm_04_11.c: clarify implicit CP-ACK handling + * libmsc/ran_peer.c: fix msgb memleak in ran_peer_rx_reset() + * libmsc/gsm_04_11.c: properly handle TP-User-Data-Length + * libmsc/gsm_04_11.c: fix double init of both SMR and SMC FSMs + * libmsc/gsm_04_11.c: cosmetic: restructure gsm411_mm_send() + * libmsc/gsm_04_08.c: fix: print proper length value + * libmsc/gsm_04_08.c: refactor CM Service Request parsing + * libmsc/gsm_04_08.c: clarify IMEI rejection in gsm48_rx_mm_serv_req() + * libmsc/gsm_04_11_gsup.c: cosmetic: drop useless variable + * tests/.../Makefile.am avoid redundant linkage with librt + * libmsc/sgs_server.c: do not override rc in case of SCTP_SHUTDOWN_EVENT + * libmsc/msc_ho.c: fix unreacheable check of MSC-T role allocation + * libmsc/msc_a.c: fix possible NULL-pointer dereferences + * sms_queue_test: assert return value of osmo_use_count_get_put() + * libmsc/gsm_04_11.c: fix NULL-pointer dereference in gsm340_rx_tpdu() + * libmsc/ran_msg_a.c: avoid ternary operator in struct initialization + * libmsc/ran_msg_a.c: refactor ran_a_decode_lcls_notification() + * libmsc/ran_msg_a.c: prevent chosen_encryption->key buffer overrun + * libmsc/mncc_call.c: fix uninitialized access of stack memory + * libmsc/ran_peer.c: fix msgb memleaks in ran_peer_down_paging() + * libmsc/ran_peer.c: avoid unreasonable use of goto in ran_peer_down_paging() + * libmsc/msc_vty.c: fix: use msub_for_vsub() in subscr_dump_full_vty() + * libmsc/msc_vty.c: fix documentation of 'show subscriber id' + * libmsc/msc_vty.c: use llist_count() in subscr_dump_full_vty() + * libmsc/rtp_stream.c: prevent NULL-pointer dereference + * libmsc/gsm_04_11.c: properly handle MMTS indication + * transaction: accept trans_type enum in trans_log_subsys() + * Use GSM23003_MSISDN_MAX_DIGITS from libosmogsm + * libmsc/msc_vty.c: refactor 'show subscr / conn / trans' commands + * libmsc/msc_vty.c: do not abuse strlen() to check char buffers + * tests: share stubs.h from msc_vlr_test as stubs.c + * Introduce initial unit test for db_sms_* API + * libmsc/db.c: fix storing SMS with empty TP-User-Data + * debian/control: add missing libdbd-sqlite3 to Build-Depends + * libmsc/db.c: fix potential integer overflow + * libmsc/db.c: introduce and use parse_sm_ud_from_result() + * libmsc/db.c: warn user about SMS text truncation + * libmsc/db.c: get rid of hard-coded SMS expiry threshold + * libmsc/mncc_builtin.c: drop dummy switch in int_mncc_recv() + * libmsc/gsm_0(4|9)_11_gsup.c: print error message if subscr is not known + * gsup_client_mux_tx_error_reply(): fix: do not override IMSI + * gsup_client_mux_tx_error_reply(): fix: do not omit session IEs + * gsup_client_mux_tx_error_reply(): fix: do not omit message class IE + * gsup_client_mux_tx_error_reply(): fix: do not omit SM-RP-MR IE + * libmsc/gsm_09_11.c: fix: return trans from establish_nc_ss_trans() + * libmsc/gsm_09_11.c: send GSUP PROS_SS ERROR message when needed + * libmsc/gsm_04_08.c: clean up unused leftover includes + * libmsc/msc_a.c: fix: remove dummy allstate_action of msc_a_fsm + * libmsc/paging.c: avoid double zero-initialization + * libmsc/paging.c: cosmetic: actually use default branch of switch + * libmsc/paging.c: cosmetic: remove leading space in log line + * libmsc/gsm_09_11.c: do not abuse LOG_TRANS() and early trans allocation + * libmsc/gsm_09_11.c: log network-originated session establishment error + * libmsc/gsm_09_11.c: drop rudimentary vsub->cgi.lai.lac check + * libmsc/gsm_09_11.c: drop meaningless check for concurrent paging + * libmsc/msc_net_init.c: pass pointer to gsm_network directly + * libmsc/gsm_09_11.c: inform HLR/EUSE if Paging has failed + * libmsc/gsm_09_11.c: properly handle OSMO_GSUP_MSGT_PROC_SS_ERROR + * libmsc/gsm_09_11.c: avoid double zero-initialization of gsup_msg + * libmsc/gsm_09_11.c: fix broken reference counting for vsub + * libmsc/gsm_09_11.c: do not abuse LOG_TRANS() in gsm0911_rcv_nc_ss() + * libmsc/gsm_09_11.c: do not suppress rc of gsup_client_mux_tx() + * tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear() + * libvlr/vlr.c: do not expire subscribers if periodic LU is disabled + * gsm_04_11_gsup.c: fix broken reference counting for vsub + * libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans() + * libmsc/ran_msg_iu.c: fix: properly handle SAPI IE of RANAP_DirectTransfer + * Fix: add missing semicolons to OSMO_ASSERT statements + * libmsc/msc_vty.c: print subscriber expiration time + + [ Harald Welte ] + * Add SGs Interface + * debian: depend on libsctp-dev + * configure.ac: Check for libsctp + * a_iface: Centralize/wrap BSSAP / N-DATA transmission + * a_iface: use 'const' qualifier for ran_conn whenever possible + * a_iface: Fix hexdumping of N-DATA.req + * a_iface: OSMO_ASSERT() if we ever want to send BSSAP with invalid length + * smpp_smsc: Call destroy_tlv() when using build_tlv() + * smpp: Make libsmpp34 use talloc for its allocations + * msub_check_for_release(): Initialize msc_role_a_c + * SMPP: Don't accept password or system-id exceeding spec length + * Iu: Send SMS over SAPI-3 + + [ Philipp Maier ] + * a_iface: Include CSFB Indication into BSSMAP CLEAR COMMAND + * silent_call: use osmo_strlcpy() instead of strncpy() + * msc_vty: add missing header file + * vlr_sgs: fix SGs IMSI detech from non EPS services + * vlr_sgs: start lu expiration timer on sgs eps detach + * sgs_iface: fix nullpointer dereference + * vlr_sgs_fsm: make sure vsub is marked used when LA is present + * sgs_iface: detect and react to VLR/HLR failure + + [ Oliver Smith ] + * debian: depend on libdbd-sqlite3 + * vlr_lu_fsm.c: assert for invalid events + * vty: make retrieve-imeisv-early configurable + * vlr: fix IMEI length + * vlr: when setting IMEISV, also set IMEI + * vlr: optionally send IMEI early to HLR + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * vlr_lu_fsm.c: don't send LU reject twice + + [ Keith ] + * Don't deliver alert notifications to ESME not yet bound. + * Write configuration correctly from vty (alert notifications) + + [ Neels Hofmeyr ] + * use only accepted ran_conns for new transactions + * gsm_04_11_gsup.c: drop unused conn lookup + * SMS queue: properly log failed attempts number + * vty: add cmd subscriber ID sms delete-all + * vlr_subscr_name(): use OSMO_STRBUF + * enable osmo_fsm_term_safely(), apply logging changes + * sms queue: avoid repeated Paging for a failed SMS + * vlr_subscr: use osmo_use_count + * add LOG_TRANS, proper context for all transactions + * gsm_04_08_cc: improve logging for CC trans + * smpp: fix vlr_subscr use count bugs + * vlr subscr get/put: also check against NULL + * fix various missing line endings in logging + * gsm_04_11: use gsm48_decode_bcd_number2(), evaluate rc + * large refactoring: support inter-BSC and inter-MSC Handover + * GSUP: include terminating nul in inter-MSC source/destination name + * rename bscconfig.h to config.h, cleanup + * fix regression: fix internal MNCC operation + * vty/cfg: add missing write-back of inter-BSC and inter-MSC HO config + * comment: apply function renames to message cycle explanation + * ran_a_make_handover_request(): allow no encryption + * make msc_a_vsub() and others NULL-safe + * no HO call forwarding if no RTP stream + * LOG_TRANS: store subsys in trans, unify USSD logging back to DMM + * call_leg: remove unused event MSC_EV_CALL_LEG_RTP_RELEASED + * call_leg: document the parent_event_* items + * add DSS logging category + * silence error messages about HANDOVER_END not permitted + * build osmo-msc: add "missing" LIBASN1C_LIBS + * minor comments in msc_vty.c + * manual: adjust and fix auth and ciph docs + * do not force encryption on UTRAN + * add msc_vlr tests for UMTS without ciphering + * doc/sequence_charts/mncc_fsm.msc: add SIP messages, tweak + * doc/sequence_charts: fix naming of mncc_fsm to mncc_call + * vlr_lu_fsm: fix missing event for IMEISV + + [ Sylvain Munaut ] + * libmsc: Allow different channel types to be requested as silent calls + * libvlr: Allow 2G auth tuples to be re-used without going through AUTH + * make LOG_TRANS() NULL-safe again + + [ Pau Espin Pedrol ] + * debian/control: Fix typo + * sms_queue: Print dest msisdn instead of unknown subscriber + * ran_peer: Move rx_reset_ack logic into its own func + * vty: Add option to enable osmux towards BSCs + * bssap: Detect BSC Osmux support on RESET (ACK) recv + * a_iface: Announce Osmux support on RESET (ACK) send + * Request Osmux CID and forward it in Assign Req and Assign Compl + * db: Fix call to mempcy with NULL src ptr + * db_sms_test: Do not print exact memcmp result + * db_sms_test: Remove libdbi expected driver load errors + * sms_queue.c: Improve misleading log line + * doc: Add Osmux documentation to User Manual + * Remove undefined param passed to logging_vty_add_cmds + * Fix dependency version requirements + + [ Omar Ramadan ] + * Allow MME name preformatted as FQDN in SGsAP + + [ Alexander Couzens ] + * remove msc specific db counters + * replace osmo_counter with stat_items + + [ Eric Wild ] + * libvlr: fix sgsn tmsi creation, replace constant with define + * turn -Werror=null-dereference into a warning + + [ Daniel Willmann ] + * manuals: Add script to update vty/counter documentation from docker + * manuals: Update counter/vty documentation + * manuals: Include overview chapter about counters + + [ Thorsten Alteholz ] + * fix spelling detected by lintian + + [ Keith Whyte ] + * Set coding in mncc_set_cause() + + -- Pau Espin Pedrol Thu, 08 Aug 2019 16:01:38 +0200 + osmo-msc (1.3.1) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 Gerrit-Change-Number: 15122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:58:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:58:42 +0000 Subject: Change in ...osmo-sgsn[master]: Require newer versions of dependencies In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 ) Change subject: Require newer versions of dependencies ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae Gerrit-Change-Number: 15123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:58:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:58:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:58:46 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E1_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 ) Change subject: Bump version: 1.4.1 ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2 Gerrit-Change-Number: 15124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:58:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:58:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:58:48 +0000 Subject: Change in ...osmo-sgsn[master]: Require newer versions of dependencies In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 ) Change subject: Require newer versions of dependencies ...................................................................... Require newer versions of dependencies New APIs only available since libgtp 1.4.0 are needed, and in turn that libgtp version requires newer libosmocore 1.1.0. osmo-sgsn itself requires libosmocore 1.2.0 since it uses GSM23003_TMSI_SGSN_MASK. Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae --- M configure.ac M debian/control 2 files changed, 17 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index a7d3717..02dcf05 100644 --- a/configure.ac +++ b/configure.ac @@ -39,12 +39,12 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) @@ -61,7 +61,7 @@ AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.3.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.4.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/control b/debian/control index 9ad95a1..df1f070 100644 --- a/debian/control +++ b/debian/control @@ -10,17 +10,17 @@ automake, libtool, pkg-config, - libasn1c-dev, libtalloc-dev, libc-ares-dev, - libgtp-dev, - libosmocore-dev, - libosmo-abis-dev, - libosmo-ranap-dev, - libosmo-sccp-dev, - libosmo-sigtran-dev, - libosmo-netif-dev, - libosmo-gsup-client-dev, + libgtp-dev (>= 1.4.0), + libosmocore-dev (>= 1.2.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.4.0), + libosmo-gsup-client-dev (>= 1.0.0), + libasn1c-dev (>= 0.9.30), + libosmo-ranap-dev (>= 0.4.0), + libosmo-sigtran-dev (>= 1.0.0), + libosmo-sccp-dev (>= 1.0.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git @@ -32,14 +32,14 @@ Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks +Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks Package: osmo-sgsn-dbg Section: debug Architecture: any Multi-Arch: same Depends: osmo-sgsn (= ${binary:Version}), ${misc:Depends} -Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks +Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks Package: osmo-gtphub Architecture: any -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae Gerrit-Change-Number: 15123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 15:58:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 15:58:48 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E1_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 ) Change subject: Bump version: 1.4.1 ? 1.5.0 ...................................................................... Bump version: 1.4.1 ? 1.5.0 Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2 --- M debian/changelog 1 file changed, 66 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 5461745..02ec236 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +osmo-sgsn (1.5.0) unstable; urgency=medium + + [ Max ] + * Improve 'show subscriber cache' vty command + * GMM: permit VLR_ANSWERED event in attach FSM + * Fix IMSI padding in imsi-acl + + [ Harald Welte ] + * gbproxy_test: Fix test expectations of gprs_ns_rcvmsg() + * LLC XID: Fix string representation of N201_U + * LLC: Don't blindly assume all LLC frames have data payload + * LLC: Avoid NOTICE message on LLC NULL + * gprs_llc: Correctly refuse any ABM command (SABM, DISC) with DM + * LLC: Store the XID inside the LLC Entity, not LLC Mgmg Entity + * gb_proxy.h: Add missing comments; improve comments + * gb_proxy: cosmetic: Use 'bool' in data structures where applicable + + [ efistokl ] + * gsm0408_rcv_gmm: send Iu-ReleaseCommand upon receiving Attach Complete. + * gprs_gmm: send Service Reject when no PDP ctxs are available. + + [ Alexander Couzens ] + * gprs_gmm: reintroduce calling gsm48_gmm_authorize when not handling GMM Attach Requests + * gbproxy: parse dtap GSM48_MT_GSM_DEACT_PDP_REQ|ACK + + [ Pau Espin Pedrol ] + * gprs_sndcp_comp_free: Replace ifelse with switch and better handling of error + * sgsn: vty: Improve log warning content with spec section + * Document max retransmit times for T3395 + * sgsn: Fix echo timer not started upon first pdp ctx created + * sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API + * sgsn: Have authentication required on by default + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require newer versions of dependencies + + [ Keith ] + * Echo zero byte XID-Field of Type L3_PAR + + [ Oliver Smith ] + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + * osmo-gtphub.cfg: fix conflict with osmo-sgsn.cfg + * osmo-gbproxy.cfg: fix conflict with osmo-sgsn.cfg + + [ Vadim Yanitskiy ] + * doc/manuals/vty: regenerate sgsn_vty_reference.xml + * osmo-sgsn: add VTY parameter to toggle authentication + * sgsn_mm_ctx_find_ggsn_ctx(): fix: always set gsm_cause + + [ Eric Wild ] + * replace magic tmsi constant with define + * turn -Werror=null-dereference into a warning + + [ Daniel Willmann ] + * manuals: Add script to regenerate vty/counter documentation + * manuals: Update vty/counter documentation + * Add/fix help string for version option + * osmo-sgsn: Fix outdated information in usermanual + * configuration.adoc: Small fixes + * configuration.adoc: Add a section about encryption + + [ Ruben Undheim ] + * Spelling fixes + + -- Pau Espin Pedrol Thu, 08 Aug 2019 16:46:31 +0200 + osmo-sgsn (1.4.0) unstable; urgency=medium [ Alexander Couzens ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2 Gerrit-Change-Number: 15124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:02:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:02:33 +0000 Subject: Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 ) Change subject: Require newer libosmocore 1.0.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:02:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:02:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:02:35 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E25-ff8a_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 ) Change subject: Bump version: 1.2.0.25-ff8a ? 1.3.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c Gerrit-Change-Number: 15129 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:02:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:02:38 +0000 Subject: Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 ) Change subject: Require newer libosmocore 1.0.0 ...................................................................... Require newer libosmocore 1.0.0 Use of osmo_mncc_name() requires libosmocore 0.12.0 Use of gsm48_cc_cause_name() requires libosmocore 1.0.0 Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 407bd9e..5fe30f0 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE(sanitize, diff --git a/debian/control b/debian/control index 38de657..bac9b13 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, - libosmocore-dev, libsofia-sip-ua-glib-dev, libsofia-sip-ua-dev, dh-systemd (>= 1.5), dh-autoreconf, + libosmocore-dev (>= 1.0.0), osmo-gsm-manuals-dev Standards-Version: 3.8.4 Homepage: https://osmocom.org/projects/osmo-sip-conector/wiki -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:02:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:02:39 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eosmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E25-ff8a_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 ) Change subject: Bump version: 1.2.0.25-ff8a ? 1.3.0 ...................................................................... Bump version: 1.2.0.25-ff8a ? 1.3.0 Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c --- M debian/changelog 1 file changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8e570cb..bbe3db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +osmo-sip-connector (1.3.0) unstable; urgency=medium + + [ Keith ] + * Support International Caller ID + * Support Emergency Calling + * Add media mode parameter to sdp_create_file() + * Handle SIP re-INVITEs + * Prepare to support MO Call HOLD + * Add support for MNCC HOLD/RETRIEVE + * Only send update to MNCC if media info changed. + * IPs stored in the call struct are NETWORK byte order + * Following from previous commit, assume other->ip is network byte order + * inet_ntoa() is deprecated, use inet_ntop() instead + * Fix bug with MO calls not connecting. + * Define hold/retrieve functions for MO calls + * Cosmetic: Logging and Comments, spelling and clarity changes + * Handle case where SIP side hangsup while MNCC is on hold + * Logging: Make use of Levels, clarify some messages + * In hold/retrieve/reinvite, add check that other_leg exists + + [ Harald Welte ] + * cosmetic: use OSMO_STRLCPY_ARRAY() instead of osmo_strlcpy() + * MNCC: Do not continue with B leg if A leg is cancelled. + + [ Rafael Diniz ] + * Added daemonize feature to osmo-sip-connector + + [ Daniel Willmann ] + * Properly indent config file + + [ Oliver Smith ] + * Cosmetic: debian: build-depends in multiple lines + * debian: create -doc subpackage with pdf manuals + * contrib/jenkins.sh: run "make maintainer-clean" + + [ Pau Espin Pedrol ] + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * Require newer libosmocore 1.0.0 + + -- Pau Espin Pedrol Thu, 08 Aug 2019 17:54:49 +0200 + osmo-sip-connector (1.2.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c Gerrit-Change-Number: 15129 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:04:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:04:12 +0000 Subject: Change in ...openbsc[master]: debian/control: Match dependency versions against configure.ac In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/15125 ) Change subject: debian/control: Match dependency versions against configure.ac ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 Gerrit-Change-Number: 15125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:04:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:04:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:04:13 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eopenbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E5-38ea_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/15126 ) Change subject: Bump version: 1.3.0.5-38ea ? 1.3.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0 Gerrit-Change-Number: 15126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:04:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:04:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:04:17 +0000 Subject: Change in ...openbsc[master]: debian/control: Match dependency versions against configure.ac In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/openbsc/+/15125 ) Change subject: debian/control: Match dependency versions against configure.ac ...................................................................... debian/control: Match dependency versions against configure.ac Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 --- M debian/control 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/control b/debian/control index 557467e..b9008ef 100644 --- a/debian/control +++ b/debian/control @@ -6,16 +6,16 @@ autotools-dev, autoconf-archive, pkg-config, - libosmocore-dev, - libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, dh-systemd (>= 1.5), - libosmo-abis-dev, - libosmo-netif-dev, + libsmpp34-dev (>= 1.13.0), + libosmocore-dev (>= 1.0.1), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.4.0), + libosmo-sccp-dev (>= 1.0.0), libdbd-sqlite3, - libpcap-dev, - libsmpp34-dev + libpcap-dev Standards-Version: 3.9.8 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 Gerrit-Change-Number: 15125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:04:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:04:17 +0000 Subject: =?UTF-8?Q?Change_in_=2E=2E=2Eopenbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E5-38ea_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/openbsc/+/15126 ) Change subject: Bump version: 1.3.0.5-38ea ? 1.3.1 ...................................................................... Bump version: 1.3.0.5-38ea ? 1.3.1 Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0 --- M debian/changelog 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 51bc211..ec4e072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +openbsc (1.3.1) unstable; urgency=medium + + [ Daniel Willmann ] + * manuals: Update osmonitb counter/vty documentation + * manuals: Generate vty/counter documentation for osmo-bscnat + + [ Pau Espin Pedrol ] + * nat: Remove unused func bsc_vty_init() + * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds + * debian/control: Match dependency versions against configure.ac + + -- Pau Espin Pedrol Thu, 08 Aug 2019 17:32:51 +0200 + openbsc (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0 Gerrit-Change-Number: 15126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:04:42 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 16:04:42 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh File osmo-release.sh: https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh at 27 PS1, Line 27: if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then would prefer if [ -f "openbsc/configure.ac" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 16:04:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:05:50 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 16:05:50 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh File osmo-release.sh: https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh at 27 PS1, Line 27: if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then > would prefer [?] (add "$GIT_TOPDIR") -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 16:05:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:07:37 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 16:07:37 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh File osmo-release.sh: https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh at 171 PS1, Line 171: git add ${GIT_TOPDIR}/debian/changelog unmentioned / unrelated fix? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 16:07:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:15:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:15:59 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh File osmo-release.sh: https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh at 27 PS1, Line 27: if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then > (add "$GIT_TOPDIR") Ack https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh at 171 PS1, Line 171: git add ${GIT_TOPDIR}/debian/changelog > unmentioned / unrelated fix? That's needed, because script in this case (at least for me) runs CWD=openbsc/openbsc. So this way it works no matter the place or repository, because debian dir is always directly under the GIT_TOPDIR. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 16:15:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:16:31 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 8 Aug 2019 16:16:31 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 8: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c at 360 PS8, Line 360: vty_out(vty, " callwaiting%s", VTY_NEWLINE); (still think it would be good to omit the default, but you decide) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:16:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:20:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 8 Aug 2019 16:20:49 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15127 to look at the new patch set (#2). Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... osmo-release.sh: Support releasing openbsc.git openbsc's directory structure is a bit different (has most stuff inside an extra subdir). Let's account for that. Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 --- M osmo-release.sh 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/15127/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:38:37 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 16:38:37 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c at 360 PS8, Line 360: vty_out(vty, " callwaiting%s", VTY_NEWLINE); > (still think it would be good to omit the default, but you decide) Ah! yeah.. OK that's pretty standard to omit the default. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:38:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 16:58:23 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 16:58:23 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#9). Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 55 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 8 17:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 8 Aug 2019 17:14:50 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#10). Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 54 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:14 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:14 +0000 Subject: Change in ...osmo-mgw[master]: rename codecs_cmp() to codecs_same() Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15130 Change subject: rename codecs_cmp() to codecs_same() ...................................................................... rename codecs_cmp() to codecs_same() The name 'cmp' implies a return value of -1, 0, 1 to indicate smaller, match or larger. Since this function returns bool, it should not be named with 'cmp'. Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/15130/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 8be4c3c..e9e2c62 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -352,7 +352,7 @@ /* Compare two codecs, all parameters must match up, except for the payload type * number. */ -static bool codecs_cmp(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) +static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) { if (codec_a->rate != codec_b->rate) return false; @@ -406,7 +406,7 @@ codecs_assigned = rtp_dst->codecs_assigned; OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS); for (i = 0; i < codecs_assigned; i++) { - if (codecs_cmp(codec_src, &rtp_dst->codecs[i])) { + if (codecs_same(codec_src, &rtp_dst->codecs[i])) { codec_dst = &rtp_dst->codecs[i]; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8 Gerrit-Change-Number: 15130 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:14 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:14 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: constify 'param' arg Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15131 Change subject: mgcp_codec: constify 'param' arg ...................................................................... mgcp_codec: constify 'param' arg Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba --- M include/osmocom/mgcp/mgcp_codec.h M src/libosmo-mgcp/mgcp_codec.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/31/15131/1 diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 2bbb86e..3ead60a 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -2,6 +2,6 @@ void mgcp_codec_summary(struct mgcp_conn_rtp *conn); void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn); -int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, struct mgcp_codec_param *param); +int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param); int mgcp_codec_decide(struct mgcp_conn_rtp *conn); int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index e9e2c62..d5b99e8 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -101,7 +101,7 @@ /* Set members of struct mgcp_rtp_codec, extrapolate in missing information. Param audio_name is expected in uppercase. */ static int codec_set(void *ctx, struct mgcp_rtp_codec *codec, int payload_type, const char *audio_name, - unsigned int pt_offset, struct mgcp_codec_param *param) + unsigned int pt_offset, const struct mgcp_codec_param *param) { int rate; int channels; @@ -242,7 +242,7 @@ * \param[in] audio_name audio codec name, in uppercase (e.g. "GSM/8000/1"). * \param[in] param optional codec parameters (set to NULL when unused). * \returns 0 on success, -EINVAL on failure. */ -int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, struct mgcp_codec_param *param) +int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param) { int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba Gerrit-Change-Number: 15131 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:14 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:14 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... mgcp_codec: split codec_free() off of codec_init() Both are used only in the same .c file, so make them static. Preparation to fix a memleak in a conn's codec list. Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/32/15132/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index d5b99e8..4c14d12 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -76,18 +76,24 @@ } /* Initalize or reset codec information with default data. */ -void codec_init(struct mgcp_rtp_codec *codec) +static void codec_init(struct mgcp_rtp_codec *codec) +{ + *codec = (struct mgcp_rtp_codec){ + .payload_type = -1, + .frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM, + .frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN, + .rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE, + .channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS, + }; +} + +static void codec_free(struct mgcp_rtp_codec *codec) { if (codec->subtype_name) talloc_free(codec->subtype_name); if (codec->audio_name) talloc_free(codec->audio_name); - memset(codec, 0, sizeof(*codec)); - codec->payload_type = -1; - codec->frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM; - codec->frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN; - codec->rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE; - codec->channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS; + *codec = (struct mgcp_rtp_codec){}; } /*! Initalize or reset codec information with default data. @@ -229,7 +235,7 @@ return 0; error: /* Make sure we leave a clean codec entry on error. */ - codec_init(codec); + codec_free(codec); memset(codec, 0, sizeof(*codec)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:14 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:14 +0000 Subject: Change in ...osmo-mgw[master]: fix memleak: actually free strings in mgcp_codec_reset_all() Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15133 Change subject: fix memleak: actually free strings in mgcp_codec_reset_all() ...................................................................... fix memleak: actually free strings in mgcp_codec_reset_all() The audio_name and subtype_name are allocated from talloc, so they need to be freed before resetting the codec array. Use mgcp_codec_free() to ensure this. Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/15133/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 4c14d12..b27c60d 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -100,7 +100,9 @@ * \param[out] conn related rtp-connection. */ void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn) { - memset(conn->end.codecs, 0, sizeof(conn->end.codecs)); + int i; + for (i = 0; i < conn->end.codecs_assigned; i++) + codec_free(&conn->end.codecs[i]); conn->end.codecs_assigned = 0; conn->end.codec = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f Gerrit-Change-Number: 15133 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:15 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15134 Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() ...................................................................... mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() Instead of manually entering codec values, use mgcp_codec_add() to populate test conns with codecs. The idea is to better test what actually happens when parsing SDP codec strings. Rewrite current test_mgcp_codec_pt_translate() from procedural to a data model with human readable stdout logging. This prepares to enable interpreting codec strings like "FOO/8000/1" as equivalent with "FOO/8000": the SDP standard defines the final "/1", indicating the nr of channels, as optional for a single channel, but osmo-mgw currently is unable to match these two formats as identical. So prepare the test_mgcp_codec_pt_translate() so that upcoming patches can incorporate strings with and without the final "/1" by extending the struct arrays. Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb --- M tests/mgcp/mgcp_test.c 1 file changed, 166 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/15134/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 39fe5d0..2c1e690 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1711,98 +1711,178 @@ OSMO_ASSERT(check_local_cx_options(ctx, ",,,") == -1); } -static void test_mgcp_codec_pt_translate_pars(struct mgcp_rtp_codec *c) -{ - c->rate = 8000; - c->channels = 1; - c->frame_duration_num = 23; - c->frame_duration_den = 42; -} +static const struct mgcp_codec_param amr_param_octet_aligned_true = { + .amr_octet_aligned_present = true, + .amr_octet_aligned = true, +}; + +#if 0 +static const struct mgcp_codec_param amr_param_octet_aligned_false = { + .amr_octet_aligned_present = true, + .amr_octet_aligned = false, +}; + +static const struct mgcp_codec_param amr_param_octet_aligned_unset = { + .amr_octet_aligned_present = false, +}; +#endif + +struct testcase_mgcp_codec_pt_translate_codec { + int payload_type; + const char *audio_name; + const struct mgcp_codec_param *param; + int expect_rc; +}; + +struct testcase_mgcp_codec_pt_translate_expect { + bool end; + int payload_type_map[2]; +}; + +struct testcase_mgcp_codec_pt_translate { + const char *descr; + /* two conns on an endpoint, each with N configured codecs */ + struct testcase_mgcp_codec_pt_translate_codec codecs[2][10]; + struct testcase_mgcp_codec_pt_translate_expect expect[32]; +}; + +static const struct testcase_mgcp_codec_pt_translate test_mgcp_codec_pt_translate_cases[] = { + { + .descr = "same order, but differing payload type numbers", + .codecs = { + { + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + }, + { + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 97, "GSM-HR-08/8000/1", NULL, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "conn0 has no codecs", + .codecs = { + { + /* no codecs */ + }, + { + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 97, "GSM-HR-08/8000/1", NULL, }, + }, + }, + .expect = { + { .payload_type_map = {112, -EINVAL}, }, + { .payload_type_map = {0, -EINVAL}, }, + { .payload_type_map = {111, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "conn1 has no codecs", + .codecs = { + { + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + }, + { + /* no codecs */ + }, + }, + .expect = { + { .payload_type_map = {112, -EINVAL}, }, + { .payload_type_map = {0, -EINVAL}, }, + { .payload_type_map = {111, -EINVAL} }, + { .end = true }, + }, + }, +}; static void test_mgcp_codec_pt_translate(void) { - struct mgcp_conn_rtp conn_src; - struct mgcp_conn_rtp conn_dst; - int pt_dst; + int i; + bool ok = true; + printf("\nTesting mgcp_codec_pt_translate()\n"); - /* Setup a realistic set of codec configurations on both - * ends. AMR and HR will use different payload types. PCMU - * must use 0 on both ends since this is not a dynamic payload - * type */ - test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[0]); - test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[0]); - test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[1]); - test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[1]); - test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[2]); - test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[2]); - conn_src.end.codecs[0].payload_type = 112; - conn_dst.end.codecs[0].payload_type = 96; - conn_src.end.codecs[1].payload_type = 0; - conn_dst.end.codecs[1].payload_type = 0; - conn_src.end.codecs[2].payload_type = 111; - conn_dst.end.codecs[2].payload_type = 97; - conn_src.end.codecs[0].audio_name = "AMR/8000/1"; - conn_dst.end.codecs[0].audio_name = "AMR/8000/1"; - conn_src.end.codecs[1].audio_name = "PCMU/8000/1"; - conn_dst.end.codecs[1].audio_name = "PCMU/8000/1"; - conn_src.end.codecs[2].audio_name = "GSM-HR-08/8000/1"; - conn_dst.end.codecs[2].audio_name = "GSM-HR-08/8000/1"; - conn_src.end.codecs[0].subtype_name = "AMR"; - conn_dst.end.codecs[0].subtype_name = "AMR"; - conn_src.end.codecs[1].subtype_name = "PCMU"; - conn_dst.end.codecs[1].subtype_name = "PCMU"; - conn_src.end.codecs[2].subtype_name = "GSM-HR-08"; - conn_dst.end.codecs[2].subtype_name = "GSM-HR-08"; - conn_src.end.codecs_assigned = 3; - conn_dst.end.codecs_assigned = 3; + for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_pt_translate_cases); i++) { + const struct testcase_mgcp_codec_pt_translate *t = &test_mgcp_codec_pt_translate_cases[i]; + struct mgcp_conn_rtp conn[2] = {}; + int rc; + int conn_i; + int c; - /* We expect the function to find the PT we must use when we send the - * packet out to the destination. All we know is the context for both - * connections and the payload type from the source packet */ - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[0].payload_type); - OSMO_ASSERT(pt_dst == conn_dst.end.codecs[0].payload_type); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[1].payload_type); - OSMO_ASSERT(pt_dst == conn_dst.end.codecs[1].payload_type); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[2].payload_type); - OSMO_ASSERT(pt_dst == conn_dst.end.codecs[2].payload_type); + printf("#%d: %s\n", i, t->descr); - /* Try some constellations that must fail */ - pt_dst = mgcp_codec_pt_translate(&conn_src, &conn_dst, 123); - OSMO_ASSERT(pt_dst == -EINVAL); - conn_src.end.codecs_assigned = 0; - conn_dst.end.codecs_assigned = 3; - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[0].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[1].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[2].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - conn_src.end.codecs_assigned = 3; - conn_dst.end.codecs_assigned = 0; - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[0].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[1].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[2].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); + for (conn_i = 0; conn_i < 2; conn_i++) { + printf(" - add codecs on conn%d:\n", conn_i); + for (c = 0; c < ARRAY_SIZE(t->codecs[conn_i]); c++) { + const struct testcase_mgcp_codec_pt_translate_codec *codec = &t->codecs[conn_i][c]; + if (!codec->audio_name) + break; + + rc = mgcp_codec_add(&conn[conn_i], codec->payload_type, codec->audio_name, codec->param); + + printf(" %2d: %3d %s%s -> rc=%d\n", c, codec->payload_type, codec->audio_name, + codec->param ? + (codec->param->amr_octet_aligned_present? + (codec->param->amr_octet_aligned ? + " octet-aligned=1" : " octet-aligned=0") + : " octet-aligned=unset") + : "", + rc); + if (rc != codec->expect_rc) { + printf(" ERROR: expected rc=%d\n", codec->expect_rc); + ok = false; + } + } + if (!c) + printf(" (none)\n"); + } + + for (c = 0; c < ARRAY_SIZE(t->expect); c++) { + const struct testcase_mgcp_codec_pt_translate_expect *expect = &t->expect[c]; + int result; + + if (expect->end) + break; + + result = mgcp_codec_pt_translate(&conn[0], &conn[1], expect->payload_type_map[0]); + printf(" - mgcp_codec_pt_translate(conn0, conn1, %d) -> %d\n", + expect->payload_type_map[0], result); + if (result != expect->payload_type_map[1]) { + printf(" ERROR: expected -> %d\n", expect->payload_type_map[1]); + ok = false; + } + + /* If the expected result is an error, don't do reverse map test */ + if (expect->payload_type_map[1] < 0) + continue; + + result = mgcp_codec_pt_translate(&conn[1], &conn[0], expect->payload_type_map[1]); + printf(" - mgcp_codec_pt_translate(conn1, conn0, %d) -> %d\n", + expect->payload_type_map[1], result); + if (result != expect->payload_type_map[0]) { + printf(" ERROR: expected -> %d\n", expect->payload_type_map[0]); + ok = false; + } + } + + for (conn_i = 0; conn_i < 2; conn_i++) + mgcp_codec_reset_all(&conn[conn_i]); + } + + OSMO_ASSERT(ok); } void test_conn_id_matching() -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb Gerrit-Change-Number: 15134 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:15 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135 Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... test_mgcp_codec_pt_translate(): more tests Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 112 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/15135/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2c1e690..44e8234 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1770,6 +1770,49 @@ }, }, { + .descr = "different order and different payload type numbers", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08/8000/1", NULL, }, + { 0, "PCMU/8000/1", NULL, }, + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "both sides have the same payload_type numbers assigned to conflicting codecs", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 96, "GSM-HR-08/8000/1", NULL, }, + { 97, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08/8000/1", NULL, }, + { 0, "PCMU/8000/1", NULL, }, + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {96, 97}, }, + { .payload_type_map = {97, 96}, }, + { .payload_type_map = {0, 0}, }, + { .end = true }, + }, + }, + { .descr = "conn0 has no codecs", .codecs = { { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 6f4da10..13d1870 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1218,6 +1218,75 @@ p10, aPCMU -> (null) '10,a :PCMU' -> '(null)' +Testing mgcp_codec_pt_translate() +#0: same order, but differing payload type numbers + - add codecs on conn0: + 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 111 GSM-HR-08/8000/1 -> rc=0 + - add codecs on conn1: + 0: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 97 GSM-HR-08/8000/1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#1: different order and different payload type numbers + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 111 GSM-HR-08/8000/1 -> rc=0 + 2: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08/8000/1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#2: both sides have the same payload_type numbers assigned to conflicting codecs + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 96 GSM-HR-08/8000/1 -> rc=0 + 2: 97 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08/8000/1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 96) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 96 + - mgcp_codec_pt_translate(conn0, conn1, 97) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 97 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 +#3: conn0 has no codecs + - add codecs on conn0: + (none) + - add codecs on conn1: + 0: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 97 GSM-HR-08/8000/1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 +#4: conn1 has no codecs + - add codecs on conn0: + 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 111 GSM-HR-08/8000/1 -> rc=0 + - add codecs on conn1: + (none) + - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 + Testing test_conn_id_matching needle='23AB' found '000023AB' needle='0023AB' found '000023AB' -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:15 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... differentiate AMR octet-aligned=0 vs =1 Add corresponding tests in mgcp_test.c Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 95 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/15136/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index b27c60d..ead1412 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -358,6 +358,16 @@ return -EINVAL; } +/* Default to octet-aligned=0, i.e. bandwidth-efficient mode */ +static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec) +{ + if (!codec->param_present) + return false; + if (!codec->param.amr_octet_aligned_present) + return false; + return codec->param.amr_octet_aligned; +} + /* Compare two codecs, all parameters must match up, except for the payload type * number. */ static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) @@ -374,6 +384,10 @@ return false; if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; + if (!strcmp(codec_a->subtype_name, "AMR")) { + if (amr_is_octet_aligned(codec_a) != amr_is_octet_aligned(codec_b)) + return false; + } return true; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 44e8234..5d4267f 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1716,7 +1716,6 @@ .amr_octet_aligned = true, }; -#if 0 static const struct mgcp_codec_param amr_param_octet_aligned_false = { .amr_octet_aligned_present = true, .amr_octet_aligned = false, @@ -1725,7 +1724,6 @@ static const struct mgcp_codec_param amr_param_octet_aligned_unset = { .amr_octet_aligned_present = false, }; -#endif struct testcase_mgcp_codec_pt_translate_codec { int payload_type; @@ -1850,6 +1848,58 @@ { .end = true }, }, }, + { + .descr = "test AMR with differing octet-aligned settings", + .codecs = { + { + { 111, "AMR/8000", &amr_param_octet_aligned_true, }, + { 112, "AMR/8000", &amr_param_octet_aligned_false, }, + }, + { + { 122, "AMR/8000", &amr_param_octet_aligned_false, }, + { 121, "AMR/8000", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {111, 121}, }, + { .payload_type_map = {112, 122} }, + { .end = true }, + }, + }, + { + .descr = "test AMR with missing octet-aligned settings (defaults to 0)", + .codecs = { + { + { 111, "AMR/8000", &amr_param_octet_aligned_true, }, + { 112, "AMR/8000", &amr_param_octet_aligned_false, }, + }, + { + { 122, "AMR/8000", &amr_param_octet_aligned_unset, }, + }, + }, + .expect = { + { .payload_type_map = {111, -EINVAL}, }, + { .payload_type_map = {112, 122} }, + { .end = true }, + }, + }, + { + .descr = "test AMR with NULL param (defaults to 0)", + .codecs = { + { + { 111, "AMR/8000", &amr_param_octet_aligned_true, }, + { 112, "AMR/8000", &amr_param_octet_aligned_false, }, + }, + { + { 122, "AMR/8000", NULL, }, + }, + }, + .expect = { + { .payload_type_map = {111, -EINVAL}, }, + { .payload_type_map = {112, 122} }, + { .end = true }, + }, + }, }; static void test_mgcp_codec_pt_translate(void) diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 13d1870..35ca92b 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1286,6 +1286,35 @@ - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 +#5: test AMR with differing octet-aligned settings + - add codecs on conn0: + 0: 111 AMR/8000 octet-aligned=1 -> rc=0 + 1: 112 AMR/8000 octet-aligned=0 -> rc=0 + - add codecs on conn1: + 0: 122 AMR/8000 octet-aligned=0 -> rc=0 + 1: 121 AMR/8000 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121 + - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 +#6: test AMR with missing octet-aligned settings (defaults to 0) + - add codecs on conn0: + 0: 111 AMR/8000 octet-aligned=1 -> rc=0 + 1: 112 AMR/8000 octet-aligned=0 -> rc=0 + - add codecs on conn1: + 0: 122 AMR/8000 octet-aligned=unset -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 +#7: test AMR with NULL param (defaults to 0) + - add codecs on conn0: + 0: 111 AMR/8000 octet-aligned=1 -> rc=0 + 1: 112 AMR/8000 octet-aligned=0 -> rc=0 + - add codecs on conn1: + 0: 122 AMR/8000 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 Testing test_conn_id_matching needle='23AB' found '000023AB' -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:16 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15137 Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... ptmap: implicitly match '/8000' and '/8000/1' In codecs_cmp(), do not compare the complete audio_name. The parts of it are already checked individually: - subtype_name ("AMR"), - rate ("8000"; defaults to 8000 if omitted) and - channels ("1"; defaults to 1 if omitted) So by also checking the complete audio_name, we brushed over the match of implicit "/8000" and "/8000/1", which otherwise works out fine. As a result, translating payload type numbers in RTP headers now also works if one conn of an endpoint set an rtpmap with "AMR/8000" and the other conn set "AMR/8000/1". It seems to me that most PBX out there generate ptmaps omitting the "/1", so fixing this should make us more interoperable with third party SDP. See IETF RFC4566 section 6. SDP Attributes: For audio streams, indicates the number of audio channels. This parameter is OPTIONAL and may be omitted if the number of channels is one, provided that no additional parameters are needed. Also allowing to omit the "/8000" is a mere side effect of this patch. Omitting the rate does not seem to be specified in an RFC, but is logical for audio codecs defined to require exactly 8000 set as rate (most GSM codecs). Add tests in mgcp_test.c. Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 92 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/37/15137/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index ead1412..a947bb3 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -380,8 +380,6 @@ return false; if (codec_a->frame_duration_den != codec_b->frame_duration_den) return false; - if (strcmp(codec_a->audio_name, codec_b->audio_name)) - return false; if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; if (!strcmp(codec_a->subtype_name, "AMR")) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 5d4267f..8a37ef0 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1900,6 +1900,70 @@ { .end = true }, }, }, + { + .descr = "match FOO/8000/1 and FOO/8000 as identical, single channel is implicit", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08/8000", NULL, }, + { 0, "PCMU/8000", NULL, }, + { 96, "AMR/8000", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "match FOO/8000/1 and FOO as identical, 8k and single channel are implicit", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08", NULL, }, + { 0, "PCMU", NULL, }, + { 96, "AMR", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "test whether channel number matching is waterproof", + .codecs = { + { + { 111, "GSM-HR-08/8000", }, + { 112, "GSM-HR-08/8000/2", .expect_rc = -22}, + { 113, "GSM-HR-08/8000/3", .expect_rc = -22}, + }, + { + { 122, "GSM-HR-08/8000/2", .expect_rc = -22}, + { 121, "GSM-HR-08/8000/1", }, + }, + }, + .expect = { + { .payload_type_map = {111, 121}, }, + { .payload_type_map = {112, -EINVAL} }, + { .payload_type_map = {113, -EINVAL} }, + { .end = true }, + }, + }, }; static void test_mgcp_codec_pt_translate(void) diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 35ca92b..18ddf7d 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1315,6 +1315,34 @@ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 +#8: match FOO/8000/1 and FOO/8000 as identical, single channel is implicit + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 111 GSM-HR-08/8000/1 -> rc=0 + 2: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08/8000 -> rc=0 + 1: 0 PCMU/8000 -> rc=0 + 2: 96 AMR/8000 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#9: test whether channel number matching is waterproof + - add codecs on conn0: + 0: 111 GSM-HR-08/8000 -> rc=0 + 1: 112 GSM-HR-08/8000/2 -> rc=-22 + 2: 113 GSM-HR-08/8000/3 -> rc=-22 + - add codecs on conn1: + 0: 122 GSM-HR-08/8000/2 -> rc=-22 + 1: 121 GSM-HR-08/8000/1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121 + - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 113) -> -22 Testing test_conn_id_matching needle='23AB' found '000023AB' -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:16 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... mgcp_codec: codec_set(): log about all possible errors In codec_set(), for each 'goto error', log the specific error cause. Also add a TODO and a FIXME comment about inventing dynamic payload type numbers. Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 27 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/38/15138/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index a947bb3..93a8157 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -121,12 +121,13 @@ if (payload_type != PTYPE_UNDEFINED) { /* Make sure we do not get any reserved or undefined type numbers */ /* See also: https://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ - if (payload_type == 1 || payload_type == 2 || payload_type == 19) + if ((payload_type == 1 || payload_type == 2 || payload_type == 19) + || (payload_type >= 72 && payload_type <= 76) + || (payload_type >= 127)) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot add codec, payload type number %d is reserved\n", + payload_type); goto error; - if (payload_type >= 72 && payload_type <= 76) - goto error; - if (payload_type >= 127) - goto error; + } codec->payload_type = payload_type; } @@ -152,6 +153,8 @@ /* The given payload type is not known to us, or it * it is a dynamic payload type for which we do not * know the audio name. We must give up here */ + LOGP(DLMGCP, LOGL_ERROR, "No audio codec name given, and payload type %d unknown\n", + payload_type); goto error; } } @@ -159,16 +162,23 @@ /* Now we extract the codec subtype name, rate and channels. The latter * two are optional. If they are not present we use the safe defaults * above. */ - if (strlen(audio_name) > sizeof(audio_codec)) + if (strlen(audio_name) > sizeof(audio_codec)) { + LOGP(DLMGCP, LOGL_ERROR, "Audio codec too long: %s\n", osmo_quote_str(audio_name, -1)); goto error; + } channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS; rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE; - if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, &rate, &channels) < 1) + if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, &rate, &channels) < 1) { + LOGP(DLMGCP, LOGL_ERROR, "Invalid audio codec: %s\n", osmo_quote_str(audio_name, -1)); goto error; + } /* Note: We only accept configurations with one audio channel! */ - if (channels != 1) + if (channels != 1) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot handle audio codec with more than one channel: %s\n", + osmo_quote_str(audio_name, -1)); goto error; + } codec->rate = rate; codec->channels = channels; @@ -186,6 +196,9 @@ /* Derive the payload type if it is unknown */ if (codec->payload_type == PTYPE_UNDEFINED) { + /* TODO: since all codecs are ultimately added by SDP lines like 'a=rtpmap:98 AMR/8000' I can't + * currently see any practical use case for this condition: is there really ever a situation where the + * payload type number is unknown in this function??? */ /* For the known codecs from the static range we restore * the IANA or 3GPP assigned payload type number */ @@ -221,9 +234,14 @@ * 110 onwards 3gpp defines prefered codec types, which are * also fixed, see above) */ if (codec->payload_type < 0) { + /* FIXME: pt_offset is completely unrelated and useless here, any of those numbers may already + * have been added to the codecs. Instead, there should be an iterator checking for an actually + * unused dynamic payload type number. */ codec->payload_type = 96 + pt_offset; - if (codec->payload_type > 109) + if (codec->payload_type > 109) { + LOGP(DLMGCP, LOGL_ERROR, "Ran out of payload type numbers to assign dynamically\n"); goto error; + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:16 +0000 Subject: Change in ...osmo-mgw[master]: explicitly free codecs in mgcp_rtp_conn_cleanup() Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15139 Change subject: explicitly free codecs in mgcp_rtp_conn_cleanup() ...................................................................... explicitly free codecs in mgcp_rtp_conn_cleanup() There are allocated bits in conn->end.codecs[], free them. This is not fixing a memleak, since mgcp_rtp_conn_cleanup() is currently only called from mgcp_conn_free(), which soon after frees the conn; the conn serves as talloc parent for the codec strings freed in this patch. The rationale: it is better style to explicitly free them, to also guard against future callers of mgcp_rtp_conn_cleanup() which might expect complete cleanup. Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 --- M src/libosmo-mgcp/mgcp_conn.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/39/15139/1 diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 772584b..60a1700 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -129,6 +129,7 @@ conn_osmux_disable(conn_rtp); mgcp_free_rtp_port(&conn_rtp->end); rate_ctr_group_free(conn_rtp->rate_ctr_group); + mgcp_codec_reset_all(conn_rtp); } void mgcp_conn_watchdog_cb(void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 Gerrit-Change-Number: 15139 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:16 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... tweak mgcp_parse_audio_ptime_rtpmap() - move the error logging up to the actual errors. Each appear only once, no goto labels needed. - instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more concisely trigger on the actual syntax of the audio parameters. Same for "a=ptime:". Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 33 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/40/15140/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 3f8e780..6275385 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -339,46 +339,44 @@ char codec_resp[64]; unsigned int codec; +#define A_PTIME "a=ptime:" +#define A_RTPMAP "a=rtpmap:" - if (strstr(line, "ptime")) { - if (sscanf(line, "a=ptime:%u", &r->ptime) != 1) - goto response_parse_failure_ptime; - } else if (strstr(line, "rtpmap")) { - if (sscanf(line, "a=rtpmap:%d %63s", &pt, codec_resp) == 2) { - /* The MGW may assign an own payload type in the - * response if the choosen codec falls into the IANA - * assigned dynamic payload type range (96-127). - * Normally the MGW should obey the 3gpp payload type - * assignments, which are fixed, so we likely wont see - * anything unexpected here. In order to be sure that - * we will now check the codec string and if the result - * does not match to what is IANA / 3gpp assigned, we - * will create an entry in the ptmap table so we can - * lookup later what has been assigned. */ - codec = map_str_to_codec(codec_resp); - if (codec != pt) { - if (r->ptmap_len < ARRAY_SIZE(r->ptmap)) { - r->ptmap[r->ptmap_len].pt = pt; - r->ptmap[r->ptmap_len].codec = codec; - r->ptmap_len++; - } else - goto response_parse_failure_rtpmap; + if (osmo_str_startswith(line, A_PTIME)) { + if (sscanf(line, A_PTIME "%u", &r->ptime) != 1) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse SDP parameter, invalid ptime (%s)\n", line); + return -EINVAL; + } + } else if (osmo_str_startswith(line, A_RTPMAP)) { + if (sscanf(line, A_RTPMAP "%d %63s", &pt, codec_resp) != 2) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse SDP parameter, invalid rtpmap: %s\n", osmo_quote_str(line, -1)); + return -EINVAL; + } + /* The MGW may assign an own payload type in the + * response if the choosen codec falls into the IANA + * assigned dynamic payload type range (96-127). + * Normally the MGW should obey the 3gpp payload type + * assignments, which are fixed, so we likely wont see + * anything unexpected here. In order to be sure that + * we will now check the codec string and if the result + * does not match to what is IANA / 3gpp assigned, we + * will create an entry in the ptmap table so we can + * lookup later what has been assigned. */ + codec = map_str_to_codec(codec_resp); + if (codec != pt) { + if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { + LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); + return -ENOSPC; } - - } else - goto response_parse_failure_rtpmap; + r->ptmap[r->ptmap_len].pt = pt; + r->ptmap[r->ptmap_len].codec = codec; + r->ptmap_len++; + } } return 0; - -response_parse_failure_ptime: - LOGP(DLMGCP, LOGL_ERROR, - "Failed to parse SDP parameter, invalid ptime (%s)\n", line); - return -EINVAL; -response_parse_failure_rtpmap: - LOGP(DLMGCP, LOGL_ERROR, - "Failed to parse SDP parameter, invalid rtpmap (%s)\n", line); - return -EINVAL; } /* Parse a line like "c=IN IP4 10.11.12.13" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:38:17 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:38:17 +0000 Subject: Change in ...osmo-mgw[master]: SDP: store all ptmap entries Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15141 Change subject: SDP: store all ptmap entries ...................................................................... SDP: store all ptmap entries If a ptmap appears in the SDP, always store it in the ptmap array. No longer attempt to drop entries if they match the conventional payload type number. - One reason is that the past code only matched full explicit "FOO/8000/1" strings, while the channel number "/1" can be omitted to imply 1; by simply storing everything received in the SDP, there is no need to add complexity to match both "FOO/8000" and "FOO/8000/1". - The other reason is to rather parse exactly what was received, instead of filtering entries, to take away a degree of implied magic. Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 8 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/41/15141/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 6275385..5823e2b 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -337,7 +337,7 @@ { unsigned int pt; char codec_resp[64]; - unsigned int codec; + enum mgcp_codecs codec; #define A_PTIME "a=ptime:" #define A_RTPMAP "a=rtpmap:" @@ -354,26 +354,14 @@ "Failed to parse SDP parameter, invalid rtpmap: %s\n", osmo_quote_str(line, -1)); return -EINVAL; } - /* The MGW may assign an own payload type in the - * response if the choosen codec falls into the IANA - * assigned dynamic payload type range (96-127). - * Normally the MGW should obey the 3gpp payload type - * assignments, which are fixed, so we likely wont see - * anything unexpected here. In order to be sure that - * we will now check the codec string and if the result - * does not match to what is IANA / 3gpp assigned, we - * will create an entry in the ptmap table so we can - * lookup later what has been assigned. */ - codec = map_str_to_codec(codec_resp); - if (codec != pt) { - if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { - LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); - return -ENOSPC; - } - r->ptmap[r->ptmap_len].pt = pt; - r->ptmap[r->ptmap_len].codec = codec; - r->ptmap_len++; + if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { + LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); + return -ENOSPC; } + codec = map_str_to_codec(codec_resp); + r->ptmap[r->ptmap_len].pt = pt; + r->ptmap[r->ptmap_len].codec = codec; + r->ptmap_len++; } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b Gerrit-Change-Number: 15141 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:39:53 +0000 Subject: Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14768 ) Change subject: add vty 'no neighbors' to remove all HO targets ...................................................................... Patch Set 3: I am tempted to merge this myself soon, being a low-risk patch, comments addressed sufficiently (IMHO) and this patch blocking the neighbor config and ttcn test patches... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 Gerrit-Change-Number: 14768 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 00:39:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 9 00:39:40 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 00:39:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4cc0e9a723e_712d2af47b0e85f4270161@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 320s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 325s] # Make absolutely sure that the %.check target is updated. [ 325s] touch osmomgw-usermanual.check [ 325s] # Do print the WARNING output but return error if any was found [ 325s] # (grep -v would omit the WARNING output from the log). [ 325s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 325s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 325s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 325s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 325s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 325s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 325s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make[2]: *** [Makefile:793: check] Error 2 [ 325s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 325s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 325s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 325s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make: *** [debian/rules:17: build] Error 2 [ 325s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 325s] [ 325s] lamb16 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 00:39:34 UTC 2019. [ 325s] [ 325s] ### VM INTERACTION START ### [ 328s] [ 310.891033] sysrq: SysRq : Power Off [ 328s] [ 310.895480] reboot: Power down [ 328s] ### VM INTERACTION END ### [ 328s] [ 328s] lamb16 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 00:39:37 UTC 2019. [ 328s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 00:44:48 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 00:44:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4cc21565f55_712d2af47b0e85f4270212@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 1214s] #define HAVE_STDLIB_H 1 [ 1214s] #define HAVE_STRING_H 1 [ 1214s] #define HAVE_MEMORY_H 1 [ 1214s] #define HAVE_STRINGS_H 1 [ 1214s] #define HAVE_INTTYPES_H 1 [ 1214s] #define HAVE_STDINT_H 1 [ 1214s] #define HAVE_UNISTD_H 1 [ 1214s] #define HAVE_DLFCN_H 1 [ 1214s] #define LT_OBJDIR ".libs/" [ 1214s] #define STDC_HEADERS 1 [ 1214s] #define HAVE_BYTESWAP_H 1 [ 1214s] #define TIME_WITH_SYS_TIME 1 [ 1214s] [ 1214s] configure: exit 1 [ 1214s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 1214s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255 [ 1214s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1214s] make: *** [debian/rules:6: build] Error 2 [ 1214s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1214s] [ 1214s] cloud131 failed "build osmo-trx_1.1.0.dsc" at Fri Aug 9 00:44:28 UTC 2019. [ 1214s] [ 1214s] ### VM INTERACTION START ### [ 1218s] [ 1167.619593] sysrq: SysRq : Power Off [ 1218s] [ 1167.818003] reboot: Power down [ 1220s] ### VM INTERACTION END ### [ 1220s] [ 1220s] cloud131 failed "build osmo-trx_1.1.0.dsc" at Fri Aug 9 00:44:36 UTC 2019. [ 1220s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 00:45:40 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 00:45:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4cc24dc7237_712d2af47b0e85f427037f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 286s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 287s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 288s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 288s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 288s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 288s] #include [ 288s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 288s] compilation terminated. [ 288s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 288s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 288s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 288s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 288s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 288s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 288s] make[1]: *** [Makefile:380: all] Error 2 [ 288s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 288s] dh_auto_build: make -j1 returned exit code 2 [ 288s] make: *** [debian/rules:45: build] Error 255 [ 288s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 288s] [ 288s] build77 failed "build osmo-bsc_1.5.0.dsc" at Fri Aug 9 00:45:32 UTC 2019. [ 288s] [ 288s] ### VM INTERACTION START ### [ 291s] [ 275.716113] sysrq: SysRq : Power Off [ 291s] [ 275.718042] reboot: Power down [ 291s] ### VM INTERACTION END ### [ 291s] [ 291s] build77 failed "build osmo-bsc_1.5.0.dsc" at Fri Aug 9 00:45:35 UTC 2019. [ 291s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 9 00:50:38 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 9 Aug 2019 00:50:38 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... avoid bogus error logs when no cmd_timer is set mncc.c often calls stop_cmd_timer() even if no timer is running. If no timer is set, this causes bogus ERROR logs saying: Wanted response() but got () Instead do nothing if no timer is pending at all. Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 --- M src/mncc.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/42/15142/1 diff --git a/src/mncc.c b/src/mncc.c index f5a44d5..d223906 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -71,6 +71,8 @@ static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res) { + if (!osmo_timer_pending(&leg->cmd_timeout)) + return; if (leg->rsp_wanted != got_res) { LOGP(DMNCC, LOGL_ERROR, "Wanted response(%s) but got(%s) for leg(%u)\n", osmo_mncc_name(leg->rsp_wanted), osmo_mncc_name(got_res), leg->callref); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 9 01:39:23 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 01:39:23 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d4ccedbd3530_712d2af47b0e85f42750e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 217s] libcommon/source/usb.c:692:15: error: redefinition of 'i' [ 217s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 217s] ^ [ 217s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was here [ 217s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 217s] ^ [ 217s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 217s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 217s] ^ [ 217s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' failed [ 217s] make[2]: *** [obj/simtrace/flash_usb.o] Error 1 [ 217s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 217s] Makefile:11: recipe for target 'fw-simtrace-trace' failed [ 217s] make[1]: *** [fw-simtrace-trace] Error 2 [ 217s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 217s] dh_auto_build: make -j1 returned exit code 2 [ 217s] debian/rules:4: recipe for target 'build' failed [ 217s] make: *** [build] Error 2 [ 217s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 217s] [ 217s] lamb25 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9 01:39:17 UTC 2019. [ 217s] [ 217s] ### VM INTERACTION START ### [ 221s] [ 205.704624] sysrq: SysRq : Power Off [ 221s] [ 205.774967] reboot: Power down [ 221s] ### VM INTERACTION END ### [ 221s] [ 221s] lamb25 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9 01:39:20 UTC 2019. [ 221s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 01:41:23 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 01:41:23 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5d4ccf4fa01c5_712d2af47b0e85f4275560@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 252s] libcommon/source/usb.c:692:15: error: redefinition of 'i' [ 252s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 252s] ^ [ 252s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was here [ 252s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 252s] ^ [ 252s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 252s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 252s] ^ [ 252s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' failed [ 252s] make[2]: *** [obj/simtrace/flash_usb.o] Error 1 [ 252s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 252s] Makefile:11: recipe for target 'fw-simtrace-trace' failed [ 252s] make[1]: *** [fw-simtrace-trace] Error 2 [ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 252s] dh_auto_build: make -j1 returned exit code 2 [ 252s] debian/rules:4: recipe for target 'build' failed [ 252s] make: *** [build] Error 2 [ 252s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 252s] [ 252s] lamb22 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9 01:41:13 UTC 2019. [ 252s] [ 252s] ### VM INTERACTION START ### [ 256s] [ 227.973445] sysrq: SysRq : Power Off [ 256s] [ 228.004375] reboot: Power down [ 256s] ### VM INTERACTION END ### [ 256s] [ 256s] lamb22 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9 01:41:17 UTC 2019. [ 256s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 01:46:48 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 01:46:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4cd09e795e4_712d2af47b0e85f42773b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 144s] | am_cv_prog_cc_c_o=yes [ 144s] | lt_cv_ar_at_file=@ [ 144s] | lt_cv_archive_cmds_need_lc=no [ 144s] | lt_cv_deplibs_check_method=pass_all [ 144s] | lt_cv_file_magic_cmd='$MAGIC_CMD' [ 144s] | lt_cv_file_magic_test_file= [ 144s] | lt_cv_ld_reload_flag=-r [ 144s] | lt_cv_nm_interface='BSD nm' [ 144s] | lt_cv_objdir=.libs [ 144s] | lt_cv_path_LD=/usr/bin/ld [ 144s] | lt_cv_path_NM='/usr/bin/nm -B' [ 144s] | lt_cv_path_mainfest_tool=no [ 144s] | lt_cv_prog_compiler_c_o=yes [ 144s] | lt_cv_prog_compiler_pic='-fPIC -DPIC' [ 144s] | lt_cv_prog_compiler_pic_works=yes [ 144s] | lt_cv_prog_compiler_rtti_exceptions=no [ 144s] | lt_cv_prog_compiler_static_works=yes [ 144s] | lt_cv_prog_gnu_ld=yes [ 144s] | lt_cv_sharedlib_from_linklib_cmd='printf %s\n' [ 144s] | lt_cv_shlibpath_overrides_runpath=yes [ 144s] | lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\''' [ 144s] | lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \(.*\) .*$/ {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/ {"\1", (void *) \&\1},/p'\''' [ 144s] | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\) .*$/ {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(lib.*\)$/ {"\1", (void *) \&\1},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/ {"lib\1", (void *) \&\1},/p'\''' [ 147s] | lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T [ 132.595095] sysrq: SysRq : Power Off [ 147s] [ 132.600503] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] build85 failed "build libosmo-netif_0.6.0.dsc" at Fri Aug 9 01:46:34 UTC 2019. [ 147s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 01:53:06 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 01:53:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d4cd220b5fa4_712d2af47b0e85f4279013@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 351s] #define STDC_HEADERS 1 [ 351s] #define HAVE_SYS_TYPES_H 1 [ 351s] #define HAVE_SYS_STAT_H 1 [ 351s] #define HAVE_STDLIB_H 1 [ 351s] #define HAVE_STRING_H 1 [ 351s] #define HAVE_MEMORY_H 1 [ 351s] #define HAVE_STRINGS_H 1 [ 351s] #define HAVE_INTTYPES_H 1 [ 351s] #define HAVE_STDINT_H 1 [ 351s] #define HAVE_UNISTD_H 1 [ 351s] #define HAVE_DLFCN_H 1 [ 351s] #define LT_OBJDIR ".libs/" [ 351s] [ 351s] configure: exit 1 [ 351s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 351s] make[1]: *** [debian/rules:33: override_dh_auto_configure] Error 255 [ 351s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 351s] make: *** [debian/rules:17: build] Error 2 [ 351s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 351s] [ 351s] build34 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 01:52:47 UTC 2019. [ 351s] [ 351s] ### VM INTERACTION START ### [ 354s] [ 331.970059] sysrq: SysRq : Power Off [ 354s] [ 331.974723] reboot: Power down [ 355s] ### VM INTERACTION END ### [ 355s] [ 355s] build34 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 01:52:51 UTC 2019. [ 355s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 01:54:31 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 01:54:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d4cd260aa414_712d2af47b0e85f427956d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 523s] asciidoc: sigtran-osmocom.adoc: line 220: evaluating: {set2:target:test-usermanual__53.png} [ 523s] asciidoc: sigtran-simple-2g.dot: line 22: filtering: "/usr/bin/python2" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o "/usr/src/packages/BUILD/tests/test-usermanual__53.png" -L dot -F png - [ 523s] Execute: dot -Tpng "/usr/src/packages/BUILD/tests/test-usermanual__53.txt" > "/usr/src/packages/BUILD/tests/test-usermanual__53.png" [ 523s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/sigtran-simple-3g.dot [ 523s] asciidoc: sigtran-osmocom.adoc: line 251: reading: /usr/src/packages/BUILD/common/chapters/sigtran-simple-3g.dot [ 523s] asciidoc: sigtran-osmocom.adoc: line 250: evaluating: {counter2:target-number} [ 523s] asciidoc: sigtran-osmocom.adoc: line 250: evaluating: {set2:target:test-usermanual__54.png} [ 523s] asciidoc: sigtran-simple-3g.dot: line 24: filtering: "/usr/bin/python2" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o "/usr/src/packages/BUILD/tests/test-usermanual__54.png" -L dot -F png - [ 523s] Execute: dot -Tpng "/usr/src/packages/BUILD/tests/test-usermanual__54.txt" > "/usr/src/packages/BUILD/tests/test-usermanual__54.png" [ 523s] [ 523s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 523s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 523s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 523s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 523s] make[1]: *** [Makefile:362: all] Error 2 [ 523s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 523s] dh_auto_build: make -j1 returned exit code 2 [ 523s] make: *** [debian/rules:5: binary] Error 2 [ 523s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 523s] [ 523s] armbuild21 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Fri Aug 9 01:54:13 UTC 2019. [ 523s] [ 523s] ### VM INTERACTION START ### [ 526s] [ 501.204638] sysrq: SysRq : Power Off [ 526s] [ 501.238991] reboot: Power down [ 527s] ### VM INTERACTION END ### [ 527s] [ 527s] armbuild21 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Fri Aug 9 01:54:17 UTC 2019. [ 527s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 9 04:18:48 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 09 Aug 2019 04:18:48 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4cf43dabf2b_712d2af47b0e85f42901c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 155s] 75%: Checks: 4, Failures: 0, Errors: 1 [ 155s] /usr/src/packages/BUILD/test/websocket.c:73:P:test_ulfius_websocket:test_websocket_ulfius_set_websocket_response:0: Passed [ 155s] /usr/src/packages/BUILD/test/websocket.c:89:P:test_ulfius_websocket:test_websocket_ulfius_set_websocket_request:0: Passed [ 155s] /usr/src/packages/BUILD/test/websocket.c:106:P:test_ulfius_websocket:test_websocket_ulfius_open_websocket_client_connection_error:0: Passed [ 155s] /usr/src/packages/BUILD/test/websocket.c:131:E:test_ulfius_websocket:test_websocket_ulfius_websocket_client:0: (after this point) Test timeout expired [ 155s] [ 155s] [ 155s] 75% tests passed, 1 tests failed out of 4 [ 155s] [ 155s] Total Test time (real) = 30.03 sec [ 155s] [ 155s] The following tests FAILED: [ 155s] 4 - websocket (Failed) [ 155s] Errors while running CTest [ 155s] make[1]: *** [Makefile:144: test] Error 8 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 155s] dh_auto_test: cd build && make -j6 test ARGS\+=-j6 returned exit code 2 [ 155s] make: *** [debian/rules:9: build] Error 255 [ 155s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 155s] [ 155s] morla5 failed "build ulfius_2.5.2-4.1.dsc" at Fri Aug 9 04:18:29 UTC 2019. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 143.618289] sysrq: SysRq : Power Off [ 158s] [ 143.625185] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] morla5 failed "build ulfius_2.5.2-4.1.dsc" at Fri Aug 9 04:18:32 UTC 2019. [ 158s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 9 07:55:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 07:55:30 +0000 Subject: Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14768 ) Change subject: add vty 'no neighbors' to remove all HO targets ...................................................................... Patch Set 3: > I am tempted to merge this myself soon, being a low-risk patch, > comments addressed sufficiently (IMHO) and this patch blocking the > neighbor config and ttcn test patches... I did not add any further comments as my original comments remain unmodified. If you merge it like this I will likely send a follow-up patch to use llist iteration helpers. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 Gerrit-Change-Number: 14768 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 07:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:14:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:14:55 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:14:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:17:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:17:44 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 10: (2 comments) https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/gsm_04_08_cc.c at 1893 PS10, Line 1893: = NULL; explicit NULL assignment not needed, as you unconditionally set it to the return value of another function one line below. https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/msc_vty.c at 296 PS10, Line 296: callwaiting I would suggest 'call-waiting' for better readability -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 08:17:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:17:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:17:52 +0000 Subject: Change in ...simtrace2[master]: Fix builds on Ubuntu 16.04 In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/simtrace2/+/15112 ) Change subject: Fix builds on Ubuntu 16.04 ...................................................................... Fix builds on Ubuntu 16.04 The most recent commits introduced 'C99' syntax by declaring variables inside the 'for' statement itself, rather than before. This resulted in compile failures in the Ubuntu 16.04 builds on build.opensuse.org: [ 105s] libcommon/source/usb.c: In function 'SIMtrace_USB_Initialize': [ 105s] libcommon/source/usb.c:679:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:679:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 105s] libcommon/source/usb.c:686:15: error: redefinition of 'i' [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:679:15: note: previous definition of 'i' was here [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:686:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:692:15: error: redefinition of 'i' [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was here [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { [ 105s] ^ [ 105s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 105s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { [ 105s] ^ [ 105s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' faile Change-Id: Ibdb837ac105664484b10873c2c0d9561051b1c2a --- M firmware/libcommon/source/usb.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 3efb9fc..9d3072f 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -653,7 +653,7 @@ void SIMtrace_USB_Initialize(void) { - + unsigned int i; /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ #ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; @@ -676,20 +676,20 @@ char device_id_string[32 + 1]; snprintf(device_id_string, ARRAY_SIZE(device_id_string), "%08x%08x%08x%08x", device_id[0], device_id[1], device_id[2], device_id[3]); - for (uint8_t i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { + for (i = 0; i < ARRAY_SIZE(device_id_string) - 1; i++) { usb_string_serial[2 + 2 * i] = device_id_string[i]; } // put version into USB string usb_string_version[0] = USBStringDescriptor_LENGTH(ARRAY_SIZE(git_version) - 1); usb_string_version[1] = USBGenericDescriptor_STRING; - for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { + for (i = 0; i < ARRAY_SIZE(git_version) - 1; i++) { usb_string_version[2 + i * 2 + 0] = git_version[i]; usb_string_version[2 + i * 2 + 1] = 0; } // fill extended USB strings - for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { + for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { usb_strings_extended[i] = usb_strings[i]; } usb_strings_extended[SERIAL_STR] = usb_string_serial; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibdb837ac105664484b10873c2c0d9561051b1c2a Gerrit-Change-Number: 15112 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:18:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:18:25 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 09 Aug 2019 08:18:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:19:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:19:01 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: constify 'param' arg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15131 ) Change subject: mgcp_codec: constify 'param' arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba Gerrit-Change-Number: 15131 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:19:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:19:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:19:32 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:19:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:20:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:20:02 +0000 Subject: Change in ...osmo-mgw[master]: rename codecs_cmp() to codecs_same() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15130 ) Change subject: rename codecs_cmp() to codecs_same() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8 Gerrit-Change-Number: 15130 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:20:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:20:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:20:34 +0000 Subject: Change in ...osmo-mgw[master]: fix memleak: actually free strings in mgcp_codec_reset_all() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15133 ) Change subject: fix memleak: actually free strings in mgcp_codec_reset_all() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f Gerrit-Change-Number: 15133 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:20:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:20:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:20:58 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:20:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:21:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:21:31 +0000 Subject: Change in ...osmo-mgw[master]: SDP: store all ptmap entries In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15141 ) Change subject: SDP: store all ptmap entries ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b Gerrit-Change-Number: 15141 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:21:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 08:22:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 9 Aug 2019 08:22:20 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15137 ) Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 08:22:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 09:41:18 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 09:41:18 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 Change subject: coverity: Address issue found by coverity ...................................................................... coverity: Address issue found by coverity Add NULL checks on the return value of call_leg_other() in update_rtp() If the remote side has requested media change and we cannot find the other leg, then release call. This should not happen. Also, Add an assert to show that we cannot be here without call type of SIP or MNCC (not related to coverity) Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 --- M src/mncc.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/43/15143/1 diff --git a/src/mncc.c b/src/mncc.c index f5a44d5..7919c9b 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -211,10 +211,22 @@ if (_leg->type == CALL_TYPE_MNCC) { leg = (struct mncc_call_leg *) _leg; struct call_leg *other = call_leg_other(&leg->base); + if (!other) { + LOGP(DMNCC, LOGL_ERROR, "Failed to find other leg."); + _leg->release_call(_leg); + return; + } send_rtp_connect(leg, other); - } else { + } else if (_leg->type == CALL_TYPE_SIP) { leg = (struct mncc_call_leg *) call_leg_other(_leg); + if (!leg) { + LOGP(DMNCC, LOGL_ERROR, "Failed to find other leg."); + _leg->release_call(_leg); + return; + } send_rtp_connect(leg, _leg); + } else { + OSMO_ASSERT(false); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:17:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:17:27 +0000 Subject: Change in ...osmo-mgw[master]: rename codecs_cmp() to codecs_same() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15130 ) Change subject: rename codecs_cmp() to codecs_same() ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15130/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15130/1/src/libosmo-mgcp/mgcp_codec.c at 355 PS1, Line 355: static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) Probably a better term here would be "codecs_equal", but it's fine this way too. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8 Gerrit-Change-Number: 15130 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:17:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:17:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:17:42 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: constify 'param' arg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15131 ) Change subject: mgcp_codec: constify 'param' arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba Gerrit-Change-Number: 15131 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:17:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:22:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:22:09 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/15132/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15132/1/src/libosmo-mgcp/mgcp_codec.c at 117 PS1, Line 117: codec_init(codec); So in here you are not longer freeing codec->subtype_name and codec->audio_name. Are you sure that's fine? https://gerrit.osmocom.org/#/c/15132/1/src/libosmo-mgcp/mgcp_codec.c at 239 PS1, Line 239: memset(codec, 0, sizeof(*codec)); You can either drop this memset or line 96: "*codec = (struct mgcp_rtp_codec){};" -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:22:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:24:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:24:38 +0000 Subject: Change in ...osmo-mgw[master]: fix memleak: actually free strings in mgcp_codec_reset_all() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15133 ) Change subject: fix memleak: actually free strings in mgcp_codec_reset_all() ...................................................................... Patch Set 1: Code-Review+1 Comment from previous commit. Since you use codec_free() here, then remove the memset(0) from the previous commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f Gerrit-Change-Number: 15133 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:24:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:24:48 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 9 Aug 2019 10:24:48 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/15143/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15143/1//COMMIT_MSG at 19 PS1, Line 19: Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Please add "Fixes: CID#202863" after this line (or before, as you like), so we can see which issue to be fixed by this commit. https://gerrit.osmocom.org/#/c/15143/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/1/src/mncc.c at 215 PS1, Line 215: ." New line is missing. https://gerrit.osmocom.org/#/c/15143/1/src/mncc.c at 223 PS1, Line 223: ." New line is missing. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 09 Aug 2019 10:24:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:25:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:25:05 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15134 ) Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() ...................................................................... Patch Set 1: Test output need update. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb Gerrit-Change-Number: 15134 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:25:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:25:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:25:51 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/msc_vty.c at 296 PS10, Line 296: callwaiting > I would suggest 'call-waiting' for better readability Agree -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:25:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:26:36 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 9 Aug 2019 10:26:36 +0000 Subject: Change in ...osmocom-bb[master]: fb_tools/bdf_to_c.py: make it compatible with python3 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/14758 ) Change subject: fb_tools/bdf_to_c.py: make it compatible with python3 ...................................................................... Patch Set 4: BTW: true Pythonic way would be to use the logging module ;) Anyway, feel free to merge. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaa20dd0aafa20e36186cf8dfe4d0ac9ab638f235 Gerrit-Change-Number: 14758 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:26:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:32:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:32:03 +0000 Subject: Change in ...meta-telephony[201705]: Update Osmocom recipes to latest tags (release 201908) Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/15144 Change subject: Update Osmocom recipes to latest tags (release 201908) ...................................................................... Update Osmocom recipes to latest tags (release 201908) Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 17 files changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/44/15144/1 diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index e04e525..9da4f54 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "6996e5dba9603208609f4604a3b3d59f88c85d90" +SRCREV = "d2704da4cb3efdf241d2cde037688badaef53f9a" SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.13.0+gitr${SRCPV}" +PV = "1.14.0+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 9d4fa87..879a22f 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d36012fb029fd9914b4e8125c9c3186785940258" +SRCREV = "19205a38c34175f4fb4d1d06e77f1d3e4a39c651" SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.31+gitr${SRCPV}" +PV = "0.9.32+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 3032d28..e64ace2 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "176a1fbab6ae45eb1c60e3d8b263b0765759e1da" +SRCREV = "30249a15d51a15b498e87b78bd3fc8d684ffcf46" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.6.0+gitr${SRCPV}" +PV = "0.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 73c6314..23a0148 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c775ffe1cc6cfd842566d30c96d287502d9d6218" +SRCREV = "592057bb33dc0c336a63003cd7a3a67944d92757" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.4.0+gitr${SRCPV}" +PV = "0.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 6bdea27..6204aab 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "81c6a0a97980f9da76ef0e698ca6ab526b98c7c2" +SRCREV = "0b7ad1a72fae2a4547bf0d1d6430918a74ea577b" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.0.0+gitr${SRCPV}" +PV = "1.1.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 8eca57f..06e9796 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d4c406a04eae0071da4fb7aecd3cb47acd0fdab6" +SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.0.1+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7dbb07a..c9b75e8 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.1+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "ed8815e723b41e9800f14c67bccd34e51a06beb6" +SRCREV = "bb414bf8b104e1b56e61bb804c75d30cda2a9e3c" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index 56e7eb4..19be0e5 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "117fa9d92d0da3d94a51cbfc1cbeb0d5bdcd3767" +SRCREV = "3c9485751cd20215ca6029df8dde4be94ee6f39d" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index a88eb84..939fc58 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f5a268a96d7d3c7bcfbc530f2a0b334cf25d3e3c" +SRCREV = "67aebc9d1c6b0773b082b496a579be1a80c2a9b2" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://libgtp-queue_depth_32.patch \ " -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index c072a52..2a5d842 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e0c6fe5921b30b0e8de35c021be5226c1475c2f5" +SRCREV = "9cf0030b6a8e41fbcfec6cedb5f6c2c5871d7931" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "1.0.0+gitr${SRCPV}" +PV = "1.1.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index 5eb6d50..2d1beba 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "92a88ee73f471a4ddb7b864ae9f487493307a175" +SRCREV = "505fa9eae765a31289e3a1743f606e83b9cd65d0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.4.0+gitr${SRCPV}" +PV = "0.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 3998c5d..3b8d37d 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e81c1176aa1254b0bb148385134186f6a55fd405" +SRCREV = "50e52e45f9c01d5799520ddb53565b868729801f" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 87de339..c3681ad 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "41e7cf115d4148a9f34fcb863b68b2d5370e335d" +SRCREV = "0218814c8c099d6e9e6ba1e85f8d0d6672a32214" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.3.1+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index 9ffb510..2e2ca55 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "901543a78846cc4e3a0cdae91dead4913b1be961" +SRCREV = "5e10f1db125cf869c5f1769df9abdd6084679b3e" SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.0+gitr${SRCPV}" +PV = "0.1.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index 2c1991e..fe22de5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "319a52b577843f6eebb00d8039c2e2479adc8da5" +SRCREV = "d7ef94c0bb48797cb53947773c9e59ccdedc72bb" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index 0d74751..ec679c5 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "336add4990191011ec6b8f621593e24b2ad5e324" +SRCREV = "f56af15181afdeeb9b517c589b7a220820b0083b" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index e23e807..32796b3 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "65d937c45c3362504b8900173b8256a5894adae9" +SRCREV = "7648a0eb1824e432075353cde10dffdac1cd295e" SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" -PV = "0.0.1+gitr${SRCPV}" +PV = "0.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 Gerrit-Change-Number: 15144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:33:06 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:33:06 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 to look at the new patch set (#2). Change subject: coverity: Address issue found by coverity ...................................................................... coverity: Address issue found by coverity Add NULL checks on the return value of call_leg_other() in update_rtp() If the remote side has requested media change and we cannot find the other leg, then release call. This should not happen. Also, Add an assert to show that we cannot be here without call type of SIP or MNCC (not related to coverity) Fixes: CID#202863 Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 --- M src/mncc.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/43/15143/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:35:23 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:35:23 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/gsm_04_08_cc.c at 1893 PS10, Line 1893: = NULL; > explicit NULL assignment not needed, as you unconditionally set it to the return value of another fu [?] I wondered...s hould it just be one line then? declare and assign at the same time: struct gsm_trans *existing_cc_trans = trans_find_by_type(msc_a, TRANS_CC); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:35:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:39:18 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:39:18 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#11). Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 53 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:42:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:42:35 +0000 Subject: Change in ...meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/15145 Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Add libosmo-netif to osmo-sysmon dependencies This is in preparation for upcoming patch related to OpenVPN probe [1]. [1] change-id I4493e19b9a09dcebd289457eacd1719f7f8cc31c (osmo-sysmon) Change-Id: I8532e9b0391bc3489cd9b53caced9f5bf0d3581f --- M recipes-osmocom/osmo-sysmon/osmo-sysmon.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/45/15145/1 diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc index 1469438..aab52bc 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libtalloc libosmocore libmnl liboping" +DEPENDS = "libtalloc libosmocore libosmo-netif libmnl liboping" INC_PR="r0.${META_TELEPHONY_OSMO_INC}" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8532e9b0391bc3489cd9b53caced9f5bf0d3581f Gerrit-Change-Number: 15145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:42:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:42:36 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Disable TLS workaround to avoid ld crash Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/15146 Change subject: libosmocore: Disable TLS workaround to avoid ld crash ...................................................................... libosmocore: Disable TLS workaround to avoid ld crash Change-Id: I8d2bfa7ed44d1d2a7fb024ac49bc81cdbf38675d --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/46/15146/1 diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 06e9796..3a417f0 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -24,3 +24,15 @@ RREPLACES_libosmovty = "DONOTREPLACElibosmocore" EXTRA_OECONF += "--disable-pcsc" + +# OS#4062: Some gcc version (< 7.3.0) on ARM generate wrong code for __thread +# variables that crash at runtime. It seems, due to some unknown reason, that we +# are not affected by this bug with toolchain from poky pyro (6.4.0). However, +# libosmocore as of e188b8cd98f599468fbb200c7d590de955daf761 applies some +# CFLAGS="-mtls-dialect=gnu2" to workaround the issue automatically. But same +# toolchain contains an "ld" that crashes when those flags are applied. +# Fortunately, libosmocore provides a way to disable the workaround, and since +# we are not affected by the bug, we are fine with that. If the toolchain had +# the TLS runtime bug, then we'd had to build with -O0. Can be probably dropped +# once we move to newer toolchain. +EXTRA_OECONF += "--disable-detect-tls-gcc-arm-bug" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8d2bfa7ed44d1d2a7fb024ac49bc81cdbf38675d Gerrit-Change-Number: 15146 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:44:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:44:07 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/15120/10/src/libmsc/gsm_04_08_cc.c at 1893 PS10, Line 1893: = NULL; > I wondered...s hould it just be one line then? [?] That's fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:44:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:46:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:46:34 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 11: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15120/11//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15120/11//COMMIT_MSG at 14 PS11, Line 14: When this switch is disabled with "no callwaiting" in vty You forgot to update the description: "no call-waiting" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 10:46:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:51:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:51:12 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/15143/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/2/src/mncc.c at 214 PS2, Line 214: if (!other) { if (!other) goto ret_release; https://gerrit.osmocom.org/#/c/15143/2/src/mncc.c at 222 PS2, Line 222: if (!leg) { if (!leg) goto ret_release; https://gerrit.osmocom.org/#/c/15143/2/src/mncc.c at 230 PS2, Line 230: } return; ret_release: LOGP(DMNCC, LOGL_ERROR, "Failed to find other leg.\n"); _leg->release_call(_leg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:51:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:52:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:52:21 +0000 Subject: Change in ...meta-telephony[201705]: Update Osmocom recipes to latest tags (release 201908) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15144 ) Change subject: Update Osmocom recipes to latest tags (release 201908) ...................................................................... Patch Set 1: The 3 commit shsould be merged together. I have branch laforge/nightly rebase prepared locally, I'll push it once these are merged. -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 Gerrit-Change-Number: 15144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:52:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:53:07 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:53:07 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#12). Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no call-waiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 53 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:53:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 10:53:18 +0000 Subject: Change in ...meta-telephony[201705]: Update Osmocom recipes to latest tags (release 201908) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15144 ) Change subject: Update Osmocom recipes to latest tags (release 201908) ...................................................................... Patch Set 1: I'll push patches for meta-sysmocom-bsp once the patches are merged, otherwise I may break latest build (due to dependencies fro mmeta-telephony missing). -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 Gerrit-Change-Number: 15144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:53:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:57:59 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:57:59 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 to look at the new patch set (#3). Change subject: coverity: Address issue found by coverity ...................................................................... coverity: Address issue found by coverity Add NULL checks on the return value of call_leg_other() in update_rtp() If the remote side has requested media change and we cannot find the other leg, then release call. This should not happen. Also, Add an assert to show that we cannot be here without call type of SIP or MNCC (not related to coverity) Fixes: CID#202863 Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 --- M src/mncc.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/43/15143/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:58:56 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:58:56 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15143/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/3/src/mncc.c at 227 PS3, Line 227: ret_release: i see this usually at COL 0, correct? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:58:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:59:37 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:59:37 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15143/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/3/src/mncc.c at 219 PS3, Line 219: if (!leg) { gah.. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 10:59:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 10:59:53 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 10:59:53 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 to look at the new patch set (#4). Change subject: coverity: Address issue found by coverity ...................................................................... coverity: Address issue found by coverity Add NULL checks on the return value of call_leg_other() in update_rtp() If the remote side has requested media change and we cannot find the other leg, then release call. This should not happen. Also, Add an assert to show that we cannot be here without call type of SIP or MNCC (not related to coverity) Fixes: CID#202863 Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 --- M src/mncc.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/43/15143/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:00:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:00:52 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 11:00:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:01:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:01:35 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15143/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/3/src/mncc.c at 227 PS3, Line 227: ret_release: > i see this usually at COL 0, correct? Yes -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:01:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:05:30 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 11:05:30 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 11:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:11:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:11:09 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/15143/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/4/src/mncc.c at 205 PS4, Line 205: static void update_rtp(struct call_leg *_leg) { No need to change it now, but this function would be a lot simpler by using a switch: static void update_rtp(struct call_leg *_leg) { struct mncc_call_leg *leg; LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP for LEG Type (%u)\n", _leg->type); switch (_leg->type) { case: CALL_TYPE_MNCC: leg = (struct mncc_call_leg *) _leg; struct call_leg *other = call_leg_other(&leg->base); if (!other) goto ret_release; break; case CALL_TYPE_SIP: leg = (struct mncc_call_leg *) call_leg_other(_leg); if (!leg) goto ret_release; break; default: OSMO_ASSERT(false); } send_rtp_connect(leg, other); return; ret_release: LOGP(DMNCC, LOGL_ERROR, "Failed to find other leg.\n"); _leg->release_call(_leg); } https://gerrit.osmocom.org/#/c/15143/4/src/mncc.c at 228 PS4, Line 228: _leg->release_call(_leg); Wrong indentation here. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:11:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:13:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:13:19 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c at 361 PS1, Line 361: /* Default to octet-aligned=0, i.e. bandwidth-efficient mode */ Just to make sure, did you check in the specs if bandwidth-efficient is the default? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:13:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:14:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:14:49 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15137 ) Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:14:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:16:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:16:46 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:16:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:17:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:17:40 +0000 Subject: Change in ...osmo-mgw[master]: explicitly free codecs in mgcp_rtp_conn_cleanup() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15139 ) Change subject: explicitly free codecs in mgcp_rtp_conn_cleanup() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 Gerrit-Change-Number: 15139 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:17:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:20:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:20:00 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 ) Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG at 12 PS1, Line 12: - instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more Does spec state there shall be no whitespace at the start of the line? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:20:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 11:21:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 11:21:40 +0000 Subject: Change in ...osmo-mgw[master]: SDP: store all ptmap entries In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15141 ) Change subject: SDP: store all ptmap entries ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b Gerrit-Change-Number: 15141 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 11:21:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:04:24 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 12:04:24 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c at 361 PS1, Line 361: /* Default to octet-aligned=0, i.e. bandwidth-efficient mode */ > Just to make sure, did you check in the specs if bandwidth-efficient is the default? it is -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:04:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:06:43 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 12:06:43 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c at 361 PS1, Line 361: /* Default to octet-aligned=0, i.e. bandwidth-efficient mode */ > it is http://git.osmocom.org/osmo-sip-connector/commit/?id=b6032727870ab2b98372b697d91f7256da4f32b3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:06:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:12:37 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 12:12:37 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 to look at the new patch set (#5). Change subject: coverity: Address issue found by coverity ...................................................................... coverity: Address issue found by coverity Add NULL checks on the return value of call_leg_other() in update_rtp() If the remote side has requested media change and we cannot find the other leg, then release call. This should not happen. Also, Add an assert to show that we cannot be here without call type of SIP or MNCC (not related to coverity) Fixes: CID#202863 Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 --- M src/mncc.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/43/15143/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:13:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 12:13:57 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:13:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:14:09 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 9 Aug 2019 12:14:09 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15143/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15143/4/src/mncc.c at 205 PS4, Line 205: static void update_rtp(struct call_leg *_leg) { > No need to change it now, but this function would be a lot simpler by using a switch: [?] ok, i will take note for a planned general refactoring -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:14:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:15:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 12:15:18 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:15:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:15:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 12:15:44 +0000 Subject: Change in ...meta-telephony[201705]: Update Osmocom recipes to latest tags (release 201908) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15144 ) Change subject: Update Osmocom recipes to latest tags (release 201908) ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 Gerrit-Change-Number: 15144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:15:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:15:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 12:15:47 +0000 Subject: Change in ...meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15145 ) Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8532e9b0391bc3489cd9b53caced9f5bf0d3581f Gerrit-Change-Number: 15145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:15:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:15:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 12:15:51 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Disable TLS workaround to avoid ld crash In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15146 ) Change subject: libosmocore: Disable TLS workaround to avoid ld crash ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8d2bfa7ed44d1d2a7fb024ac49bc81cdbf38675d Gerrit-Change-Number: 15146 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 12:15:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 12:25:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 9 Aug 2019 12:25:44 +0000 Subject: Change in ...libusrp[master]: jenkins.sh: Workaround race conditon in make Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/15147 Change subject: jenkins.sh: Workaround race conditon in make ...................................................................... jenkins.sh: Workaround race conditon in make Sometimes the jenkins job fails to build. I never have this issue on my workstation. Disabling PARALLEL_MAKE is osmo-trx jenkins.sh (which requires libusrp build) made libusrp stop failing there, so let's do the same here. OS#3970 Change-Id: Iab8eab6d21365e3ee8d018428a707c56cc1b72e5 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/47/15147/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d75beda..7a7e782 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,6 +4,6 @@ autoreconf --install --force ./configure -$MAKE $PARALLEL_MAKE +$MAKE # Parallel make fails ocsasionally, see OS#3970. $MAKE distcheck $MAKE maintainer-clean -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iab8eab6d21365e3ee8d018428a707c56cc1b72e5 Gerrit-Change-Number: 15147 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 13:24:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 9 Aug 2019 13:24:09 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Aug 2019 13:24:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 9 13:33:17 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 9 Aug 2019 13:33:17 +0000 Subject: Change in ...osmocom-bb[master]: fb_tools/bdf_to_c.py: make it compatible with python3 In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/14758 ) Change subject: fb_tools/bdf_to_c.py: make it compatible with python3 ...................................................................... fb_tools/bdf_to_c.py: make it compatible with python3 This would break python2 compatibility. Change-Id: Iaa20dd0aafa20e36186cf8dfe4d0ac9ab638f235 --- M src/host/fb_tools/bdf_to_c.py 1 file changed, 33 insertions(+), 33 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/fb_tools/bdf_to_c.py b/src/host/fb_tools/bdf_to_c.py index 86be6a6..ebeb7f9 100755 --- a/src/host/fb_tools/bdf_to_c.py +++ b/src/host/fb_tools/bdf_to_c.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- ''' @@ -133,7 +133,7 @@ arr = l.split(None,1) if len(arr) < 2 and \ arr[0].lower() != 'STARTCHAR' : - print >>sys.stderr,'Not start of glyph: %s'%(l) + print('Not start of glyph: %s'%(l), file=sys.stderr) continue inchar = unique_name(arr[1],self.glyphs) continue @@ -159,7 +159,7 @@ continue if len(arr) < 2 : - print >>sys.stderr,'Bad line in font: %s'%(l) + print('Bad line in font: %s'%(l), file=sys.stderr) continue data[arr[0].lower()] = arr[1] @@ -183,40 +183,40 @@ if opts.firstchar == None : opts.firstchar = min(font.enc) - print 'First character in font: %d, %s'%(opts.firstchar, - font.enc[opts.firstchar]) + print('First character in font: %d, %s'%(opts.firstchar, + font.enc[opts.firstchar])) if opts.lastchar == None : opts.lastchar = max(font.enc) - print 'Last character in font: %d, %s'%(opts.lastchar, - font.enc[opts.lastchar]) + print('Last character in font: %d, %s'%(opts.lastchar, + font.enc[opts.lastchar])) if opts.base == None : opts.base = 'font_'+os.path.basename(args[0]) if opts.base[-4:] == '.bdf' : opts.base = opts.base[:-4] - print >>sys.stderr,'Guessing symbol prefix to be %s.'%(opts.base) + print('Guessing symbol prefix to be %s.'%(opts.base), file=sys.stderr) if opts.out == None : opts.out = os.path.basename(args[0]) if opts.out[-4:] == '.bdf' : opts.out = opts.out[:-4] opts.out = opts.out + '.c' - print >>sys.stderr,'Guessing output filename to be %s.'%(opts.out) + print('Guessing output filename to be %s.'%(opts.out), file=sys.stderr) if os.path.exists(opts.out) : - print >>sys.stderr,'Will *NOT* overwrite existing file when guessing output!' + print('Will *NOT* overwrite existing file when guessing output!', file=sys.stderr) sys.exit(1) of = file(opts.out,'w') - print >>of,'#include ' - print >>of,'/* file autogenerated by %s */'%(sys.argv[0]) + print('#include ', file=of) + print('/* file autogenerated by %s */' %(sys.argv[0]), file=of) offsets = list() glyphnames = list() - print >>of,'static const uint8_t %s_data[] = {'%(opts.base) + print('static const uint8_t %s_data[] = {'%(opts.base), file=of) pos = 0 @@ -236,8 +236,8 @@ bitmap = glyph['bitmap'] if bbx[1] != len(bitmap) : - print >>sys.stderr,'ERROR: glyph',charname,'has wrong number of lines of data!' - print >>sys.stderr,' want: ',bbx[1],'but have',len(bitmap) + print('ERROR: glyph',charname,'has wrong number of lines of data!', file=sys.stderr) + print(' want: ',bbx[1],'but have',len(bitmap), file=sys.stderr) sys.exit(1) removedrows = 0 @@ -254,40 +254,40 @@ bitmap = bitmap[:-1] if removedrows > 0 : - print "Glyph %s: removed %d rows."%(charname,removedrows) + print("Glyph %s: removed %d rows."%(charname,removedrows)) w = int(glyph['dwidth'].split(None,1)[0]) - print >>of,'/* --- new character %s %s starting at offset 0x%04x --- */'%( - charname,ascii_charnum(i),pos) - print >>of,'\t/*%04x:*/\t%d, %d, %d, %d, %d, /* width and bbox (w,h,x,y) */'%( - pos,w,bbx[0],bbx[1],bbx[2],bbx[3]) + print('/* --- new character %s %s starting at offset 0x%04x --- */'%( + charname,ascii_charnum(i),pos), file=of) + print('\t/*%04x:*/\t%d, %d, %d, %d, %d, /* width and bbox (w,h,x,y) */'%( + pos,w,bbx[0],bbx[1],bbx[2],bbx[3]), file=of) pos += 5 for k,l in enumerate(bitmap) : bytes = [ int(l[i:i+2],16) for i in range(0,len(l),2) ] if len(bytes) != (bbx[0]+7)/8 : - print >>sys.stderr,'ERROR: glyph',charname,'has wrong # of bytes' - print >>sys.stderr,' per line. Want',(bbx[0]+7)/8,'have',len(bytes) + print('ERROR: glyph',charname,'has wrong # of bytes', file=sys.stderr) + print(' per line. Want',(bbx[0]+7)/8,'have',len(bytes), file=sys.stderr) sys.exit(1) cdata = ','.join([ '0x%02x'%v for v in bytes ]) comment = ''.join([ byte_to_bits(b) for b in bytes ]) - print >>of,'\t/*%04x:*/\t'%(pos)+cdata+', /* '+comment+' */' + print('\t/*%04x:*/\t'%(pos)+cdata+', /* '+comment+' */', file=of) pos += len(bytes) - print >>of,"};" + print("};", file=of) x = ',\n\t'.join(['0x%04x /* %s */'%(w,n) for w,n in zip(offsets,glyphnames)]) - print >>of,'static const uint16_t %s_offsets[] = {\n\t%s\n};'%(opts.base,x) + print('static const uint16_t %s_offsets[] = {\n\t%s\n};'%(opts.base,x), file=of) height = font.ascent + font.descent - print >>of,'const struct fb_font %s = {'%(opts.base) - print >>of,'\t.height = %d,'%(height) - print >>of,'\t.ascent = %d,'%(font.ascent) - print >>of,'\t.firstchar = %d, /* %s */'%(opts.firstchar,font.enc.get(opts.firstchar,"?")) - print >>of,'\t.lastchar = %d, /* %s */'%(opts.lastchar,font.enc.get(opts.lastchar,"?")) - print >>of,'\t.chardata = %s_data,'%(opts.base) - print >>of,'\t.charoffs = %s_offsets,'%(opts.base) - print >>of,'};' + print('const struct fb_font %s = {'%(opts.base), file=of) + print('\t.height = %d,'%(height), file=of) + print('\t.ascent = %d,'%(font.ascent), file=of) + print('\t.firstchar = %d, /* %s */'%(opts.firstchar,font.enc.get(opts.firstchar,"?")), file=of) + print('\t.lastchar = %d, /* %s */'%(opts.lastchar,font.enc.get(opts.lastchar,"?")), file=of) + print('\t.chardata = %s_data,'%(opts.base), file=of) + print('\t.charoffs = %s_offsets,'%(opts.base), file=of) + print('};', file=of) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaa20dd0aafa20e36186cf8dfe4d0ac9ab638f235 Gerrit-Change-Number: 14758 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 10 03:17:11 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 10 Aug 2019 03:17:11 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d4e37449c94a_583b2b131b52c5fc2361aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: can't create /var/cache/obs/worker/cache/content.new: Input/output error at ./bs_worker line 1209. (worker was cloud134:2) -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Aug 10 14:49:38 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 10 Aug 2019 14:49:38 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 10 Aug 2019 14:49:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 10 14:49:41 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 10 Aug 2019 14:49:41 +0000 Subject: Change in ...osmo-sip-connector[master]: coverity: Address issue found by coverity In-Reply-To: References: Message-ID: keith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 ) Change subject: coverity: Address issue found by coverity ...................................................................... coverity: Address issue found by coverity Add NULL checks on the return value of call_leg_other() in update_rtp() If the remote side has requested media change and we cannot find the other leg, then release call. This should not happen. Also, Add an assert to show that we cannot be here without call type of SIP or MNCC (not related to coverity) Fixes: CID#202863 Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 --- M src/mncc.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve keith: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index f5a44d5..e23bd6f 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -211,11 +211,21 @@ if (_leg->type == CALL_TYPE_MNCC) { leg = (struct mncc_call_leg *) _leg; struct call_leg *other = call_leg_other(&leg->base); + if (!other) + goto ret_release; send_rtp_connect(leg, other); - } else { + } else if (_leg->type == CALL_TYPE_SIP) { leg = (struct mncc_call_leg *) call_leg_other(_leg); + if (!leg) + goto ret_release; send_rtp_connect(leg, _leg); + } else { + OSMO_ASSERT(false); } + return; +ret_release: + LOGP(DMNCC, LOGL_ERROR, "Failed to find other leg.\n"); + _leg->release_call(_leg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6f1f26533a25c93f243090bc02f1bc83b9108d42 Gerrit-Change-Number: 15143 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 10 14:51:19 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 10 Aug 2019 14:51:19 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 12: Code-Review+1 Just want to make sure people are happy with this now? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 10 Aug 2019 14:51:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 11 01:43:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 11 Aug 2019 01:43:32 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d4f72ca1e145_583b2b131b52c5fc338712@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 118s] [NA] Client's read_cb_cli(): received 11(11) bytes: 72 65 61 64 5f 63 62 5f 73 72 76 [ 118s] [NA] Client's read_cb_cli(): initial read, contacting server [ 118s] [OK] Client's read_cb_cli(): sent 29 bytes message: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 118s] -[OK|OK] Server's read_cb_srv(): callback triggered [ 118s] -[OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 118s] -[OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 [ 118s] -[OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call [ 118s] -[OK] Client's read_cb_cli(): callback triggered [ 118s] -[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled [ 118s] non-reconnecting test complete. [ 118s] [ 118s] Stream tests completed [ 118s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 118s] debian/rules:27: recipe for target 'override_dh_auto_test' failed [ 118s] make[1]: *** [override_dh_auto_test] Error 1 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] debian/rules:13: recipe for target 'build' failed [ 118s] make: *** [build] Error 2 [ 118s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 118s] [ 118s] lamb14 failed "build libosmo-netif_0.6.0.dsc" at Sun Aug 11 01:43:15 UTC 2019. [ 118s] [ 118s] ### VM INTERACTION START ### [ 120s] [ 109.773492] sysrq: SysRq : Power Off [ 120s] [ 109.778465] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] lamb14 failed "build libosmo-netif_0.6.0.dsc" at Sun Aug 11 01:43:19 UTC 2019. [ 121s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Aug 11 11:37:37 2019 From: gerrit-no-reply at lists.osmocom.org (steve-m) Date: Sun, 11 Aug 2019 11:37:37 +0000 Subject: Change in ...osmocom-bb[master]: fw/build: Use arm-none-eabi as default toolchain Message-ID: steve-m has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15148 Change subject: fw/build: Use arm-none-eabi as default toolchain ...................................................................... fw/build: Use arm-none-eabi as default toolchain This is what we describe in our wiki and what ships with recent distros. Change-Id: I70da7eeb33275fa5fff1d8a3581c384e031b12e5 --- M src/target/firmware/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/15148/1 diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 9049898..a91cf4f 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -1,7 +1,7 @@ #### TOOLCHAIN CONFIGURATION #### -CROSS_COMPILE?=arm-elf- +CROSS_COMPILE?=arm-none-eabi- CC=gcc LD=ld -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I70da7eeb33275fa5fff1d8a3581c384e031b12e5 Gerrit-Change-Number: 15148 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 11:38:28 2019 From: gerrit-no-reply at lists.osmocom.org (steve-m) Date: Sun, 11 Aug 2019 11:38:28 +0000 Subject: Change in ...osmocom-bb[master]: fw/abb/twl3025: Add function to query PWON state Message-ID: steve-m has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15149 Change subject: fw/abb/twl3025: Add function to query PWON state ...................................................................... fw/abb/twl3025: Add function to query PWON state This allows us to detect power button presses on the Pirelli DP-L10 and the Huawei GTM900-B module. Polling will only be activated once the power button has been pressed and we received the interrupt. The goal is to reduce the required amount of TWL3025 register accesses to a minimum. Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770 --- M src/target/firmware/abb/twl3025.c M src/target/firmware/include/abb/twl3025.h 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/15149/1 diff --git a/src/target/firmware/abb/twl3025.c b/src/target/firmware/abb/twl3025.c index e4fcf4f..ad2b01f 100644 --- a/src/target/firmware/abb/twl3025.c +++ b/src/target/firmware/abb/twl3025.c @@ -60,8 +60,15 @@ ABB_RAMP_VAL( 0, 0), }; +typedef enum pwon_state { + PWON_IDLE, + PWON_DETECTED, + PWON_REPORTED, +} pwon_state_t; + struct twl3025 { uint8_t page; + pwon_state_t pwon; }; static struct twl3025 twl3025_state; @@ -106,6 +113,8 @@ case IRQ_EXTERNAL: // charger in/out, pwrbtn, adc done src = twl3025_reg_read(ITSTATREG); // printd("itstatreg 0x%02x\n", src); + if ((src & 0x04) && twl3025_state.pwon == PWON_IDLE) + twl3025_state.pwon = PWON_DETECTED; if (src & 0x08) handle_charger(); if (src & 0x20) @@ -127,6 +136,7 @@ twl3025_clk13m(1); twl3025_reg_write(AFCCTLADD, 0x01); /* AFCCK(1:0) must not be zero! */ twl3025_unit_enable(TWL3025_UNIT_AFC, 1); + twl3025_state.pwon = PWON_IDLE; irq_register_handler(IRQ_EXTERNAL, &twl3025_irq); irq_config(IRQ_EXTERNAL, 0, 0, 0); @@ -185,6 +195,24 @@ delay_ms(1); } +int twl3025_get_pwon(void) +{ + switch (twl3025_state.pwon) { + case PWON_DETECTED: + twl3025_state.pwon = PWON_REPORTED; + break; + case PWON_REPORTED: + if (twl3025_reg_read(VRPCSTS) & 0x10) + twl3025_state.pwon = PWON_IDLE; + break; + case PWON_IDLE: + default: + break; + } + + return (twl3025_state.pwon != PWON_IDLE); +} + void twl3025_power_off(void) { unsigned long flags; diff --git a/src/target/firmware/include/abb/twl3025.h b/src/target/firmware/include/abb/twl3025.h index 3640644..938a425 100755 --- a/src/target/firmware/include/abb/twl3025.h +++ b/src/target/firmware/include/abb/twl3025.h @@ -144,6 +144,8 @@ void twl3025_reg_write(uint8_t reg, uint16_t data); uint16_t twl3025_reg_read(uint8_t reg); +int twl3025_get_pwon(void); + void twl3025_power_off(void); void twl3025_clk13m(int enable); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770 Gerrit-Change-Number: 15149 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 11:38:43 2019 From: gerrit-no-reply at lists.osmocom.org (steve-m) Date: Sun, 11 Aug 2019 11:38:43 +0000 Subject: Change in ...osmocom-bb[master]: fw/keypad: Poll Iota powerbutton if required Message-ID: steve-m has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15150 Change subject: fw/keypad: Poll Iota powerbutton if required ...................................................................... fw/keypad: Poll Iota powerbutton if required This commit adds polling of the TWL3025 PWON signal. If the powerbutton is pressed on targets that use it (Pirelli DP-L10, Huawei GTM900-B), a normal keypad scanning cycle is started in order to preserve the timing, required for the 500ms power off press duration for example. Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 --- M src/target/firmware/board/compal/keymap.h M src/target/firmware/board/pirelli_dpl10/keymap.h M src/target/firmware/calypso/keypad.c M src/target/firmware/include/keypad.h 4 files changed, 27 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/15150/1 diff --git a/src/target/firmware/board/compal/keymap.h b/src/target/firmware/board/compal/keymap.h index ce8f9c2..fe0e303 100644 --- a/src/target/firmware/board/compal/keymap.h +++ b/src/target/firmware/board/compal/keymap.h @@ -23,5 +23,6 @@ [KEY_OK] = 0, [KEY_POWER] = 24, [KEY_MINUS] = 30, /* not existent */ - [KEY_PLUS] = 31, /* not existent */ + [KEY_PLUS] = 30, /* not existent */ + [KEY_CAMERA] = 30, /* not existent */ }; diff --git a/src/target/firmware/board/pirelli_dpl10/keymap.h b/src/target/firmware/board/pirelli_dpl10/keymap.h index b85621b..b06f17d 100644 --- a/src/target/firmware/board/pirelli_dpl10/keymap.h +++ b/src/target/firmware/board/pirelli_dpl10/keymap.h @@ -21,8 +21,9 @@ [KEY_LEFT] = 5, [KEY_RIGHT] = 10, [KEY_OK] = 11, -/* power button is not connected, we use the camera button instead */ - [KEY_POWER] = 23, +/* power button is not connected to keypad scan matrix but to TWL3025 */ + [KEY_POWER] = 31, [KEY_MINUS] = 22, [KEY_PLUS] = 21, + [KEY_CAMERA] = 23, }; diff --git a/src/target/firmware/calypso/keypad.c b/src/target/firmware/calypso/keypad.c index 937f8bd..c3c1810 100644 --- a/src/target/firmware/calypso/keypad.c +++ b/src/target/firmware/calypso/keypad.c @@ -1,7 +1,7 @@ /* Driver for the keypad attached to the TI Calypso */ /* (C) 2010 by roh - * (C) 2013 by Steve Markgraf + * (C) 2013-19 by Steve Markgraf * * All Rights Reserved * @@ -119,6 +119,15 @@ static uint16_t reg; static uint16_t col; static uint32_t buttons = 0, debounce1 = 0, debounce2 = 0; + uint8_t use_iota_pwrbtn = (btn_map[KEY_POWER] == 31); + uint32_t pwr_mask = (1 << btn_map[KEY_POWER]); + + /* only read Iota powerbutton if it was not yet pressed */ + if (use_iota_pwrbtn && !(buttons & pwr_mask) && twl3025_get_pwon()) { + buttons |= pwr_mask; + if (!polling) + polling = 1; + } if (with_interrupts && !polling) return; @@ -154,7 +163,6 @@ col++; if (col > 5) { - uint32_t pwr_mask = (1 << btn_map[KEY_POWER]); col = 0; /* if power button, ignore other states */ if (buttons & pwr_mask) @@ -162,6 +170,16 @@ else if (lastbuttons & pwr_mask) buttons = lastbuttons & ~pwr_mask; dispatch_buttons(buttons); + + /* check if powerbutton connected to Iota was released */ + if (use_iota_pwrbtn && (buttons & pwr_mask) && !twl3025_get_pwon()) { + buttons &= ~pwr_mask; + + /* dispatch buttons again so we do not loose + * very short powerbutton presses */ + dispatch_buttons(buttons); + } + if (buttons == 0) { writew(0x0, KBC_REG); polling = 3; @@ -172,5 +190,4 @@ writew(0xff, KBC_REG); else writew(0x1f & ~(0x1 << col ), KBC_REG); - } diff --git a/src/target/firmware/include/keypad.h b/src/target/firmware/include/keypad.h index 9e9acfe..2ad9889 100644 --- a/src/target/firmware/include/keypad.h +++ b/src/target/firmware/include/keypad.h @@ -25,11 +25,11 @@ KEY_POWER, //red on-hook KEY_MINUS, KEY_PLUS, + KEY_CAMERA, + BUTTON_CNT, KEY_INV = 0xFF }; -#define BUTTON_CNT 23 - enum key_states { PRESSED, RELEASED, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 Gerrit-Change-Number: 15150 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 11:38:55 2019 From: gerrit-no-reply at lists.osmocom.org (steve-m) Date: Sun, 11 Aug 2019 11:38:55 +0000 Subject: Change in ...osmocom-bb[master]: fw/flash: Read extended ID, expose API Message-ID: steve-m has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15151 Change subject: fw/flash: Read extended ID, expose API ...................................................................... fw/flash: Read extended ID, expose API We now unlock the flash before reading the extended ID (required for Spansion and Samsung flash chips). These commands will be ignored by Intel/ST flash chips, and this change has been verified with all flash chips we support. Furthermore, expose the API for reading the flash ID. Change-Id: I3bcd71c84c8931bcd574953063737b51a41738a3 --- M src/target/firmware/flash/cfi_flash.c M src/target/firmware/include/flash/cfi_flash.h 2 files changed, 36 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/15151/1 diff --git a/src/target/firmware/flash/cfi_flash.c b/src/target/firmware/flash/cfi_flash.c index 974165d..2f8cde0 100644 --- a/src/target/firmware/flash/cfi_flash.c +++ b/src/target/firmware/flash/cfi_flash.c @@ -69,12 +69,6 @@ struct cfi_region erase_regions[CFI_FLASH_MAX_ERASE_REGIONS]; } __attribute__ ((packed)); -/* manufacturer ids */ -enum cfi_manuf { - CFI_MANUF_ST = 0x0020, - CFI_MANUF_INTEL = 0x0089, -}; - /* algorithm ids */ enum cfi_algo { CFI_ALGO_INTEL_3 = 0x03 @@ -83,6 +77,7 @@ /* various command bytes */ enum cfi_flash_cmd { CFI_CMD_RESET = 0xff, + CFI_CMD_RESET_TO_READ_MODE = 0xF0, CFI_CMD_READ_ID = 0x90, CFI_CMD_CFI = 0x98, CFI_CMD_READ_STATUS = 0x70, @@ -91,6 +86,8 @@ CFI_CMD_BLOCK_ERASE = 0x20, CFI_CMD_ERASE_CONFIRM = 0xD0, CFI_CMD_PROTECT = 0x60, + CFI_CMD_UNLOCK1 = 0xAA, + CFI_CMD_UNLOCK2 = 0x55, }; /* protection commands */ @@ -104,6 +101,8 @@ enum flash_offset { CFI_OFFSET_MANUFACTURER_ID = 0x00, CFI_OFFSET_DEVICE_ID = 0x01, + CFI_OFFSET_EXT_DEVICE_ID1 = 0x0E, + CFI_OFFSET_EXT_DEVICE_ID2 = 0x0F, CFI_OFFSET_INTEL_PROTECTION = 0x81, CFI_OFFSET_CFI_RESP = 0x10 }; @@ -125,6 +124,9 @@ CFI_STATUS_RESERVED = 0x01 }; +#define CFI_CMD_ADDR1 0xAAA +#define CFI_CMD_ADDR2 0x555 + __ramtext static inline void flash_write_cmd(const void *base_addr, uint16_t cmd) { @@ -379,17 +381,27 @@ return res; } -/* Internal: retrieve manufacturer and device id from id space */ +/* retrieve manufacturer and extended device id from id space */ __ramtext -static int get_id(void *base_addr, +int flash_get_id(void *base_addr, uint16_t * manufacturer_id, uint16_t * device_id) { - flash_write_cmd(base_addr, CFI_CMD_READ_ID); + flash_write_cmd(base_addr, CFI_CMD_RESET_TO_READ_MODE); - *manufacturer_id = flash_read16(base_addr, CFI_OFFSET_MANUFACTURER_ID); - *device_id = flash_read16(base_addr, CFI_OFFSET_DEVICE_ID); + flash_write_cmd(base_addr + CFI_CMD_ADDR1, CFI_CMD_UNLOCK1); + flash_write_cmd(base_addr + CFI_CMD_ADDR2, CFI_CMD_UNLOCK2); + flash_write_cmd(base_addr + CFI_CMD_ADDR1, CFI_CMD_READ_ID); - flash_write_cmd(base_addr, CFI_CMD_RESET); + if (manufacturer_id) + *manufacturer_id = flash_read16(base_addr, CFI_OFFSET_MANUFACTURER_ID); + + if (device_id) { + device_id[0] = flash_read16(base_addr, CFI_OFFSET_DEVICE_ID); + device_id[1] = flash_read16(base_addr, CFI_OFFSET_EXT_DEVICE_ID1); + device_id[2] = flash_read16(base_addr, CFI_OFFSET_EXT_DEVICE_ID2); + } + + flash_write_cmd(base_addr, CFI_CMD_RESET_TO_READ_MODE); return 0; } @@ -524,12 +536,12 @@ { int res; unsigned u; - uint16_t m_id, d_id; + uint16_t m_id, d_id[3]; uint32_t base; struct cfi_query qry; /* retrieve and check manufacturer and device id */ - res = get_id(base_addr, &m_id, &d_id); + res = flash_get_id(base_addr, &m_id, d_id); if (res) { return res; } diff --git a/src/target/firmware/include/flash/cfi_flash.h b/src/target/firmware/include/flash/cfi_flash.h index 9d8b33a..8589fb6 100644 --- a/src/target/firmware/include/flash/cfi_flash.h +++ b/src/target/firmware/include/flash/cfi_flash.h @@ -26,6 +26,14 @@ FLASH_LOCKED_DOWN } flash_lock_t; +/* manufacturer ids */ +enum cfi_manuf { + CFI_MANUF_ST = 0x0020, + CFI_MANUF_INTEL = 0x0089, + CFI_MANUF_SPANSION = 0x0001, + CFI_MANUF_SAMSUNG = 0x00EC, +}; + int flash_init(flash_t *flash, void *base_addr); flash_lock_t flash_block_getlock(flash_t *flash, uint32_t block_offset); @@ -38,4 +46,6 @@ int flash_program(flash_t *flash, uint32_t dst_offset, void *src, uint32_t nbytes); +int flash_get_id(void *base_addr, uint16_t * manufacturer_id, uint16_t * device_id); + #endif -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3bcd71c84c8931bcd574953063737b51a41738a3 Gerrit-Change-Number: 15151 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 11:39:08 2019 From: gerrit-no-reply at lists.osmocom.org (steve-m) Date: Sun, 11 Aug 2019 11:39:08 +0000 Subject: Change in ...osmocom-bb[master]: fw: Add support for Huawei GTM900-B modules Message-ID: steve-m has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15152 Change subject: fw: Add support for Huawei GTM900-B modules ...................................................................... fw: Add support for Huawei GTM900-B modules Both MG01GSMT and MG01GSMT hardware variants are supported and automatically detected based on the flash manufacturer. Change-Id: I3a770ea93fc72c4e9b63078e253602f204b5be23 --- M src/target/firmware/Makefile A src/target/firmware/board/gtm900b/init.c A src/target/firmware/board/gtm900b/keymap.h A src/target/firmware/board/gtm900b/rf_power.c A src/target/firmware/board/gtm900b/rffe_gtm900b.c 5 files changed, 464 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/15152/1 diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 2f44a20..f7235ac 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -24,7 +24,7 @@ # # List of all supported boards (meant to be overridden on command line) -BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 gta0x fcdev3b pirelli_dpl10 +BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 gta0x gtm900b fcdev3b pirelli_dpl10 # Framebuffer support, board specific drivers FB_OBJS=fb/framebuffer.o fb/font.o fb/helvR08.o fb/helvB14.o fb/c64.o \ @@ -46,6 +46,12 @@ battery/dummy.o $(FB_dummy_OBJS) BOARD_gta0x_ENVIRONMENTS=highram +# Huawei GTM900-B +BOARD_gtm900b_OBJS=$(calypso_COMMON_OBJS) board/gtm900b/init.o \ + board/gtm900b/rffe_gtm900b.o board/gtm900b/rf_power.o \ + battery/dummy.o $(FB_dummy_OBJS) +BOARD_gtm900b_ENVIRONMENTS=highram + # FreeCalypso FCDEV3B BOARD_fcdev3b_OBJS=$(calypso_COMMON_OBJS) board/fcdev3b/init.o \ board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_power.o \ diff --git a/src/target/firmware/board/gtm900b/init.c b/src/target/firmware/board/gtm900b/init.c new file mode 100644 index 0000000..38ede10 --- /dev/null +++ b/src/target/firmware/board/gtm900b/init.c @@ -0,0 +1,140 @@ +/* Initialization for the Huawei GTM900-B modem */ + +/* (C) 2010 by Harald Welte + * (C) 2010-19 by Steve Markgraf + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include "keymap.h" + +#define ARMIO_LATCH_OUT 0xfffe4802 +#define IO_CNTL_REG 0xfffe4804 +#define ASIC_CONF_REG 0xfffef008 +#define IO_CONF_REG 0xfffef00a +#define LPG_LCR_REG 0xfffe7800 +#define LPG_PM_REG 0xfffe7801 + +static void board_io_init(void) +{ + uint16_t reg; + + reg = readw(ASIC_CONF_REG); + /* Set LPG pin mux for power LED */ + reg |= (1 << 6); + /* TWL3025: Set SPI+RIF RX clock to rising edge */ + reg |= (1 << 13) | (1 << 14); + writew(reg, ASIC_CONF_REG); + + /* + * Most Calypso peripheral interface signals are unconnected + * on this modem. We configure them to be GPIOs in IO_CONF_REG, + * then configure them to be outputs in IO_CNTL_REG, then set + * the outputs to 0 in ARMIO_LATCH_OUT. + */ + writew(0x03F5, IO_CONF_REG); + writew(0xC000, IO_CNTL_REG); + writew(0x0000, ARMIO_LATCH_OUT); + + /* Set LPG output permanently on (power LED) */ + writew(1, LPG_PM_REG); + writew((1 << 7), LPG_LCR_REG); +} + +void board_init(int with_irq) +{ + /* Configure the memory interface */ + calypso_mem_cfg(CALYPSO_nCS0, 3, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS1, 3, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS2, 5, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS3, 5, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_CS4, 0, CALYPSO_MEM_8bit, 1); + calypso_mem_cfg(CALYPSO_nCS6, 0, CALYPSO_MEM_32bit, 1); + calypso_mem_cfg(CALYPSO_nCS7, 0, CALYPSO_MEM_32bit, 0); + + /* Set VTCXO_DIV2 = 1, configure PLL for 104 MHz and give ARM half of that */ + calypso_clock_set(2, CALYPSO_PLL13_104_MHZ, ARM_MCLK_DIV_2); + + /* Configure the RHEA bridge with some sane default values */ + calypso_rhea_cfg(0, 0, 0xff, 0, 1, 0, 0); + + /* Initialize board-specific GPIO */ + board_io_init(); + + /* Enable bootrom mapping to route exception vectors to RAM */ + calypso_bootrom(with_irq); + calypso_exceptions_install(); + + /* Initialize interrupt controller */ + if (with_irq) + irq_init(); + + sercomm_bind_uart(UART_IRDA); + cons_bind_uart(UART_MODEM); + + /* initialize IRDA UART to be used for sercomm */ + uart_init(UART_IRDA, with_irq); + uart_baudrate(UART_IRDA, UART_115200); + + /* Initialize MODEM UART to be used for old-school console code. */ + uart_init(UART_MODEM, with_irq); + uart_baudrate(UART_MODEM, UART_115200); + + /* Initialize hardware timers */ + hwtimer_init(); + + /* Initialize DMA controller */ + dma_init(); + + /* Initialize real time clock */ + rtc_init(); + + /* Initialize system timers (uses hwtimer 2) */ + timer_init(); + + /* Initialize keypad driver */ + keypad_init(keymap, with_irq); + + /* Initialize ABB driver (uses SPI) */ + twl3025_init(); +} diff --git a/src/target/firmware/board/gtm900b/keymap.h b/src/target/firmware/board/gtm900b/keymap.h new file mode 100644 index 0000000..07a19e0 --- /dev/null +++ b/src/target/firmware/board/gtm900b/keymap.h @@ -0,0 +1,29 @@ +/* keymap for the Huawei GTM900-B */ + +static const uint8_t keymap[] = { + [KEY_0] = 0, + [KEY_1] = 0, + [KEY_2] = 0, + [KEY_3] = 0, + [KEY_4] = 0, + [KEY_5] = 0, + [KEY_6] = 0, + [KEY_7] = 0, + [KEY_8] = 0, + [KEY_9] = 0, + [KEY_STAR] = 0, + [KEY_HASH] = 0, + [KEY_MENU] = 0, + [KEY_LEFT_SB] = 0, + [KEY_RIGHT_SB] = 0, + [KEY_UP] = 0, + [KEY_DOWN] = 0, + [KEY_LEFT] = 0, + [KEY_RIGHT] = 0, + [KEY_OK] = 0, +/* power button is not connected to keypad scan matrix but to TWL3025 */ + [KEY_POWER] = 31, + [KEY_MINUS] = 0, + [KEY_PLUS] = 0, + [KEY_CAMERA] = 0, +}; diff --git a/src/target/firmware/board/gtm900b/rf_power.c b/src/target/firmware/board/gtm900b/rf_power.c new file mode 100644 index 0000000..cd47ddf --- /dev/null +++ b/src/target/firmware/board/gtm900b/rf_power.c @@ -0,0 +1,63 @@ +/* Tx RF power calibration for the Huawei GTM900-B */ + +/* (C) 2010 by Harald Welte + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include + +/* GSM900 ARFCN 33, Measurements by Steve Markgraf / May 2010 */ +/* FIXME those are from the Compal phones, do measurements with the GTM900-B */ +const int16_t dbm2apc_gsm900[] = { + [0] = 151, + [1] = 152, + [2] = 153, + [3] = 155, + [4] = 156, + [5] = 158, + [6] = 160, + [7] = 162, + [8] = 164, + [9] = 167, + [10] = 170, + [11] = 173, + [12] = 177, + [13] = 182, + [14] = 187, + [15] = 192, + [16] = 199, + [17] = 206, + [18] = 214, + [19] = 223, + [20] = 233, + [21] = 244, + [22] = 260, + [23] = 271, + [24] = 288, + [25] = 307, + [26] = 327, + [27] = 350, + [28] = 376, + [29] = 407, + [30] = 456, + [31] = 575, +}; + +const int dbm2apc_gsm900_max = ARRAY_SIZE(dbm2apc_gsm900) - 1; diff --git a/src/target/firmware/board/gtm900b/rffe_gtm900b.c b/src/target/firmware/board/gtm900b/rffe_gtm900b.c new file mode 100644 index 0000000..633c637 --- /dev/null +++ b/src/target/firmware/board/gtm900b/rffe_gtm900b.c @@ -0,0 +1,225 @@ +/* RF frontend driver for Huawei GTM900-B modems, supporting both + * MG01GSMT and MG01GSMT hardware variants */ + +/* (C) 2019 by Steve Markgraf + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* This is a value that has been measured for the GTM900-B: 74dBm, + it is the difference between the input level at the antenna and what + the DSP reports, subtracted by the total gain of the TRF6151 */ +#define SYSTEM_INHERENT_GAIN 74 + +/* describe how the RF frontend is wired on the Huawei GTM900-B */ +#define IOTA_STROBE TSPEN(0) /* Strobe for the Iota TSP */ +#define RITA_STROBE TSPEN(2) /* Strobe for the Rita TSP */ + +#define RITA_RESET TSPACT(0) /* Reset of the Rita TRF6151 */ +#define PA_BAND_SELECT TSPACT(3) /* Low: 850/900, High: 1800/1900 */ +#define PA_TX_ENABLE TSPACT(9) /* Enable the Power Amplifier */ + +/* MGC2GSMT Ver. BRF specific antenna switch signals, low active */ +#define ASM_VC1 TSPACT(1) /* low on GSM900 TX */ +#define ASM_VC2 TSPACT(2) /* low on DCS1800 TX */ + +/* MG01GSMT Ver. C specific antenna switch signals, low active */ +#define CXG_CTLA TSPACT(4) /* CXG1192UR CTLA input */ +#define CXG_CTLB TSPACT(1) /* CXG1192UR CTLB input */ +#define CXG_CTLC TSPACT(2) /* CXG1192UR CTLC input */ + +/* + * The Sony CXG1192UR switch is wired as follows on the MG01GSMT Ver. C: + * + * Rx1: GSM850 RX filter (Epcos B5013) + * Rx2: GSM900 RX filter (Epcos B7710) + * Rx3: DCS1800 RX filter (Epcos 7714) + * Rx4: PCS1900 RX filter (not populated) + * Tx1: low band PA output + * Tx2: high band PA output + */ + +typedef enum rffe_var { + RFFE_MGC2GSMT, + RFFE_MG01GSMT +} rffe_var_t; + +static rffe_var_t rffe_variant = RFFE_MGC2GSMT; + +static inline void rffe_mode_mgc2gsmt(enum gsm_band band, int tx) +{ + uint16_t tspact = tsp_act_state(); + + /* First we mask off all bits from the state cache */ + tspact &= ~(PA_BAND_SELECT | PA_TX_ENABLE); + tspact |= (ASM_VC1 | ASM_VC2); /* low-active */ + +#ifdef CONFIG_TX_ENABLE + /* Then we selectively set the bits on, if required */ + if (tx) { + tspact |= PA_TX_ENABLE; + tspact &= ~CXG_CTLA; + + if (band == GSM_BAND_1800 || band == GSM_BAND_1900) { + tspact |= PA_BAND_SELECT; + tspact &= ~ASM_VC2; + } else { + tspact &= ~ASM_VC1; + } + } +#endif /* TRANSMIT_SUPPORT */ + + tsp_act_update(tspact); +} + +static inline void rffe_mode_mg01gsmt(enum gsm_band band, int tx) +{ + uint16_t tspact = tsp_act_state(); + + /* First we mask off all bits from the state cache */ + tspact &= ~(PA_BAND_SELECT | PA_TX_ENABLE); + tspact |= (CXG_CTLA | CXG_CTLB | CXG_CTLC); /* low-active */ + + switch (band) { + case GSM_BAND_850: + tspact &= ~CXG_CTLB; /* select Ant1 - Rx1 */ + break; + case GSM_BAND_900: + tspact &= ~CXG_CTLC; /* select Ant1 - Rx2 */ + break; + case GSM_BAND_1800: /* select Ant2 - Rx3 */ + break; + case GSM_BAND_1900: + tspact &= ~(CXG_CTLB | CXG_CTLC); /* select Ant2 - Rx4 */ + break; + default: + break; + } + +#ifdef CONFIG_TX_ENABLE + /* Then we selectively set the bits on, if required */ + if (tx) { + tspact |= PA_TX_ENABLE; + tspact &= ~CXG_CTLA; + + if (band == GSM_BAND_1800 || band == GSM_BAND_1900) { + tspact |= PA_BAND_SELECT; + tspact &= ~CXG_CTLB; + } + } +#endif /* TRANSMIT_SUPPORT */ + + tsp_act_update(tspact); +} + +/* switch RF Frontend Mode */ +void rffe_mode(enum gsm_band band, int tx) +{ + if (rffe_variant == RFFE_MGC2GSMT) + rffe_mode_mgc2gsmt(band, tx); + else + rffe_mode_mg01gsmt(band, tx); +} + +uint32_t rffe_get_rx_ports(void) +{ + return (1 << PORT_LO) | (1 << PORT_DCS1800) | (1 << PORT_PCS1900); +} + +uint32_t rffe_get_tx_ports(void) +{ + return (1 << PORT_LO) | (1 << PORT_HI); +} + +/* Returns need for IQ swap */ +int rffe_iq_swapped(uint16_t band_arfcn, int tx) +{ + return trf6151_iq_swapped(band_arfcn, tx); +} + +#define ARM_CONF_REG 0xfffef006 + +void rffe_init(void) +{ + uint16_t reg; + uint16_t manufacturer_id = 0; + + reg = readw(ARM_CONF_REG); + reg &= ~ (1 << 7); /* TSPACT4 I/O function, not nRDYMEM */ + writew(reg, ARM_CONF_REG); + + /* Configure the TSPEN which is connected to the TWL3025 */ + tsp_setup(IOTA_STROBE, 1, 0, 0); + + trf6151_init(RITA_STROBE, RITA_RESET); + + /* Detect the used RFFE variant based on the used flash chip. + * The MGC2GSMT uses a Samsung flash, whereas the MG01GSMT uses + * a Spansion flash. We use an address above the Calpso bootrom + * so we do not need to unmap it to access the flash. */ + flash_get_id((void *)0x40000, &manufacturer_id, NULL); + + switch (manufacturer_id) { + case CFI_MANUF_SPANSION: + printf("Detected MG01GSMT module\n\n"); + rffe_variant = RFFE_MG01GSMT; + break; + case CFI_MANUF_SAMSUNG: + printf("Detected MGC2GSMT module\n\n"); + rffe_variant = RFFE_MGC2GSMT; + break; + default: + printf("Unknown module detected, flash ID 0x%4.4x\n" + "Please contact mailing list!\n\n", manufacturer_id); + rffe_variant = RFFE_MGC2GSMT; + break; + } +} + +uint8_t rffe_get_gain(void) +{ + return trf6151_get_gain(); +} + +void rffe_set_gain(uint8_t dbm) +{ + trf6151_set_gain(dbm); +} + +const uint8_t system_inherent_gain = SYSTEM_INHERENT_GAIN; + +/* Given the expected input level of exp_inp dBm/8 and the target of target_bb + * dBm8, configure the RF Frontend with the respective gain */ +void rffe_compute_gain(int16_t exp_inp, int16_t target_bb) +{ + trf6151_compute_gain(exp_inp, target_bb); +} + +void rffe_rx_win_ctrl(int16_t exp_inp, int16_t target_bb) +{ + /* FIXME */ +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a770ea93fc72c4e9b63078e253602f204b5be23 Gerrit-Change-Number: 15152 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:04:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:04:51 +0000 Subject: Change in ...osmocom-bb[master]: fw/build: Use arm-none-eabi as default toolchain In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15148 ) Change subject: fw/build: Use arm-none-eabi as default toolchain ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I70da7eeb33275fa5fff1d8a3581c384e031b12e5 Gerrit-Change-Number: 15148 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 12:04:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:05:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:05:48 +0000 Subject: Change in ...osmocom-bb[master]: fw/abb/twl3025: Add function to query PWON state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15149 ) Change subject: fw/abb/twl3025: Add function to query PWON state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770 Gerrit-Change-Number: 15149 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 12:05:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:07:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:07:24 +0000 Subject: Change in ...osmocom-bb[master]: fw/keypad: Poll Iota powerbutton if required In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15150 ) Change subject: fw/keypad: Poll Iota powerbutton if required ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 Gerrit-Change-Number: 15150 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 12:07:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:08:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:08:07 +0000 Subject: Change in ...osmocom-bb[master]: fw/flash: Read extended ID, expose API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15151 ) Change subject: fw/flash: Read extended ID, expose API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3bcd71c84c8931bcd574953063737b51a41738a3 Gerrit-Change-Number: 15151 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 12:08:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:09:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:09:56 +0000 Subject: Change in ...osmocom-bb[master]: fw: Add support for Huawei GTM900-B modules In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15152 ) Change subject: fw: Add support for Huawei GTM900-B modules ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a770ea93fc72c4e9b63078e253602f204b5be23 Gerrit-Change-Number: 15152 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 12:09:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:10:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:10:28 +0000 Subject: Change in ...meta-telephony[201705]: Update Osmocom recipes to latest tags (release 201908) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15144 ) Change subject: Update Osmocom recipes to latest tags (release 201908) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 Gerrit-Change-Number: 15144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 11 Aug 2019 12:10:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:10:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:10:30 +0000 Subject: Change in ...meta-telephony[201705]: Update Osmocom recipes to latest tags (release 201908) In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/meta-telephony/+/15144 ) Change subject: Update Osmocom recipes to latest tags (release 201908) ...................................................................... Update Osmocom recipes to latest tags (release 201908) Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 17 files changed, 34 insertions(+), 34 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index e04e525..9da4f54 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "6996e5dba9603208609f4604a3b3d59f88c85d90" +SRCREV = "d2704da4cb3efdf241d2cde037688badaef53f9a" SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.13.0+gitr${SRCPV}" +PV = "1.14.0+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 9d4fa87..879a22f 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d36012fb029fd9914b4e8125c9c3186785940258" +SRCREV = "19205a38c34175f4fb4d1d06e77f1d3e4a39c651" SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.31+gitr${SRCPV}" +PV = "0.9.32+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 3032d28..e64ace2 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "176a1fbab6ae45eb1c60e3d8b263b0765759e1da" +SRCREV = "30249a15d51a15b498e87b78bd3fc8d684ffcf46" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.6.0+gitr${SRCPV}" +PV = "0.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 73c6314..23a0148 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c775ffe1cc6cfd842566d30c96d287502d9d6218" +SRCREV = "592057bb33dc0c336a63003cd7a3a67944d92757" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.4.0+gitr${SRCPV}" +PV = "0.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 6bdea27..6204aab 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "81c6a0a97980f9da76ef0e698ca6ab526b98c7c2" +SRCREV = "0b7ad1a72fae2a4547bf0d1d6430918a74ea577b" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.0.0+gitr${SRCPV}" +PV = "1.1.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 8eca57f..06e9796 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d4c406a04eae0071da4fb7aecd3cb47acd0fdab6" +SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.0.1+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7dbb07a..c9b75e8 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.1+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "ed8815e723b41e9800f14c67bccd34e51a06beb6" +SRCREV = "bb414bf8b104e1b56e61bb804c75d30cda2a9e3c" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index 56e7eb4..19be0e5 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "117fa9d92d0da3d94a51cbfc1cbeb0d5bdcd3767" +SRCREV = "3c9485751cd20215ca6029df8dde4be94ee6f39d" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index a88eb84..939fc58 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f5a268a96d7d3c7bcfbc530f2a0b334cf25d3e3c" +SRCREV = "67aebc9d1c6b0773b082b496a579be1a80c2a9b2" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://libgtp-queue_depth_32.patch \ " -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index c072a52..2a5d842 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e0c6fe5921b30b0e8de35c021be5226c1475c2f5" +SRCREV = "9cf0030b6a8e41fbcfec6cedb5f6c2c5871d7931" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "1.0.0+gitr${SRCPV}" +PV = "1.1.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index 5eb6d50..2d1beba 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "92a88ee73f471a4ddb7b864ae9f487493307a175" +SRCREV = "505fa9eae765a31289e3a1743f606e83b9cd65d0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.4.0+gitr${SRCPV}" +PV = "0.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 3998c5d..3b8d37d 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e81c1176aa1254b0bb148385134186f6a55fd405" +SRCREV = "50e52e45f9c01d5799520ddb53565b868729801f" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 87de339..c3681ad 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "41e7cf115d4148a9f34fcb863b68b2d5370e335d" +SRCREV = "0218814c8c099d6e9e6ba1e85f8d0d6672a32214" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.3.1+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index 9ffb510..2e2ca55 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "901543a78846cc4e3a0cdae91dead4913b1be961" +SRCREV = "5e10f1db125cf869c5f1769df9abdd6084679b3e" SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.0+gitr${SRCPV}" +PV = "0.1.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index 2c1991e..fe22de5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "319a52b577843f6eebb00d8039c2e2479adc8da5" +SRCREV = "d7ef94c0bb48797cb53947773c9e59ccdedc72bb" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index 0d74751..ec679c5 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "336add4990191011ec6b8f621593e24b2ad5e324" +SRCREV = "f56af15181afdeeb9b517c589b7a220820b0083b" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index e23e807..32796b3 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "65d937c45c3362504b8900173b8256a5894adae9" +SRCREV = "7648a0eb1824e432075353cde10dffdac1cd295e" SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" -PV = "0.0.1+gitr${SRCPV}" +PV = "0.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1b06cbd9998660951d33a011726d86ae288fc7b9 Gerrit-Change-Number: 15144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:10:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:10:38 +0000 Subject: Change in ...meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15145 ) Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8532e9b0391bc3489cd9b53caced9f5bf0d3581f Gerrit-Change-Number: 15145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 11 Aug 2019 12:10:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:10:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:10:44 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Disable TLS workaround to avoid ld crash In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15146 ) Change subject: libosmocore: Disable TLS workaround to avoid ld crash ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8d2bfa7ed44d1d2a7fb024ac49bc81cdbf38675d Gerrit-Change-Number: 15146 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 11 Aug 2019 12:10:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:10:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:10:45 +0000 Subject: Change in ...meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/meta-telephony/+/15145 ) Change subject: Add libosmo-netif to osmo-sysmon dependencies ...................................................................... Add libosmo-netif to osmo-sysmon dependencies This is in preparation for upcoming patch related to OpenVPN probe [1]. [1] change-id I4493e19b9a09dcebd289457eacd1719f7f8cc31c (osmo-sysmon) Change-Id: I8532e9b0391bc3489cd9b53caced9f5bf0d3581f --- M recipes-osmocom/osmo-sysmon/osmo-sysmon.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc index 1469438..aab52bc 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libtalloc libosmocore libmnl liboping" +DEPENDS = "libtalloc libosmocore libosmo-netif libmnl liboping" INC_PR="r0.${META_TELEPHONY_OSMO_INC}" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8532e9b0391bc3489cd9b53caced9f5bf0d3581f Gerrit-Change-Number: 15145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:10:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:10:45 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Disable TLS workaround to avoid ld crash In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/meta-telephony/+/15146 ) Change subject: libosmocore: Disable TLS workaround to avoid ld crash ...................................................................... libosmocore: Disable TLS workaround to avoid ld crash Change-Id: I8d2bfa7ed44d1d2a7fb024ac49bc81cdbf38675d --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 06e9796..3a417f0 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -24,3 +24,15 @@ RREPLACES_libosmovty = "DONOTREPLACElibosmocore" EXTRA_OECONF += "--disable-pcsc" + +# OS#4062: Some gcc version (< 7.3.0) on ARM generate wrong code for __thread +# variables that crash at runtime. It seems, due to some unknown reason, that we +# are not affected by this bug with toolchain from poky pyro (6.4.0). However, +# libosmocore as of e188b8cd98f599468fbb200c7d590de955daf761 applies some +# CFLAGS="-mtls-dialect=gnu2" to workaround the issue automatically. But same +# toolchain contains an "ld" that crashes when those flags are applied. +# Fortunately, libosmocore provides a way to disable the workaround, and since +# we are not affected by the bug, we are fine with that. If the toolchain had +# the TLS runtime bug, then we'd had to build with -O0. Can be probably dropped +# once we move to newer toolchain. +EXTRA_OECONF += "--disable-detect-tls-gcc-arm-bug" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I8d2bfa7ed44d1d2a7fb024ac49bc81cdbf38675d Gerrit-Change-Number: 15146 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:11:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:11:17 +0000 Subject: Change in ...libusrp[master]: jenkins.sh: Workaround race conditon in make In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15147 ) Change subject: jenkins.sh: Workaround race conditon in make ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iab8eab6d21365e3ee8d018428a707c56cc1b72e5 Gerrit-Change-Number: 15147 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 12:11:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 12:11:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 11 Aug 2019 12:11:18 +0000 Subject: Change in ...libusrp[master]: jenkins.sh: Workaround race conditon in make In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15147 ) Change subject: jenkins.sh: Workaround race conditon in make ...................................................................... jenkins.sh: Workaround race conditon in make Sometimes the jenkins job fails to build. I never have this issue on my workstation. Disabling PARALLEL_MAKE is osmo-trx jenkins.sh (which requires libusrp build) made libusrp stop failing there, so let's do the same here. OS#3970 Change-Id: Iab8eab6d21365e3ee8d018428a707c56cc1b72e5 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d75beda..7a7e782 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,6 +4,6 @@ autoreconf --install --force ./configure -$MAKE $PARALLEL_MAKE +$MAKE # Parallel make fails ocsasionally, see OS#3970. $MAKE distcheck $MAKE maintainer-clean -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iab8eab6d21365e3ee8d018428a707c56cc1b72e5 Gerrit-Change-Number: 15147 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 11 19:16:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 11 Aug 2019 19:16:10 +0000 Subject: Change in ...osmocom-bb[master]: fw/build: Use arm-none-eabi as default toolchain In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15148 ) Change subject: fw/build: Use arm-none-eabi as default toolchain ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I70da7eeb33275fa5fff1d8a3581c384e031b12e5 Gerrit-Change-Number: 15148 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 11 Aug 2019 19:16:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 12 00:26:23 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 12 Aug 2019 00:26:23 +0000 Subject: Build failure of network:osmocom:latest/limesuite in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d50b241986c7_583b2b131b52c5fc58768b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/limesuite/Raspbian_10/armv7l Package network:osmocom:latest/limesuite failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest limesuite Last lines of build log: [ 178s] /usr/bin/ld: libLimeSuite.so.19.04.0: undefined reference to `__atomic_load_8' [ 178s] /usr/bin/ld: libLimeSuite.so.19.04.0: undefined reference to `__atomic_store_8' [ 178s] collect2: error: ld returned 1 exit status [ 178s] make[3]: *** [src/CMakeFiles/boardEmulator.dir/build.make:89: src/boardEmulator] Error 1 [ 178s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 178s] make[2]: *** [CMakeFiles/Makefile2:216: src/CMakeFiles/boardEmulator.dir/all] Error 2 [ 189s] [ 43%] Linking CXX static library liboglGraph.a [ 189s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src/oglGraph && /usr/bin/cmake -P CMakeFiles/oglGraph.dir/cmake_clean_target.cmake [ 189s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src/oglGraph && /usr/bin/cmake -E cmake_link_script CMakeFiles/oglGraph.dir/link.txt --verbose=1 [ 189s] /usr/bin/ar qc liboglGraph.a CMakeFiles/oglGraph.dir/dlgMarkers.cpp.o CMakeFiles/oglGraph.dir/GLFont.cpp.o CMakeFiles/oglGraph.dir/OpenGLGraph.cpp.o CMakeFiles/oglGraph.dir/glew/glew.c.o [ 189s] /usr/bin/ranlib liboglGraph.a [ 189s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 189s] [ 43%] Built target oglGraph [ 189s] make[2]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 189s] make[1]: *** [Makefile:133: all] Error 2 [ 189s] make[1]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 189s] dh_auto_build: cd obj-arm-linux-gnueabihf && make -j4 returned exit code 2 [ 189s] make: *** [debian/rules:28: binary] Error 2 [ 189s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 189s] [ 189s] armbuild04 failed "build limesuite_19.04.0-1.dsc" at Mon Aug 12 00:26:08 UTC 2019. [ 189s] [ 189s] ### VM INTERACTION START ### [ 192s] [ 169.255070] sysrq: SysRq : Power Off [ 192s] [ 169.261538] reboot: Power down [ 192s] ### VM INTERACTION END ### [ 192s] [ 192s] armbuild04 failed "build limesuite_19.04.0-1.dsc" at Mon Aug 12 00:26:11 UTC 2019. [ 192s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:12:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 08:12:12 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... Patch Set 2: Code-Review+2 Merging now (because I set meta-telephony 201705 to this commit instead of the exact commmit of the tag and build fails now) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 12 Aug 2019 08:12:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:12:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 08:12:15 +0000 Subject: Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 ) Change subject: osmo-release.sh: Support releasing openbsc.git ...................................................................... osmo-release.sh: Support releasing openbsc.git openbsc's directory structure is a bit different (has most stuff inside an extra subdir). Let's account for that. Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 --- M osmo-release.sh 1 file changed, 7 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/osmo-release.sh b/osmo-release.sh index a779a26..1effe7e 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -24,7 +24,12 @@ # Make sure that depedency requirement versions match in configure.ac vs debian/control. #eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," check_configureac_debctrl_deps_match() { - configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") + if [ -f "${GIT_TOPDIR}/openbsc/configure.ac" ]; then + configureac_file="openbsc/configure.ac" + else + configureac_file="configure.ac" + fi + configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") echo "$configureac_list" | \ { return_error=0 while read -r dep ver; do @@ -163,7 +168,7 @@ fi gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" dch -r -m --distribution "unstable" "" -git add debian/changelog +git add ${GIT_TOPDIR}/debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty git commit --amend # let the user add extra information to the release commit. git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:28:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:28:12 +0000 Subject: Change in ...osmo-msc[master]: add ipa keepalive for gsup connections to the hlr In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#4) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-msc/+/14753 ) Change subject: add ipa keepalive for gsup connections to the hlr ...................................................................... add ipa keepalive for gsup connections to the hlr Change-Id: I7d0beb9357ab9b1baeb030d726f312008f2fc533 --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsup_client_mux.h M src/libmsc/gsup_client_mux.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c 6 files changed, 36 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/14753/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7d0beb9357ab9b1baeb030d726f312008f2fc533 Gerrit-Change-Number: 14753 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:29:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:29:37 +0000 Subject: Change in ...osmo-msc[master]: add ipa keepalive for gsup connections to the hlr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14753 ) Change subject: add ipa keepalive for gsup connections to the hlr ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/14753/4/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/14753/4/src/libmsc/msc_vty.c at 1858 PS4, Line 1858: if (atoi(argv[0]) > 0) { there appears to be no way to disable it again, neither by "keepalive 0 1" being treated below, nor by a "no keepalive" command. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7d0beb9357ab9b1baeb030d726f312008f2fc533 Gerrit-Change-Number: 14753 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 12 Aug 2019 08:29:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:31:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:31:59 +0000 Subject: Change in ...libosmo-sccp[master]: systemd: This patch adds Documentation field to the systemd service file In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#4) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/14804 ) Change subject: systemd: This patch adds Documentation field to the systemd service file ...................................................................... systemd: This patch adds Documentation field to the systemd service file Change-Id: Ia112dec6b61853cbfe1222cf4b7aecfe305ddb99 --- M contrib/systemd/osmo-stp.service 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/04/14804/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia112dec6b61853cbfe1222cf4b7aecfe305ddb99 Gerrit-Change-Number: 14804 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:32:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:32:06 +0000 Subject: Change in ...libosmo-sccp[master]: systemd: This patch adds Documentation field to the systemd service file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/14804 ) Change subject: systemd: This patch adds Documentation field to the systemd service file ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia112dec6b61853cbfe1222cf4b7aecfe305ddb99 Gerrit-Change-Number: 14804 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 08:32:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:32:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:32:07 +0000 Subject: Change in ...libosmo-sccp[master]: systemd: This patch adds Documentation field to the systemd service file In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/14804 ) Change subject: systemd: This patch adds Documentation field to the systemd service file ...................................................................... systemd: This patch adds Documentation field to the systemd service file Change-Id: Ia112dec6b61853cbfe1222cf4b7aecfe305ddb99 --- M contrib/systemd/osmo-stp.service 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-stp.service b/contrib/systemd/osmo-stp.service index 5d06870..87b414b 100644 --- a/contrib/systemd/osmo-stp.service +++ b/contrib/systemd/osmo-stp.service @@ -1,5 +1,6 @@ [Unit] Description=Osmocom STP (Signal Transfer Point) +Documentation=https://osmocom.org/projects/osmo-stp/wiki [Service] Type=simple -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia112dec6b61853cbfe1222cf4b7aecfe305ddb99 Gerrit-Change-Number: 14804 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:33:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:33:32 +0000 Subject: Change in ...osmo-hlr[master]: Fix test for return codes on mipsel and alpha archs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14805 ) Change subject: Fix test for return codes on mipsel and alpha archs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia64f1d9f39fe2b1fb704f7b6c4d9cce93ab708cd Gerrit-Change-Number: 14805 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Ruben Undheim Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 12 Aug 2019 08:33:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:33:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:33:33 +0000 Subject: Change in ...osmo-hlr[master]: Fix test for return codes on mipsel and alpha archs In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14805 ) Change subject: Fix test for return codes on mipsel and alpha archs ...................................................................... Fix test for return codes on mipsel and alpha archs Change-Id: Ia64f1d9f39fe2b1fb704f7b6c4d9cce93ab708cd --- M tests/db/db_test.c M tests/db/db_test.err 2 files changed, 27 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 91b32ea..1da2752 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -51,7 +51,12 @@ * The return code is then available in g_rc. */ #define ASSERT_RC(call, expect_rc) \ do { \ - fprintf(stderr, #call " --> " #expect_rc "\n"); \ + if ((expect_rc) == -ENOKEY) \ + fprintf(stderr, #call " --> -ENOKEY\n"); \ + else if ((expect_rc) == -ENOTSUP) \ + fprintf(stderr, #call " --> -ENOTSUP\n"); \ + else \ + fprintf(stderr, #call " --> " #expect_rc "\n"); \ g_rc = call; \ if (g_rc != (expect_rc)) \ fprintf(stderr, " MISMATCH: got rc = %d, expected: " \ @@ -67,7 +72,12 @@ do { \ int rc; \ fill_invalid(g_subscr); \ - fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> " \ + if ((expect_rc) == -ENOKEY) \ + fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> -ENOKEY \n"); \ + else if ((expect_rc) == -ENOTSUP) \ + fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> -ENOTSUP \n"); \ + else \ + fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> " \ #expect_rc "\n"); \ rc = db_subscr_get_by_##by(dbc, val, &g_subscr); \ if (rc != (expect_rc)) \ diff --git a/tests/db/db_test.err b/tests/db/db_test.err index a7c4cf1..da67d45 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -828,12 +828,12 @@ .imsi = '123456789000000', } -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -910,12 +910,12 @@ db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)) --> 0 -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -935,12 +935,12 @@ db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, "f000000000000f00000000000f000000")) --> 0 -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1037,12 +1037,12 @@ db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, NULL, false, NULL, 0)) --> 0 -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1072,12 +1072,12 @@ db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, "asdfasdfasd", false, "asdfasdfasdf", 99999)) --> 0 -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1318,12 +1318,12 @@ .imsi = '123456789000000', } -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1450,7 +1450,7 @@ .imsi = '123456789000000', } -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1461,7 +1461,7 @@ db_update_sqn(dbc, id, 123) --> -ENOENT DAUC Cannot update SQN for subscriber ID=1: no auc_3g entry for such subscriber -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1469,7 +1469,7 @@ db_update_sqn(dbc, id, 543) --> -ENOENT DAUC Cannot update SQN for subscriber ID=1: no auc_3g entry for such subscriber -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia64f1d9f39fe2b1fb704f7b6c4d9cce93ab708cd Gerrit-Change-Number: 14805 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Ruben Undheim Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:34:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:34:50 +0000 Subject: Change in ...libosmocore[master]: No fail if no /proc/cpuinfo In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmocore/+/14798 ) Change subject: No fail if no /proc/cpuinfo ...................................................................... No fail if no /proc/cpuinfo Change-Id: I4b9e12e34f69d98fa87179c7ee390e31001ec943 --- M tests/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/14798/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b9e12e34f69d98fa87179c7ee390e31001ec943 Gerrit-Change-Number: 14798 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Ruben Undheim Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:35:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:35:12 +0000 Subject: Change in ...libosmocore[master]: TIMER constants not on some architectures In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14796 ) Change subject: TIMER constants not on some architectures ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If24616c3dbf9f1eb6053caed90a63b590d3f5833 Gerrit-Change-Number: 14796 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Ruben Undheim Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:36:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:36:22 +0000 Subject: Change in ...osmo-hlr[master]: fix spelling errors detected by lintian In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14806 ) Change subject: fix spelling errors detected by lintian ...................................................................... fix spelling errors detected by lintian Change-Id: I2a1a21aceabc20fadc5dd28985a94689d2b873a2 --- M src/ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ctrl.c b/src/ctrl.c index 05a0107..c610d92 100644 --- a/src/ctrl.c +++ b/src/ctrl.c @@ -95,7 +95,7 @@ cmd->reply = "No such subscriber."; return false; default: - cmd->reply = "An unknown error has occured during get_subscriber()."; + cmd->reply = "An unknown error has occurred during get_subscriber()."; return false; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2a1a21aceabc20fadc5dd28985a94689d2b873a2 Gerrit-Change-Number: 14806 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:37:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:37:07 +0000 Subject: Change in ...libosmocore[master]: No fail if no /proc/cpuinfo In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14798 ) Change subject: No fail if no /proc/cpuinfo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b9e12e34f69d98fa87179c7ee390e31001ec943 Gerrit-Change-Number: 14798 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Ruben Undheim Gerrit-Reviewer: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 08:37:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:39:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:39:37 +0000 Subject: Change in ...osmo-bts[master]: scheduler_trx: Deal with osmo_amr_rtp_enc() returning negative In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/14876 to look at the new patch set (#3). Change subject: scheduler_trx: Deal with osmo_amr_rtp_enc() returning negative ...................................................................... scheduler_trx: Deal with osmo_amr_rtp_enc() returning negative We cannot pass the possibly negative return value as length value to _sched_compose_tch_ind() which would use it as the (unsigned) length value of a memcpy. Change-Id: I70ce98c5697b9ce6fac7ab57a5d70f3201db29d9 Closes: CID#178643 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/14876/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70ce98c5697b9ce6fac7ab57a5d70f3201db29d9 Gerrit-Change-Number: 14876 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:40:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:40:03 +0000 Subject: Change in ...osmo-pcu[master]: tests: test encoding of egprs ul ack/nacks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/14760 ) Change subject: tests: test encoding of egprs ul ack/nacks ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/14760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35d6b5e312faeb116ddda6b33c550840da1496fe Gerrit-Change-Number: 14760 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 12 Aug 2019 08:40:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:40:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:40:04 +0000 Subject: Change in ...osmo-pcu[master]: tests: test encoding of egprs ul ack/nacks In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/14760 ) Change subject: tests: test encoding of egprs ul ack/nacks ...................................................................... tests: test encoding of egprs ul ack/nacks Test the encoding with uncompressed and compressed acknowledgements. Change-Id: I35d6b5e312faeb116ddda6b33c550840da1496fe --- M tests/types/TypesTest.cpp M tests/types/TypesTest.err 2 files changed, 304 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 589f156..b2ddc94 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -2,6 +2,7 @@ * TypesTest.cpp Test the primitive data types * * Copyright (C) 2013 by Holger Hans Peter Freyther + * Copyright (C) 2019 by Sysmocom s.f.m.c. GmbH * * All Rights Reserved * @@ -26,6 +27,7 @@ #include "encoding.h" #include "decoding.h" #include "gprs_rlcmac.h" +#include "egprs_rlc_compression.h" extern "C" { #include @@ -431,6 +433,296 @@ } } +struct crbb_test { + bool has_crbb; + bitvec *crbb; + uint8_t length; + bool color_code; +}; + +static void extract_egprs_ul_ack_nack( + struct gprs_rlcmac_ul_tbf *tbf, + struct bitvec *dest, + uint16_t *ssn, + struct crbb_test *crbb_test, + struct bitvec **urbb, + bool is_final) +{ + uint8_t bytelength; + + /* Start of Ack/Nack Description struct */ + uint8_t startbit_ack_nack = 0; + + bool has_length = false; + uint8_t length = 0; + + bool bow = false; + uint8_t urbb_length = 0; + dest->cur_bit = 0; + + /* ignore the first 8 bit */ + bitvec_get_uint(dest, 8); + + /* uplink ack/nack message content */ + OSMO_ASSERT(bitvec_get_uint(dest, 6) == 0b001001); + + /* ignore page mode*/ + bitvec_get_uint(dest, 2); + + /* fix 00 */ + OSMO_ASSERT(bitvec_get_uint(dest, 2) == 0); + + OSMO_ASSERT(bitvec_get_uint(dest, 5) == tbf->tfi()); + + /* egprs ack/nack */ + OSMO_ASSERT(bitvec_get_uint(dest, 1) == 1); + + /* fix 00 */ + OSMO_ASSERT(bitvec_get_uint(dest, 2) == 0); + + /* ignore Channel Coding Command */ + bitvec_get_uint(dest, 4); + + /* we always allow resegmentation */ + OSMO_ASSERT(bitvec_get_uint(dest, 1) == 1); + + /* ignore pre emptive transmission */ + bitvec_get_uint(dest, 1); + + /* ignore PRR retransmission request */ + bitvec_get_uint(dest, 1); + + /* ignore ARAC retransmission request */ + bitvec_get_uint(dest, 1); + + if (bitvec_get_uint(dest, 1)) { + OSMO_ASSERT((uint32_t) bitvec_get_uint(dest, 32) == tbf->tlli()); + } + + /* ignore TBF_EST */ + bitvec_get_uint(dest, 1); + + /* Timing Advance */ + if (bitvec_get_uint(dest, 1)) { + /* Timing Advance Value */ + if (bitvec_get_uint(dest, 1)) + bitvec_get_uint(dest, 6); + + /* Timing Advance Index*/ + if (bitvec_get_uint(dest, 1)) + bitvec_get_uint(dest, 6); + /* Timing Advance Timeslot Number */ + bitvec_get_uint(dest, 3); + } + + /* Packet Extended Timing Advance */ + if (bitvec_get_uint(dest, 1)) + bitvec_get_uint(dest, 2); + + /* Power Control Parameters */ + if (bitvec_get_uint(dest, 1)) { + /* Alpha */ + bitvec_get_uint(dest, 4); + for (int i=0; i<8 ; i++) { + /* Gamma */ + if (bitvec_get_uint(dest, 1)) + bitvec_get_uint(dest, 5); + } + } + + /* Extension Bits */ + if (bitvec_get_uint(dest, 1)) { + int length = bitvec_get_uint(dest, 6); + bitvec_get_uint(dest, length); + } + + /* Beging of the EGPRS Ack/Nack */ + has_length = bitvec_get_uint(dest, 1); + if (has_length) { + length = bitvec_get_uint(dest, 8); + } else { + /* remaining bits is the length */ + length = dest->data_len * 8 - dest->cur_bit; + } + startbit_ack_nack = dest->cur_bit; + + OSMO_ASSERT(bitvec_get_uint(dest, 1) == is_final); + + /* bow Begin Of Window */ + bow = bitvec_get_uint(dest, 1); + /* TODO: check if bow is always present in our implementation */ + + /* eow End Of Window */ + /* TODO: eow checking */ + bitvec_get_uint(dest, 1); + + *ssn = bitvec_get_uint(dest, 11); + if (bow) { + OSMO_ASSERT(*ssn == tbf->window()->v_q() + 1); + } + + crbb_test->has_crbb = bitvec_get_uint(dest, 1); + if (crbb_test->has_crbb) { + crbb_test->length = bitvec_get_uint(dest, 7); + crbb_test->color_code = bitvec_get_uint(dest, 1); + if (crbb_test->length % 8) + bytelength = crbb_test->length * 8 + 1; + else + bytelength = crbb_test->length * 8; + + crbb_test->crbb = bitvec_alloc(bytelength, tall_pcu_ctx); + for (int i=0; ilength; i++) + bitvec_set_bit(crbb_test->crbb, bitvec_get_bit_pos(dest, dest->cur_bit + i)); + + dest->cur_bit += crbb_test->length; + } + + OSMO_ASSERT(dest->cur_bit < dest->data_len * 8); + urbb_length = length - (dest->cur_bit - startbit_ack_nack); + + if (urbb_length > 0) { + if (urbb_length % 8) + bytelength = urbb_length / 8 + 1; + else + bytelength = urbb_length / 8; + + *urbb = bitvec_alloc(bytelength, tall_pcu_ctx); + for (int i=urbb_length; i>0; i--) { + bitvec_set_bit(*urbb, bitvec_get_bit_pos(dest, dest->cur_bit + i - 1)); + } + } +} + +static void check_egprs_bitmap(struct gprs_rlcmac_ul_tbf *tbf, uint16_t ssn, struct crbb_test *crbb_test, bitvec *urbb, unsigned int *rbb_size) +{ + gprs_rlc_ul_window *win = tbf->window(); + uint8_t rbb_should[RLC_EGPRS_MAX_WS] = {0}; + bitvec rbb_should_bv; + rbb_should_bv.data = rbb_should; + rbb_should_bv.data_len = RLC_EGPRS_MAX_WS; + rbb_should_bv.cur_bit = 0; + + /* rbb starting at ssn without mod */ + bitvec *rbb_ssn_bv = bitvec_alloc(RLC_EGPRS_MAX_WS, tall_pcu_ctx); + + /* even any ssn is allowed, pcu should only use v_q() at least for now */ + OSMO_ASSERT(ssn == (win->v_q() + 1)); + + if (crbb_test->has_crbb) { + OSMO_ASSERT(0 == egprs_compress::decompress_crbb( + crbb_test->length, + crbb_test->color_code, + crbb_test->crbb->data, + rbb_ssn_bv)); + } + + if (urbb && urbb->cur_bit > 0) { + for (unsigned int i=0; icur_bit; i++) { + bitvec_set_bit(rbb_ssn_bv, bitvec_get_bit_pos(urbb, i)); + } + } + + /* check our rbb is equal the decompressed */ + rbb_should_bv.cur_bit = win->update_egprs_rbb(rbb_should); + + bool failed = false; + for (unsigned int i=0; i < rbb_ssn_bv->cur_bit; i++) { + if (bitvec_get_bit_pos(&rbb_should_bv, i) != + bitvec_get_bit_pos(rbb_ssn_bv, i)) + failed = true; + } + if (failed) { + fprintf(stderr, "SSN %d\n", ssn); + for (int i=win->v_q(); iws(); i++) { + fprintf(stderr, "bsn %d is %s\n", i, win->is_received( i) ? "received" : "MISS"); + } + char to_dump[256] = { 0 }; + bitvec_to_string_r(&rbb_should_bv, to_dump); + fprintf(stderr, "should: %s\n", to_dump); + memset(to_dump, 0x0, 256); + bitvec_to_string_r(rbb_ssn_bv, to_dump); + fprintf(stderr, "is : %s\n", to_dump); + OSMO_ASSERT(false); + } + + if (rbb_size) + *rbb_size = rbb_ssn_bv->cur_bit; +} + +static void free_egprs_ul_ack_nack(bitvec **rbb, struct crbb_test *crbb_test) +{ + if (*rbb) { + bitvec_free(*rbb); + *rbb = NULL; + } + + if (crbb_test->crbb) { + bitvec_free(crbb_test->crbb); + crbb_test->crbb = NULL; + } +} + +static void test_egprs_ul_ack_nack() +{ + bitvec *dest = bitvec_alloc(23, tall_pcu_ctx); + + fprintf(stderr, "############## test_egprs_ul_ack_nack\n"); + + BTS the_bts; + the_bts.bts_data()->egprs_enabled = true; + the_bts.bts_data()->alloc_algorithm = alloc_algorithm_a; + the_bts.bts_data()->trx[0].pdch[4].enable(); + + struct gprs_rlcmac_ul_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), NULL, 0, 1, 1, true); + struct crbb_test crbb_test = {0}; + bitvec *rbb = NULL; + unsigned int rbb_size; + uint16_t ssn = 0; + gprs_rlc_ul_window *win = tbf->window(); + + fprintf(stderr, "************** Test with empty window\n"); + win->reset_state(); + win->set_ws(256); + + Encoding::write_packet_uplink_ack(dest, tbf, false, 0); + extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false); + check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size); + free_egprs_ul_ack_nack(&rbb, &crbb_test); + OSMO_ASSERT(rbb_size == 0); + + fprintf(stderr, "************** Test with 1 lost packet\n"); + win->reset_state(); + win->set_ws(256); + win->receive_bsn(1); + + Encoding::write_packet_uplink_ack(dest, tbf, false, 0); + extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false); + check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size); + free_egprs_ul_ack_nack(&rbb, &crbb_test); + OSMO_ASSERT(rbb_size == 1); + + fprintf(stderr, "************** Test with compressed window\n"); + win->reset_state(); + win->set_ws(128); + win->receive_bsn(127); + + Encoding::write_packet_uplink_ack(dest, tbf, false, 0); + extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false); + check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size); + free_egprs_ul_ack_nack(&rbb, &crbb_test); + + fprintf(stderr, "************** Provoke an uncompressed ACK without EOW\n"); + win->reset_state(); + win->set_ws(384); + for (uint16_t i=1; i<384/2; i++) + win->receive_bsn(i*2); + + Encoding::write_packet_uplink_ack(dest, tbf, false, 0); + extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false); + check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size); + free_egprs_ul_ack_nack(&rbb, &crbb_test); +} + static void check_imm_ass(struct gprs_rlcmac_tbf *tbf, bool dl, enum ph_burst_type bt, const uint8_t *exp, uint8_t len, const char *kind) { @@ -619,6 +911,7 @@ log_set_print_filename(osmo_stderr_target, 0); printf("Making some basic type testing.\n"); + test_llc(); test_rlc(); test_rlc_v_b(); @@ -631,6 +924,7 @@ test_immediate_assign_ul1s(); test_immediate_assign_rej(); test_lsb(); + test_egprs_ul_ack_nack(); return EXIT_SUCCESS; } diff --git a/tests/types/TypesTest.err b/tests/types/TypesTest.err index 3abc61c..92dbe06 100644 --- a/tests/types/TypesTest.err +++ b/tests/types/TypesTest.err @@ -7,3 +7,13 @@ Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 02, dl_slots = 00 +############## test_egprs_ul_ack_nack +Allocating UL TBF: MS_CLASS=1/1 +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 4 +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 00 +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +************** Test with empty window +************** Test with 1 lost packet +************** Test with compressed window +************** Provoke an uncompressed ACK without EOW -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/14760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35d6b5e312faeb116ddda6b33c550840da1496fe Gerrit-Change-Number: 14760 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:41:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:41:16 +0000 Subject: Change in ...docker-playground[master]: adjust osmo-bsc.cfg for TC_ho_neighbor_config_1 thru _7 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14764 ) Change subject: adjust osmo-bsc.cfg for TC_ho_neighbor_config_1 thru _7 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1c57a04747f5ec004ccf4657954dcb0b003c24fc Gerrit-Change-Number: 14764 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 08:41:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:41:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:41:34 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: make function mncc_tx_to_gsm_cc static In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15008 ) Change subject: cosmetic: make function mncc_tx_to_gsm_cc static ...................................................................... cosmetic: make function mncc_tx_to_gsm_cc static The function mncc_tx_to_gsm_cc() is declared as non static but only used from within gsm_04_08_cc.c. Lets declare it as static to increase readability of the code Change-Id: Icd02c669cfee6dd7e6b154e303cd0f4c148c83c4 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 03830de..34d95f6 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1798,7 +1798,7 @@ (sizeof(downstatelist) / sizeof(struct downstate)) -int mncc_tx_to_gsm_cc(struct gsm_network *net, const union mncc_msg *msg) +static int mncc_tx_to_gsm_cc(struct gsm_network *net, const union mncc_msg *msg) { int i, rc = 0; struct msc_a *msc_a = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd02c669cfee6dd7e6b154e303cd0f4c148c83c4 Gerrit-Change-Number: 15008 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:41:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:41:50 +0000 Subject: Change in ...osmocom-bb[master]: fw/build: Use arm-none-eabi as default toolchain In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15148 ) Change subject: fw/build: Use arm-none-eabi as default toolchain ...................................................................... fw/build: Use arm-none-eabi as default toolchain This is what we describe in our wiki and what ships with recent distros. Change-Id: I70da7eeb33275fa5fff1d8a3581c384e031b12e5 --- M src/target/firmware/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 9049898..a91cf4f 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -1,7 +1,7 @@ #### TOOLCHAIN CONFIGURATION #### -CROSS_COMPILE?=arm-elf- +CROSS_COMPILE?=arm-none-eabi- CC=gcc LD=ld -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I70da7eeb33275fa5fff1d8a3581c384e031b12e5 Gerrit-Change-Number: 15148 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:43:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:43:12 +0000 Subject: Change in ...libosmocore[master]: codec/ecu_fr: Mark input TCH frame as 'const' as we only read it In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15028 ) Change subject: codec/ecu_fr: Mark input TCH frame as 'const' as we only read it ...................................................................... codec/ecu_fr: Mark input TCH frame as 'const' as we only read it Change-Id: I64c6d3dc08ff87b673ba6225f98546e86f91bcfd --- M include/osmocom/codec/ecu.h M src/codec/ecu_fr.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h index f7a29a0..ec0a2f8 100644 --- a/include/osmocom/codec/ecu.h +++ b/include/osmocom/codec/ecu.h @@ -11,5 +11,5 @@ uint8_t frame_backup[GSM_FR_BYTES]; }; -void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, uint8_t *frame); +void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame); int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame); diff --git a/src/codec/ecu_fr.c b/src/codec/ecu_fr.c index 20a0f89..ef42ea9 100644 --- a/src/codec/ecu_fr.c +++ b/src/codec/ecu_fr.c @@ -130,7 +130,7 @@ * \param[in] state The state object for the ECU * \param[out] frame The valid frame (GSM_FR_BYTES bytes in RTP payload format) */ -void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, uint8_t *frame) +void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) { state->subsequent_lost_frame = false; memcpy(state->frame_backup, frame, GSM_FR_BYTES); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I64c6d3dc08ff87b673ba6225f98546e86f91bcfd Gerrit-Change-Number: 15028 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 08:43:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 12 Aug 2019 08:43:44 +0000 Subject: Change in ...osmo-bsc[master]: bsc_msc_data: remove unused member is_authenticated In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15007 ) Change subject: bsc_msc_data: remove unused member is_authenticated ...................................................................... bsc_msc_data: remove unused member is_authenticated The struct member struct bsc_msc_data->is_authenticated is set to true permanently. This is a leftover from the sccplite implementation and can be removed now. Change-Id: I966a48b383c85345c92c9a1fec791150e96cd7b9 Related: OS#3112 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_msc.c 3 files changed, 0 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 2ad7c68..5612483 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -77,7 +77,6 @@ int core_lac; int core_ci; int rtp_base; - bool is_authenticated; /* audio codecs */ struct gsm48_multi_rate_conf amr_conf; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 6ca5455..4dc4883 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -307,8 +307,6 @@ round_robin: llist_for_each_entry(msc, &bsc->mscs, entry) { - if (!msc->is_authenticated) - continue; if (!is_emerg && msc->type != MSC_CON_TYPE_NORMAL) continue; if (is_emerg && !msc->allow_emerg) diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 7e78d94..24c8c6d 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -49,13 +49,6 @@ uint16_t mgw_port; int rc; - /* FIXME: This is a leftover from the old architecture that used - * sccp-lite with osmocom specific authentication. Since we now - * changed to AoIP the connected status and the authentication - * status is managed differently. However osmo_bsc_filter.c still - * needs the flags to be set to one. See also: OS#3112 */ - msc->is_authenticated = 1; - if (net->mgw.conf->remote_port >= 0) mgw_port = net->mgw.conf->remote_port; else -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I966a48b383c85345c92c9a1fec791150e96cd7b9 Gerrit-Change-Number: 15007 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 09:22:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 09:22:15 +0000 Subject: Change in ...libosmocore[master]: No fail if no /proc/cpuinfo In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14798 ) Change subject: No fail if no /proc/cpuinfo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b9e12e34f69d98fa87179c7ee390e31001ec943 Gerrit-Change-Number: 14798 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Ruben Undheim Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Mon, 12 Aug 2019 09:22:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 09:23:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 09:23:29 +0000 Subject: Change in ...osmo-bts[master]: scheduler_trx: Deal with osmo_amr_rtp_enc() returning negative In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14876 ) Change subject: scheduler_trx: Deal with osmo_amr_rtp_enc() returning negative ...................................................................... Patch Set 3: It seems there's some LOGP parameter mess up in this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70ce98c5697b9ce6fac7ab57a5d70f3201db29d9 Gerrit-Change-Number: 14876 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 09:23:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 10:09:08 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 10:09:08 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 to look at the new patch set (#2). Change subject: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 ...................................................................... osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 When using osmo_sccp_simple_client(), it will create an sccp instance if none exists. The sccp instance identifier starts with 0. The implicit created instance should use sccp instance 0 (the first connection). Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae --- M src/sccp_user.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/62/15062/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 10:11:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 10:11:49 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro... Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15153 Change subject: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other projects ...................................................................... ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other projects Change-Id: I89ba62be92557e35ed083dbc9a3624ff0fb6cbd3 --- M ttcn3-sgsn-test/osmo-sgsn.cfg 1 file changed, 1 insertion(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/15153/1 diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 996d251..38b9945 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -5,7 +5,7 @@ log gsmtap 172.18.8.103 logging level set-all debug ! -log stderr +log file /data/osmo-sgsn.log logging filter all 1 logging color 1 logging print category 1 @@ -44,44 +44,6 @@ logging level lm3ua notice logging level lmgcp notice ! -log file sgsn-raw.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging print file 1 - logging level all everything - logging level mm debug - logging level pag notice - logging level meas notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp info - logging level llc debug - logging level sndcp debug - logging level slhc notice - logging level ranap info - logging level sua info - logging level v42bis info - logging level lglobal info - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp debug - logging level lstats notice - logging level lgsup debug - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice -! stats interval 5 ! line vty -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I89ba62be92557e35ed083dbc9a3624ff0fb6cbd3 Gerrit-Change-Number: 15153 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 10:19:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 10:19:31 +0000 Subject: Change in ...libosmocore[master]: fsm: Quote received event token in logging line Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15154 Change subject: fsm: Quote received event token in logging line ...................................................................... fsm: Quote received event token in logging line Otherwise confusing log lines can appear on some event names, for instance: "Received Event Received an attach request" Change-Id: Ibeaeb046058777c2367e3cbfff0e00fc7e3a1640 --- M src/fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/15154/1 diff --git a/src/fsm.c b/src/fsm.c index c886351..af4f1ee 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -806,7 +806,7 @@ fs = &fi->fsm->states[fi->state]; LOGPFSMSRC(fi, file, line, - "Received Event %s\n", osmo_fsm_event_name(fsm, event)); + "Received Event '%s'\n", osmo_fsm_event_name(fsm, event)); if (((1 << event) & fsm->allstate_event_mask) && fsm->allstate_action) { fsm->allstate_action(fi, event, data); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibeaeb046058777c2367e3cbfff0e00fc7e3a1640 Gerrit-Change-Number: 15154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 10:26:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 10:26:42 +0000 Subject: Change in ...libosmocore[master]: fsm: Quote received event token in logging line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15154 ) Change subject: fsm: Quote received event token in logging line ...................................................................... Patch Set 1: It seems tons of unit tests in several projects depend on this line keeping same format... that's bad! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibeaeb046058777c2367e3cbfff0e00fc7e3a1640 Gerrit-Change-Number: 15154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 10:26:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 11:55:11 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 12 Aug 2019 11:55:11 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15142/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15142/1//COMMIT_MSG at 9 PS1, Line 9: mncc.c often calls stop_cmd_timer() even if no timer is running. If no timer is I can't say I've seen this "often". If we're calling stop_cmd_timer when there is no timer, should we rather not do that than hide the log message that we got a command we did not expect? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: keith Gerrit-Comment-Date: Mon, 12 Aug 2019 11:55:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:13:15 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:13:15 +0000 Subject: Change in ...docker-playground[master]: osmo-sgsn-master: add Iu test Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 Change subject: osmo-sgsn-master: add Iu test ...................................................................... osmo-sgsn-master: add Iu test To support Iu tests, start osmo-stp when testing. Depends-on: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 (osmo-ttcn3-hacks) Change-Id: I4d6aef98832202652c5fe254105728430ba77119 --- M ttcn3-sgsn-test/SGSN_Tests.cfg M ttcn3-sgsn-test/jenkins.sh M ttcn3-sgsn-test/osmo-sgsn.cfg A ttcn3-sgsn-test/osmo-stp.cfg 4 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/55/15155/1 diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 5ad5f7d..f7d6d9a 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -26,6 +26,11 @@ remote_ip := "172.18.8.10" } } +SGSN_Tests.mp_ranap_cfg := { + { + sctp_addr := { 23908, "172.18.8.103", 2905, "172.18.8.200" } + } +} SGSN_Tests.mp_hlr_ip := "172.18.8.103" SGSN_Tests.mp_ggsn_ip := "172.18.8.103" @@ -34,3 +39,4 @@ [EXECUTE] SGSN_Tests.control +SGSN_Tests_Iu.control diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9505624..621ad2e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -4,6 +4,7 @@ IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ "debian-stretch-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ "osmo-sgsn-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-sgsn-test" @@ -16,8 +17,18 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + mkdir $VOL_BASE_DIR/unix +echo Starting container with STP +docker run --rm \ + --network $NET_NAME --ip 172.18.8.200 \ + -v $VOL_BASE_DIR/stp:/data \ + --name ${BUILD_TAG}-stp -d \ + $REPO_USER/osmo-stp-$IMAGE_SUFFIX + echo Starting container with SGSN docker run --rm \ --network $NET_NAME --ip 172.18.8.10 \ @@ -45,6 +56,7 @@ echo Stopping containers docker container kill ${BUILD_TAG}-sgsn +docker container kill ${BUILD_TAG}-stp network_remove collect_logs diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 996d251..d764096 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -90,6 +90,13 @@ ctrl bind 0.0.0.0 ! +cs7 instance 0 + point-code 0.23.4 + asp asp-clnt-OsmoSGSN-A 2905 0 m3ua + remote-ip 172.18.8.200 + as as-clnt-OsmoSGSN-A m3ua + asp asp-clnt-OsmoSGSN-A + routing-key 3 0.23.4 ns timer tns-block 3 timer tns-block-retries 3 diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg new file mode 100644 index 0000000..1871358 --- /dev/null +++ b/ttcn3-sgsn-test/osmo-stp.cfg @@ -0,0 +1,49 @@ +! +! OsmoSTP (0.8.1) configuration saved from vty +!! +! +log gsmtap 172.18.1.103 + logging level set-all debug +! +log file /data/osmo-stp.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice +! +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + asp virt-rnc0-0 23908 2905 m3ua + local-ip 172.18.8.200 + remote-ip 172.18.8.103 + as virt-rnc0 m3ua + asp virt-rnc0-0 + routing-key 2 0.24.3 + route-table system + update route 0.24.3 7.255.7 linkset virt-rnc0 + listen m3ua 2905 + accept-asp-connections dynamic-permitted + listen ipa 5000 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:16:55 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:16:55 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 ) Change subject: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure ...................................................................... BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure It originally seemed like a great idea to define a custom record which aggregates the decoded BSSGP, LLC, L3 and/or SNDCP and passes it to the individual ConnHdlr. However, particularly with testcase interoperability for IuPS in mind, this seems bogus. Also, we never really took advantage of this. Let's now decode as far as we can decode any PDU, and then send the decoded version of that PDU via the ports between the BSSGP_Emulation and the ConnHdlr component. Change-Id: I8c1082880902dd9a04935945f0293895f4d0c53a --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_RAW.ttcn M sgsn/SGSN_Tests.ttcn 4 files changed, 112 insertions(+), 165 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/13865/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 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: I8c1082880902dd9a04935945f0293895f4d0c53a Gerrit-Change-Number: 13865 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:16:55 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:16:55 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Integrate RANAP In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#7) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 ) Change subject: sgsn: Integrate RANAP ...................................................................... sgsn: Integrate RANAP Integrate RANAP support to SGSN_Tests.ttcn. Related: OS#2857 Change-Id: Ib62fc4c6007f6f4c47db7ca096a8d629bc72bb22 --- M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 3 files changed, 106 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/13754/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 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: Ib62fc4c6007f6f4c47db7ca096a8d629bc72bb22 Gerrit-Change-Number: 13754 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:16:55 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:16:55 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Actual first Iu test case In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 ) Change subject: sgsn: Actual first Iu test case ...................................................................... sgsn: Actual first Iu test case Change-Id: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 --- M sgsn/SGSN_Tests.ttcn A sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 160 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/13866/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 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: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 Gerrit-Change-Number: 13866 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:16:57 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:16:57 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 Change subject: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef ...................................................................... RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef Change-Id: I1ff98c933b00a90f54ceedf290121d61d35c6063 --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/15156/1 diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 40cf0fa..e995e8d 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -168,10 +168,12 @@ connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP); #endif #ifdef IPA_EMULATION_CTRL +#ifdef RAN_EMULATION_CTRL /* connect IPA CTRL port with BSSMAP CTRL port */ log("Connecting CTRL RAN Emulation to IPA CTRL PORT"); connect(ba.vc_IPA:IPA_CTRL_PORT, ba.vc_RAN:CTRL); #endif +#endif } log("Starting RAN_Emulation"); ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), "")); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 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: I1ff98c933b00a90f54ceedf290121d61d35c6063 Gerrit-Change-Number: 15156 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:16:58 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:16:58 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 Change subject: RAN_Adapter: invert check for RAN_ops == omit ...................................................................... RAN_Adapter: invert check for RAN_ops == omit The SGSN_Tests.ttcn run into bugs when doing the isvalue() check on a const object. Check explicit for "omit" to skip creation of the vc_RAN object Change-Id: I639ab6d0586174c0f20b93a53169f0aa254970fa --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/15157/1 diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index e995e8d..8e19241 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -90,7 +90,7 @@ /* create components */ ba.vc_SCCP := SCCP_CT.create(id & "-SCCP"); - if (isvalue(ops)) { + if (not istemplatekind(ops, "omit")) { ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN"); } select (cfg.transport) { @@ -142,7 +142,7 @@ } } - if (isvalue(ops)) { + if (not istemplatekind(ops, "omit")) { timer T := 5.0; T.start; //T.timeout; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 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: I639ab6d0586174c0f20b93a53169f0aa254970fa Gerrit-Change-Number: 15157 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:29:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 13:29:25 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Integrate RANAP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 ) Change subject: sgsn: Integrate RANAP ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/13754/7/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/13754/7/sgsn/SGSN_Tests.ttcn at 323 PS7, Line 323: f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps); Probably better name it "RAN_SGSN_Test_" ... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 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: Ib62fc4c6007f6f4c47db7ca096a8d629bc72bb22 Gerrit-Change-Number: 13754 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:29:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:29:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 13:29:50 +0000 Subject: Change in ...docker-playground[master]: osmo-sgsn-master: add Iu test In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: osmo-sgsn-master: add Iu test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:29:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:38:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 13:38:16 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Actual first Iu test case In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 ) Change subject: sgsn: Actual first Iu test case ...................................................................... Patch Set 4: (5 comments) https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn at 466 PS4, Line 466: private function f_send_l3_gmm_llc(template (value) PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr { This looks unrelated? https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn at 492 PS4, Line 492: rNC_ID := 2342 /* FIXME */ Can you extend the FIXME here and a few lines above? https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn at 508 PS4, Line 508: if (gb_index >= NUM_GB) { AFAIU, you use gb_index >= NUM_GB to know if conn is Iu or Gb? Can you add a function is_iu(gb_index) for that? so it becomes easy to understand. Or perhaps have an extra param signalling which protocol we use (simlar to what we already have for SCCPLITE vs AoIP in other tests). https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn at 628 PS4, Line 628: //BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))); Why is this commented? https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests_Iu.ttcn File sgsn/SGSN_Tests_Iu.ttcn: https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests_Iu.ttcn at 534 PS4, Line 534: This repeat seems unrelated. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 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: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 Gerrit-Change-Number: 13866 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:38:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:39:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 13:39:59 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 ) Change subject: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 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: I8c1082880902dd9a04935945f0293895f4d0c53a Gerrit-Change-Number: 13865 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:40:39 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 13:40:39 +0000 Subject: Change in ...docker-playground[master]: osmo-sgsn-master: add Iu test In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: osmo-sgsn-master: add Iu test ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:40:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:41:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 13:41:00 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 ) Change subject: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 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: I1ff98c933b00a90f54ceedf290121d61d35c6063 Gerrit-Change-Number: 15156 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:41:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 13:41:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 13:41:50 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 ) Change subject: RAN_Adapter: invert check for RAN_ops == omit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 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: I639ab6d0586174c0f20b93a53169f0aa254970fa Gerrit-Change-Number: 15157 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 13:41:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 14:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 14:07:33 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce macros to access msgb's associated IU UE ctx Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15158 Change subject: gprs_gmm: Introduce macros to access msgb's associated IU UE ctx ...................................................................... gprs_gmm: Introduce macros to access msgb's associated IU UE ctx Change-Id: I4d1d47af332d4557e8a3a70c1055bcc172166016 --- M src/gprs/gprs_gmm.c 1 file changed, 20 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/15158/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 3465a52..c93ddf4 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -116,6 +116,12 @@ { 0, NULL } }; +/* On RANAP, Returns pointer to he associated ranap_ue_conn_ctx in msg, filled + * in by osmo-iuh's iu_recv_cb(). + * On Gb, returns NULL */ +#define MSG_IU_UE_CTX(msg) ((struct ranap_ue_conn_ctx *)(msg)->dst) +#define MSG_IU_UE_CTX_SET(msg, val) (msg)->dst = (val) + static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx); static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) @@ -271,10 +277,7 @@ } #ifdef BUILD_IU - /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb mode - * dst is empty. */ - /* FIXME: have a more explicit indicator for Iu messages */ - if (msg->dst) + if (MSG_IU_UE_CTX(msg)) return ranap_iu_tx(msg, GPRS_SAPI_GMM); #endif @@ -289,7 +292,7 @@ msgb_tlli(msg) = msgb_tlli(old); msgb_bvci(msg) = msgb_bvci(old); msgb_nsei(msg) = msgb_nsei(old); - msg->dst = old->dst; + MSG_IU_UE_CTX_SET(msg, MSG_IU_UE_CTX(old)); } /* Store BVCI/NSEI in MM context */ @@ -298,7 +301,7 @@ mm->gb.bvci = msgb_bvci(msg); mm->gb.nsei = msgb_nsei(msg); /* In case a Iu connection is reconnected we need to update the ue ctx */ - mm->iu.ue_ctx = msg->dst; + mm->iu.ue_ctx = MSG_IU_UE_CTX(msg); if (mm->ran_type == MM_CTX_T_UTRAN_Iu && mm->iu.ue_ctx) { #ifdef BUILD_IU @@ -314,7 +317,7 @@ msgb_tlli(msg) = mm->gb.tlli; msgb_bvci(msg) = mm->gb.bvci; msgb_nsei(msg) = mm->gb.nsei; - msg->dst = mm->iu.ue_ctx; + MSG_IU_UE_CTX_SET(msg, mm->iu.ue_ctx); } static void mm_ctx_cleanup_free(struct sgsn_mm_ctx *ctx, const char *log_text) @@ -1290,15 +1293,12 @@ * with a foreign TLLI (P-TMSI that was allocated to the MS before), * or with random TLLI. */ - /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb mode - * dst is empty. */ - /* FIXME: have a more explicit indicator for Iu messages */ - if (!msg->dst) { + if (!MSG_IU_UE_CTX(msg)) { /* Gb mode */ cid = bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); } else { #ifdef BUILD_IU - ra_id = ((struct ranap_ue_conn_ctx*)msg->dst)->ra_id; + ra_id = MSG_IU_UE_CTX(msg)->ra_id; #else LOGMMCTXP(LOGL_ERROR, ctx, "Cannot handle Iu Attach Request, built without Iu support\n"); return -ENOTSUP; @@ -1354,8 +1354,8 @@ if (!ctx) ctx = sgsn_mm_ctx_by_imsi(mi_string); if (!ctx) { - if (msg->dst) - ctx = sgsn_mm_ctx_alloc_iu(msg->dst); + if (MSG_IU_UE_CTX(msg)) + ctx = sgsn_mm_ctx_alloc_iu(MSG_IU_UE_CTX(msg)); else ctx = sgsn_mm_ctx_alloc_gb(0, &ra_id); if (!ctx) { @@ -1379,8 +1379,8 @@ if (!ctx) { /* Allocate a context as most of our code expects one. * Context will not have an IMSI ultil ID RESP is received */ - if (msg->dst) - ctx = sgsn_mm_ctx_alloc_iu(msg->dst); + if (MSG_IU_UE_CTX(msg)) + ctx = sgsn_mm_ctx_alloc_iu(MSG_IU_UE_CTX(msg)); else ctx = sgsn_mm_ctx_alloc_gb(msgb_tlli(msg), &ra_id); if (!ctx) { @@ -1697,10 +1697,8 @@ * is an optimization to avoid the RA reject (impl detached) * below, which will cause a new attach cycle. */ /* Look-up the MM context based on old RA-ID and TLLI */ - /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb - * mode dst is empty. */ - /* FIXME: have a more explicit indicator for Iu messages */ - if (!msg->dst) { + if (!MSG_IU_UE_CTX(msg)) { + /* Gb */ mmctx = sgsn_mm_ctx_by_tlli_and_ptmsi(msgb_tlli(msg), &old_ra_id); } else if (TLVP_PRESENT(&tp, GSM48_IE_GMM_ALLOC_PTMSI)) { #ifdef BUILD_IU @@ -1847,7 +1845,7 @@ LOGMMCTXP(LOGL_INFO, ctx, "-> GMM SERVICE REQUEST "); /* This message is only valid in Iu mode */ - if (!msg->dst) { + if (!MSG_IU_UE_CTX(msg)) { LOGPC(DMM, LOGL_INFO, "Invalid if not in Iu mode\n"); return -1; } @@ -2904,7 +2902,7 @@ struct sgsn_mm_ctx *mmctx; int rc = -EINVAL; - mmctx = sgsn_mm_ctx_by_ue_ctx(msg->dst); + mmctx = sgsn_mm_ctx_by_ue_ctx(MSG_IU_UE_CTX(msg)); if (mmctx) { rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); if (ra_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4d1d47af332d4557e8a3a70c1055bcc172166016 Gerrit-Change-Number: 15158 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 14:23:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 14:23:09 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_llc.h: Improve documentation of some structs Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15159 Change subject: gprs_llc.h: Improve documentation of some structs ...................................................................... gprs_llc.h: Improve documentation of some structs Change-Id: I1b45f45addc87c74f3ae109e544143a1335180de --- M include/osmocom/sgsn/gprs_llc.h 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/59/15159/1 diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 711bcd6..5b12248 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -110,13 +110,13 @@ uint16_t kU; }; -/* Section 4.7.1: Logical Link Entity: One per DLCI (TLLI + SAPI) */ +/* 3GPP TS 44.064 ? 4.7.1: Logical Link Entity: One per DLCI (TLLI + SAPI) */ struct gprs_llc_lle { struct llist_head list; uint32_t sapi; - struct gprs_llc_llme *llme; + struct gprs_llc_llme *llme; /* backpointer to the Logical Link Management Entity */ enum gprs_llc_lle_state state; @@ -156,6 +156,7 @@ #define NUM_SAPIS 16 +/* 3GPP TS 44.064 ? 4.7.3: Logical Link Management Entity: One per TLLI */ struct gprs_llc_llme { struct llist_head list; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1b45f45addc87c74f3ae109e544143a1335180de Gerrit-Change-Number: 15159 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 14:44:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 14:44:10 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Improve doc on nullable parameters Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15160 Change subject: gprs_gmm.c: Improve doc on nullable parameters ...................................................................... gprs_gmm.c: Improve doc on nullable parameters Change-Id: Iefb9b6dc34d87b4088c7535ef0a246103fe3f7e9 --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/60/15160/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c93ddf4..f3ba290 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1959,7 +1959,7 @@ return 0; } -/* GPRS Mobility Management */ +/* Rx GPRS Mobility Management. MMCTX can be NULL when called. On !Gb (Iu), llme is NULL */ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable) { @@ -1967,7 +1967,6 @@ struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); int rc; - /* MMCTX can be NULL when called */ if (drop_cipherable && gsm48_hdr_gmm_cipherable(gh)) { LOGMMCTXP(LOGL_NOTICE, mmctx, "Dropping cleartext GMM %s which " "is expected to be encrypted for TLLI 0x%08x\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iefb9b6dc34d87b4088c7535ef0a246103fe3f7e9 Gerrit-Change-Number: 15160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 15:17:30 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 15:17:30 +0000 Subject: Change in ...osmo-iuh[master]: RFC: iu_client: close sccp connection after release_complete Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 Change subject: RFC: iu_client: close sccp connection after release_complete ...................................................................... RFC: iu_client: close sccp connection after release_complete I don't know if this is a hard layer violation or not. /todo read code Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b --- M src/iu_client.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/15161/1 diff --git a/src/iu_client.c b/src/iu_client.c index 92d25f5..1f10333 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -526,6 +526,7 @@ static void cn_ranap_handle_co(void *ctx, ranap_message *message) { int rc; + struct ranap_ue_conn_ctx *ue = ctx; LOGPIU(LOGL_NOTICE, "handle_co(dir=%u, proc=%u)\n", message->direction, message->procedureCode); @@ -566,6 +567,7 @@ LOGPIU(LOGL_ERROR, "Iu Release event: Iu Event callback returned %d\n", rc); } + osmo_sccp_tx_disconn(g_scu, ue->conn_id, NULL, 0); break; default: LOGPIU(LOGL_ERROR, "Received Successful Outcome: unknown Procedure Code %d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 16:04:18 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 12 Aug 2019 16:04:18 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: I'm looking at the log from a busy site that is running sip connector all day, and I have not seen one log message from stop_cmd_timer() I wonder is this something that is happening between osmo-msc and the sip conx? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: keith Gerrit-Comment-Date: Mon, 12 Aug 2019 16:04:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 16:07:45 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 16:07:45 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: make the ranap interface optional Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162 Change subject: sgsn: make the ranap interface optional ...................................................................... sgsn: make the ranap interface optional Allows to use the test cases without STP Change-Id: I43df456c2d5aa3ba3ea9e34da3f0f96b55f7c9a1 --- M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 20 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/15162/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index d7ee587..d96d3d9 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -129,6 +129,7 @@ type component test_CT { var GbInstances g_gb; var RAN_Adapter g_ranap[NUM_RNC]; + var boolean g_ranap_enable := false; var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; @@ -174,8 +175,8 @@ SGSN_ConnHdlrNetworkPars net, float t_guard, /* only in IuPS / RANAP case */ - SCCP_PAR_Address sccp_addr_local, - SCCP_PAR_Address sccp_addr_peer + SCCP_PAR_Address sccp_addr_local optional, + SCCP_PAR_Address sccp_addr_peer optional }; private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV { @@ -321,9 +322,11 @@ f_init_gb(g_gb[1], "SGSN_Test-Gb1", 1); f_init_gb(g_gb[2], "SGSN_Test-Gb2", 2); - for (i := 0; i < NUM_RNC; i := i+1) { - f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps); - f_ran_adapter_start(g_ranap[i]); + if (g_ranap_enable) { + for (i := 0; i < NUM_RNC; i := i+1) { + f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps); + f_ran_adapter_start(g_ranap[i]); + } } f_init_gsup("SGSN_Test"); f_init_gtp("SGSN_Test"); @@ -383,10 +386,15 @@ vec := omit, net := net_pars, t_guard := t_guard, - sccp_addr_local := g_ranap[0].sccp_addr_own, - sccp_addr_peer := g_ranap[0].sccp_addr_peer + sccp_addr_local := omit, + sccp_addr_peer := omit }; + if (g_ranap_enable) { + pars.sccp_addr_local := g_ranap[0].sccp_addr_own; + pars.sccp_addr_peer := g_ranap[0].sccp_addr_peer; + } + vc_conn := BSSGP_ConnHdlr.create(id); connect(vc_conn:BSSGP[0], gb[0].vc_BSSGP:BSSGP_SP); connect(vc_conn:BSSGP_PROC[0], gb[0].vc_BSSGP:BSSGP_PROC); @@ -396,8 +404,10 @@ connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP:BSSGP_PROC); /* FIXME: support multiple RNCs */ - connect(vc_conn:BSSAP, g_ranap[0].vc_RAN:CLIENT); - connect(vc_conn:BSSAP_PROC, g_ranap[0].vc_RAN:PROC); + if (g_ranap_enable) { + connect(vc_conn:BSSAP, g_ranap[0].vc_RAN:CLIENT); + connect(vc_conn:BSSAP_PROC, g_ranap[0].vc_RAN:PROC); + } connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 2c2a8af..43d1965 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -20,6 +20,7 @@ } testcase TC_iu_attach() runs on test_CT { var BSSGP_ConnHdlr vc_conn; + g_ranap_enable := true; f_init(); f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_iu_attach), testcasename(), g_gb, 1001); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162 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: I43df456c2d5aa3ba3ea9e34da3f0f96b55f7c9a1 Gerrit-Change-Number: 15162 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 16:07:45 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 12 Aug 2019 16:07:45 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: add TC_iu_attach_gmm_rau Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 Change subject: sgsn: add TC_iu_attach_gmm_rau ...................................................................... sgsn: add TC_iu_attach_gmm_rau do a GMM attach on Iu do a GMM Routing Area Update on GMM Change-Id: Ie043639638a640a2041324fc910964385a41c77d fixme: This will crash the SGSN atm :) --- M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/15163/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index d96d3d9..4b5dd0f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2183,7 +2183,7 @@ vc_conn.done; } -private function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr { +friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr { var PDU_L3_SGSN_MS l3_mt; /* then send RAU */ diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 43d1965..9ee4468 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -27,10 +27,28 @@ vc_conn.done; } +private function f_TC_iu_attach_geran_rau(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + /* first perform regular attach */ + f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, gb_idx := 3); + + /* do a routing area update */ + f_routing_area_update(g_pars.ra); +} + +testcase TC_iu_attach_gmm_rau() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + g_ranap_enable := true; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_iu_attach_geran_rau), testcasename(), g_gb, 1001); + vc_conn.done; +} control { execute( TC_iu_attach() ); + execute( TC_iu_attach_gmm_rau() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 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: Ie043639638a640a2041324fc910964385a41c77d Gerrit-Change-Number: 15163 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 16:19:12 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 12 Aug 2019 16:19:12 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15142/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15142/1/src/mncc.c at 74 PS1, Line 74: if (!osmo_timer_pending(&leg->cmd_timeout)) As far as I can make out, we only start timers immediately before sending an MNCC command to which we expect the response that will call stop_cmd_timer. The timeout is hard coded to five seconds. If there are incoming unexpected MNCC commands that are triggering stop_cmd_timer after the timeout, then something is wrong, no? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: keith Gerrit-Comment-Date: Mon, 12 Aug 2019 16:19:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 16:19:30 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 12 Aug 2019 16:19:30 +0000 Subject: Change in ...libosmocore[master]: fsm: Quote received event token in logging line In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15154 ) Change subject: fsm: Quote received event token in logging line ...................................................................... Patch Set 1: Code-Review+1 > It seems tons of unit tests in several projects depend on this line keeping same format... that's bad! Yep, we definitely need some kind of "weak" matching in unit tests, like we do in the VTY tests. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibeaeb046058777c2367e3cbfff0e00fc7e3a1640 Gerrit-Change-Number: 15154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 16:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 17:14:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 17:14:54 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Drop unneeded brackets Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15164 Change subject: gprs_gmm.c: Drop unneeded brackets ...................................................................... gprs_gmm.c: Drop unneeded brackets Change-Id: Ie8ba2b9da695de8730834abb591df64295bb6172 --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/64/15164/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index f3ba290..5a6ea28 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1820,10 +1820,8 @@ rc = gsm48_tx_gmm_ra_upd_rej(msg, reject_cause); if (mmctx) mm_ctx_cleanup_free(mmctx, "GPRS RA UPDATE REJ"); - else { - if (llme) - gprs_llgmm_unassign(llme); - } + else if (llme) + gprs_llgmm_unassign(llme); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie8ba2b9da695de8730834abb591df64295bb6172 Gerrit-Change-Number: 15164 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 17:14:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 17:14:54 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce define TLLI_UNASSIGNED Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15165 Change subject: Introduce define TLLI_UNASSIGNED ...................................................................... Introduce define TLLI_UNASSIGNED Change-Id: Ib8be5af2a5e92a7403505b73ce4c1751832de40d --- M include/osmocom/sgsn/gprs_llc.h M src/gprs/gprs_gmm.c M src/gprs/gprs_llc.c M src/gprs/gprs_sgsn.c 4 files changed, 18 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/65/15165/1 diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 5b12248..8a0b9ef 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -192,6 +192,9 @@ #define GPRS_LLME_RESET_AGE (0) +/* 3GPP TS 44.064 ? 8.3 TLLI assignment procedures */ +#define TLLI_UNASSIGNED (0xffffffff) + extern struct llist_head gprs_llc_llmes; /* LLC low level types */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 5a6ea28..c8bc0f7 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2077,7 +2077,7 @@ /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llme_copy_key(mmctx, mmctx->gb.llme); - gprs_llgmm_assign(mmctx->gb.llme, 0xffffffff, + gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); } mmctx->gmm_state = GMM_REGISTERED_NORMAL; @@ -2102,7 +2102,7 @@ if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; - gprs_llgmm_assign(mmctx->gb.llme, 0xffffffff, + gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); } mmctx->gmm_state = GMM_REGISTERED_NORMAL; @@ -2125,7 +2125,7 @@ if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; - //gprs_llgmm_assign(mmctx->gb.llme, 0xffffffff, mmctx->gb.tlli_new, GPRS_ALGO_GEA0, NULL); + //gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new, GPRS_ALGO_GEA0, NULL); } rc = 0; break; diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c index acf4b54..a301a63 100644 --- a/src/gprs/gprs_llc.c +++ b/src/gprs/gprs_llc.c @@ -527,7 +527,7 @@ lle = &llme->lle[sapi]; return lle; } - + LOGP(DLLC, LOGL_NOTICE, "unknown TLLI(0x%08x)/SAPI(%d): Silently dropping\n", tlli, sapi); @@ -556,7 +556,7 @@ return NULL; llme->tlli = tlli; - llme->old_tlli = 0xffffffff; + llme->old_tlli = TLLI_UNASSIGNED; llme->state = GPRS_LLMS_UNASSIGNED; llme->age_timestamp = GPRS_LLME_RESET_AGE; llme->cksn = GSM_KEY_SEQ_INVAL; @@ -1042,19 +1042,19 @@ { unsigned int i; - if (old_tlli == 0xffffffff && new_tlli != 0xffffffff) { + if (old_tlli == TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { /* TLLI Assignment 8.3.1 */ /* New TLLI shall be assigned and used when (re)transmitting LLC frames */ - /* If old TLLI != 0xffffffff was assigned to LLME, then TLLI + /* If old TLLI != TLLI_UNASSIGNED was assigned to LLME, then TLLI * old is unassigned. Only TLLI new shall be accepted when * received from peer. */ - if (llme->old_tlli != 0xffffffff) { - llme->old_tlli = 0xffffffff; + if (llme->old_tlli != TLLI_UNASSIGNED) { + llme->old_tlli = TLLI_UNASSIGNED; llme->tlli = new_tlli; } else { - /* If TLLI old == 0xffffffff was assigned to LLME, then this is + /* If TLLI old == TLLI_UNASSIGNED was assigned to LLME, then this is * TLLI assignmemt according to 8.3.1 */ - llme->old_tlli = 0xffffffff; + llme->old_tlli = TLLI_UNASSIGNED; llme->tlli = new_tlli; llme->state = GPRS_LLMS_ASSIGNED; /* 8.5.3.1 For all LLE's */ @@ -1066,14 +1066,14 @@ /* FIXME Set parameters according to table 9 */ } } - } else if (old_tlli != 0xffffffff && new_tlli != 0xffffffff) { + } else if (old_tlli != TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { /* TLLI Change 8.3.2 */ /* Both TLLI Old and TLLI New are assigned; use New when * (re)transmitting. Accept both Old and New on Rx */ llme->old_tlli = old_tlli; llme->tlli = new_tlli; llme->state = GPRS_LLMS_ASSIGNED; - } else if (old_tlli != 0xffffffff && new_tlli == 0xffffffff) { + } else if (old_tlli != TLLI_UNASSIGNED && new_tlli == TLLI_UNASSIGNED) { /* TLLI Unassignment 8.3.3) */ llme->tlli = llme->old_tlli = 0; llme->state = GPRS_LLMS_UNASSIGNED; @@ -1091,7 +1091,7 @@ /* TLLI unassignment */ int gprs_llgmm_unassign(struct gprs_llc_llme *llme) { - return gprs_llgmm_assign(llme, llme->tlli, 0xffffffff); + return gprs_llgmm_assign(llme, llme->tlli, TLLI_UNASSIGNED); } /* Chapter 7.2.1.2 LLGMM-RESET.req */ diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 9a5de41..e01bc5c 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -362,7 +362,7 @@ if (llme) { /* TLLI unassignment, must be called after sgsn_mm_ctx_free */ - gprs_llgmm_assign(llme, tlli, 0xffffffff); + gprs_llgmm_assign(llme, tlli, TLLI_UNASSIGNED); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib8be5af2a5e92a7403505b73ce4c1751832de40d Gerrit-Change-Number: 15165 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 17:14:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 17:14:55 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Warn upon llme free unexpected scenarios Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 Change subject: gprs_sgsn.c: Warn upon llme free unexpected scenarios ...................................................................... gprs_sgsn.c: Warn upon llme free unexpected scenarios May be useful to detect unexpected conditions which could end up in memory leaks. Related: OS#3957 Change-Id: I0d175501083ce458ff1c07ad38761d2cbf4ea470 --- M src/gprs/gprs_sgsn.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/66/15166/1 diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index e01bc5c..8f1e54a 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -362,7 +362,9 @@ if (llme) { /* TLLI unassignment, must be called after sgsn_mm_ctx_free */ - gprs_llgmm_assign(llme, tlli, TLLI_UNASSIGNED); + OSMO_ASSERT(llme->tlli == tlli); + if (gprs_llgmm_unassign(llme) < 0) + LOGMMCTXP(LOGL_ERROR, mm, "gprs_llgmm_unassign failed, llme not freed!\n"); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d175501083ce458ff1c07ad38761d2cbf4ea470 Gerrit-Change-Number: 15166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 17:14:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 17:14:55 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... gprs_gmm: Introduce assert to guard against unexpected condition This may well be the culprit of OS#3957, were already freed llme is accessed from mmctx context. Related: OS#3957 Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 --- M src/gprs/gprs_gmm.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/67/15167/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c8bc0f7..672864f 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1741,6 +1741,10 @@ "The MM context cannot be used, RA: %03d-%0*d-%d-%d\n", mmctx->ra.mcc, mmctx->ra.mnc_3_digits, mmctx->ra.mnc, mmctx->ra.lac, mmctx->ra.rac); + /* mmctx is set to NULL and gprs_llgmm_unassign(llme) will be + called below, let's make sure we don't keep dangling llme + pointers in mmctx (OS#3957). */ + OSMO_ASSERT(!(mmctx->ran_type == MM_CTX_T_GERAN_Gb && mmctx->gb.llme == NULL)); mmctx = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 17:18:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 17:18:00 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: make the ranap interface optional In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162 ) Change subject: sgsn: make the ranap interface optional ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162 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: I43df456c2d5aa3ba3ea9e34da3f0f96b55f7c9a1 Gerrit-Change-Number: 15162 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 17:18:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 17:19:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 12 Aug 2019 17:19:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: add TC_iu_attach_gmm_rau In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 ) Change subject: sgsn: add TC_iu_attach_gmm_rau ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 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: Ie043639638a640a2041324fc910964385a41c77d Gerrit-Change-Number: 15163 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 17:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 18:52:16 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Mon, 12 Aug 2019 18:52:16 +0000 Subject: Change in ...simtrace2[master]: disable ERASE pin Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/15168 Change subject: disable ERASE pin ...................................................................... disable ERASE pin disabling the ERASE pin prevents accidental erase for the flash memory while the board is powered on (e.g. in case the user overcomes the weak 100 kOhm pull-down for more than 220 ms by touching or shorting the pin). the flash is still erasable using the ERASE pin during power up. it is only disabled after boot completed. Change-Id: Ic3332eb1d4247a07988b2fd841f40e79862d06a7 --- M firmware/libboard/common/source/board_lowlevel.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/68/15168/1 diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index 8210938..b4d7d32 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.c @@ -127,6 +127,9 @@ SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM | SUPC_SMMR_SMRSTEN_ENABLE; + /* disable ERASE pin to prevent accidental flash erase */ + MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO12; + /* enable both LED and green LED */ PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN; PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic3332eb1d4247a07988b2fd841f40e79862d06a7 Gerrit-Change-Number: 15168 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:22:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:22:02 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 to look at the new patch set (#2). Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() ...................................................................... mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() Instead of manually entering codec values, use mgcp_codec_add() to populate test conns with codecs. The idea is to better test what actually happens when parsing SDP codec strings. Rewrite current test_mgcp_codec_pt_translate() from procedural to a data model with human readable stdout logging. This prepares to enable interpreting codec strings like "FOO/8000/1" as equivalent with "FOO/8000": the SDP standard defines the final "/1", indicating the nr of channels, as optional for a single channel, but osmo-mgw currently is unable to match these two formats as identical. So prepare the test_mgcp_codec_pt_translate() so that upcoming patches can incorporate strings with and without the final "/1" by extending the struct arrays. Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 204 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/15134/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb Gerrit-Change-Number: 15134 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:22:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:22:02 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 to look at the new patch set (#2). Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... test_mgcp_codec_pt_translate(): more tests Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 76 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/15135/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:22:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:22:02 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: Hello pespin, keith, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 to look at the new patch set (#2). Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... differentiate AMR octet-aligned=0 vs =1 Add corresponding tests in mgcp_test.c Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 95 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/15136/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:22:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:22:02 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 to look at the new patch set (#2). Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... ptmap: implicitly match '/8000' and '/8000/1' In codecs_cmp(), do not compare the complete audio_name. The parts of it are already checked individually: - subtype_name ("AMR"), - rate ("8000"; defaults to 8000 if omitted) and - channels ("1"; defaults to 1 if omitted) So by also checking the complete audio_name, we brushed over the match of implicit "/8000" and "/8000/1", which otherwise works out fine. As a result, translating payload type numbers in RTP headers now also works if one conn of an endpoint set an rtpmap with "AMR/8000" and the other conn set "AMR/8000/1". It seems to me that most PBX out there generate ptmaps omitting the "/1", so fixing this should make us more interoperable with third party SDP. See IETF RFC4566 section 6. SDP Attributes: For audio streams, indicates the number of audio channels. This parameter is OPTIONAL and may be omitted if the number of channels is one, provided that no additional parameters are needed. Also allowing to omit the "/8000" is a mere side effect of this patch. Omitting the rate does not seem to be specified in an RFC, but is logical for audio codecs defined to require exactly 8000 set as rate (most GSM codecs). Add tests in mgcp_test.c. Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 108 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/37/15137/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:22:07 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:22:07 +0000 Subject: Change in ...osmo-mgw[master]: add simplistic IuUP FSM and strip/add IuUP headers Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15169 Change subject: add simplistic IuUP FSM and strip/add IuUP headers ...................................................................... add simplistic IuUP FSM and strip/add IuUP headers This should really be using the FSM in libosmocore/laforge/iu_up: take the best of both sides and integate in the libosmocore FSM implementation, then use it here. - in libosmocore, the FSM definition is nicer. - here, we have correct header checksums. Introduce using msgb to receive, pass and send RTP packets. Add/strip IuUP from RTP data (for which msgb is particularly useful). The payload type on an IuUP conn is maintained as negotiated in the IuUP Initialization. For the pure RTP side, an SDP "AMR" ptmap attribute is looked up, so that payload type numbers are translated between IuUP <-> RTP. Change-Id: Ibc70e0aa00476926dd1f4ea8139c34f31f9cdfa3 --- M configure.ac M include/osmocom/mgcp/debug.h A include/osmocom/mgcp/iuup_cn_node.h A include/osmocom/mgcp/iuup_protocol.h M include/osmocom/mgcp/mgcp_codec.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/Makefile.am A src/libosmo-mgcp/iuup_cn_node.c A src/libosmo-mgcp/iuup_protocol.c M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/osmo-mgw/mgw_main.c M tests/Makefile.am A tests/iuup/Makefile.am A tests/iuup/iuup_test.c A tests/iuup/iuup_test.err A tests/iuup/iuup_test.ok M tests/mgcp/mgcp_test.c M tests/testsuite.at 21 files changed, 1,241 insertions(+), 196 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/15169/1 diff --git a/configure.ac b/configure.ac index 124f1e6..b9e3b60 100644 --- a/configure.ac +++ b/configure.ac @@ -195,6 +195,7 @@ tests/atlocal tests/mgcp_client/Makefile tests/mgcp/Makefile + tests/iuup/Makefile doc/Makefile doc/examples/Makefile doc/manuals/Makefile diff --git a/include/osmocom/mgcp/debug.h b/include/osmocom/mgcp/debug.h index ddeb0dc..1eed769 100644 --- a/include/osmocom/mgcp/debug.h +++ b/include/osmocom/mgcp/debug.h @@ -29,6 +29,7 @@ /* Debug Areas of the code */ enum { DRTP, + DIUUP, Debug_LastEntry, }; diff --git a/include/osmocom/mgcp/iuup_cn_node.h b/include/osmocom/mgcp/iuup_cn_node.h new file mode 100644 index 0000000..ca69b4d --- /dev/null +++ b/include/osmocom/mgcp/iuup_cn_node.h @@ -0,0 +1,47 @@ +/* A Media Gateway Control Protocol Media Gateway: RFC 3435 */ +/* IuUP CN node, minimal implementation */ + +/* _____IuUP_CN_____ + * | | + * UE <--> RNC --PDU-> osmo_iuup_cn_rx_pdu() -+-> ---+-> rx_payload() + * | | | + * | <-PDU-- tx_msg() <-------------+-- <-+--- osmo_iuup_cn_tx_payload() + * | | + * ----------------- + */ + +#pragma once + +struct msgb; + +typedef int (*osmo_iuup_data_cb_t)(struct msgb *msg, void *node_priv); + +struct osmo_iuup_cn_cfg { + void *node_priv; + + /* When the IuUP peer sent a voice packet, the clean RTP without the IuUP header is fed to this + * callback. */ + osmo_iuup_data_cb_t rx_payload; + + /* IuUP handler requests that a PDU shall be sent to the IuUP peer (e.g. the RNC). + * It is guaranteed that the msgb->dst pointer is preserved or copied from the msgb that + * originated the request. */ + osmo_iuup_data_cb_t tx_msg; +}; + +struct osmo_iuup_cn { + struct osmo_iuup_cn_cfg cfg; + char *name; + uint8_t next_frame_nr; + int rtp_payload_type; +}; + +bool osmo_iuup_cn_is_iuup_init(struct msgb *msg); + +struct osmo_iuup_cn *osmo_iuup_cn_init(void *ctx, struct osmo_iuup_cn_cfg *cfg, + const char *name_fmt, ...); +void osmo_iuup_cn_free(struct osmo_iuup_cn *cn); + +int osmo_iuup_cn_tx_payload(struct osmo_iuup_cn *cn, struct msgb *payload); + +int osmo_iuup_cn_rx_pdu(struct osmo_iuup_cn *cn, struct msgb *pdu); diff --git a/include/osmocom/mgcp/iuup_protocol.h b/include/osmocom/mgcp/iuup_protocol.h new file mode 100644 index 0000000..f4aec1f --- /dev/null +++ b/include/osmocom/mgcp/iuup_protocol.h @@ -0,0 +1,117 @@ +/* A Media Gateway Control Protocol Media Gateway: RFC 3435 */ +/* IuUP protocol handling, minimal implementation */ + +#pragma once + +#include +#include + +#define OSMO_IUUP_HEADROOM 32 + +enum osmo_iuup_pdu_type { + OSMO_IUUP_PDU_DATA_WITH_CRC = 0, + OSMO_IUUP_PDU_CONTROL_PROCEDURE = 14, +}; + +enum osmo_iuup_acknack { + OSMO_IUUP_ACKNACK_PROCEDURE = 0, + OSMO_IUUP_ACKNACK_ACK = 1, + OSMO_IUUP_ACKNACK_NACK = 2, +}; + +enum osmo_iuup_procedure { + OSMO_IUUP_PROC_INITIALIZATION = 0, + OSMO_IUUP_PROC_RATE_CONTROL = 1, + OSMO_IUUP_PROC_TIME_ALIGNMENT = 2, + OSMO_IUUP_PROC_ERROR_EVENT = 3, +}; + +enum osmo_iuup_frame_good { + OSMO_IUUP_FRAME_GOOD = 0, + OSMO_IUUP_FRAME_BAD = 1, + OSMO_IUUP_FRAME_BAD_DUE_TO_RADIO = 2, +}; + +struct osmo_iuup_hdr_ctrl { +#if OSMO_IS_BIG_ENDIAN + uint8_t pdu_type:4, + ack_nack:2, + frame_nr:2; + uint8_t mode_version:4, + procedure:4; + uint8_t header_crc:6, + payload_crc_hi:2; + uint8_t payload_crc_lo; + uint8_t payload[0]; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t frame_nr:2, + ack_nack:2, + pdu_type:4; + uint8_t procedure:4, + mode_version:4; + uint8_t payload_crc_hi:2, + header_crc:6; + uint8_t payload_crc_lo; + uint8_t payload[0]; +#endif +} __attribute__((packed)); + +union osmo_iuup_hdr_ctrl_payload { + struct { +#if OSMO_IS_BIG_ENDIAN + uint8_t spare:3, + iptis_present:1, + subflows:3, + chain:1; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t spare:3, + iptis_present:1, + subflows:3, + chain:1; +#endif + } initialization; + + struct { +#if OSMO_IS_BIG_ENDIAN + uint8_t error_distance:2, + error_cause:6; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t error_cause:6, + error_distance:2; +#endif + } error_event; +}; + +extern const struct value_string osmo_iuup_error_cause_names[]; +static inline const char *osmo_iuup_error_cause_name(uint8_t val) +{ return get_value_string(osmo_iuup_error_cause_names, val); } + +struct osmo_iuup_hdr_data { +#if OSMO_IS_BIG_ENDIAN + uint8_t pdu_type:4, + frame_nr:4; + uint8_t frame_good:2, + rfci:6; + uint8_t header_crc:6, + payload_crc_hi:2; + uint8_t payload_crc_lo; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t frame_nr:4, + pdu_type:4; + uint8_t rfci:6, + frame_good:2; + uint8_t payload_crc_hi:2, + header_crc:6; + uint8_t payload_crc_lo; +#endif + uint8_t payload[0]; +} __attribute__((packed)); + +int osmo_iuup_classify(bool log_errors, + const char *log_label, + struct msgb *pdu, + struct osmo_iuup_hdr_ctrl **is_ctrl, + struct osmo_iuup_hdr_data **is_data); +bool osmo_iuup_is_init(struct msgb *pdu); +void osmo_iuup_make_init_ack(struct msgb *ack); +void osmo_iuup_set_checksums(uint8_t *iuup_header_and_payload, unsigned int header_and_payload_len); diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 3ead60a..caeecb0 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -5,3 +5,5 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param); int mgcp_codec_decide(struct mgcp_conn_rtp *conn); int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); +const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, + const char *subtype_name, unsigned int match_nr); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 75f093d..9c0dc8c 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -23,15 +23,27 @@ #pragma once +#include + struct sockaddr_in; struct mgcp_conn; +struct mgcp_conn_rtp; struct mgcp_endpoint; -/* Callback type for RTP dispatcher functions - (e.g mgcp_dispatch_rtp_bridge_cb, see below) */ -typedef int (*mgcp_dispatch_rtp_cb) (int proto, struct sockaddr_in *addr, - char *buf, unsigned int buf_size, - struct mgcp_conn *conn); +struct osmo_rtp_msg_ctx { + int proto; + struct mgcp_conn_rtp *conn_src; + struct sockaddr_in *from_addr; +}; + +#define OSMO_RTP_MSG_CTX(MSGB) (*(struct osmo_rtp_msg_ctx**)&((MSGB)->dst)) + +#define LOG_ENDP(endp, level, fmt, args...) \ + LOGP(DRTP, level, "%x@ " fmt, ENDPOINT_NUMBER(endp), ## args) + +/* Callback type for RTP dispatcher functions (e.g mgcp_dispatch_rtp_bridge_cb, see below). + * The OSMO_RTP_MSG_CTX() should be set appropriately on the msg. */ +typedef int (*mgcp_dispatch_rtp_cb) (struct msgb *msg); /* Callback type for endpoint specific cleanup actions. This function * is automatically executed when a connection is freed (see mgcp_conn_free() diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index e9d5d2d..3e83bdf 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -37,6 +37,13 @@ #define CONN_ID_BTS "0" #define CONN_ID_NET "1" +#define LOG_CONN(conn, level, fmt, args...) \ + LOGP(DRTP, level, "(%d@ I:%s) " fmt, \ + ENDPOINT_NUMBER((conn)->endp), (conn)->id, ## args) + +#define LOG_CONN_RTP(conn_rtp, level, fmt, args...) \ + LOG_CONN(conn_rtp->conn, level, fmt, ## args) + enum mgcp_trunk_type { MGCP_TRUNK_VIRTUAL, MGCP_TRUNK_E1, @@ -204,6 +211,8 @@ } osmux; struct rate_ctr_group *rate_ctr_group; + + struct osmo_iuup_cn *iuup; }; /*! Connection type, specifies which member of the union "u" in mgcp_conn @@ -266,11 +275,10 @@ }; int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, - char *buf, int rc, struct mgcp_conn_rtp *conn_src, + struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst); int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn); -int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct mgcp_conn *conn); +int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg); void mgcp_cleanup_rtp_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn); int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port, struct mgcp_conn_rtp *conn); @@ -350,3 +358,8 @@ LOGPENDP((conn)->endp, cat, level, "CI:%s " fmt, \ (conn)->id, \ ## args) + +void mgcp_patch_and_count(struct mgcp_endpoint *endp, + struct mgcp_rtp_state *state, + struct mgcp_rtp_end *rtp_end, + struct sockaddr_in *addr, struct msgb *msg); diff --git a/src/libosmo-mgcp/Makefile.am b/src/libosmo-mgcp/Makefile.am index 587bdd4..7314b22 100644 --- a/src/libosmo-mgcp/Makefile.am +++ b/src/libosmo-mgcp/Makefile.am @@ -40,4 +40,6 @@ mgcp_conn.c \ mgcp_stat.c \ mgcp_endp.c \ + iuup_protocol.c \ + iuup_cn_node.c \ $(NULL) diff --git a/src/libosmo-mgcp/iuup_cn_node.c b/src/libosmo-mgcp/iuup_cn_node.c new file mode 100644 index 0000000..239a159 --- /dev/null +++ b/src/libosmo-mgcp/iuup_cn_node.c @@ -0,0 +1,211 @@ +/* A Media Gateway Control Protocol Media Gateway: RFC 3435 */ +/* IuUP Core Network side protocol handling, minimal implementation */ + +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include + +#include + +#define LOG_IUUP_CN(cn, level, fmt, args...) \ + LOGP(DIUUP, level, "(%s) " fmt, (cn)->name, ## args) + +struct osmo_iuup_cn *osmo_iuup_cn_init(void *ctx, struct osmo_iuup_cn_cfg *cfg, + const char *name_fmt, ...) +{ + va_list ap; + struct osmo_iuup_cn *cn = talloc_zero(ctx, struct osmo_iuup_cn); + OSMO_ASSERT(cn); + + cn->cfg = *cfg; + + if (!name_fmt) + name_fmt = "-"; + + va_start(ap, name_fmt); + cn->name = talloc_vasprintf(cn, name_fmt, ap); + va_end(ap); + + LOGP(DIUUP, LOGL_INFO, "(%s) Initializing IuUP node\n", cn->name); + + if (!osmo_identifier_valid(cn->name)) { + LOGP(DIUUP, LOGL_ERROR, "Attempting to set illegal id for IuUP CN instance: %s\n", + osmo_quote_str(cn->name, -1)); + talloc_free(cn); + return NULL; + } + + return cn; +} + +void osmo_iuup_cn_free(struct osmo_iuup_cn *cn) +{ + talloc_free(cn); +} + +static int rx_data(struct osmo_iuup_cn *cn, struct msgb *pdu, + struct osmo_iuup_hdr_data *hdr) +{ + /* Remove the IuUP bit from the middle of the buffer by writing the RTP header forward. */ + /* And append AMR 12.2k header "0xf03c". - AD HOC fix */ + unsigned int pre_hdr_len = ((uint8_t*)hdr) - pdu->data; + memmove(pdu->data + sizeof(*hdr) - 2, pdu->data, pre_hdr_len); + ((uint8_t*)hdr)[2] = 0xf0; + ((uint8_t*)hdr)[3] = 0x3c; + msgb_pull(pdu, sizeof(*hdr) - 2); + + LOGP(DIUUP, LOGL_DEBUG, "(%s) IuUP stripping IuUP header from RTP data\n", cn->name); + cn->cfg.rx_payload(pdu, cn->cfg.node_priv); + + return 0; +} + +static int tx_init_ack(struct osmo_iuup_cn *cn, struct msgb *src_pdu) +{ + /* Send Initialization Ack PDU back to the sender */ + int rc; + struct msgb *ack = msgb_alloc(4096, "IuUP Initialization Ack"); + OSMO_ASSERT(ack); + ack->dst = src_pdu->dst; + + /* Just copy the RTP header that was sent... TODO: tweak some RTP values?? */ + memcpy(msgb_put(ack, sizeof(struct rtp_hdr)), src_pdu->data, sizeof(struct rtp_hdr)); + + osmo_iuup_make_init_ack(ack); + + LOGP(DIUUP, LOGL_DEBUG, "(%s) Sending Initialization ACK %p\n", cn->name, cn->cfg.node_priv); + rc = cn->cfg.tx_msg(ack, cn->cfg.node_priv); + msgb_free(ack); + return rc; +} + +static int rx_control(struct osmo_iuup_cn *cn, struct msgb *pdu, + struct osmo_iuup_hdr_ctrl *hdr) +{ + switch (hdr->procedure) { + case OSMO_IUUP_PROC_INITIALIZATION: + switch (hdr->ack_nack) { + case OSMO_IUUP_ACKNACK_PROCEDURE: + LOGP(DIUUP, LOGL_INFO, "(%s) Rx IuUP Initialization, sending ACK\n", cn->name); + cn->rtp_payload_type = ((struct rtp_hdr*)pdu->data)->payload_type; + return tx_init_ack(cn, pdu); + + default: + LOGP(DIUUP, LOGL_DEBUG, "(%s) Rx IuUP Initialization, unhandled ack_nack = %d\n", + cn->name, hdr->ack_nack); + break; + } + /* Continue to log "unexpected procedure" below. */ + break; + + case OSMO_IUUP_PROC_ERROR_EVENT: + { + union osmo_iuup_hdr_ctrl_payload *p = (void*)hdr->payload; + LOGP(DIUUP, LOGL_ERROR, + "(%s) Rx IuUP Error Event: distance=%u, cause=%u=\"%s\"\n", + cn->name, p->error_event.error_distance, p->error_event.error_cause, + osmo_iuup_error_cause_name(p->error_event.error_cause)); + return 0; + } + + default: + break; + } + LOG_IUUP_CN(cn, LOGL_ERROR, + "Rx control PDU with unexpected procedure: 0x%x acknack=0x%x\n", + hdr->procedure, hdr->ack_nack); + return -EINVAL; +} + +/* Feed a received PDU to the IuUP CN node. This function takes ownership of the msgb, it must not be + * freed by the caller. */ +int osmo_iuup_cn_rx_pdu(struct osmo_iuup_cn *cn, struct msgb *pdu) +{ + struct osmo_iuup_hdr_ctrl *is_ctrl; + struct osmo_iuup_hdr_data *is_data; + int rc; + + rc = osmo_iuup_classify(true, cn->name, pdu, &is_ctrl, &is_data); + if (rc) + return rc; + + if (is_ctrl) + return rx_control(cn, pdu, is_ctrl); + if (is_data) + return rx_data(cn, pdu, is_data); + return rc; +} + +static uint8_t next_frame_nr(struct osmo_iuup_cn *cn) +{ + uint8_t frame_nr = cn->next_frame_nr; + cn->next_frame_nr = (frame_nr + 1) & 0x0f; + return frame_nr; +} + +/* Send this RTP packet to the IuUP peer: add IuUP header and call the tx_msg() to transmit the resulting + * message to the IuUP peer. + * Returns 0 on success, negative on error. */ +int osmo_iuup_cn_tx_payload(struct osmo_iuup_cn *cn, struct msgb *pdu) +{ + struct rtp_hdr *rtp_was, *rtp; + struct osmo_iuup_hdr_data *iuup_hdr; + + /* Splice an IuUP header in between RTP header and payload data */ + rtp_was = (void*)pdu->data; + + /* copy the RTP header part backwards by the size needed for the IuUP header */ + /* also strips 2 bytes from the front of RTP payload - AMR header - AD HOC fix */ + rtp = (void*)msgb_push(pdu, sizeof(*iuup_hdr) - 2); + memmove(rtp, rtp_was, sizeof(*rtp)); + + /* The IuUP side negotiated a payload type number to use during Initialization. The RTP packet going to the IuUP + * peer should reflect this payload_type. This should already have happened in mgcp_patch_pt(), but can't hurt + * to patch over it again. */ + rtp->payload_type = cn->rtp_payload_type; + + iuup_hdr = (void*)rtp->data; + + *iuup_hdr = (struct osmo_iuup_hdr_data){ + .pdu_type = OSMO_IUUP_PDU_DATA_WITH_CRC, + .frame_nr = next_frame_nr(cn), + .frame_good = OSMO_IUUP_FRAME_GOOD, + }; + + osmo_iuup_set_checksums((uint8_t*)iuup_hdr, pdu->tail - (uint8_t*)iuup_hdr); + LOGP(DIUUP, LOGL_DEBUG, "(%s) IuUP inserting IuUP header in RTP data (frame nr %u)\n", + cn->name, iuup_hdr->frame_nr); + + return cn->cfg.tx_msg(pdu, cn->cfg.node_priv); +} diff --git a/src/libosmo-mgcp/iuup_protocol.c b/src/libosmo-mgcp/iuup_protocol.c new file mode 100644 index 0000000..bfb009d --- /dev/null +++ b/src/libosmo-mgcp/iuup_protocol.c @@ -0,0 +1,286 @@ +/* A Media Gateway Control Protocol Media Gateway: RFC 3435 */ +/* IuUP Core Network side protocol, minimal implementation */ + +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include + +/* Calculating two bytes of CRC is ok to do by a loop */ +static uint8_t header_crc6(const uint8_t *hdr) +{ + int bit; + /* Polynomial: D^6 + D^5 + D^3 + D^2 + D^1 + 1 + * that's 1101111 or 0x6f; + * align its lowest bit with a uint16_t's highest bit: */ + uint32_t polynomial = 0x6f << 15; // 00110111 10000000 00000000 + uint32_t remainder = ( ((uint32_t)hdr[0]) << 8 | hdr[1] ) << 6; + + for (bit = 15; bit >= 0; bit--) + { + if (remainder & (0x40 << bit)) + remainder ^= polynomial; + polynomial >>= 1; + } + + return remainder; +} + +/* + * Charles Michael Heard's CRC-10 code, from + * + * http://web.archive.org/web/20061005231950/http://cell-relay.indiana.edu/cell-relay/publications/software/CRC/crc10.html + * + * with the CRC table initialized with values computed by + * his "gen_byte_crc10_table()" routine, rather than by calling that + * routine at run time, and with various data type cleanups. + */ +static const uint16_t byte_crc10_table[256] = { + 0x0000, 0x0233, 0x0255, 0x0066, 0x0299, 0x00aa, 0x00cc, 0x02ff, + 0x0301, 0x0132, 0x0154, 0x0367, 0x0198, 0x03ab, 0x03cd, 0x01fe, + 0x0031, 0x0202, 0x0264, 0x0057, 0x02a8, 0x009b, 0x00fd, 0x02ce, + 0x0330, 0x0103, 0x0165, 0x0356, 0x01a9, 0x039a, 0x03fc, 0x01cf, + 0x0062, 0x0251, 0x0237, 0x0004, 0x02fb, 0x00c8, 0x00ae, 0x029d, + 0x0363, 0x0150, 0x0136, 0x0305, 0x01fa, 0x03c9, 0x03af, 0x019c, + 0x0053, 0x0260, 0x0206, 0x0035, 0x02ca, 0x00f9, 0x009f, 0x02ac, + 0x0352, 0x0161, 0x0107, 0x0334, 0x01cb, 0x03f8, 0x039e, 0x01ad, + 0x00c4, 0x02f7, 0x0291, 0x00a2, 0x025d, 0x006e, 0x0008, 0x023b, + 0x03c5, 0x01f6, 0x0190, 0x03a3, 0x015c, 0x036f, 0x0309, 0x013a, + 0x00f5, 0x02c6, 0x02a0, 0x0093, 0x026c, 0x005f, 0x0039, 0x020a, + 0x03f4, 0x01c7, 0x01a1, 0x0392, 0x016d, 0x035e, 0x0338, 0x010b, + 0x00a6, 0x0295, 0x02f3, 0x00c0, 0x023f, 0x000c, 0x006a, 0x0259, + 0x03a7, 0x0194, 0x01f2, 0x03c1, 0x013e, 0x030d, 0x036b, 0x0158, + 0x0097, 0x02a4, 0x02c2, 0x00f1, 0x020e, 0x003d, 0x005b, 0x0268, + 0x0396, 0x01a5, 0x01c3, 0x03f0, 0x010f, 0x033c, 0x035a, 0x0169, + 0x0188, 0x03bb, 0x03dd, 0x01ee, 0x0311, 0x0122, 0x0144, 0x0377, + 0x0289, 0x00ba, 0x00dc, 0x02ef, 0x0010, 0x0223, 0x0245, 0x0076, + 0x01b9, 0x038a, 0x03ec, 0x01df, 0x0320, 0x0113, 0x0175, 0x0346, + 0x02b8, 0x008b, 0x00ed, 0x02de, 0x0021, 0x0212, 0x0274, 0x0047, + 0x01ea, 0x03d9, 0x03bf, 0x018c, 0x0373, 0x0140, 0x0126, 0x0315, + 0x02eb, 0x00d8, 0x00be, 0x028d, 0x0072, 0x0241, 0x0227, 0x0014, + 0x01db, 0x03e8, 0x038e, 0x01bd, 0x0342, 0x0171, 0x0117, 0x0324, + 0x02da, 0x00e9, 0x008f, 0x02bc, 0x0043, 0x0270, 0x0216, 0x0025, + 0x014c, 0x037f, 0x0319, 0x012a, 0x03d5, 0x01e6, 0x0180, 0x03b3, + 0x024d, 0x007e, 0x0018, 0x022b, 0x00d4, 0x02e7, 0x0281, 0x00b2, + 0x017d, 0x034e, 0x0328, 0x011b, 0x03e4, 0x01d7, 0x01b1, 0x0382, + 0x027c, 0x004f, 0x0029, 0x021a, 0x00e5, 0x02d6, 0x02b0, 0x0083, + 0x012e, 0x031d, 0x037b, 0x0148, 0x03b7, 0x0184, 0x01e2, 0x03d1, + 0x022f, 0x001c, 0x007a, 0x0249, 0x00b6, 0x0285, 0x02e3, 0x00d0, + 0x011f, 0x032c, 0x034a, 0x0179, 0x0386, 0x01b5, 0x01d3, 0x03e0, + 0x021e, 0x002d, 0x004b, 0x0278, 0x0087, 0x02b4, 0x02d2, 0x00e1 +}; + +static uint16_t crc10(uint16_t crc10_accum, const uint8_t *payload, unsigned int payload_len) +{ + int i; + + for (i = 0; i < payload_len; i++) { + crc10_accum = ((crc10_accum << 8) & 0x300) + ^ byte_crc10_table[(crc10_accum >> 2) & 0xff] + ^ payload[i]; + } + return crc10_accum; +} + +/* When a payload of a multiple of bytes has run through, we need to still feed 10 bits of zeros into the + * CRC10 to get the payload's checksum result that we can send to a peer. That can't be done with above + * table, because it acts as if full 16 bits are fed. This stops after 10 bits. */ +static uint16_t crc10_remainder(uint16_t crc10_accum) +{ + int bit; + /* Polynomial: D^10 + D^9 + D^5 + D^4 + D^1 + 1 + * that's 11000110011 or 0x633; + * align its lowest bit with a 10bit value's highest bit: */ + uint32_t polynomial = 0x633 << 9; // 1100 01100110 00000000 + uint32_t remainder = ((uint32_t)crc10_accum) << 10; + + /* Run on 10 bits */ + for (bit = 9; bit >= 0; bit--) + { + if (remainder & ((1 << 10) << bit)) + remainder ^= polynomial; + polynomial >>= 1; + } + + return remainder & 0x3ff; +} + +static uint16_t payload_crc10(const uint8_t *payload, unsigned int payload_len) +{ + uint16_t crc10_accum = crc10(0, payload, payload_len); + return crc10_remainder(crc10_accum); +} + +/* Given an IuUP PDU data block, write the correct header and payload CRC checksums at the right places. + */ +void osmo_iuup_set_checksums(uint8_t *iuup_header_and_payload, unsigned int header_and_payload_len) +{ + /* For both data and ctrl, the checksums and payload are at the same offset */ + struct osmo_iuup_hdr_data *hdr = (void*)iuup_header_and_payload; + uint16_t crc; + unsigned int payload_len; + + hdr->header_crc = header_crc6(iuup_header_and_payload); + + payload_len = iuup_header_and_payload + header_and_payload_len - hdr->payload; + crc = payload_crc10(hdr->payload, payload_len); + hdr->payload_crc_hi = (crc >> 8) & 0x3; + hdr->payload_crc_lo = crc & 0xff; + +} + +/* Validate minimum message sizes, IuUP PDU type, header- and payload checksums. If it is a Control + * Procedure PDU, return the header position in is_ctrl, if it is a Data PDU, return the header position + * in is_data. If log_errors is true, log on DIUUP with the given log label for context. Return NULL in + * both is_ctrl and is_data, and return a negative error code if the PDU could not be identified as a + * valid RTP PDU containing an IuUP part. */ +int osmo_iuup_classify(bool log_errors, + const char *log_label, + struct msgb *pdu, + struct osmo_iuup_hdr_ctrl **is_ctrl, + struct osmo_iuup_hdr_data **is_data) +{ + struct rtp_hdr *rtp = (void*)pdu->data; + struct osmo_iuup_hdr_ctrl *hdr = (void*)rtp->data; + unsigned int payload_len; + uint16_t crc_calculated; + uint16_t crc_from_peer; + +#define ERR(fmt, args...) do { \ + if (log_errors) \ + LOGP(DIUUP, LOGL_ERROR, "(%s) " fmt, log_label? : "-", ## args); \ + return -EINVAL; \ + } while (0) + + if (is_ctrl) + *is_ctrl = NULL; + if (is_data) + *is_data = NULL; + + /* We need at least a header of 4 bytes. The osmo_iuup_hdr_ctrl already includes a byte of + * payload, so use osmo_iuup_hdr_data to check the minimum here. */ + if (pdu->len < (sizeof(*rtp) + sizeof(struct osmo_iuup_hdr_data))) + ERR("IuUP PDU too short: %u\n", pdu->len); + + /* Let's not validate checksums if the header type isn't sane */ + switch (hdr->pdu_type) { + case OSMO_IUUP_PDU_DATA_WITH_CRC: + /* If the caller isn't interested in data PDUs, cut short here. */ + if (!is_data) + return 0; + break; + case OSMO_IUUP_PDU_CONTROL_PROCEDURE: + /* If the caller isn't interested in control PDUs, cut short here. */ + if (!is_ctrl) + return 0; + if (pdu->len < (sizeof(*rtp) + sizeof(struct osmo_iuup_hdr_ctrl))) + ERR("IuUP control PDU too short: %u\n", pdu->len); + break; + default: + ERR("IuUP with invalid type: %u\n", hdr->pdu_type); + } + + /* For both data and ctrl, the checksums and payload are at the same offset */ + + crc_calculated = header_crc6((uint8_t*)hdr); + if (crc_calculated != hdr->header_crc) + ERR("IuUP PDU with invalid header CRC (peer sent 0x%x, calculated 0x%x)\n", + hdr->header_crc, crc_calculated); + + payload_len = pdu->tail - hdr->payload; + crc_calculated = payload_crc10(hdr->payload, payload_len); + crc_from_peer = (((uint16_t)hdr->payload_crc_hi) << 8) | hdr->payload_crc_lo; + if (crc_from_peer != crc_calculated) + ERR("IuUP PDU with invalid payload CRC (peer sent 0x%x, calculated 0x%x)\n", + crc_from_peer, crc_calculated); + + switch (hdr->pdu_type) { + case OSMO_IUUP_PDU_DATA_WITH_CRC: + if (is_data) + *is_data = (void*)hdr; + return 0; + case OSMO_IUUP_PDU_CONTROL_PROCEDURE: + if (is_ctrl) + *is_ctrl = hdr; + return 0; + default: + ERR("IuUP with invalid type: %u\n", hdr->pdu_type); + } +#undef ERR +} + +/* Return true if this RTP packet contains an IuUP Initialization header (detect IuUP peer). */ +bool osmo_iuup_is_init(struct msgb *pdu) +{ + struct osmo_iuup_hdr_ctrl *is_ctrl; + osmo_iuup_classify(false, NULL, pdu, &is_ctrl, NULL); + return is_ctrl + && is_ctrl->procedure == OSMO_IUUP_PROC_INITIALIZATION + && is_ctrl->ack_nack == OSMO_IUUP_ACKNACK_PROCEDURE; +} + +/* Append an IuUP Initialization ACK message */ +void osmo_iuup_make_init_ack(struct msgb *ack) +{ + /* Send Initialization Ack PDU back to the sender */ + struct osmo_iuup_hdr_ctrl *hdr; + OSMO_ASSERT(ack); + + hdr = (void*)msgb_put(ack, sizeof(*hdr)); + + *hdr = (struct osmo_iuup_hdr_ctrl){ + .pdu_type = OSMO_IUUP_PDU_CONTROL_PROCEDURE, + .ack_nack = OSMO_IUUP_ACKNACK_ACK, + .procedure = OSMO_IUUP_PROC_INITIALIZATION, + }; + + osmo_iuup_set_checksums((uint8_t*)hdr, sizeof(*hdr)); +} + +const struct value_string osmo_iuup_error_cause_names[] = { + { 0, "CRC error of frame header" }, + { 1, "CRC error of frame payload" }, + { 2, "Unexpected frame number" }, + { 3, "Frame loss" }, + { 4, "PDU type unknown" }, + { 5, "Unknown procedure" }, + { 6, "Unknown reserved value" }, + { 7, "Unknown field" }, + { 8, "Frame too short" }, + { 9, "Missing fields" }, + { 16, "Unexpected PDU type" }, + { 17, "spare" }, + { 18, "Unexpected procedure" }, + { 19, "Unexpected RFCI" }, + { 20, "Unexpected value" }, + { 42, "Initialisation failure" }, + { 43, "Initialisation failure (network error, timer expiry)" }, + { 44, "Initialisation failure (Iu UP function error, repeated NACK)" }, + { 45, "Rate control failure" }, + { 46, "Error event failure" }, + { 47, "Time Alignment not supported" }, + { 48, "Requested Time Alignment not possible" }, + { 49, "Iu UP Mode version not supported" }, + {} +}; diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 93a8157..cf9f942 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -454,3 +454,19 @@ return codec_dst->payload_type; } + +const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, + const char *subtype_name, unsigned int match_nr) +{ + int i; + for (i = 0; i < conn->end.codecs_assigned; i++) { + if (!strcmp(conn->end.codecs[i].subtype_name, subtype_name)) { + if (match_nr) { + match_nr--; + continue; + } + return &conn->end.codecs[i]; + } + } + return NULL; +} diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index bb29d2b..af2a647 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -45,6 +45,8 @@ #include #include #include +#include +#include #define RTP_SEQ_MOD (1 << 16) @@ -52,11 +54,13 @@ #define RTP_MAX_MISORDER 100 #define RTP_BUF_SIZE 4096 -enum { +enum rtp_proto { MGCP_PROTO_RTP, MGCP_PROTO_RTCP, }; +static int rx_rtp(struct msgb *msg); + /*! Determine the local rtp bind IP-address. * \param[out] addr caller provided memory to store the resulting IP-Address * \param[in] endp mgcp endpoint, that holds a copy of the VTY parameters @@ -469,19 +473,38 @@ * Patch the payload type of an RTP packet so that it uses the payload type * that is valid for the destination connection (conn_dst) */ static int mgcp_patch_pt(struct mgcp_conn_rtp *conn_src, - struct mgcp_conn_rtp *conn_dst, char *data, int len) + struct mgcp_conn_rtp *conn_dst, struct msgb *msg) { struct rtp_hdr *rtp_hdr; uint8_t pt_in; int pt_out; - OSMO_ASSERT(len >= sizeof(struct rtp_hdr)); - rtp_hdr = (struct rtp_hdr *)data; + OSMO_ASSERT(msg->len >= sizeof(struct rtp_hdr)); + rtp_hdr = (struct rtp_hdr *)msg->data; - pt_in = rtp_hdr->payload_type; - pt_out = mgcp_codec_pt_translate(conn_src, conn_dst, pt_in); - if (pt_out < 0) - return -EINVAL; + if (conn_src->iuup) { + /* The source is an IuUP payload. We have received a dynamic payload type number on the IuUP side, and + * towards the pure RTP side it should go out as "AMR/8000". Make sure that the payload type number in + * the RTP packet matches the a=rtpmap:N payload type number configured for AMR. */ + const struct mgcp_rtp_codec *amr_codec = mgcp_codec_pt_find_by_subtype_name(conn_dst, "AMR", 0); + + if (!amr_codec) { + /* There is no AMR codec configured on the outgoing conn. */ + return -EINVAL; + } + + pt_out = amr_codec->payload_type; + } else if (conn_dst->iuup) { + /* The destination is an IuUP payload. Use whatever payload number was negotiated during IuUP + * Initialization. */ + pt_out = conn_dst->iuup->rtp_payload_type; + } else { + /* Both sides are normal RTP payloads. Consult the rtpmap settings received by SDP. */ + pt_in = rtp_hdr->payload_type; + pt_out = mgcp_codec_pt_translate(conn_src, conn_dst, pt_in); + if (pt_out < 0) + return -EINVAL; + } rtp_hdr->payload_type = (uint8_t) pt_out; return 0; @@ -496,7 +519,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, char *data, int len) + struct sockaddr_in *addr, struct msgb *msg) { uint32_t arrival_time; int32_t transit; @@ -504,11 +527,12 @@ uint32_t timestamp, ssrc; struct rtp_hdr *rtp_hdr; int payload = rtp_end->codec->payload_type; + unsigned int len = msg->len; if (len < sizeof(*rtp_hdr)) return; - rtp_hdr = (struct rtp_hdr *)data; + rtp_hdr = (struct rtp_hdr *)msg->data; seq = ntohs(rtp_hdr->sequence); timestamp = ntohl(rtp_hdr->timestamp); arrival_time = get_current_ts(rtp_end->codec->rate); @@ -751,15 +775,14 @@ /* Forward data to a debug tap. This is debug function that is intended for * debugging the voice traffic with tools like gstreamer */ -static void forward_data(int fd, struct mgcp_rtp_tap *tap, const char *buf, - int len) +static void forward_data(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg) { int rc; if (!tap->enabled) return; - rc = sendto(fd, buf, len, 0, (struct sockaddr *)&tap->forward, + rc = sendto(fd, msg->data, msg->len, 0, (struct sockaddr *)&tap->forward, sizeof(tap->forward)); if (rc < 0) @@ -777,7 +800,7 @@ * \param[in] conn_dst associated destination connection * \returns 0 on success, -1 on ERROR */ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, - char *buf, int len, struct mgcp_conn_rtp *conn_src, + struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst) { /*! When no destination connection is available (e.g. when only one @@ -789,6 +812,7 @@ struct mgcp_rtp_state *rtp_state; char *dest_name; int rc; + int len; OSMO_ASSERT(conn_src); OSMO_ASSERT(conn_dst); @@ -812,7 +836,7 @@ * should not occur if transcoding is consequently avoided. Until * we have transcoding support in osmo-mgw we can not resolve this. */ if (is_rtp) { - rc = mgcp_patch_pt(conn_src, conn_dst, buf, len); + rc = mgcp_patch_pt(conn_src, conn_dst, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_DEBUG, "can not patch PT because no suitable egress codec was found.\n"); @@ -837,27 +861,27 @@ } else if (is_rtp) { int cont; int nbytes = 0; - int buflen = len; + int buflen = msg->len; do { /* Run transcoder */ cont = endp->cfg->rtp_processing_cb(endp, rtp_end, - buf, &buflen, + (char*)msg->data, &buflen, RTP_BUF_SIZE); if (cont < 0) break; if (addr) mgcp_patch_and_count(endp, rtp_state, rtp_end, - addr, buf, buflen); + addr, msg); if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) { - amr_oa_bwe_convert(endp, buf, &buflen, + amr_oa_bwe_convert(endp, (char*)msg->data, &buflen, conn_dst->end.codec->param.amr_octet_aligned); } else if (rtp_end->rfc5993_hr_convert && strcmp(conn_src->end.codec->subtype_name, "GSM-HR-08") == 0) - rfc5993_hr_convert(endp, buf, &buflen); + rfc5993_hr_convert(endp, (char*)msg->data, &buflen); LOGPENDP(endp, DRTP, LOGL_DEBUG, "process/send to %s %s " @@ -868,8 +892,9 @@ /* Forward a copy of the RTP data to a debug ip/port */ forward_data(rtp_end->rtp.fd, &conn_src->tap_out, - buf, buflen); + msg); +#if 0 /* FIXME: HACK HACK HACK. See OS#2459. * The ip.access nano3G needs the first RTP payload's first two bytes to read hex * 'e400', or it will reject the RAB assignment. It seems to not harm other femto @@ -877,7 +902,7 @@ */ if (!rtp_state->patched_first_rtp_payload && conn_src->conn->mode == MGCP_CONN_LOOPBACK) { - uint8_t *data = (uint8_t *) & buf[12]; + uint8_t *data = msg->data + 12; if (data[0] == 0xe0) { data[0] = 0xe4; data[1] = 0x00; @@ -887,10 +912,13 @@ " to fake an IuUP Initialization Ack\n"); } } +#endif - len = mgcp_udp_send(rtp_end->rtp.fd, - &rtp_end->addr, - rtp_end->rtp_port, buf, buflen); + if (conn_dst->iuup) + len = osmo_iuup_cn_tx_payload(conn_dst->iuup, msg); + else + len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, rtp_end->rtp_port, + (char*)msg->data, msg->len); if (len <= 0) return len; @@ -911,7 +939,7 @@ len = mgcp_udp_send(rtp_end->rtcp.fd, &rtp_end->addr, - rtp_end->rtcp_port, buf, len); + rtp_end->rtcp_port, (char*)msg->data, msg->len); rate_ctr_inc(&conn_dst->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]); rate_ctr_add(&conn_dst->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], len); @@ -922,45 +950,6 @@ return 0; } -/* Helper function for mgcp_recv(), - Receive one RTP Packet + Originating address from file descriptor */ -static int receive_from(struct mgcp_endpoint *endp, int fd, - struct sockaddr_in *addr, char *buf, int bufsize) -{ - int rc; - socklen_t slen = sizeof(*addr); - struct sockaddr_in addr_sink; - char buf_sink[RTP_BUF_SIZE]; - bool tossed = false; - - if (!addr) - addr = &addr_sink; - if (!buf) { - tossed = true; - buf = buf_sink; - bufsize = sizeof(buf_sink); - } - - rc = recvfrom(fd, buf, bufsize, 0, (struct sockaddr *)addr, &slen); - - LOGPENDP(endp, DRTP, LOGL_DEBUG, - "receiving %u bytes length packet from %s:%u ...\n", - rc, inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); - - if (rc < 0) { - LOGPENDP(endp, DRTP, LOGL_ERROR, - "failed to receive packet, errno: %d/%s\n", - errno, strerror(errno)); - return -1; - } - - if (tossed) { - LOGPENDP(endp, DRTP, LOGL_ERROR, "packet tossed\n"); - } - - return rc; -} - /* Check if the origin (addr) matches the address/port data of the RTP * connections. */ static int check_rtp_origin(struct mgcp_conn_rtp *conn, @@ -1053,7 +1042,7 @@ /* Do some basic checks to make sure that the RTCP packets we are going to * process are not complete garbage */ -static int check_rtcp(char *buf, unsigned int buf_size) +static int check_rtcp(struct mgcp_conn_rtp *conn_src, struct msgb *msg) { struct rtcp_hdr *hdr; unsigned int len; @@ -1061,33 +1050,45 @@ /* RTPC packets that are just a header without data do not make * any sense. */ - if (buf_size < sizeof(struct rtcp_hdr)) + if (msg->len < sizeof(struct rtcp_hdr)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTCP packet too short (%u < %zu)\n", + msg->len, sizeof(struct rtcp_hdr)); return -EINVAL; + } /* Make sure that the length of the received packet does not exceed * the available buffer size */ - hdr = (struct rtcp_hdr *)buf; + hdr = (struct rtcp_hdr *)msg->data; len = (osmo_ntohs(hdr->length) + 1) * 4; - if (len > buf_size) + if (len > msg->len) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTCP header length exceeds packet size (%u > %u)\n", + len, msg->len); return -EINVAL; + } /* Make sure we accept only packets that have a proper packet type set * See also: http://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ type = hdr->type; - if ((type < 192 || type > 195) && (type < 200 || type > 213)) + if ((type < 192 || type > 195) && (type < 200 || type > 213)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTCP header: invalid type: %u\n", type); return -EINVAL; + } return 0; } /* Do some basic checks to make sure that the RTP packets we are going to * process are not complete garbage */ -static int check_rtp(char *buf, unsigned int buf_size) +static int check_rtp(struct mgcp_conn_rtp *conn_src, struct msgb *msg) { - /* RTP packets that are just a header without data do not make - * any sense. */ - if (buf_size < sizeof(struct rtp_hdr)) - return -EINVAL; + size_t min_size = sizeof(struct rtp_hdr); + if (conn_src->iuup) + min_size += sizeof(struct osmo_iuup_hdr_data); + if (msg->len < min_size) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u < %zu)\n", + msg->len, min_size); + return -1; + } /* FIXME: Add more checks, the reason why we do not check more than * the length is because we currently handle IUUP packets as RTP @@ -1098,86 +1099,14 @@ return 0; } -/* Receive RTP data from a specified source connection and dispatch it to a - * destination connection. */ -static int mgcp_recv(int *proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct osmo_fd *fd) -{ - struct mgcp_endpoint *endp; - struct mgcp_conn_rtp *conn; - struct mgcp_trunk_config *tcfg; - int rc; - - conn = (struct mgcp_conn_rtp*) fd->data; - endp = conn->conn->endp; - tcfg = endp->tcfg; - - LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "receiving RTP/RTCP packet...\n"); - - rc = receive_from(endp, fd->fd, addr, buf, buf_size); - if (rc <= 0) - return -1; - - /* FIXME: The way how we detect the protocol looks odd. We should look - * into the packet header. Also we should introduce a packet type - * MGCP_PROTO_IUUP because currently we handle IUUP packets like RTP - * packets which is problematic. */ - *proto = fd == &conn->end.rtp ? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - - if (*proto == MGCP_PROTO_RTP) { - if (check_rtp(buf, rc) < 0) { - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "invalid RTP packet received -- packet tossed\n"); - return -1; - } - } else if (*proto == MGCP_PROTO_RTCP) { - if (check_rtcp(buf, rc) < 0) { - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "invalid RTCP packet received -- packet tossed\n"); - return -1; - } - } - - LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, ""); - LOGPC(DRTP, LOGL_DEBUG, "receiving from %s %s %d\n", - conn->conn->name, inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); - LOGPENDP(endp, DRTP, LOGL_DEBUG, "conn:%s\n", mgcp_conn_dump(conn->conn)); - - /* Check if the origin of the RTP packet seems plausible */ - if (tcfg->rtp_accept_all == 0) { - if (check_rtp_origin(conn, addr) != 0) - return -1; - } - - /* Filter out dummy message */ - if (rc == 1 && buf[0] == MGCP_DUMMY_LOAD) { - LOGPCONN(conn->conn, DRTP, LOGL_NOTICE, - "dummy message received\n"); - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "packet tossed\n"); - return 0; - } - - /* Increment RX statistics */ - rate_ctr_inc(&conn->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]); - rate_ctr_add(&conn->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR], rc); - - /* Forward a copy of the RTP data to a debug ip/port */ - forward_data(fd->fd, &conn->tap_in, buf, rc); - - return rc; -} - /* Send RTP data. Possible options are standard RTP packet * transmission or trsmission via an osmux connection */ -static int mgcp_send_rtp(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, - struct mgcp_conn_rtp *conn_src, - struct mgcp_conn_rtp *conn_dst) +static int mgcp_send_rtp(struct mgcp_conn_rtp *conn_dst, struct msgb *msg) { - struct mgcp_endpoint *endp; - endp = conn_src->conn->endp; + enum rtp_proto proto = OSMO_RTP_MSG_CTX(msg)->proto; + struct mgcp_conn_rtp *conn_src = OSMO_RTP_MSG_CTX(msg)->conn_src; + struct sockaddr_in *from_addr = OSMO_RTP_MSG_CTX(msg)->from_addr; + struct mgcp_endpoint *endp = conn_src->conn->endp; LOGPENDP(endp, DRTP, LOGL_DEBUG, "destin conn:%s\n", mgcp_conn_dump(conn_dst->conn)); @@ -1196,13 +1125,13 @@ "endpoint type is MGCP_RTP_DEFAULT, " "using mgcp_send() to forward data directly\n"); return mgcp_send(endp, proto == MGCP_PROTO_RTP, - addr, buf, buf_size, conn_src, conn_dst); + from_addr, msg, conn_src, conn_dst); case MGCP_OSMUX_BSC_NAT: case MGCP_OSMUX_BSC: LOGPENDP(endp, DRTP, LOGL_DEBUG, "endpoint type is MGCP_OSMUX_BSC_NAT, " "using osmux_xfrm_to_osmux() to forward data through OSMUX\n"); - return osmux_xfrm_to_osmux(buf, buf_size, conn_dst); + return osmux_xfrm_to_osmux((char*)msg->data, msg->len, conn_dst); } /* If the data has not been handled/forwarded until here, it will @@ -1220,10 +1149,12 @@ * \param[in] buf_size size data length of buf * \param[in] conn originating connection * \returns 0 on success, -1 on ERROR */ -int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct mgcp_conn *conn) +int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg) { + struct mgcp_conn_rtp *conn_src = OSMO_RTP_MSG_CTX(msg)->conn_src; + struct mgcp_conn *conn = conn_src->conn; struct mgcp_conn *conn_dst; + struct sockaddr_in *from_addr = OSMO_RTP_MSG_CTX(msg)->from_addr; /*! NOTE: This callback function implements the endpoint specific * dispatch bahviour of an rtp bridge/proxy endpoint. It is assumed @@ -1242,11 +1173,10 @@ * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ if (conn->u.rtp.end.rtp_port == 0) { - conn->u.rtp.end.addr = addr->sin_addr; - conn->u.rtp.end.rtp_port = addr->sin_port; + conn->u.rtp.end.addr = from_addr->sin_addr; + conn->u.rtp.end.rtp_port = from_addr->sin_port; } - return mgcp_send_rtp(proto, addr, buf, - buf_size, &conn->u.rtp, &conn->u.rtp); + return mgcp_send_rtp(conn_src, msg); } /* Find a destination connection. */ @@ -1278,9 +1208,7 @@ } /* Dispatch RTP packet to destination RTP connection */ - return mgcp_send_rtp(proto, addr, buf, - buf_size, &conn->u.rtp, &conn_dst->u.rtp); - + return mgcp_send_rtp(&conn_dst->u.rtp, msg); } /*! cleanup an endpoint when a connection on an RTP bridge endpoint is removed. @@ -1302,6 +1230,76 @@ } } +static bool is_dummy_msg(enum rtp_proto proto, struct msgb *msg) +{ + return msg->len == 1 && msg->data[0] == MGCP_DUMMY_LOAD; +} + +struct pdu_ctx { + struct sockaddr_in *from_addr; + struct mgcp_conn_rtp *conn_src; +}; + +/* IuUP CN node has stripped an IuUP header and forwards RTP data to distribute to the peers. */ +int iuup_rx_payload(struct msgb *msg, void *node_priv) +{ + struct mgcp_conn_rtp *conn_src = OSMO_RTP_MSG_CTX(msg)->conn_src; + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "iuup_rx_payload(%u bytes)\n", msg->len); + return rx_rtp(msg); +} + +/* IuUP CN node has composed a message that contains an IuUP header and asks us to send to the IuUP peer. + */ +int iuup_tx_msg(struct msgb *msg, void *node_priv) +{ + const struct in_addr zero_addr = {}; + struct mgcp_conn_rtp *conn_src = OSMO_RTP_MSG_CTX(msg)->conn_src; + struct mgcp_conn_rtp *conn_dst = node_priv; + struct sockaddr_in *from_addr = OSMO_RTP_MSG_CTX(msg)->from_addr; + struct mgcp_rtp_end *rtp_end = &conn_dst->end; + struct in_addr to_addr = rtp_end->addr; + uint16_t to_port = rtp_end->rtp_port; + + if (conn_src == conn_dst + && !memcmp(&zero_addr, &to_addr, sizeof(zero_addr)) && !to_port) { + LOG_CONN_RTP(conn_dst, LOGL_DEBUG, "iuup_tx_msg(): direct IuUP reply\n"); + /* IuUP wants to send a message back to the same peer that sent an RTP package, but there + * is no address configured for that peer yet. It is probably an IuUP Initialization ACK + * reply. Use the sender address to send the reply. + * + * During 3G RAB Assignment, a 3G cell might first probe the MGW and expect an IuUP + * Initialization ACK before it replies to the MSC with a successful RAB Assignment; only + * after that reply does MSC officially know which RTP address+port the 3G cell wants to + * use and can tell this MGW about it, so this "loopback" is, for some 3G cells, the only + * chance we have to get a successful RAB Assignment done (particularly the nano3G does + * this). */ + to_addr = from_addr->sin_addr; + to_port = from_addr->sin_port; + } + + LOG_CONN_RTP(conn_dst, LOGL_DEBUG, "iuup_tx_msg(%u bytes) to %s:%u\n", msg->len, + inet_ntoa(to_addr), ntohs(to_port)); + + return mgcp_udp_send(rtp_end->rtp.fd, &to_addr, to_port, (char*)msg->data, msg->len); +} + +static void iuup_init(struct mgcp_conn_rtp *conn_src) +{ + struct osmo_iuup_cn_cfg cfg = { + .node_priv = conn_src, + .rx_payload = iuup_rx_payload, + .tx_msg = iuup_tx_msg, + }; + + if (conn_src->iuup) { + LOG_CONN_RTP(conn_src, LOGL_NOTICE, "Rx IuUP init, but already initialized. Ignoring.\n"); + return; + } + + conn_src->iuup = osmo_iuup_cn_init(conn_src->conn, &cfg, "endp_%d_conn_%s", + ENDPOINT_NUMBER(conn_src->conn->endp), conn_src->conn->id); +} + /* Handle incoming RTP data from NET */ static int rtp_data_net(struct osmo_fd *fd, unsigned int what) { @@ -1315,23 +1313,88 @@ struct mgcp_conn_rtp *conn_src; struct mgcp_endpoint *endp; struct sockaddr_in addr; - - char buf[RTP_BUF_SIZE]; - int proto; - int len; + socklen_t slen = sizeof(addr); + int ret; + enum rtp_proto proto; + struct osmo_rtp_msg_ctx mc; + struct msgb *msg = msgb_alloc_headroom(RTP_BUF_SIZE + OSMO_IUUP_HEADROOM, + OSMO_IUUP_HEADROOM, "RTP-rx"); + int rc; conn_src = (struct mgcp_conn_rtp *)fd->data; OSMO_ASSERT(conn_src); endp = conn_src->conn->endp; OSMO_ASSERT(endp); - LOGPENDP(endp, DRTP, LOGL_DEBUG, "source conn:%s\n", - mgcp_conn_dump(conn_src->conn)); + proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - /* Receive packet */ - len = mgcp_recv(&proto, &addr, buf, sizeof(buf), fd); - if (len < 0) - return -1; + ret = recvfrom(fd->fd, msg->data, msg->data_len, 0, (struct sockaddr *)&addr, &slen); + + if (ret <= 0) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "recvfrom error: %s\n", strerror(errno)); + rc = -1; + goto out; + } + + msgb_put(msg, ret); + + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "%s: rx %u bytes from %s:%u\n", + proto == MGCP_PROTO_RTP ? "RTP" : "RTPC", + msg->len, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); + + if ((proto == MGCP_PROTO_RTP && check_rtp(conn_src, msg)) + || (proto == MGCP_PROTO_RTCP && check_rtcp(conn_src, msg))) { + /* Logging happened in the two check_ functions */ + rc = -1; + goto out; + } + + if (is_dummy_msg(proto, msg)) { + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx dummy packet (dropped)\n"); + rc = 0; + goto out; + } + + mc = (struct osmo_rtp_msg_ctx){ + .proto = proto, + .conn_src = conn_src, + .from_addr = &addr, + }; + OSMO_RTP_MSG_CTX(msg) = &mc; + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "msg ctx: %d %p %s\n", + OSMO_RTP_MSG_CTX(msg)->proto, + OSMO_RTP_MSG_CTX(msg)->conn_src, + osmo_hexdump((void*)OSMO_RTP_MSG_CTX(msg)->from_addr, sizeof(struct sockaddr_in))); + + /* Increment RX statistics */ + rate_ctr_inc(&conn_src->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]); + rate_ctr_add(&conn_src->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR], msg->len); + /* FIXME: count RTP and RTCP separately, also count IuUP payload-less separately */ + + /* Forward a copy of the RTP data to a debug ip/port */ + forward_data(fd->fd, &conn_src->tap_in, msg); + + if (proto == MGCP_PROTO_RTP && osmo_iuup_is_init(msg)) + iuup_init(conn_src); + + if (conn_src->iuup && proto == MGCP_PROTO_RTP) + rc = osmo_iuup_cn_rx_pdu(conn_src->iuup, msg); + else + rc = rx_rtp(msg); + +out: + msgb_free(msg); + return rc; +} + +static int rx_rtp(struct msgb *msg) +{ + struct mgcp_conn_rtp *conn_src = OSMO_RTP_MSG_CTX(msg)->conn_src; + struct sockaddr_in *from_addr = OSMO_RTP_MSG_CTX(msg)->from_addr; + struct mgcp_conn *conn = conn_src->conn; + struct mgcp_trunk_config *tcfg = conn->endp->tcfg; + + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx_rtp(%u bytes)\n", msg->len); mgcp_conn_watchdog_kick(conn_src->conn); @@ -1340,14 +1403,17 @@ * define, then we check if the incoming payload matches that * expectation. */ if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) { - if (amr_oa_check(buf, len) != conn_src->end.codec->param.amr_octet_aligned) + if (amr_oa_check((char*)msg->data, msg->len) != conn_src->end.codec->param.amr_octet_aligned) return -1; } + /* Check if the origin of the RTP packet seems plausible */ + if (!tcfg->rtp_accept_all && check_rtp_origin(conn_src, from_addr)) + return -1; + /* Execute endpoint specific implementation that handles the * dispatching of the RTP data */ - return endp->type->dispatch_rtp_cb(proto, &addr, buf, len, - conn_src->conn); + return conn->endp->type->dispatch_rtp_cb(msg); } /*! set IP Type of Service parameter. diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 72d3b91..885e2ae 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -234,13 +234,8 @@ { struct mgcp_conn_rtp *conn = data; struct mgcp_endpoint *endp = conn->conn->endp; - struct sockaddr_in addr = { - .sin_addr = conn->end.addr, - .sin_port = conn->end.rtp_port, - }; /* FIXME: not set/used in cb */ - - endp->type->dispatch_rtp_cb(MGCP_PROTO_RTP, &addr, (char *)msg->data, msg->len, conn->conn); + endp->type->dispatch_rtp_cb(msg); msgb_free(msg); } diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index adc1751..0b2ecce 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -244,6 +244,12 @@ .color = "\033[1;30m", .enabled = 1,.loglevel = LOGL_NOTICE, }, + [DIUUP] = { + .name = "DIUUP", + .description = "IuUP within RTP stream handling", + .color = "\033[1;31m", + .enabled = 1,.loglevel = LOGL_NOTICE, + }, }; const struct log_info log_info = { diff --git a/tests/Makefile.am b/tests/Makefile.am index 49a659f..302fa52 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = \ mgcp_client \ mgcp \ + iuup \ $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/iuup/Makefile.am b/tests/iuup/Makefile.am new file mode 100644 index 0000000..12806b1 --- /dev/null +++ b/tests/iuup/Makefile.am @@ -0,0 +1,45 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +EXTRA_DIST = \ + iuup_test.ok \ + iuup_test.err \ + $(NULL) + +noinst_PROGRAMS = \ + iuup_test \ + $(NULL) + +iuup_test_SOURCES = \ + iuup_test.c \ + $(NULL) + +iuup_test_LDADD = \ + $(top_builddir)/src/libosmo-mgcp/libosmo-mgcp.a \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBRARY_DL) \ + $(LIBOSMONETIF_LIBS) \ + -lm \ + $(NULL) + +update_exp: + $(builddir)/iuup_test >$(srcdir)/iuup_test.ok 2>$(srcdir)/iuup_test.err diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c new file mode 100644 index 0000000..e6f2ca5 --- /dev/null +++ b/tests/iuup/iuup_test.c @@ -0,0 +1,156 @@ +#include +#include + +#include +#include +#include + +#include +#include + +void *ctx = NULL; + +static const char *dump(struct msgb *msg) +{ + return osmo_hexdump_nospc(msg->data, msg->len); +} + +struct msgb *msgb_from_hex(const char *label, const char *hex) +{ + struct msgb *msg = msgb_alloc_headroom(4096 + OSMO_IUUP_HEADROOM, + OSMO_IUUP_HEADROOM, label); + unsigned char *rc; + msg->l2h = msg->data; + rc = msgb_put(msg, osmo_hexparse(hex, msg->data, msgb_tailroom(msg))); + OSMO_ASSERT(rc == msg->l2h); + return msg; +} + +const char *expect_rx_payload = NULL; +int rx_payload(struct msgb *msg, void *node_priv) +{ + printf("rx_payload() invoked by iuup_cn!\n"); + printf(" [IuUP] -RTP->\n"); + printf("%s\n", dump(msg)); + printf("node_priv=%p\n", node_priv); + if (!expect_rx_payload) { + printf("ERROR: did not expect rx_payload()\n"); + exit(-1); + } else if (strcmp(expect_rx_payload, dump(msg))) { + printf("ERROR: mismatches expected msg %s\n", expect_rx_payload); + exit(-1); + } else + printf("ok: matches expected msg\n"); + expect_rx_payload = NULL; + return 0; +} + +const char *expect_tx_msg = NULL; +int tx_msg(struct msgb *msg, void *node_priv) +{ + printf("tx_msg() invoked by iuup_cn!\n"); + printf(" <-PDU- [IuUP]\n"); + printf("%s\n", dump(msg)); + printf("node_priv=%p\n", node_priv); + if (!expect_tx_msg) { + printf("ERROR: did not expect tx_msg()\n"); + exit(-1); + } else if (strcmp(expect_tx_msg, dump(msg))) { + printf("ERROR: mismatches expected msg %s\n", expect_tx_msg); + exit(-1); + } else + printf("ok: matches expected msg\n"); + expect_tx_msg = NULL; + return 0; +} + +static int rx_pdu(struct osmo_iuup_cn *cn, struct msgb *msg) +{ + int rc; + printf(" -PDU-> [IuUP]\n"); + printf("%s\n", dump(msg)); + rc = osmo_iuup_cn_rx_pdu(cn, msg); + printf("rc=%d\n", rc); + return rc; +} + +static int tx_payload(struct osmo_iuup_cn *cn, struct msgb *msg) +{ + int rc; + printf(" [IuUP] <-RTP-\n"); + printf("%s\n", dump(msg)); + rc = osmo_iuup_cn_tx_payload(cn, msg); + printf("rc=%d\n", rc); + return rc; +} + +void test_cn_session() +{ + void *node_priv = (void*)0x2342; + + struct osmo_iuup_cn_cfg cfg = { + .node_priv = node_priv, + .rx_payload = rx_payload, + .tx_msg = tx_msg, + }; + + struct osmo_iuup_cn *cn = osmo_iuup_cn_init(ctx, &cfg, __func__); + OSMO_ASSERT(cn); + + printf("\nSend IuUP Initialization. Expecting direct tx_msg() of the Initialization Ack\n"); + expect_tx_msg = "8060dc5219495e3f00010111" /* RTP header */ + "e4002400"; /* IuUP Init Ack */ + rx_pdu(cn, + msgb_from_hex("IuUP-Init", + "8060dc5219495e3f00010111" /* <- RTP header */ + "e000df99" /* <- IuUP header */ + "160051673c01270000820000001710000100" /* IuUP params */)); + +#define RTP_HEADER "8060944c6256042c00010102" +#define IUUP_HEADER "0100e2b3" +#define RTP_PAYLOAD "6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0" + printf("\nReceive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet\n"); + printf("i.e. should strip away " IUUP_HEADER "\n"); + expect_rx_payload = RTP_HEADER "f03c" RTP_PAYLOAD; + rx_pdu(cn, + msgb_from_hex("IuUP-Data", + RTP_HEADER IUUP_HEADER RTP_PAYLOAD)); + + printf("\nTransmit RTP. Expecting tx_msg() with inserted IuUP header\n"); + expect_tx_msg = RTP_HEADER "000002b3" RTP_PAYLOAD; + tx_payload(cn, + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); + + printf("\nMore RTP, each time the Frame Nr advances, causing a new header CRC.\n"); + expect_tx_msg = RTP_HEADER "0100e2b3" RTP_PAYLOAD; + tx_payload(cn, + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); + expect_tx_msg = RTP_HEADER "02007eb3" RTP_PAYLOAD; + tx_payload(cn, + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); + expect_tx_msg = RTP_HEADER "03009eb3" RTP_PAYLOAD; + tx_payload(cn, + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); + + printf("All done.\n"); +} + +static const struct log_info_cat log_categories[] = { +}; + +const struct log_info log_info = { + .cat = log_categories, + .num_cat = ARRAY_SIZE(log_categories), +}; + +int main(void) +{ + ctx = talloc_named_const(NULL, 0, __FILE__); + void *msgb_ctx = msgb_talloc_ctx_init(ctx, 0); + osmo_init_logging2(ctx, &log_info); + + test_cn_session(); + + talloc_free(msgb_ctx); + return 0; +} diff --git a/tests/iuup/iuup_test.err b/tests/iuup/iuup_test.err new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/iuup/iuup_test.err diff --git a/tests/iuup/iuup_test.ok b/tests/iuup/iuup_test.ok new file mode 100644 index 0000000..8c473d6 --- /dev/null +++ b/tests/iuup/iuup_test.ok @@ -0,0 +1,58 @@ + +Send IuUP Initialization. Expecting direct tx_msg() of the Initialization Ack + -PDU-> [IuUP] +8060dc5219495e3f00010111e000df99160051673c01270000820000001710000100 +tx_msg() invoked by iuup_cn! + <-PDU- [IuUP] +8060dc5219495e3f00010111e4002400 +node_priv=0x2342 +ok: matches expected msg +rc=0 + +Receive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet +i.e. should strip away 0100e2b3 + -PDU-> [IuUP] +8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +rx_payload() invoked by iuup_cn! + [IuUP] -RTP-> +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +node_priv=0x2342 +ok: matches expected msg +rc=0 + +Transmit RTP. Expecting tx_msg() with inserted IuUP header + [IuUP] <-RTP- +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +tx_msg() invoked by iuup_cn! + <-PDU- [IuUP] +8060944c6256042c00010102000002b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +node_priv=0x2342 +ok: matches expected msg +rc=0 + +More RTP, each time the Frame Nr advances, causing a new header CRC. + [IuUP] <-RTP- +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +tx_msg() invoked by iuup_cn! + <-PDU- [IuUP] +8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +node_priv=0x2342 +ok: matches expected msg +rc=0 + [IuUP] <-RTP- +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +tx_msg() invoked by iuup_cn! + <-PDU- [IuUP] +8060944c6256042c0001010202007eb36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +node_priv=0x2342 +ok: matches expected msg +rc=0 + [IuUP] <-RTP- +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +tx_msg() invoked by iuup_cn! + <-PDU- [IuUP] +8060944c6256042c0001010203009eb36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +node_priv=0x2342 +ok: matches expected msg +rc=0 +All done. diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 8a37ef0..5074de5 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -1237,7 +1238,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, char *data, int len); + struct sockaddr_in *addr, struct msgb *msg); static void test_packet_error_detection(int patch_ssrc, int patch_ts) { @@ -1249,7 +1250,6 @@ struct mgcp_rtp_state state; struct mgcp_rtp_end *rtp; struct sockaddr_in addr = { 0 }; - char buffer[4096]; uint32_t last_ssrc = 0; uint32_t last_timestamp = 0; uint32_t last_seqno = 0; @@ -1297,16 +1297,17 @@ for (i = 0; i < ARRAY_SIZE(test_rtp_packets1); ++i) { struct rtp_packet_info *info = test_rtp_packets1 + i; + struct msgb *msg = msgb_alloc(4096, __func__); force_monotonic_time_us = round(1000000.0 * info->txtime); - OSMO_ASSERT(info->len <= sizeof(buffer)); + OSMO_ASSERT(info->len <= msgb_tailroom(msg)); OSMO_ASSERT(info->len >= 0); - memmove(buffer, info->data, info->len); + msg->l3h = msgb_put(msg, info->len); + memcpy((char*)msgb_l3(msg), info->data, info->len); mgcp_rtp_end_config(&endp, 1, rtp); - mgcp_patch_and_count(&endp, &state, rtp, &addr, - buffer, info->len); + mgcp_patch_and_count(&endp, &state, rtp, &addr, msg); if (state.out_stream.ssrc != last_ssrc) { printf("Output SSRC changed to %08x\n", @@ -1333,6 +1334,8 @@ last_out_ts_err_cnt = state.out_stream.err_ts_ctr->current; last_timestamp = state.out_stream.last_timestamp; last_seqno = state.out_stream.last_seq; + + msgb_free(msg); } force_monotonic_time_us = -1; diff --git a/tests/testsuite.at b/tests/testsuite.at index 3585bf0..0c3f802 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -13,3 +13,10 @@ cat $abs_srcdir/mgcp/mgcp_test.ok > expout AT_CHECK([$abs_top_builddir/tests/mgcp/mgcp_test], [], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([iuup]) +AT_KEYWORDS([iuup]) +cat $abs_srcdir/iuup/iuup_test.ok > expout +cat $abs_srcdir/iuup/iuup_test.err > experr +AT_CHECK([$abs_top_builddir/tests/iuup/iuup_test], [], [expout], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibc70e0aa00476926dd1f4ea8139c34f31f9cdfa3 Gerrit-Change-Number: 15169 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:23:09 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:23:09 +0000 Subject: Change in ...osmo-mgw[master]: rename codecs_cmp() to codecs_same() In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15130 ) Change subject: rename codecs_cmp() to codecs_same() ...................................................................... rename codecs_cmp() to codecs_same() The name 'cmp' implies a return value of -1, 0, 1 to indicate smaller, match or larger. Since this function returns bool, it should not be named with 'cmp'. Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 2 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/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 8be4c3c..e9e2c62 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -352,7 +352,7 @@ /* Compare two codecs, all parameters must match up, except for the payload type * number. */ -static bool codecs_cmp(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) +static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) { if (codec_a->rate != codec_b->rate) return false; @@ -406,7 +406,7 @@ codecs_assigned = rtp_dst->codecs_assigned; OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS); for (i = 0; i < codecs_assigned; i++) { - if (codecs_cmp(codec_src, &rtp_dst->codecs[i])) { + if (codecs_same(codec_src, &rtp_dst->codecs[i])) { codec_dst = &rtp_dst->codecs[i]; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8 Gerrit-Change-Number: 15130 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:23:10 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:23:10 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: constify 'param' arg In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15131 ) Change subject: mgcp_codec: constify 'param' arg ...................................................................... mgcp_codec: constify 'param' arg Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba --- M include/osmocom/mgcp/mgcp_codec.h M src/libosmo-mgcp/mgcp_codec.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 2bbb86e..3ead60a 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -2,6 +2,6 @@ void mgcp_codec_summary(struct mgcp_conn_rtp *conn); void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn); -int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, struct mgcp_codec_param *param); +int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param); int mgcp_codec_decide(struct mgcp_conn_rtp *conn); int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index e9e2c62..d5b99e8 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -101,7 +101,7 @@ /* Set members of struct mgcp_rtp_codec, extrapolate in missing information. Param audio_name is expected in uppercase. */ static int codec_set(void *ctx, struct mgcp_rtp_codec *codec, int payload_type, const char *audio_name, - unsigned int pt_offset, struct mgcp_codec_param *param) + unsigned int pt_offset, const struct mgcp_codec_param *param) { int rate; int channels; @@ -242,7 +242,7 @@ * \param[in] audio_name audio codec name, in uppercase (e.g. "GSM/8000/1"). * \param[in] param optional codec parameters (set to NULL when unused). * \returns 0 on success, -EINVAL on failure. */ -int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, struct mgcp_codec_param *param) +int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param) { int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba Gerrit-Change-Number: 15131 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:35:49 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:35:49 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15132/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15132/1/src/libosmo-mgcp/mgcp_codec.c at 117 PS1, Line 117: codec_init(codec); > So in here you are not longer freeing codec->subtype_name and codec->audio_name. [?] Yes: codec_set() is only used by codec_add(), and invariably it uses an *unpopulated* array entry. So there could be random data in that entry and we must not free those pointers. Instead it is important to free the memory when removing a codec entry, i.e. before it becomes an unpopulated array entry. For clarity this function should probably go inside codec_add()... yes I'll do that quickly. https://gerrit.osmocom.org/#/c/15132/1/src/libosmo-mgcp/mgcp_codec.c at 239 PS1, Line 239: memset(codec, 0, sizeof(*codec)); > You can either drop this memset or line 96: "*codec = (struct mgcp_rtp_codec){};" nice, thx -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 22:35:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:42:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:42:16 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15136/1/src/libosmo-mgcp/mgcp_codec.c at 361 PS1, Line 361: /* Default to octet-aligned=0, i.e. bandwidth-efficient mode */ > http://git.osmocom. [?] yes did check, will add a pointer -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 22:42:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 22:50:03 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 22:50:03 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 ) Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG at 12 PS1, Line 12: - instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more > Does spec state there shall be no whitespace at the start of the line? (There are no spaces at SDP line beginnings.) The point being that 'strstr("rtpmap")' would also match these convoluted examples: o=openrtpmaptool 1565090289 1565090290 IN IP4 192.168.11.151 s=rtpmap-test or strstr("ptime") would even match s=sleeptimer i.e. we must not match the middle of a free-format string. The only accurate match is at the start of a line after 'a=' a=rtpmap:123 FOO/8000 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 12 Aug 2019 22:50:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 23:02:17 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 23:02:17 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 to look at the new patch set (#2). Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... mgcp_codec: split codec_free() off of codec_init() Both are used only in the same .c file, so make them static. Move codec_set() guts into codec_add(): codec_set is only called by codec_add. If codec_set were left separate, it'd look like the codec_init() is a bug and lacks a codec_free() first. When looking at the entire context in codec_add(), it becomes obvious that codec_init() should be called, not codec_free(), because it is populating a previously unused entry. Preparation to fix a memleak in a conn's codec list. Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 35 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/32/15132/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 23:02:17 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 23:02:17 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: Hello pespin, keith, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 to look at the new patch set (#3). Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... differentiate AMR octet-aligned=0 vs =1 Add corresponding tests in mgcp_test.c Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 104 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/15136/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 12 23:02:17 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 12 Aug 2019 23:02:17 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 to look at the new patch set (#3). Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... ptmap: implicitly match '/8000' and '/8000/1' In codecs_same(), do not compare the complete audio_name. The parts of it are already checked individually: - subtype_name ("AMR"), - rate ("8000"; defaults to 8000 if omitted) and - channels ("1"; defaults to 1 if omitted) So by also checking the complete audio_name, we brushed over the match of implicit "/8000" and "/8000/1", which otherwise works out fine. As a result, translating payload type numbers in RTP headers now also works if one conn of an endpoint set an rtpmap with "AMR/8000" and the other conn set "AMR/8000/1". It seems to me that most PBX out there generate ptmaps omitting the "/1", so fixing this should make us more interoperable with third party SDP. See IETF RFC4566 section 6. SDP Attributes: For audio streams, indicates the number of audio channels. This parameter is OPTIONAL and may be omitted if the number of channels is one, provided that no additional parameters are needed. Also allowing to omit the "/8000" is a mere side effect of this patch. Omitting the rate does not seem to be specified in an RFC, but is logical for audio codecs defined to require exactly 8000 set as rate (most GSM codecs). Add tests in mgcp_test.c. Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 108 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/37/15137/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Aug 13 01:38:34 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:38:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5d5214acd723f_15472b0455b805f43084ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 398s] asciidoc: test-usermanual.adoc: line 28: reading: /usr/src/packages/BUILD/common/chapters/counters-overview.adoc [ 398s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/glossary.adoc [ 398s] asciidoc: test-usermanual.adoc: line 29: reading: /usr/src/packages/BUILD/common/chapters/glossary.adoc [ 398s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/osmux/mgcp_extension_osmux.adoc [ 398s] asciidoc: test-usermanual.adoc: line 30: reading: /usr/src/packages/BUILD/common/chapters/osmux/mgcp_extension_osmux.adoc [ 398s] asciidoc: ERROR: mgcp_extension_osmux.adoc: line 2: glossary section cannot contain sub-sections [ 398s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/osmux/osmux.adoc [ 398s] asciidoc: test-usermanual.adoc: line 31: reading: /usr/src/packages/BUILD/common/chapters/osmux/osmux.adoc [ 398s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/osmux/network_osmux_aoip.dot [ 398s] asciidoc: osmux.adoc: line 102: reading: /usr/src/packages/BUILD/common/chapters/osmux/network_osmux_aoip.dot [ 398s] asciidoc: osmux.adoc: line 101: evaluating: {counter2:target-number} [ 398s] asciidoc: osmux.adoc: line 101: evaluating: {set2:target:test-usermanual__49.png} [ 398s] asciidoc: network_osmux_aoip.dot: line 32: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o "/usr/src/packages/BUILD/tests/test-usermanual__49.png" -L dot -F png - [ 398s] Execute: dot -Tpng "/usr/src/packages/BUILD/tests/test-usermanual__49.txt" > "/usr/src/packages/BUILD/tests/test-usermanual__49.png" [ 398s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/osmux/mo_call_osmux_aoip.msc [ 398s] asciidoc: osmux.adoc: line 108: reading: /usr/src/packages/BUILD/common/chapters/osmux/mo_call_osmux_aoip.msc [ 398s] asciidoc: osmux.adoc: line 107: evaluating: {counter2:target-number} [ 398s] asciidoc: osmux.adoc: line 107: evaluating: {set2:target:test-usermanual__50.png} [ 398s] asciidoc: mo_call_osmux_aoip.msc: line 54: filtering: "/usr/bin/python" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__50.png" -Tpng - [ 398s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/osmux/network_osmux_sccplite.dot [ 398s] asciidoc: osmux.adoc: line 117: reading: /usr/src/packages/BUILD/common/chapters/osmux/network_osmux_sccplite.dot [ 398s] asciidoc: osmux.adoc: line 116: evaluating: {counter2:target-number} [ 398s] asciidoc: osmux.adoc: line 116: evaluating: {set2:target:test-usermanual__51.png} [ 400s] asciidoc: network_osmux_sccplite.dot: line 33: filtering: "/usr/bin/python" "/etc/asciidoc/filters[ 376.739188] sysrq: SysRq : Power Off [ 400s] [ 376.742459] reboot: Power down [ 400s] ### VM INTERACTION END ### [ 400s] [ 400s] obs-arm-4 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Tue Aug 13 01:38:22 UTC 2019. [ 400s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:42:34 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:42:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5d52159bd3419_15472b0455b805f43085c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 122s] --- experr 2019-08-13 01:42:14.939050749 +0000 [ 122s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:42:15.071050754 +0000 [ 122s] @@ -1360,7 +1360,7 @@ [ 122s] [ 122s] sqlite3_step(stmt) --> SQLITE_DONE [ 122s] [ 122s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 122s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 122s] DAUC[ 114.001436] serial8250: too much work for irq4 [ 122s] IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 122s] DAUC IMSI='123456789000000': No 3G Auth Data [ 122s] [ 122s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 122s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 122s] make[1]: *** [override_dh_auto_test] Error 1 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 122s] debian/rules:7: recipe for target 'build' failed [ 122s] make: *** [build] Error 2 [ 122s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 122s] [ 122s] build77 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:42:15 UTC 2019. [ 122s] [ 122s] ### VM INTERACTION START ### [ 125s] [ 117.100070] sysrq: SysRq : Power Off [ 125s] [ 117.101850] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] build77 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:42:18 UTC 2019. [ 125s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:43:09 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:43:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5d5215babd8f8_15472b0455b805f43086f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_8.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 186s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 186s] --- experr 2019-08-13 01:42:59.120000000 +0000 [ 186s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:42:59.316000000 +0000 [ 186s] @@ -1360,7 +1360,7 @@ [ 186s] [ 186s] sqlite3_step(stmt) --> SQLITE_DONE [ 186s] [ 186s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 186s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 186s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 186s] DAUC IMSI='123456789000000': No 3G Auth Data [ 186s] [ 186s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 186s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 186s] make[1]: *** [override_dh_auto_test] Error 1 [ 186s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 186s] debian/rules:7: recipe for target 'build' failed [ 186s] make: *** [build] Error 2 [ 186s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 186s] [ 186s] lamb61 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:42:59 UTC 2019. [ 186s] [ 186s] ### VM INTERACTION START ### [ 188s] Powering off. [ 188s] [ 175.294942] reboot: Power down [ 188s] ### VM INTERACTION END ### [ 188s] [ 188s] lamb61 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:43:01 UTC 2019. [ 188s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:43:26 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:43:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5d5215d95d59e_15472b0455b805f4308720@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 169s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 169s] --- experr 2019-08-13 01:43:14.692000000 +0000 [ 169s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:43:14.848000000 +0000 [ 169s] @@ -1360,7 +1360,7 @@ [ 169s] [ 169s] sqlite3_step(stmt) --> SQLITE_DONE [ 169s] [ 169s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 169s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 169s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 169s] DAUC IMSI='123456789000000': No 3G Auth Data [ 169s] [ 169s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 169s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 169s] make[1]: *** [override_dh_auto_test] Error 1 [ 169s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 169s] debian/rules:7: recipe for target 'build' failed [ 169s] make: *** [build] Error 2 [ 169s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 169s] [ 169s] sheep84 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:43:15 UTC 2019. [ 169s] [ 169s] ### VM INTERACTION START ### [ 173s] [ 162.664791] sysrq: SysRq : Power Off [ 173s] [ 162.671411] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] sheep84 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:43:19 UTC 2019. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:45:09 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:45:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5d52163510947_15472b0455b805f43088e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 218s] | #define HAVE_STDLIB_H 1 [ 218s] | #define HAVE_STRING_H 1 [ 218s] | #define HAVE_MEMORY_H 1 [ 218s] | #define HAVE_STRINGS_H 1 [ 218s] | #define HAVE_INTTYPES_H 1 [ 218s] | #define HAVE_STDINT_H 1 [ 218s] | #define HAVE_UNISTD_H 1 [ 218s] | #define HAVE_DLFCN_H 1 [ 218s] | #define LT_OBJDIR ".libs/" [ 218s] | #define PACKAGE "osmo-hlr" [ 218s] | #define VERSION "1.1.0.2-b07f" [ 218s] | #define STDC_HEADERS 1 [ 218s] | [ 218s] | configure: exit 0 [ 218s] [ 218s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 218s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 218s] make: *** [debian/rules:7: build] Error 2 [ 218s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 218s] [ 218s] sheep84 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:44:55 UTC 2019. [ 218s] [ 218s] ### VM INTERACTION START ### [ 221s] [ 209.774723] sysrq: SysRq : Power Off [ 221s] [ 209.780705] reboot: Power down [ 221s] ### VM INTERACTION END ### [ 221s] [ 221s] sheep84 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:44:59 UTC 2019. [ 221s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:45:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:45:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5d521653d1f6e_15472b0455b805f43089ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 176s] | #define HAVE_MEMORY_H 1 [ 176s] | #define HAVE_STRINGS_H 1 [ 176s] | #define HAVE_INTTYPES_H 1 [ 176s] | #define HAVE_STDINT_H 1 [ 176s] | #define HAVE_UNISTD_H 1 [ 176s] | #define HAVE_DLFCN_H 1 [ 176s] | #define LT_OBJDIR ".libs/" [ 176s] | #define PACKAGE "osmo-hlr" [ 176s] | #define VERSION "1.1.0.2-b07f" [ 176s] | #define STDC_HEADERS 1 [ 176s] | [ 176s] | configure: exit 0 [ 176s] [ 176s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 176s] make[1]: *** [override_dh_auto_test] Error 1 [ 176s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 176s] debian/rules:7: recipe for target 'build' failed [ 176s] make: *** [build] Error 2 [ 176s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 176s] [ 176s] build81 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:45:34 UTC 2019. [ 176s] [ 176s] ### VM INTERACTION START ### [ 179s] [ 169.177239] sysrq: SysRq : Power Off [ 179s] [ 169.179212] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] build81 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:45:38 UTC 2019. [ 179s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:46:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:46:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5d5216724842d_15472b0455b805f43090f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 181s] | #define HAVE_MEMORY_H 1 [ 181s] | #define HAVE_STRINGS_H 1 [ 181s] | #define HAVE_INTTYPES_H 1 [ 181s] | #define HAVE_STDINT_H 1 [ 181s] | #define HAVE_UNISTD_H 1 [ 181s] | #define HAVE_DLFCN_H 1 [ 181s] | #define LT_OBJDIR ".libs/" [ 181s] | #define PACKAGE "osmo-hlr" [ 181s] | #define VERSION "1.1.0.2-b07f" [ 181s] | #define STDC_HEADERS 1 [ 181s] | [ 181s] | configure: exit 0 [ 181s] [ 181s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 181s] make[1]: *** [override_dh_auto_test] Error 1 [ 181s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 181s] debian/rules:7: recipe for target 'build' failed [ 181s] make: *** [build] Error 2 [ 181s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 181s] [ 181s] lamb60 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:45:44 UTC 2019. [ 181s] [ 181s] ### VM INTERACTION START ### [ 181s] Powering off. [ 181s] [ 169.143575] reboot: Power down [ 181s] ### VM INTERACTION END ### [ 181s] [ 181s] lamb60 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:45:45 UTC 2019. [ 181s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:46:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:46:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5d5216abe951c_15472b0455b805f43092fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 165s] | #define HAVE_MEMORY_H 1 [ 165s] | #define HAVE_STRINGS_H 1 [ 165s] | #define HAVE_INTTYPES_H 1 [ 165s] | #define HAVE_STDINT_H 1 [ 165s] | #define HAVE_UNISTD_H 1 [ 165s] | #define HAVE_DLFCN_H 1 [ 165s] | #define LT_OBJDIR ".libs/" [ 165s] | #define PACKAGE "osmo-hlr" [ 165s] | #define VERSION "1.1.0.2-b07f" [ 165s] | #define STDC_HEADERS 1 [ 165s] | [ 165s] | configure: exit 0 [ 165s] [ 165s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 165s] make[1]: *** [override_dh_auto_test] Error 1 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] debian/rules:7: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] [ 165s] sheep82 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:46:41 UTC 2019. [ 165s] [ 165s] ### VM INTERACTION START ### [ 168s] [ 159.946994] sysrq: SysRq : Power Off [ 168s] [ 159.953240] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] sheep82 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:46:45 UTC 2019. [ 168s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:47:09 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:47:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5d5216ac5acef_15472b0455b805f430930@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 241s] | #define HAVE_MEMORY_H 1 [ 241s] | #define HAVE_STRINGS_H 1 [ 241s] | #define HAVE_INTTYPES_H 1 [ 241s] | #define HAVE_STDINT_H 1 [ 241s] | #define HAVE_UNISTD_H 1 [ 241s] | #define HAVE_DLFCN_H 1 [ 241s] | #define LT_OBJDIR ".libs/" [ 241s] | #define PACKAGE "osmo-hlr" [ 241s] | #define VERSION "1.1.0.2-b07f" [ 241s] | #define STDC_HEADERS 1 [ 241s] | [ 241s] | configure: exit 0 [ 241s] [ 241s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 241s] make[1]: *** [override_dh_auto_test] Error 1 [ 241s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 241s] debian/rules:7: recipe for target 'build' failed [ 241s] make: *** [build] Error 2 [ 241s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 241s] [ 241s] lamb54 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:03 UTC 2019. [ 241s] [ 241s] ### VM INTERACTION START ### [ 244s] [ 230.524536] sysrq: SysRq : Power Off [ 244s] [ 230.530221] reboot: Power down [ 244s] ### VM INTERACTION END ### [ 244s] [ 244s] lamb54 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:07 UTC 2019. [ 244s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:47:26 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:47:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5d5216cacf055_15472b0455b805f430941d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 290s] # -*- compilation -*- [ 290s] 5. testsuite.at:32: testing db ... [ 290s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 290s] --- experr 2019-08-13 01:47:06.048000000 +0000 [ 290s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:47:06.368000000 +0000 [ 290s] @@ -1360,7 +1360,7 @@ [ 290s] [ 290s] sqlite3_step(stmt) --> SQLITE_DONE [ 290s] [ 290s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 290s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 290s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 290s] DAUC IMSI='123456789000000': No 3G Auth Data [ 290s] [ 290s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 290s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 290s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 290s] make: *** [debian/rules:7: build] Error 2 [ 290s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 290s] [ 290s] lamb69 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:06 UTC 2019. [ 290s] [ 290s] ### VM INTERACTION START ### [ 293s] [ 279.403258] sysrq: SysRq : Power Off [ 293s] [ 279.411896] reboot: Power down [ 293s] ### VM INTERACTION END ### [ 293s] [ 293s] lamb69 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:10 UTC 2019. [ 293s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:47:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:47:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5d5216cb7ef8e_15472b0455b805f43095f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 290s] | #define HAVE_STDLIB_H 1 [ 290s] | #define HAVE_STRING_H 1 [ 290s] | #define HAVE_MEMORY_H 1 [ 290s] | #define HAVE_STRINGS_H 1 [ 290s] | #define HAVE_INTTYPES_H 1 [ 290s] | #define HAVE_STDINT_H 1 [ 290s] | #define HAVE_UNISTD_H 1 [ 290s] | #define HAVE_DLFCN_H 1 [ 290s] | #define LT_OBJDIR ".libs/" [ 290s] | #define PACKAGE "osmo-hlr" [ 290s] | #define VERSION "1.1.0.2-b07f" [ 290s] | #define STDC_HEADERS 1 [ 290s] | [ 290s] | configure: exit 0 [ 290s] [ 290s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 290s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 290s] make: *** [debian/rules:7: build] Error 2 [ 290s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 290s] [ 290s] lamb24 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:36 UTC 2019. [ 290s] [ 290s] ### VM INTERACTION START ### [ 293s] [ 279.267545] sysrq: SysRq : Power Off [ 293s] [ 279.274361] reboot: Power down [ 293s] ### VM INTERACTION END ### [ 293s] [ 293s] lamb24 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:40 UTC 2019. [ 293s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:48:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:48:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5216e9f1230_15472b0455b805f4309631@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 315s] | #define HAVE_STDLIB_H 1 [ 315s] | #define HAVE_STRING_H 1 [ 315s] | #define HAVE_MEMORY_H 1 [ 315s] | #define HAVE_STRINGS_H 1 [ 315s] | #define HAVE_INTTYPES_H 1 [ 315s] | #define HAVE_STDINT_H 1 [ 315s] | #define HAVE_UNISTD_H 1 [ 315s] | #define HAVE_DLFCN_H 1 [ 315s] | #define LT_OBJDIR ".libs/" [ 315s] | #define PACKAGE "osmo-hlr" [ 315s] | #define VERSION "1.1.0.2-b07f" [ 315s] | #define STDC_HEADERS 1 [ 315s] | [ 315s] | configure: exit 0 [ 315s] [ 315s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 315s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 315s] make: *** [debian/rules:7: build] Error 2 [ 315s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 315s] [ 315s] lamb15 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:46 UTC 2019. [ 315s] [ 315s] ### VM INTERACTION START ### [ 318s] [ 301.859347] sysrq: SysRq : Power Off [ 318s] [ 301.867206] reboot: Power down [ 318s] ### VM INTERACTION END ### [ 318s] [ 318s] lamb15 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:47:49 UTC 2019. [ 318s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:48:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:48:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5d5217222ca62_15472b0455b805f43097d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 343s] | #define HAVE_STDLIB_H 1 [ 343s] | #define HAVE_STRING_H 1 [ 343s] | #define HAVE_MEMORY_H 1 [ 343s] | #define HAVE_STRINGS_H 1 [ 343s] | #define HAVE_INTTYPES_H 1 [ 343s] | #define HAVE_STDINT_H 1 [ 343s] | #define HAVE_UNISTD_H 1 [ 343s] | #define HAVE_DLFCN_H 1 [ 343s] | #define LT_OBJDIR ".libs/" [ 343s] | #define PACKAGE "osmo-hlr" [ 343s] | #define VERSION "1.1.0.2-b07f" [ 343s] | #define STDC_HEADERS 1 [ 343s] | [ 343s] | configure: exit 0 [ 343s] [ 343s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 343s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 343s] make: *** [debian/rules:7: build] Error 2 [ 343s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 343s] [ 343s] build34 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:48:42 UTC 2019. [ 343s] [ 343s] ### VM INTERACTION START ### [ 346s] [ 329.712559] sysrq: SysRq : Power Off [ 346s] [ 329.715314] reboot: Power down [ 347s] ### VM INTERACTION END ### [ 347s] [ 347s] build34 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:48:46 UTC 2019. [ 347s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:50:17 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:50:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d52176230ec4_15472b0455b805f430991c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 372s] | #define HAVE_STDLIB_H 1 [ 372s] | #define HAVE_STRING_H 1 [ 372s] | #define HAVE_MEMORY_H 1 [ 372s] | #define HAVE_STRINGS_H 1 [ 372s] | #define HAVE_INTTYPES_H 1 [ 372s] | #define HAVE_STDINT_H 1 [ 372s] | #define HAVE_UNISTD_H 1 [ 372s] | #define HAVE_DLFCN_H 1 [ 372s] | #define LT_OBJDIR ".libs/" [ 372s] | #define PACKAGE "osmo-hlr" [ 372s] | #define VERSION "1.1.0.2-b07f" [ 372s] | #define STDC_HEADERS 1 [ 372s] | [ 372s] | configure: exit 0 [ 372s] [ 372s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 372s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 372s] make: *** [debian/rules:7: build] Error 2 [ 372s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 372s] [ 372s] cloud103 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:49:55 UTC 2019. [ 372s] [ 372s] ### VM INTERACTION START ### [ 374s] [ 332.314444] sysrq: SysRq : Power Off [ 374s] [ 332.326696] reboot: Power down [ 375s] ### VM INTERACTION END ### [ 375s] [ 375s] cloud103 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:50:00 UTC 2019. [ 375s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:52:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:52:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5d5217d736bba_15472b0455b805f4310067@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 252s] | #define HAVE_MEMORY_H 1 [ 252s] | #define HAVE_STRINGS_H 1 [ 252s] | #define HAVE_INTTYPES_H 1 [ 252s] | #define HAVE_STDINT_H 1 [ 252s] | #define HAVE_UNISTD_H 1 [ 252s] | #define HAVE_DLFCN_H 1 [ 252s] | #define LT_OBJDIR ".libs/" [ 252s] | #define PACKAGE "osmo-hlr" [ 252s] | #define VERSION "1.1.0.2-b07f" [ 252s] | #define STDC_HEADERS 1 [ 252s] | [ 252s] | configure: exit 0 [ 252s] [ 252s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 252s] make[1]: *** [override_dh_auto_test] Error 1 [ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 252s] debian/rules:7: recipe for target 'build' failed [ 252s] make: *** [build] Error 2 [ 252s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 252s] [ 252s] obs-arm-7 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:51:51 UTC 2019. [ 252s] [ 252s] ### VM INTERACTION START ### [ 255s] [ 244.449908] sysrq: Power Off [ 255s] [ 244.496612] reboot: Power down [ 255s] ### VM INTERACTION END ### [ 255s] [ 255s] obs-arm-7 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:51:54 UTC 2019. [ 255s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:52:17 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:52:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5d5217d7dcece_15472b0455b805f431025b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 360s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 360s] --- experr 2019-08-13 01:51:57.245853485 +0000 [ 360s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:51:57.585853468 +0000 [ 360s] @@ -1360,7 +1360,7 @@ [ 360s] [ 360s] sqlite3_step(stmt) --> SQLITE_DONE [ 360s] [ 360s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 360s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 360s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 360s] DAUC IMSI='123456789000000': No 3G Auth Data [ 360s] [ 360s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 360s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 360s] make[1]: *** [override_dh_auto_test] Error 1 [ 360s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 360s] debian/rules:7: recipe for target 'build' failed [ 360s] make: *** [build] Error 2 [ 360s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 360s] [ 360s] cloud122 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:51:57 UTC 2019. [ 360s] [ 360s] ### VM INTERACTION START ### [ 362s] [ 333.077012] sysrq: SysRq : Power Off [ 362s] [ 333.081447] reboot: Power down [ 363s] ### VM INTERACTION END ### [ 363s] [ 363s] cloud122 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:52:02 UTC 2019. [ 363s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:52:00 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:52:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d5217d7780f0_15472b0455b805f4310156@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 399s] | #define HAVE_STDLIB_H 1 [ 399s] | #define HAVE_STRING_H 1 [ 399s] | #define HAVE_MEMORY_H 1 [ 399s] | #define HAVE_STRINGS_H 1 [ 399s] | #define HAVE_INTTYPES_H 1 [ 399s] | #define HAVE_STDINT_H 1 [ 399s] | #define HAVE_UNISTD_H 1 [ 399s] | #define HAVE_DLFCN_H 1 [ 399s] | #define LT_OBJDIR ".libs/" [ 399s] | #define PACKAGE "osmo-hlr" [ 399s] | #define VERSION "1.1.0.2-b07f" [ 399s] | #define STDC_HEADERS 1 [ 399s] | [ 399s] | configure: exit 0 [ 399s] [ 399s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 399s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 399s] make: *** [debian/rules:7: build] Error 2 [ 399s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 399s] [ 399s] obs-arm-5 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:51:51 UTC 2019. [ 399s] [ 399s] ### VM INTERACTION START ### [ 402s] [ 369.999380] sysrq: SysRq : Power Off [ 402s] [ 370.000781] reboot: Power down [ 402s] ### VM INTERACTION END ### [ 402s] [ 402s] obs-arm-5 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:51:54 UTC 2019. [ 402s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:52:17 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:52:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5d5217d83eba7_15472b0455b805f4310324@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 407s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 407s] --- experr 2019-08-13 01:52:06.210000000 +0000 [ 407s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:52:06.305000000 +0000 [ 407s] @@ -1360,7 +1360,7 @@ [ 407s] [ 407s] sqlite3_step(stmt) --> SQLITE_DONE [ 407s] [ 407s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 407s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 407s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 407s] DAUC IMSI='123456789000000': No 3G Auth Data [ 407s] [ 407s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 407s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 407s] make[1]: *** [override_dh_auto_test] Error 1 [ 407s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 407s] debian/rules:7: recipe for target 'build' failed [ 407s] make: *** [build] Error 2 [ 407s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 407s] [ 407s] armbuild02 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:52:06 UTC 2019. [ 407s] [ 407s] ### VM INTERACTION START ### [ 410s] [ 387.632887] sysrq: SysRq : Power Off [ 410s] [ 387.634333] reboot: Power down [ 410s] ### VM INTERACTION END ### [ 410s] [ 410s] armbuild02 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:52:09 UTC 2019. [ 410s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:52:34 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:52:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/armv7l In-Reply-To: References: Message-ID: <5d5217f6ca99f_15472b0455b805f4310442@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 421s] # -*- compilation -*- [ 421s] 5. testsuite.at:32: testing db ... [ 421s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 421s] --- experr 2019-08-13 01:52:21.435000000 +0000 [ 421s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:52:21.515000000 +0000 [ 421s] @@ -1360,7 +1360,7 @@ [ 421s] [ 421s] sqlite3_step(stmt) --> SQLITE_DONE [ 421s] [ 421s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 421s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 421s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 421s] DAUC IMSI='123456789000000': No 3G Auth Data [ 421s] [ 421s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 421s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 421s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 421s] make: *** [debian/rules:7: build] Error 2 [ 421s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 421s] [ 421s] obs-arm-6 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:52:21 UTC 2019. [ 421s] [ 421s] ### VM INTERACTION START ### [ 424s] [ 378.673115] sysrq: SysRq : Power Off [ 424s] [ 378.675059] reboot: Power down [ 425s] ### VM INTERACTION END ### [ 425s] [ 425s] obs-arm-6 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:52:26 UTC 2019. [ 425s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:53:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:53:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/i586 In-Reply-To: References: Message-ID: <5d521834323c2_15472b0455b805f4310530@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 422s] 5. testsuite.at:32: testing db ... [ 422s] ./testsuite.at:37: $abs_top_builddir/tests/d[ 379.388291] serial8250: too much work for irq4 [ 422s] b/db_test [ 422s] --- experr 2019-08-13 01:53:25.680483123 +0000 [ 422s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 01:53:26.112483123 +0000 [ 422s] @@ -1360,7 +1360,7 @@ [ 422s] [ 422s] sqlite3_step(stmt) --> SQLITE_DONE [ 422s] [ 422s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 422s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 422s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 422s] DAUC IMSI='123456789000000': No 3G Auth Data [ 422s] [ 422s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 422s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 422s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 422s] make: *** [debian/rules:7: build] Error 2 [ 422s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 422s] [ 422s] cloud106 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:53:27 UTC 2019. [ 422s] [ 422s] ### VM INTERACTION START ### [ 425s] [ 382.608401] sysrq: SysRq : Power Off [ 425s] [ 382.613613] reboot: Power down [ 426s] ### VM INTERACTION END ### [ 426s] [ 426s] cloud106 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:53:31 UTC 2019. [ 426s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 01:54:17 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 01:54:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5d52184ecdb75_15472b0455b805f4310616@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 498s] | | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 498s] | | #define PACKAGE_URL "" [ 498s] | | /* end confdefs.h. */ [ 498s] | | #include [ 498s] | configure:6744: checking for ANSI C header files [ 498s] | configure:6764: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 498s] | configure:6764: $? = 0 [ 498s] | configure:6837: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now conftest.c >&5 [ 498s] | configure:6837: $? = 0 [ 498s] | configure:6837: ./conftest [ 498s] | configure:6837: $? = 0 [ 498s] | configure:6848: result: yes [ 498s] | configure:6861: checking for sys/types.h [ 498s] | configure:6861: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 498s] | configure:6861: $? = 0 [ 498s] | configure:6861: result: yes [ 498s] | configure:6861: checking for sys/stat.h [ 498s] | configure:6861: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 498s] | configure:6861: $? = 0 [ 498s] | configure:6861: result: yes [ 498s] | configure:6861: checking for stdlib.h [ 498s] | configure:6861: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 498s] | configure:6861: $? = 0 [ 500s] | c[ 470.322854] sysrq: SysRq : Power Off [ 500s] [ 470.328285] reboot: Power down [ 500s] ### VM INTERACTION END ### [ 500s] [ 500s] obs-arm-3 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 01:54:00 UTC 2019. [ 500s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 13 06:41:30 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 06:41:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5d525bb21e495_15472b0455b805f4327971@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 479s] # -*- compilation -*- [ 479s] 5. testsuite.at:32: testing db ... [ 479s] ./testsuite.at:37: $abs_top_builddir/tests/db/db_test [ 479s] --- experr 2019-08-13 06:41:11.105000000 +0000 [ 479s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/5/stderr 2019-08-13 06:41:11.215000000 +0000 [ 479s] @@ -1360,7 +1360,7 @@ [ 479s] [ 479s] sqlite3_step(stmt) --> SQLITE_DONE [ 479s] [ 479s] -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 [ 479s] +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY [ 479s] DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 [ 479s] DAUC IMSI='123456789000000': No 3G Auth Data [ 479s] [ 479s] 5. testsuite.at:32: 5. db (testsuite.at:32): FAILED (testsuite.at:37) [ 479s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 479s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 479s] make: *** [debian/rules:7: build] Error 2 [ 479s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 479s] [ 479s] armbuild25 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 06:41:11 UTC 2019. [ 479s] [ 479s] ### VM INTERACTION START ### [ 481s] [ 447.542808] sysrq: SysRq : Power Off [ 481s] [ 447.544349] reboot: Power down [ 481s] ### VM INTERACTION END ### [ 481s] [ 481s] armbuild25 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 06:41:14 UTC 2019. [ 481s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:19:08 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 09:19:08 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_llc.h: Improve documentation of some structs In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15159 ) Change subject: gprs_llc.h: Improve documentation of some structs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1b45f45addc87c74f3ae109e544143a1335180de Gerrit-Change-Number: 15159 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 09:19:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:21:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 09:21:04 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Improve doc on nullable parameters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15160 ) Change subject: gprs_gmm.c: Improve doc on nullable parameters ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15160/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15160/1/src/gprs/gprs_gmm.c at 1962 PS1, Line 1962: /* Rx GPRS Mobility Management. MMCTX can be NULL when called. On !Gb (Iu), llme is NULL */ I would like to have the MMCTX on the new line :). but i'm fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iefb9b6dc34d87b4088c7535ef0a246103fe3f7e9 Gerrit-Change-Number: 15160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 09:21:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:23:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:23:05 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15134 ) Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb Gerrit-Change-Number: 15134 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:23:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:23:30 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 09:23:30 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce macros to access msgb's associated IU UE ctx In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15158 ) Change subject: gprs_gmm: Introduce macros to access msgb's associated IU UE ctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4d1d47af332d4557e8a3a70c1055bcc172166016 Gerrit-Change-Number: 15158 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 09:23:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:24:37 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 09:24:37 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Drop unneeded brackets In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15164 ) Change subject: gprs_gmm.c: Drop unneeded brackets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie8ba2b9da695de8730834abb591df64295bb6172 Gerrit-Change-Number: 15164 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 09:24:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:29:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:29:14 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15132/2/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15132/2/src/libosmo-mgcp/mgcp_codec.c at 252 PS2, Line 252: conn->end.codecs_assigned++; Is the some scenario where we shrink the list and this counter is decreased? It's only set to 0 upon conn allocation? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:29:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:29:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:29:40 +0000 Subject: Change in ...osmo-mgw[master]: fix memleak: actually free strings in mgcp_codec_reset_all() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15133 ) Change subject: fix memleak: actually free strings in mgcp_codec_reset_all() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f Gerrit-Change-Number: 15133 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:29:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:32:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:32:33 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135 ) Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15135/3/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/#/c/15135/3/tests/mgcp/mgcp_test.c at 1795 PS3, Line 1795: .descr = "both sides have the same payload_type numbers assigned to conflicting codecs", Are they really conflicting? This looks misleading, since it's actually fine, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:32:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:34:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:34:22 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:34:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:36:49 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 09:36:49 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce define TLLI_UNASSIGNED In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15165 ) Change subject: Introduce define TLLI_UNASSIGNED ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib8be5af2a5e92a7403505b73ce4c1751832de40d Gerrit-Change-Number: 15165 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 09:36:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:36:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:36:50 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15137 ) Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:36:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:42:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:42:10 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15138/3/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15138/3/src/libosmo-mgcp/mgcp_codec.c at 218 PS3, Line 218: * payload type number is unknown in this function??? */ you may find information with git blame? Or send an email to ML asking the author. Without know much about this topic, reading comments below makes me thing it's in the case where dynamic payload type numbers are used to indicate well-known codecs which can be represented without dynamic payload numbers. BUt what I'm saying could be nonsense :) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:42:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:43:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 09:43:04 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Warn upon llme free unexpected scenarios In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 ) Change subject: gprs_sgsn.c: Warn upon llme free unexpected scenarios ...................................................................... Patch Set 1: Code-Review+2 LGTM. We should move the geran stuff behind an if (ran == geran) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d175501083ce458ff1c07ad38761d2cbf4ea470 Gerrit-Change-Number: 15166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 09:43:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:48:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:48:23 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 ) Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG at 12 PS1, Line 12: - instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more > (There are no spaces at SDP line beginnings.) [?] What you say makes sense, but still not sure if the specs talks about whitespacing at the start of the line, so still something to have into account. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:48:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:52:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:52:42 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Warn upon llme free unexpected scenarios In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 ) Change subject: gprs_sgsn.c: Warn upon llme free unexpected scenarios ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+2 > > LGTM. > We should move the geran stuff behind an if (ran == geran) What do you mean? the unassign in the lines I changed? afaiu llme is only available when ran==geran, so it should be practically the same and already checked. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d175501083ce458ff1c07ad38761d2cbf4ea470 Gerrit-Change-Number: 15166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:52:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:54:01 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce macros to access msgb's associated IU UE ctx In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15158 ) Change subject: gprs_gmm: Introduce macros to access msgb's associated IU UE ctx ...................................................................... gprs_gmm: Introduce macros to access msgb's associated IU UE ctx Change-Id: I4d1d47af332d4557e8a3a70c1055bcc172166016 --- M src/gprs/gprs_gmm.c 1 file changed, 20 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 3465a52..c93ddf4 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -116,6 +116,12 @@ { 0, NULL } }; +/* On RANAP, Returns pointer to he associated ranap_ue_conn_ctx in msg, filled + * in by osmo-iuh's iu_recv_cb(). + * On Gb, returns NULL */ +#define MSG_IU_UE_CTX(msg) ((struct ranap_ue_conn_ctx *)(msg)->dst) +#define MSG_IU_UE_CTX_SET(msg, val) (msg)->dst = (val) + static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx); static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) @@ -271,10 +277,7 @@ } #ifdef BUILD_IU - /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb mode - * dst is empty. */ - /* FIXME: have a more explicit indicator for Iu messages */ - if (msg->dst) + if (MSG_IU_UE_CTX(msg)) return ranap_iu_tx(msg, GPRS_SAPI_GMM); #endif @@ -289,7 +292,7 @@ msgb_tlli(msg) = msgb_tlli(old); msgb_bvci(msg) = msgb_bvci(old); msgb_nsei(msg) = msgb_nsei(old); - msg->dst = old->dst; + MSG_IU_UE_CTX_SET(msg, MSG_IU_UE_CTX(old)); } /* Store BVCI/NSEI in MM context */ @@ -298,7 +301,7 @@ mm->gb.bvci = msgb_bvci(msg); mm->gb.nsei = msgb_nsei(msg); /* In case a Iu connection is reconnected we need to update the ue ctx */ - mm->iu.ue_ctx = msg->dst; + mm->iu.ue_ctx = MSG_IU_UE_CTX(msg); if (mm->ran_type == MM_CTX_T_UTRAN_Iu && mm->iu.ue_ctx) { #ifdef BUILD_IU @@ -314,7 +317,7 @@ msgb_tlli(msg) = mm->gb.tlli; msgb_bvci(msg) = mm->gb.bvci; msgb_nsei(msg) = mm->gb.nsei; - msg->dst = mm->iu.ue_ctx; + MSG_IU_UE_CTX_SET(msg, mm->iu.ue_ctx); } static void mm_ctx_cleanup_free(struct sgsn_mm_ctx *ctx, const char *log_text) @@ -1290,15 +1293,12 @@ * with a foreign TLLI (P-TMSI that was allocated to the MS before), * or with random TLLI. */ - /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb mode - * dst is empty. */ - /* FIXME: have a more explicit indicator for Iu messages */ - if (!msg->dst) { + if (!MSG_IU_UE_CTX(msg)) { /* Gb mode */ cid = bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); } else { #ifdef BUILD_IU - ra_id = ((struct ranap_ue_conn_ctx*)msg->dst)->ra_id; + ra_id = MSG_IU_UE_CTX(msg)->ra_id; #else LOGMMCTXP(LOGL_ERROR, ctx, "Cannot handle Iu Attach Request, built without Iu support\n"); return -ENOTSUP; @@ -1354,8 +1354,8 @@ if (!ctx) ctx = sgsn_mm_ctx_by_imsi(mi_string); if (!ctx) { - if (msg->dst) - ctx = sgsn_mm_ctx_alloc_iu(msg->dst); + if (MSG_IU_UE_CTX(msg)) + ctx = sgsn_mm_ctx_alloc_iu(MSG_IU_UE_CTX(msg)); else ctx = sgsn_mm_ctx_alloc_gb(0, &ra_id); if (!ctx) { @@ -1379,8 +1379,8 @@ if (!ctx) { /* Allocate a context as most of our code expects one. * Context will not have an IMSI ultil ID RESP is received */ - if (msg->dst) - ctx = sgsn_mm_ctx_alloc_iu(msg->dst); + if (MSG_IU_UE_CTX(msg)) + ctx = sgsn_mm_ctx_alloc_iu(MSG_IU_UE_CTX(msg)); else ctx = sgsn_mm_ctx_alloc_gb(msgb_tlli(msg), &ra_id); if (!ctx) { @@ -1697,10 +1697,8 @@ * is an optimization to avoid the RA reject (impl detached) * below, which will cause a new attach cycle. */ /* Look-up the MM context based on old RA-ID and TLLI */ - /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb - * mode dst is empty. */ - /* FIXME: have a more explicit indicator for Iu messages */ - if (!msg->dst) { + if (!MSG_IU_UE_CTX(msg)) { + /* Gb */ mmctx = sgsn_mm_ctx_by_tlli_and_ptmsi(msgb_tlli(msg), &old_ra_id); } else if (TLVP_PRESENT(&tp, GSM48_IE_GMM_ALLOC_PTMSI)) { #ifdef BUILD_IU @@ -1847,7 +1845,7 @@ LOGMMCTXP(LOGL_INFO, ctx, "-> GMM SERVICE REQUEST "); /* This message is only valid in Iu mode */ - if (!msg->dst) { + if (!MSG_IU_UE_CTX(msg)) { LOGPC(DMM, LOGL_INFO, "Invalid if not in Iu mode\n"); return -1; } @@ -2904,7 +2902,7 @@ struct sgsn_mm_ctx *mmctx; int rc = -EINVAL; - mmctx = sgsn_mm_ctx_by_ue_ctx(msg->dst); + mmctx = sgsn_mm_ctx_by_ue_ctx(MSG_IU_UE_CTX(msg)); if (mmctx) { rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); if (ra_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4d1d47af332d4557e8a3a70c1055bcc172166016 Gerrit-Change-Number: 15158 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:54:03 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce define TLLI_UNASSIGNED In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15165 ) Change subject: Introduce define TLLI_UNASSIGNED ...................................................................... Introduce define TLLI_UNASSIGNED Change-Id: Ib8be5af2a5e92a7403505b73ce4c1751832de40d --- M include/osmocom/sgsn/gprs_llc.h M src/gprs/gprs_gmm.c M src/gprs/gprs_llc.c M src/gprs/gprs_sgsn.c 4 files changed, 18 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 5b12248..8a0b9ef 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -192,6 +192,9 @@ #define GPRS_LLME_RESET_AGE (0) +/* 3GPP TS 44.064 ? 8.3 TLLI assignment procedures */ +#define TLLI_UNASSIGNED (0xffffffff) + extern struct llist_head gprs_llc_llmes; /* LLC low level types */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 5a6ea28..c8bc0f7 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2077,7 +2077,7 @@ /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llme_copy_key(mmctx, mmctx->gb.llme); - gprs_llgmm_assign(mmctx->gb.llme, 0xffffffff, + gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); } mmctx->gmm_state = GMM_REGISTERED_NORMAL; @@ -2102,7 +2102,7 @@ if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; - gprs_llgmm_assign(mmctx->gb.llme, 0xffffffff, + gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); } mmctx->gmm_state = GMM_REGISTERED_NORMAL; @@ -2125,7 +2125,7 @@ if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; - //gprs_llgmm_assign(mmctx->gb.llme, 0xffffffff, mmctx->gb.tlli_new, GPRS_ALGO_GEA0, NULL); + //gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new, GPRS_ALGO_GEA0, NULL); } rc = 0; break; diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c index acf4b54..a301a63 100644 --- a/src/gprs/gprs_llc.c +++ b/src/gprs/gprs_llc.c @@ -527,7 +527,7 @@ lle = &llme->lle[sapi]; return lle; } - + LOGP(DLLC, LOGL_NOTICE, "unknown TLLI(0x%08x)/SAPI(%d): Silently dropping\n", tlli, sapi); @@ -556,7 +556,7 @@ return NULL; llme->tlli = tlli; - llme->old_tlli = 0xffffffff; + llme->old_tlli = TLLI_UNASSIGNED; llme->state = GPRS_LLMS_UNASSIGNED; llme->age_timestamp = GPRS_LLME_RESET_AGE; llme->cksn = GSM_KEY_SEQ_INVAL; @@ -1042,19 +1042,19 @@ { unsigned int i; - if (old_tlli == 0xffffffff && new_tlli != 0xffffffff) { + if (old_tlli == TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { /* TLLI Assignment 8.3.1 */ /* New TLLI shall be assigned and used when (re)transmitting LLC frames */ - /* If old TLLI != 0xffffffff was assigned to LLME, then TLLI + /* If old TLLI != TLLI_UNASSIGNED was assigned to LLME, then TLLI * old is unassigned. Only TLLI new shall be accepted when * received from peer. */ - if (llme->old_tlli != 0xffffffff) { - llme->old_tlli = 0xffffffff; + if (llme->old_tlli != TLLI_UNASSIGNED) { + llme->old_tlli = TLLI_UNASSIGNED; llme->tlli = new_tlli; } else { - /* If TLLI old == 0xffffffff was assigned to LLME, then this is + /* If TLLI old == TLLI_UNASSIGNED was assigned to LLME, then this is * TLLI assignmemt according to 8.3.1 */ - llme->old_tlli = 0xffffffff; + llme->old_tlli = TLLI_UNASSIGNED; llme->tlli = new_tlli; llme->state = GPRS_LLMS_ASSIGNED; /* 8.5.3.1 For all LLE's */ @@ -1066,14 +1066,14 @@ /* FIXME Set parameters according to table 9 */ } } - } else if (old_tlli != 0xffffffff && new_tlli != 0xffffffff) { + } else if (old_tlli != TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { /* TLLI Change 8.3.2 */ /* Both TLLI Old and TLLI New are assigned; use New when * (re)transmitting. Accept both Old and New on Rx */ llme->old_tlli = old_tlli; llme->tlli = new_tlli; llme->state = GPRS_LLMS_ASSIGNED; - } else if (old_tlli != 0xffffffff && new_tlli == 0xffffffff) { + } else if (old_tlli != TLLI_UNASSIGNED && new_tlli == TLLI_UNASSIGNED) { /* TLLI Unassignment 8.3.3) */ llme->tlli = llme->old_tlli = 0; llme->state = GPRS_LLMS_UNASSIGNED; @@ -1091,7 +1091,7 @@ /* TLLI unassignment */ int gprs_llgmm_unassign(struct gprs_llc_llme *llme) { - return gprs_llgmm_assign(llme, llme->tlli, 0xffffffff); + return gprs_llgmm_assign(llme, llme->tlli, TLLI_UNASSIGNED); } /* Chapter 7.2.1.2 LLGMM-RESET.req */ diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 9a5de41..e01bc5c 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -362,7 +362,7 @@ if (llme) { /* TLLI unassignment, must be called after sgsn_mm_ctx_free */ - gprs_llgmm_assign(llme, tlli, 0xffffffff); + gprs_llgmm_assign(llme, tlli, TLLI_UNASSIGNED); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib8be5af2a5e92a7403505b73ce4c1751832de40d Gerrit-Change-Number: 15165 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:54:02 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Drop unneeded brackets In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15164 ) Change subject: gprs_gmm.c: Drop unneeded brackets ...................................................................... gprs_gmm.c: Drop unneeded brackets Change-Id: Ie8ba2b9da695de8730834abb591df64295bb6172 --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index f3ba290..5a6ea28 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1820,10 +1820,8 @@ rc = gsm48_tx_gmm_ra_upd_rej(msg, reject_cause); if (mmctx) mm_ctx_cleanup_free(mmctx, "GPRS RA UPDATE REJ"); - else { - if (llme) - gprs_llgmm_unassign(llme); - } + else if (llme) + gprs_llgmm_unassign(llme); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie8ba2b9da695de8730834abb591df64295bb6172 Gerrit-Change-Number: 15164 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:54:01 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Improve doc on nullable parameters In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15160 ) Change subject: gprs_gmm.c: Improve doc on nullable parameters ...................................................................... gprs_gmm.c: Improve doc on nullable parameters Change-Id: Iefb9b6dc34d87b4088c7535ef0a246103fe3f7e9 --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c93ddf4..f3ba290 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1959,7 +1959,7 @@ return 0; } -/* GPRS Mobility Management */ +/* Rx GPRS Mobility Management. MMCTX can be NULL when called. On !Gb (Iu), llme is NULL */ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable) { @@ -1967,7 +1967,6 @@ struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); int rc; - /* MMCTX can be NULL when called */ if (drop_cipherable && gsm48_hdr_gmm_cipherable(gh)) { LOGMMCTXP(LOGL_NOTICE, mmctx, "Dropping cleartext GMM %s which " "is expected to be encrypted for TLLI 0x%08x\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iefb9b6dc34d87b4088c7535ef0a246103fe3f7e9 Gerrit-Change-Number: 15160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:54:01 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_llc.h: Improve documentation of some structs In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15159 ) Change subject: gprs_llc.h: Improve documentation of some structs ...................................................................... gprs_llc.h: Improve documentation of some structs Change-Id: I1b45f45addc87c74f3ae109e544143a1335180de --- M include/osmocom/sgsn/gprs_llc.h 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 711bcd6..5b12248 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -110,13 +110,13 @@ uint16_t kU; }; -/* Section 4.7.1: Logical Link Entity: One per DLCI (TLLI + SAPI) */ +/* 3GPP TS 44.064 ? 4.7.1: Logical Link Entity: One per DLCI (TLLI + SAPI) */ struct gprs_llc_lle { struct llist_head list; uint32_t sapi; - struct gprs_llc_llme *llme; + struct gprs_llc_llme *llme; /* backpointer to the Logical Link Management Entity */ enum gprs_llc_lle_state state; @@ -156,6 +156,7 @@ #define NUM_SAPIS 16 +/* 3GPP TS 44.064 ? 4.7.3: Logical Link Management Entity: One per TLLI */ struct gprs_llc_llme { struct llist_head list; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1b45f45addc87c74f3ae109e544143a1335180de Gerrit-Change-Number: 15159 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 09:54:03 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Warn upon llme free unexpected scenarios In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 ) Change subject: gprs_sgsn.c: Warn upon llme free unexpected scenarios ...................................................................... gprs_sgsn.c: Warn upon llme free unexpected scenarios May be useful to detect unexpected conditions which could end up in memory leaks. Related: OS#3957 Change-Id: I0d175501083ce458ff1c07ad38761d2cbf4ea470 --- M src/gprs/gprs_sgsn.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index e01bc5c..8f1e54a 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -362,7 +362,9 @@ if (llme) { /* TLLI unassignment, must be called after sgsn_mm_ctx_free */ - gprs_llgmm_assign(llme, tlli, TLLI_UNASSIGNED); + OSMO_ASSERT(llme->tlli == tlli); + if (gprs_llgmm_unassign(llme) < 0) + LOGMMCTXP(LOGL_ERROR, mm, "gprs_llgmm_unassign failed, llme not freed!\n"); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d175501083ce458ff1c07ad38761d2cbf4ea470 Gerrit-Change-Number: 15166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 09:54:24 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 13 Aug 2019 09:54:24 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... Patch Set 3: Code-Review+1 :) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 09:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:00:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 10:00:34 +0000 Subject: Change in ...osmo-hlr[master]: tests: Fix db_test err file to expect error code name instead of value Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15170 Change subject: tests: Fix db_test err file to expect error code name instead of value ...................................................................... tests: Fix db_test err file to expect error code name instead of value Previous commit changed db_test to output code names to fix issues on some platforms (I guess due to different error code values), but somehow this log line was not updated. Fixes: 8b860e54be3dbb6587611a9d61f6d28b4c825697 Change-Id: I598de6f83a86d528174d3d188596314572f5d70d --- M tests/db/db_test.err 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/70/15170/1 diff --git a/tests/db/db_test.err b/tests/db/db_test.err index da67d45..a3e4d58 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -1360,7 +1360,7 @@ sqlite3_step(stmt) --> SQLITE_DONE -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 DAUC IMSI='123456789000000': No 3G Auth Data -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I598de6f83a86d528174d3d188596314572f5d70d Gerrit-Change-Number: 15170 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:03:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 10:03:47 +0000 Subject: Change in ...osmo-hlr[master]: tests: Fix db_test err file to expect error code name instead of value In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15170 ) Change subject: tests: Fix db_test err file to expect error code name instead of value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I598de6f83a86d528174d3d188596314572f5d70d Gerrit-Change-Number: 15170 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:03:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:04:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 10:04:12 +0000 Subject: Change in ...osmo-hlr[master]: tests: Fix db_test err file to expect error code name instead of value In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15170 ) Change subject: tests: Fix db_test err file to expect error code name instead of value ...................................................................... tests: Fix db_test err file to expect error code name instead of value Previous commit changed db_test to output code names to fix issues on some platforms (I guess due to different error code values), but somehow this log line was not updated. Fixes: 8b860e54be3dbb6587611a9d61f6d28b4c825697 Change-Id: I598de6f83a86d528174d3d188596314572f5d70d --- M tests/db/db_test.err 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/db/db_test.err b/tests/db/db_test.err index da67d45..a3e4d58 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -1360,7 +1360,7 @@ sqlite3_step(stmt) --> SQLITE_DONE -db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126 +db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15 DAUC IMSI='123456789000000': No 3G Auth Data -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I598de6f83a86d528174d3d188596314572f5d70d Gerrit-Change-Number: 15170 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:04:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 10:04:31 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15153 ) Change subject: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other projects ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I89ba62be92557e35ed083dbc9a3624ff0fb6cbd3 Gerrit-Change-Number: 15153 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:04:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:48:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:48:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 ) Change subject: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 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: I8c1082880902dd9a04935945f0293895f4d0c53a Gerrit-Change-Number: 13865 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:48:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:48:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:48:22 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Emulation: Support for PS domain In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13854 ) Change subject: RAN_Emulation: Support for PS domain ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13854 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: I7ba4662e5a7ba31a2582b0c133b3140c8057678f Gerrit-Change-Number: 13854 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 10:48:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:50:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:50:06 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 ) Change subject: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 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: I1ff98c933b00a90f54ceedf290121d61d35c6063 Gerrit-Change-Number: 15156 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:50:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:50:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:50:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 ) Change subject: RAN_Adapter: invert check for RAN_ops == omit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 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: I639ab6d0586174c0f20b93a53169f0aa254970fa Gerrit-Change-Number: 15157 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:50:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:51:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:51:19 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Integrate RANAP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 ) Change subject: sgsn: Integrate RANAP ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 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: Ib62fc4c6007f6f4c47db7ca096a8d629bc72bb22 Gerrit-Change-Number: 13754 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:51:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:51:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:51:41 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Emulation: Support for PS domain In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13854 ) Change subject: RAN_Emulation: Support for PS domain ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13854 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: I7ba4662e5a7ba31a2582b0c133b3140c8057678f Gerrit-Change-Number: 13854 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 10:51:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:53:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:53:39 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: make the ranap interface optional In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162 ) Change subject: sgsn: make the ranap interface optional ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162 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: I43df456c2d5aa3ba3ea9e34da3f0f96b55f7c9a1 Gerrit-Change-Number: 15162 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:53:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:54:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:54:03 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: add TC_iu_attach_gmm_rau In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 ) Change subject: sgsn: add TC_iu_attach_gmm_rau ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 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: Ie043639638a640a2041324fc910964385a41c77d Gerrit-Change-Number: 15163 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:54:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:54:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:54:39 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:54:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:54:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:54:54 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15153 ) Change subject: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other projects ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I89ba62be92557e35ed083dbc9a3624ff0fb6cbd3 Gerrit-Change-Number: 15153 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 10:54:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:54:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:54:56 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro... In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15153 ) Change subject: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other projects ...................................................................... ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other projects Change-Id: I89ba62be92557e35ed083dbc9a3624ff0fb6cbd3 --- M ttcn3-sgsn-test/osmo-sgsn.cfg 1 file changed, 1 insertion(+), 39 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 996d251..38b9945 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -5,7 +5,7 @@ log gsmtap 172.18.8.103 logging level set-all debug ! -log stderr +log file /data/osmo-sgsn.log logging filter all 1 logging color 1 logging print category 1 @@ -44,44 +44,6 @@ logging level lm3ua notice logging level lmgcp notice ! -log file sgsn-raw.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging print file 1 - logging level all everything - logging level mm debug - logging level pag notice - logging level meas notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp info - logging level llc debug - logging level sndcp debug - logging level slhc notice - logging level ranap info - logging level sua info - logging level v42bis info - logging level lglobal info - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp debug - logging level lstats notice - logging level lgsup debug - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice -! stats interval 5 ! line vty -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I89ba62be92557e35ed083dbc9a3624ff0fb6cbd3 Gerrit-Change-Number: 15153 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:55:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:55:17 +0000 Subject: Change in ...simtrace2[master]: disable ERASE pin In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/15168 ) Change subject: disable ERASE pin ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic3332eb1d4247a07988b2fd841f40e79862d06a7 Gerrit-Change-Number: 15168 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 13 Aug 2019 10:55:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:55:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:55:18 +0000 Subject: Change in ...simtrace2[master]: disable ERASE pin In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/simtrace2/+/15168 ) Change subject: disable ERASE pin ...................................................................... disable ERASE pin disabling the ERASE pin prevents accidental erase for the flash memory while the board is powered on (e.g. in case the user overcomes the weak 100 kOhm pull-down for more than 220 ms by touching or shorting the pin). the flash is still erasable using the ERASE pin during power up. it is only disabled after boot completed. Change-Id: Ic3332eb1d4247a07988b2fd841f40e79862d06a7 --- M firmware/libboard/common/source/board_lowlevel.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index 8210938..b4d7d32 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.c @@ -127,6 +127,9 @@ SUPC->SUPC_SMMR = SUPC_SMMR_SMTH_3_0V | SUPC_SMMR_SMSMPL_CSM | SUPC_SMMR_SMRSTEN_ENABLE; + /* disable ERASE pin to prevent accidental flash erase */ + MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO12; + /* enable both LED and green LED */ PIOA->PIO_PER |= PIO_LED_RED | PIO_LED_GREEN; PIOA->PIO_OER |= PIO_LED_RED | PIO_LED_GREEN; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic3332eb1d4247a07988b2fd841f40e79862d06a7 Gerrit-Change-Number: 15168 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 10:57:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 13 Aug 2019 10:57:00 +0000 Subject: Change in ...libosmocore[master]: fsm: Quote received event token in logging line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15154 ) Change subject: fsm: Quote received event token in logging line ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15154/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15154/1//COMMIT_MSG at 11 PS1, Line 11: Received an attach request then the "problem" is that I never considered when writing osmo_fsm that somebody would put spaces in them. Even names, like state names should not consist of multiple words. If they do, use underscore or dash, but don't put spaces in there. I'll create an osmocom issue for this. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibeaeb046058777c2367e3cbfff0e00fc7e3a1640 Gerrit-Change-Number: 15154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 13 Aug 2019 10:57:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:11:59 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:11:59 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 ) Change subject: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure ...................................................................... Patch Set 4: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 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: I8c1082880902dd9a04935945f0293895f4d0c53a Gerrit-Change-Number: 13865 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 11:11:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:36:19 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:36:19 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: SGSN: introduce f_send_l3() to allow one function for Gb & Iu Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15171 Change subject: SGSN: introduce f_send_l3() to allow one function for Gb & Iu ...................................................................... SGSN: introduce f_send_l3() to allow one function for Gb & Iu f_send_l3() replaces f_send_l3_gmm_llc() to have one function which sends L3 messages for Iu and Gb at the same time. This allows to share most of the tests between Iu & Gb. Change-Id: If47ad2be459ca7b87d9071d9ff020a51821e4433 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 122 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/15171/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index a7cc57f..36297c5 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -461,23 +461,79 @@ BSSGP[gb_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[gb_index], llc_enc)); } -function f_send_l3_gmm_llc(template PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr { +private function f_send_l3_gmm_llc(template (value) PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr { var octetstring l3_enc := enc_PDU_L3_MS_SGSN(valueof(l3_mo)); var BIT4 sapi := f_llc_sapi_by_l3_mo(valueof(l3_mo)); var integer n_u := f_llc_get_n_u_tx(llc[bit2int(sapi)]); f_send_llc(ts_LLC_UI(l3_enc, sapi, '0'B, n_u), gb_index); } +/* trigger sending of a RANAP InitialUE and wait for SCCP connection confirmation */ +function f_send_l3_initial_ue(template (value) PDU_L3_MS_SGSN l3_mo) runs on BSSGP_ConnHdlr { + log("Sending InitialUE: ", l3_mo); + var octetstring l3_enc := enc_PDU_L3_MS_SGSN(valueof(l3_mo)); + var RANAP_PDU ranap; + var LAI lai := { + pLMNidentity := '62F224'O, + lAC := '1234'O, + iE_Extensions := omit + }; + var SAI sai := { + pLMNidentity := lai.pLMNidentity, + lAC := lai.lAC, + sAC := '0000'O, /* FIXME */ + iE_Extensions := omit + }; + var IuSignallingConnectionIdentifier sigc_id := int2bit(23, 24); /* FIXME */ + var GlobalRNC_ID grnc_id := { + pLMNidentity := lai.pLMNidentity, + rNC_ID := 2342 /* FIXME */ + }; + + ranap := valueof(ts_RANAP_initialUE_CS(lai, sai, l3_enc, sigc_id, grnc_id)); + BSSAP.send(ts_RANAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_local, ranap)); + alt { + [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {} + [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + setverdict(fail, "DISC.ind from SCCP"); + mtc.stop; + } + } +} + +/* send a L3 (GMM/SM) message over whatever is the appropriate lower-layer bearer */ +function f_send_l3(template (value) PDU_L3_MS_SGSN l3_mo, integer gb_index := 0, boolean initial := false) runs on BSSGP_ConnHdlr { + if (gb_index >= NUM_GB) { + if (initial) { + f_send_l3_initial_ue(l3_mo); + } else { + BSSAP.send(ts_PDU_DTAP_PS_MO(l3_mo)); + } + } else { + f_send_l3_gmm_llc(l3_mo, gb_index); + } +} + altstep as_mm_identity(integer gb_idx := 0) runs on BSSGP_ConnHdlr { var MobileL3_CommonIE_Types.MobileIdentityLV mi; - [] BSSGP[gb_idx].receive(tr_GMM_ID_REQ('001'B)) { + [gb_idx < NUM_GB] BSSGP[gb_idx].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi), gb_idx); + f_send_l3(ts_GMM_ID_RESP(mi), gb_idx); repeat; } - [] BSSGP[gb_idx].receive(tr_GMM_ID_REQ('010'B)) { + [gb_idx >= NUM_GB] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_ID_REQ('001'B))) { + mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + f_send_l3(ts_GMM_ID_RESP(mi), gb_idx); + repeat; + } + [gb_idx < NUM_GB] BSSGP[gb_idx].receive(tr_GMM_ID_REQ('010'B)) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi), gb_idx); + f_send_l3(ts_GMM_ID_RESP(mi), gb_idx); + repeat; + } + [gb_idx >= NUM_GB] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_ID_REQ('010'B))) { + mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); + f_send_l3(ts_GMM_ID_RESP(mi), gb_idx); repeat; } } @@ -485,9 +541,13 @@ /* receive a L3 (GMM/SM) message over whatever is the appropriate lower-layer bearer */ function f_receive_l3(template PDU_L3_SGSN_MS rx_tpl := ?, integer gb_idx := 0) runs on BSSGP_ConnHdlr return PDU_L3_SGSN_MS { + var PDU_DTAP_PS_MT mt; var PDU_L3_SGSN_MS l3_mt; alt { - [] BSSGP[gb_idx].receive(rx_tpl) -> value l3_mt { } + [gb_idx < NUM_GB] BSSGP[gb_idx].receive(rx_tpl) -> value l3_mt { } + [gb_idx >= NUM_GB] BSSAP.receive(tr_PDU_DTAP_PS_MT(rx_tpl)) -> value mt { + l3_mt := mt.dtap; + } } return l3_mt; } @@ -555,7 +615,17 @@ l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); } - f_send_l3_gmm_llc(l3_mo, gb_idx); + f_send_l3(l3_mo, gb_idx); + + /* Security Mode Command + Complete on Iu case */ + if (gb_idx >= NUM_GB) { + BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?, uia_key := oct2bit(g_pars.vec.ik), + key_sts := ?)) { + var IntegrityProtectionAlgorithm uia_chosen := 0; /*standard_UMTS_integrity_algorithm_UIA1;*/ + BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); + //BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))); + } + } } else { /* wait for identity procedure */ f_sleep(1.0); @@ -661,7 +731,7 @@ * revisionLevelIndicatior is at the wrong place! */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; - f_send_l3_gmm_llc(attach_req, gb_idx); + f_send_l3(attach_req, gb_idx, initial := true); f_gmm_auth(umts_aka_challenge, force_gsm_sres, gb_idx); /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -670,7 +740,12 @@ f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ - f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL, gb_idx); + f_send_l3(ts_GMM_ATTACH_COMPL, gb_idx); + + /* IuPS case: Expect Iu Release */ + if (gb_idx >= NUM_GB) { + as_iu_release_compl_disc(); + } } private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { @@ -722,7 +797,7 @@ private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] BSSGP[0].receive(tr_GMM_ID_REQ(?)) { /* don't send ID Response */ @@ -748,7 +823,7 @@ private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { } @@ -768,7 +843,7 @@ private function f_TC_attach_auth_sai_reject(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { @@ -790,7 +865,7 @@ var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); @@ -819,7 +894,7 @@ var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { @@ -850,7 +925,7 @@ var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -858,7 +933,7 @@ BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); } - f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + f_send_l3(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_combined() runs on test_CT { @@ -876,12 +951,12 @@ g_pars.net.expect_auth := false; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); } - f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + f_send_l3(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_accept_all() runs on test_CT { @@ -903,7 +978,7 @@ g_pars.net.expect_auth := false; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT('07'O)) { @@ -935,7 +1010,7 @@ private function f_TC_rau_unknown(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); + f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); alt { [] BSSGP[0].receive(tr_GMM_RAU_REJECT('0a'O)) { setverdict(pass); @@ -971,7 +1046,7 @@ function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge, integer bssgp_index := 0) runs on BSSGP_ConnHdlr { var PDU_L3_SGSN_MS l3_mt; timer T := 5.0; - f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp_index); + f_send_l3(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp_index); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -1107,7 +1182,7 @@ recovery := ts_Recovery(apars.ggsn_restart_ctr); } - f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco), gb_idx); GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { f_process_gtp_ctx_act_req(apars, g_ud.gtpc); @@ -1147,7 +1222,7 @@ var boolean exp_rej := ispresent(apars.exp_rej_cause); var Gtp1cUnitdata g_ud; - f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit), gb_idx); + f_send_l3(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit), gb_idx); GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); BSSGP[gb_idx].clear; @@ -1179,7 +1254,7 @@ alt { [] BSSGP[gb_idx].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { - f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), gb_idx); + f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), gb_idx); } [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; @@ -1365,7 +1440,7 @@ /* PDP Context activation for not-attached subscriber; expect fail */ private function f_TC_pdp_act_unattached(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); - f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ @@ -1513,7 +1588,7 @@ var OCT1 cause_network_failure := int2oct(38, 1) alt { [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true)) { - f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } [] as_xid(apars); @@ -1594,7 +1669,7 @@ GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} - f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } testcase TC_attach_pdp_act_deact_mt_t3395_expire() runs on test_CT { @@ -1794,7 +1869,7 @@ /* MS: receive a Detach Request */ BSSGP[0].receive(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?)); - f_send_l3_gmm_llc(ts_GMM_DET_ACCEPT_MO); + f_send_l3(ts_GMM_DET_ACCEPT_MO); setverdict(pass); } @@ -1885,7 +1960,7 @@ var integer count_req := 0; var MobileL3_CommonIE_Types.MobileIdentityLV mi; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { @@ -1893,7 +1968,7 @@ } [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); + f_send_l3(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { @@ -1933,7 +2008,7 @@ /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */ g_pars.p_tmsi := 'c0000035'O; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { @@ -1946,7 +2021,7 @@ } [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); + f_send_l3(ts_GMM_ID_RESP(mi)); repeat; } } @@ -2007,7 +2082,7 @@ /* there is no auth */ g_pars.net.expect_auth := false; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); alt { [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { @@ -2016,7 +2091,7 @@ } [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT(*, *, *)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); - f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + f_send_l3(ts_GMM_ATTACH_COMPL); setverdict(pass); } } @@ -2060,7 +2135,7 @@ private function f_TC_attach_check_complete_resend(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); timer T := 10.0; @@ -2100,11 +2175,11 @@ var PDU_L3_SGSN_MS l3_mt; /* then send RAU */ - f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp); + f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp); alt { [] BSSGP[bssgp].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt { f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp); - f_send_l3_gmm_llc(ts_GMM_RAU_COMPL, bssgp); + f_send_l3(ts_GMM_RAU_COMPL, bssgp); setverdict(pass); } [] BSSGP[bssgp].receive(tr_GMM_RAU_REJECT) { @@ -2180,7 +2255,7 @@ var RoutingAreaIdentificationV rand_rai := f_random_RAI(); var PDU_L3_SGSN_MS l3_mt; - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { @@ -2189,16 +2264,16 @@ } [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); + f_send_l3(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { /* send out a second GMM_Attach Request. * If the SGSN follows the rules, this 2nd ATTACH REQ should be ignored, because * of the same content */ - f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); + f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); + f_send_l3(ts_GMM_ID_RESP(mi)); } } f_sleep(1.0); @@ -2207,7 +2282,7 @@ alt { [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); + f_send_l3(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { @@ -2220,7 +2295,7 @@ } [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); - f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + f_send_l3(ts_GMM_ATTACH_COMPL); setverdict(pass); /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ } @@ -2258,7 +2333,7 @@ /* The thing is, if the solSACapability is 'omit', then the * revisionLevelIndicatior is at the wrong place! */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; - f_send_l3_gmm_llc(attach_req); + f_send_l3(attach_req); /* do the auth */ var PDU_L3_MS_SGSN l3_mo; @@ -2290,7 +2365,7 @@ BSSGP[0].receive(auth_ciph_req) -> value l3_mt; /* send the gmm auth failure with resync IE */ - f_send_l3_gmm_llc(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts)); + f_send_l3(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts)); /* wait for the GSUP resync request */ GSUP.receive(tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC( @@ -2337,7 +2412,7 @@ l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); } - f_send_l3_gmm_llc(l3_mo); + f_send_l3(l3_mo); deactivate(di); /* Expect SGSN to perform LU with HLR */ @@ -2346,7 +2421,7 @@ BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); } - f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); + f_send_l3(ts_GMM_ATTACH_COMPL); setverdict(pass); } @@ -2506,7 +2581,6 @@ vc_conn.done; } - control { execute( TC_attach() ); execute( TC_attach_mnc3() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15171 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: If47ad2be459ca7b87d9071d9ff020a51821e4433 Gerrit-Change-Number: 15171 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:36:47 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:36:47 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 ) Change subject: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure ...................................................................... Patch Set 4: -Code-Review rebased it and move some stuff around. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 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: I8c1082880902dd9a04935945f0293895f4d0c53a Gerrit-Change-Number: 13865 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 11:36:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:39:27 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:39:27 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/15155 to look at the new patch set (#2). Change subject: ttcn3-sgsn-master: add support for Iu ...................................................................... ttcn3-sgsn-master: add support for Iu To support Iu tests, start osmo-stp when testing. Depends-on: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 (osmo-ttcn3-hacks) Change-Id: I4d6aef98832202652c5fe254105728430ba77119 --- M ttcn3-sgsn-test/SGSN_Tests.cfg M ttcn3-sgsn-test/jenkins.sh M ttcn3-sgsn-test/osmo-sgsn.cfg A ttcn3-sgsn-test/osmo-stp.cfg 4 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/55/15155/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:41:50 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:41:50 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present ...................................................................... gprs_gmm: only update gb/iu cell information when Iu/Gb present This function should not do the transistion of Iu/Gb. Only copy simple data Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a --- M src/gprs/gprs_gmm.c 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/72/15172/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c8bc0f7..8d8c877 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -298,15 +298,20 @@ /* Store BVCI/NSEI in MM context */ static void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg) { - mm->gb.bvci = msgb_bvci(msg); - mm->gb.nsei = msgb_nsei(msg); - /* In case a Iu connection is reconnected we need to update the ue ctx */ - mm->iu.ue_ctx = MSG_IU_UE_CTX(msg); - if (mm->ran_type == MM_CTX_T_UTRAN_Iu - && mm->iu.ue_ctx) { + /* check for Iu or Gb */ + if (!MSG_IU_UE_CTX(msg)) { + mm->gb.bvci = msgb_bvci(msg); + mm->gb.nsei = msgb_nsei(msg); + } else { #ifdef BUILD_IU - mm->iu.ue_ctx->rab_assign_addr_enc = - sgsn->cfg.iu.rab_assign_addr_enc; + /* In case a Iu connection is reconnected we need to update the ue ctx */ + /* FIXME: the old ue_ctx have to be freed/disconnected */ + mm->iu.ue_ctx = msg->dst; + if (mm->ran_type == MM_CTX_T_UTRAN_Iu + && mm->iu.ue_ctx) { + mm->iu.ue_ctx->rab_assign_addr_enc = + sgsn->cfg.iu.rab_assign_addr_enc; + } #endif } } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a Gerrit-Change-Number: 15172 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:41:51 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:41:51 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 Change subject: gprs_gmm: clarify comment of Iu follow-on request ...................................................................... gprs_gmm: clarify comment of Iu follow-on request Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60 --- M src/gprs/gprs_gmm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/73/15173/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 8d8c877..6e5936c 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1317,7 +1317,9 @@ goto err_inval; cur += msnc_len; - /* TODO: In iu mode - handle follow-on request */ + /* TODO: In iu mode - handle follow-on request. + * Atm the SGSN do a Release Request which is in spec and will + * signal we ignored the follow-on request. */ /* aTTACH Type 10.5.5.2 */ att_type = *cur++ & 0x07; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60 Gerrit-Change-Number: 15173 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 11:41:55 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 11:41:55 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: refactor msgid2mmctx() out of switch/case Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 Change subject: gprs_gmm: refactor msgid2mmctx() out of switch/case ...................................................................... gprs_gmm: refactor msgid2mmctx() out of switch/case Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854 --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/74/15174/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 6e5936c..ad02c4b 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1375,7 +1375,6 @@ ctx->gb.tlli = msgb_tlli(msg); ctx->gb.llme = llme; } - msgid2mmctx(ctx, msg); break; case GSM_MI_TYPE_TMSI: memcpy(&tmsi, mi+1, 4); @@ -1400,7 +1399,6 @@ ctx->gb.tlli = msgb_tlli(msg); ctx->gb.llme = llme; } - msgid2mmctx(ctx, msg); break; default: LOGMMCTXP(LOGL_NOTICE, ctx, "Rejecting ATTACH REQUEST with " @@ -1408,6 +1406,8 @@ reject_cause = GMM_CAUSE_MS_ID_NOT_DERIVED; goto rejected; } + + msgid2mmctx(ctx, msg); /* Update MM Context with currient RA and Cell ID */ ctx->ra = ra_id; if (ctx->ran_type == MM_CTX_T_GERAN_Gb) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854 Gerrit-Change-Number: 15174 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 14:56:42 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 14:56:42 +0000 Subject: Change in ...osmo-msc[master]: add separate vty cfg for Iu encryption / fix ttcn3 iu tests Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 Change subject: add separate vty cfg for Iu encryption / fix ttcn3 iu tests ...................................................................... add separate vty cfg for Iu encryption / fix ttcn3 iu tests Recently, the ability to run Iu without encryption was added, but the config for it was tied to the A5 GERAN encryption configuration. This affected osmo-msc's default behavior of Iu, breaking osmo-msc ttcn3 Iu tests: the ttcn3 test suite sets A5 to 0 (no encryption) but still expects Iu encryption. Fix this "regression". Add a separate vty config option for Iu encryption, even if it does not provide full granularity to select individual UEA algorithms yet. As a result, Iu default behavior remains to use encryption regardless of the A5 config. Iu encryption can be disabled by the new cfg option "no encryption iu" alone. Revert most changes to the msc_vlr test suite in commit "do not force encryption on UTRAN" (I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7): use new net->iu_encryption instead of net->a5_encryption_mask. Adjust/add test_nodes.vty transcript tests. Related: OS#4144 Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b --- M doc/manuals/chapters/net.adoc M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.h M tests/test_nodes.vty 10 files changed, 129 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/75/15175/1 diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc index 4bf34a3..6cb31d1 100644 --- a/doc/manuals/chapters/net.adoc +++ b/doc/manuals/chapters/net.adoc @@ -188,11 +188,22 @@ While authentication is always required on 3G, ciphering is optional. -So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim -solution, ciphering is enabled on 3G exactly when ciphering is enabled on 2G, -i.e. when any cipher other than A5/0 is enabled in the configuration. If only -A5/0 is configured, ciphering will be disabled on both 2G and 3G. The future -aim is to add comprehensive configuration for 3G ciphering that is independent -from the 2G setting. +So far OsmoMSC allows switching ciphering on 3G either on or off -- the default +behavior is to enable ciphering. (Individual choice of algorithms may be added +in the future.) + +Disable 3G ciphering: + +---- +network + no encryption iu +---- + +Enable 3G ciphering (default): + +---- +network + encryption iu +---- OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G. diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index e926b3f..b2b9e70 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -149,6 +149,11 @@ bool authentication_required; int send_mm_info; + /* Whether to use encryption on Iu. + * TODO: we should offer a choice of UEA1 and/or UEA2, and probably replace this bool with a bit-mask of + * permitted Iu encryption algorithms. See also OS#4143 */ + bool iu_encryption; + struct rate_ctr_group *msc_ctrs; struct osmo_stat_item_group *statg; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index cd37cff..f3e3d92 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -375,7 +375,7 @@ net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - net->a5_encryption_mask > 0x01, + is_utran ? net->iu_encryption : net->a5_encryption_mask > 0x01, lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -780,7 +780,7 @@ req->cm_service_type, mi-1, &msc_a->via_cell.lai, is_utran || net->authentication_required, - net->a5_encryption_mask > 0x01, + is_utran ? net->iu_encryption : net->a5_encryption_mask > 0x01, req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1152,7 +1152,7 @@ net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, mi_lv, &msc_a->via_cell.lai, is_utran || net->authentication_required, - net->a5_encryption_mask > 0x01, + is_utran ? net->iu_encryption : net->a5_encryption_mask > 0x01, pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 11920f3..305de15 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -49,6 +49,7 @@ /* Permit a compile-time default of A5/3 and A5/1 */ net->a5_encryption_mask = (1 << 3) | (1 << 1); + net->iu_encryption = true; /* Use 30 min periodic update interval as sane default */ net->t3212 = 5; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 5bf9701..d448f45 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -144,14 +144,13 @@ return CMD_SUCCESS; } +#define ENCRYPTION_STR "Encryption options\n" + DEFUN(cfg_net_encryption, cfg_net_encryption_cmd, "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]", - "Encryption options\n" - "GSM A5 Air Interface Encryption." - " NOTE: as long as OsmoMSC lacks distinct configuration for 3G encryption," - " 3G encryption is enabled exactly when any 2G encryption is enabled." - " Hence configuring only A5/0 here switches off 3G encryption.\n" + ENCRYPTION_STR + "GSM A5 Air Interface Encryption.\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" @@ -166,6 +165,30 @@ return CMD_SUCCESS; } +/* So far just a boolean switch, a future patch might add individual config for UEA1 and UEA2, see OS#4143 */ +DEFUN(cfg_net_encryption_iu, + cfg_net_encryption_iu_cmd, + "encryption iu", /* " [(uea1|uea2)] [(uea1|uea2)]" */ + ENCRYPTION_STR + "Iu (UTRAN, 3G): " /* "without arguments, " */ "enable all supported encryption algorithms on Iu (UEA1, UEA2).\n" + ) +{ + gsmnet->iu_encryption = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_net_no_encryption_iu, + cfg_net_no_encryption_iu_cmd, + "no encryption iu", + NO_STR + "Disable encryption\n" + "Disable encryption on Iu (UTRAN, 3G)\n" + ) +{ + gsmnet->iu_encryption = false; + return CMD_SUCCESS; +} + DEFUN(cfg_net_authentication, cfg_net_authentication_cmd, "authentication (optional|required)", @@ -308,6 +331,9 @@ vty_out(vty, " %u", i); } vty_out(vty, "%s", VTY_NEWLINE); + + if (!gsmnet->iu_encryption) + vty_out(vty, " no encryption iu%s", VTY_NEWLINE); vty_out(vty, " authentication %s%s", gsmnet->authentication_required ? "required" : "optional", VTY_NEWLINE); vty_out(vty, " rrlp mode %s%s", msc_rrlp_mode_name(gsmnet->rrlp.mode), @@ -1894,6 +1920,8 @@ install_element(GSMNET_NODE, &cfg_net_name_short_cmd); install_element(GSMNET_NODE, &cfg_net_name_long_cmd); install_element(GSMNET_NODE, &cfg_net_encryption_cmd); + install_element(GSMNET_NODE, &cfg_net_encryption_iu_cmd); + install_element(GSMNET_NODE, &cfg_net_no_encryption_iu_cmd); install_element(GSMNET_NODE, &cfg_net_authentication_cmd); install_element(GSMNET_NODE, &cfg_net_rrlp_mode_cmd); install_element(GSMNET_NODE, &cfg_net_mm_info_cmd); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index 62ea6c7..d73a5f8 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -266,8 +266,6 @@ static void test_auth_use_twice_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 1, 1, true); comment_end(); } @@ -275,8 +273,6 @@ static void test_auth_use_twice_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 1, 1, true); comment_end(); } @@ -284,8 +280,6 @@ static void test_auth_use_infinitely_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, -1, 3, false); comment_end(); } @@ -293,8 +287,6 @@ static void test_auth_use_infinitely_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, -1, 3, false); comment_end(); } @@ -302,8 +294,6 @@ static void test_no_auth_reuse_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 0, 0, true); comment_end(); } @@ -311,8 +301,6 @@ static void test_no_auth_reuse_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 0, 0, true); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index cec2f8d..065af25 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -46,7 +46,6 @@ struct vlr_subscr *vsub; net->authentication_required = true; - net->a5_encryption_mask = A5_0_3; net->vlr->cfg.assign_tmsi = true; rx_from_ran = OSMO_RAT_UTRAN_IU; diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 1bf6cd2..4e28f05 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -49,6 +49,8 @@ "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e" "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" "0c7ac3e9e9b7db05"; + bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1) + || (via_ran == OSMO_RAT_UTRAN_IU && net->iu_encryption); net->authentication_required = true; net->vlr->cfg.assign_tmsi = true; @@ -122,8 +124,7 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -197,8 +198,7 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -265,8 +265,7 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -327,8 +326,6 @@ static void test_umts_authen_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen(OSMO_RAT_GERAN_A); comment_end(); } @@ -336,8 +333,7 @@ static void test_umts_authen_utran() { comment_start(); - /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0; + net->iu_encryption = false; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -345,8 +341,7 @@ static void test_umts_auth_ciph_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; + net->iu_encryption = true; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -365,6 +360,8 @@ { struct vlr_subscr *vsub; const char *imsi = "901700000010650"; + bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1) + || (via_ran == OSMO_RAT_UTRAN_IU && net->iu_encryption); net->authentication_required = true; net->vlr->cfg.assign_tmsi = true; @@ -519,8 +516,7 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -585,8 +581,6 @@ static void test_umts_authen_resync_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_resync(OSMO_RAT_GERAN_A); comment_end(); } @@ -594,8 +588,7 @@ static void test_umts_authen_resync_utran() { comment_start(); - /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0; + net->iu_encryption = false; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -603,8 +596,7 @@ static void test_umts_auth_ciph_resync_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; + net->iu_encryption = true; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -698,8 +690,6 @@ static void test_umts_authen_too_short_res_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_too_short_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -707,8 +697,6 @@ static void test_umts_authen_too_short_res_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_short_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -802,8 +790,6 @@ static void test_umts_authen_too_long_res_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_too_long_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -811,8 +797,6 @@ static void test_umts_authen_too_long_res_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_long_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -911,8 +895,6 @@ static void test_umts_authen_only_sres_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_only_sres(OSMO_RAT_GERAN_A); comment_end(); } @@ -920,8 +902,6 @@ static void test_umts_authen_only_sres_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_umts_authen_only_sres(OSMO_RAT_UTRAN_IU); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 4330ea8..9df9cf0 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -32,9 +32,6 @@ #include #include -#define A5_0 (1 << 0) -#define A5_0_3 ((1 << 0) | (1 << 3)) - extern bool _log_lines; #define _log(fmt, args...) do { \ if (_log_lines) \ diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index fb7b1c5..6d97658 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -17,6 +17,8 @@ short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] + encryption iu + no encryption iu authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) @@ -26,6 +28,22 @@ periodic location update <6-1530> no periodic location update +OsmoMSC(config-net)# encryption? + encryption Encryption options +OsmoMSC(config-net)# encryption ? + a5 GSM A5 Air Interface Encryption. + iu Iu (UTRAN, 3G): enable all supported encryption algorithms on Iu (UEA1, UEA2). +OsmoMSC(config-net)# no? + no Negate a command or set its defaults +OsmoMSC(config-net)# no ? + encryption Disable encryption + timezone Disable network timezone override, use system tz + periodic Periodic Location Updating Interval +OsmoMSC(config-net)# no encryption? + encryption Disable encryption +OsmoMSC(config-net)# no encryption ? + iu Disable encryption on Iu (UTRAN, 3G) + OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list @@ -157,3 +175,43 @@ local-ip 0.0.0.0 vlr-name vlr.example.net end + +OsmoMSC# configure terminal +OsmoMSC(config)# network +OsmoMSC(config-net)# no encryption iu +OsmoMSC(config-net)# show running-config +... +network + network country code 001 + mobile network code 01 + short name OsmoMSC + long name OsmoMSC + encryption a5 0 + no encryption iu + authentication optional + rrlp mode none + mm info 1 + periodic location update 30 +msc + mncc guard-timeout 180 + ncss guard-timeout 30 + assign-tmsi + cs7-instance-a 0 +... + auth-tuple-max-reuse-count 3 + auth-tuple-reuse-on-error 1 + mgw local-port 2728 + mgw remote-ip 10.23.24.1 + mgw remote-port 2427 +mncc-int + default-codec tch-f fr + default-codec tch-h hr +... +hlr + remote-ip 127.0.0.1 + remote-port 4222 +sgs + local-port 29118 + local-ip 0.0.0.0 + vlr-name vlr.example.net +end -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:07:41 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 13 Aug 2019 15:07:41 +0000 Subject: Change in ...simtrace2[master]: USB: place version string in interface Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/15176 Change subject: USB: place version string in interface ...................................................................... USB: place version string in interface previously the version string was in the iConfiguration field of a dedicated USB configuration. this configuration had no interface, but the USB specification requires at least one interface. an interface has been added to this configuration. the version string is now in the iInterface field, and the iConfiguration field contains "firmware version". the USB specification does not require an end-point, and none are present. Change-Id: I99361e313979711f4f45ad424a52faa3ddd7c558 --- M firmware/libcommon/source/usb.c 1 file changed, 39 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/15176/1 diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 9d3072f..e75646e 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -62,6 +62,7 @@ CARDEM_USIM4_INTF_STR, // runtime strings SERIAL_STR, + VERSION_CONF_STR, VERSION_STR, // count STRING_DESC_CNT @@ -69,7 +70,7 @@ /** array of static (from usb_strings) and runtime (serial, version) USB strings */ -static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 2]; +static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 3]; /* USB string for the serial (using 128-bit device ID) */ static unsigned char usb_string_serial[] = { @@ -110,6 +111,26 @@ }; /* USB string for the version */ +static const unsigned char usb_string_version_conf[] = { + USBStringDescriptor_LENGTH(16), + USBGenericDescriptor_STRING, + USBStringDescriptor_UNICODE('f'), + USBStringDescriptor_UNICODE('i'), + USBStringDescriptor_UNICODE('r'), + USBStringDescriptor_UNICODE('m'), + USBStringDescriptor_UNICODE('w'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('r'), + USBStringDescriptor_UNICODE('e'), + USBStringDescriptor_UNICODE(' '), + USBStringDescriptor_UNICODE('v'), + USBStringDescriptor_UNICODE('e'), + USBStringDescriptor_UNICODE('r'), + USBStringDescriptor_UNICODE('s'), + USBStringDescriptor_UNICODE('i'), + USBStringDescriptor_UNICODE('o'), + USBStringDescriptor_UNICODE('n'), +}; static const char git_version[] = GIT_VERSION; static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2]; @@ -582,21 +603,34 @@ typedef struct _SIMTraceDriverConfigurationDescriptorVersion { /** Standard configuration descriptor. */ USBConfigurationDescriptor configuration; + USBInterfaceDescriptor version; } __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion; static const SIMTraceDriverConfigurationDescriptorVersion configurationDescriptorVersion = { - /* Standard configuration descriptor */ + /* Standard configuration descriptor for the interface descriptor*/ .configuration = { .bLength = sizeof(USBConfigurationDescriptor), .bDescriptorType = USBGenericDescriptor_CONFIGURATION, .wTotalLength = sizeof(SIMTraceDriverConfigurationDescriptorVersion), - .bNumInterfaces = 0, + .bNumInterfaces = 1, .bConfigurationValue = CFG_NUM_VERSION, - .iConfiguration = VERSION_STR, + .iConfiguration = VERSION_CONF_STR, .bmAttributes = USBD_BMATTRIBUTES, .bMaxPower = USBConfigurationDescriptor_POWER(100), }, + /* Interface standard descriptor just holding the version information */ + .version = { + .bLength = sizeof(USBInterfaceDescriptor), + .bDescriptorType = USBGenericDescriptor_INTERFACE, + .bInterfaceNumber = 0, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = USB_CLASS_PROPRIETARY, + .bInterfaceSubClass = 0xff, + .bInterfaceProtocol = 0, + .iInterface = VERSION_STR, + }, }; const USBConfigurationDescriptor *configurationDescriptorsArr[] = { @@ -693,6 +727,7 @@ usb_strings_extended[i] = usb_strings[i]; } usb_strings_extended[SERIAL_STR] = usb_string_serial; + usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf; usb_strings_extended[VERSION_STR] = usb_string_version; // Initialize standard USB driver -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I99361e313979711f4f45ad424a52faa3ddd7c558 Gerrit-Change-Number: 15176 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:18:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 15:18:16 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: ttcn3-sgsn-master: add support for Iu ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 15:18:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:20:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 15:20:44 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 ) Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/15172/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15172/1/src/gprs/gprs_gmm.c at 306 PS1, Line 306: #ifdef BUILD_IU Better move it this way, to avoid a compiler warning on empty else condition: } #ifdef BUILD_IU else { ... } #endif https://gerrit.osmocom.org/#/c/15172/1/src/gprs/gprs_gmm.c at 309 PS1, Line 309: mm->iu.ue_ctx = msg->dst; Use MSG_IU_UE_CTX_SET() -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a Gerrit-Change-Number: 15172 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 15:20:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:22:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 15:22:00 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 ) Change subject: gprs_gmm: clarify comment of Iu follow-on request ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15173/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15173/1/src/gprs/gprs_gmm.c at 1321 PS1, Line 1321: * Atm the SGSN do a Release Request which is in spec and will I think you are not clarifying until the sentence makes a bit more sense. I don't understand it. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60 Gerrit-Change-Number: 15173 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 15:22:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:23:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 15:23:52 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: refactor msgid2mmctx() out of switch/case In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 ) Change subject: gprs_gmm: refactor msgid2mmctx() out of switch/case ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15174/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15174/1/src/gprs/gprs_gmm.c at 1398 PS1, Line 1398: if (ctx->ran_type == MM_CTX_T_GERAN_Gb) { Looks liek you can also refactor this one. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854 Gerrit-Change-Number: 15174 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 15:23:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:03 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:03 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 to look at the new patch set (#2). Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... iu_client: introduce ranap_iu_free_ue() to free the UE connections When freeing the UE connection object, disconnect the SCTP connection. Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/15161/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:03 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:03 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15177 Change subject: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED ...................................................................... iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED To inform the application about failed security modes Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/77/15177/1 diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h index 873b2d2..4bcd9ce 100644 --- a/include/osmocom/ranap/iu_client.h +++ b/include/osmocom/ranap/iu_client.h @@ -35,6 +35,7 @@ enum ranap_iu_event_type { RANAP_IU_EVENT_RAB_ASSIGN, RANAP_IU_EVENT_SECURITY_MODE_COMPLETE, + RANAP_IU_EVENT_SECURITY_MODE_FAILED, /* FIXME: unimplemented */ RANAP_IU_EVENT_IU_RELEASE, /* An actual Iu Release message was received */ RANAP_IU_EVENT_LINK_INVALIDATED, /* A SUA link was lost or closed down */ }; diff --git a/src/iu_client.c b/src/iu_client.c index 92d25f5..f4e0664 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -104,6 +104,7 @@ const struct value_string ranap_iu_event_type_names[] = { OSMO_VALUE_STRING(RANAP_IU_EVENT_RAB_ASSIGN), OSMO_VALUE_STRING(RANAP_IU_EVENT_SECURITY_MODE_COMPLETE), + OSMO_VALUE_STRING(RANAP_IU_EVENT_SECURITY_MODE_FAILED), OSMO_VALUE_STRING(RANAP_IU_EVENT_IU_RELEASE), OSMO_VALUE_STRING(RANAP_IU_EVENT_LINK_INVALIDATED), { 0, NULL } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd Gerrit-Change-Number: 15177 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:04 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15178 Change subject: iu_client: ensure UE is not NULL on CO primitives ...................................................................... iu_client: ensure UE is not NULL on CO primitives When ue_conn_ctx_find() can not find a UE it returns NULL. Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 --- M src/iu_client.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/78/15178/1 diff --git a/src/iu_client.c b/src/iu_client.c index f4e0664..9addd1c 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -798,6 +798,9 @@ LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n", prim->u.disconnect.conn_id); ue = ue_conn_ctx_find(prim->u.disconnect.conn_id); + if (!ue) + break; + rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): @@ -806,6 +809,9 @@ osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg))); /* resolve UE context */ ue = ue_conn_ctx_find(prim->u.data.conn_id); + if (!ue) + break; + rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 Gerrit-Change-Number: 15178 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:04 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15179 Change subject: iu_client: sccp_sap_up: set rc early ...................................................................... iu_client: sccp_sap_up: set rc early Allows to skip assignment later. Change-Id: Idd803774612719df144bef569fb734289aa31282 --- M src/iu_client.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/79/15179/1 diff --git a/src/iu_client.c b/src/iu_client.c index 9addd1c..f8333af 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -765,7 +765,7 @@ struct osmo_sccp_user *scu = _scu; struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; struct osmo_prim_hdr *resp = NULL; - int rc; + int rc = -1; struct ranap_ue_conn_ctx *ue; struct new_ue_conn_ctx new_ctx = {}; @@ -774,7 +774,6 @@ switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): /* confirmation of outbound connection */ - rc = -1; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request*/ @@ -821,7 +820,6 @@ rc = ranap_cn_rx_cl(cn_ranap_handle_cl, prim, msgb_l2(oph->msg), msgb_l2len(oph->msg)); break; default: - rc = -1; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idd803774612719df144bef569fb734289aa31282 Gerrit-Change-Number: 15179 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:04 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15180 Change subject: iu_client: sccp_sap_up: don't decode empty disconnect indications ...................................................................... iu_client: sccp_sap_up: don't decode empty disconnect indications Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 --- M src/iu_client.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/15180/1 diff --git a/src/iu_client.c b/src/iu_client.c index f8333af..ecadc9a 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -800,7 +800,9 @@ if (!ue) break; - rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + rc = 0; + if (msgb_l2len(oph->msg)) + rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 Gerrit-Change-Number: 15180 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:05 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:05 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15181 Change subject: iu_client: introduce a connection state ...................................................................... iu_client: introduce a connection state When the SCCP stack indicate a disconnect, save this in the UE connection to allow the application to free() the instance later. Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/15181/1 diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h index 64ef9e4..4884f8a 100644 --- a/include/osmocom/ranap/iu_client.h +++ b/include/osmocom/ranap/iu_client.h @@ -23,6 +23,11 @@ RANAP_NSAP_ADDR_ENC_V4RAW, }; +enum ranap_conn_state { + RANAP_CONN_STATE_CONNECTED, + RANAP_CONN_STATE_DISCONNECTED, +}; + struct ranap_ue_conn_ctx { struct llist_head list; struct ranap_iu_rnc *rnc; @@ -30,6 +35,7 @@ int integrity_active; struct gprs_ra_id ra_id; enum ranap_nsap_addr_enc rab_assign_addr_enc; + enum ranap_conn_state conn_state; }; enum ranap_iu_event_type { diff --git a/src/iu_client.c b/src/iu_client.c index 14247ff..0c8f08e 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -116,6 +116,7 @@ ctx->rnc = rnc; ctx->conn_id = conn_id; + ctx->conn_state = RANAP_CONN_STATE_CONNECTED; llist_add(&ctx->list, &ue_conn_ctx_list); return ctx; @@ -140,7 +141,8 @@ if (!ue) return; - osmo_sccp_tx_disconn(g_scu, ue->conn_id, NULL, 0); + if (ue->conn_state == RANAP_CONN_STATE_CONNECTED) + osmo_sccp_tx_disconn(g_scu, ue->conn_id, NULL, 0); llist_for_each_entry(iter, &ue_conn_ctx_list, list) { if (iter == ue) { -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 15:51:05 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 15:51:05 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15182 Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication ...................................................................... iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 --- M src/iu_client.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/82/15182/1 diff --git a/src/iu_client.c b/src/iu_client.c index 0c8f08e..de6bfa7 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -829,6 +829,8 @@ rc = 0; if (msgb_l2len(oph->msg)) rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + + global_iu_event_cb(ue, RANAP_IU_EVENT_LINK_INVALIDATED, NULL); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:31:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:31:45 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 Change subject: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup ...................................................................... gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/83/15183/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c8bc0f7..a91a9b6 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -327,7 +327,7 @@ /* Mark MM state as deregistered */ ctx->gmm_state = GMM_DEREGISTERED; mmctx_set_pmm_state(ctx, PMM_DETACHED); - mmctx_set_pmm_state(ctx, MM_IDLE); + mmctx_set_mm_state(ctx, MM_IDLE); sgsn_mm_ctx_cleanup_free(ctx); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f Gerrit-Change-Number: 15183 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:35:49 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 16:35:49 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Actual first Iu test case In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 ) Change subject: sgsn: Actual first Iu test case ...................................................................... Patch Set 5: Code-Review-1 (1 comment) -1: I want to add such simple graph of messages as comment and into the commit messages. https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/13866/4/sgsn/SGSN_Tests.ttcn at 492 PS4, Line 492: rNC_ID := 2342 /* FIXME */ > Can you extend the FIXME here and a few lines above? moved this into own commit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 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: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 Gerrit-Change-Number: 13866 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:35:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:36:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:36:10 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/15161/2/include/osmocom/ranap/iu_client.h File include/osmocom/ranap/iu_client.h: https://gerrit.osmocom.org/#/c/15161/2/include/osmocom/ranap/iu_client.h at 76 PS2, Line 76: void ranap_iu_free_ue(struct ranap_ue_conn_ctx *ue); Call it ue_ctx like in other functions. https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c at 136 PS2, Line 136: { Call it ue_ctx. https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c at 153 PS2, Line 153: llist_del(&iter->list); No need for this flag, simply move the llist_del inside the loop. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:36:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:38:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:38:32 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac --- M include/osmocom/sgsn/gprs_sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/15184/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index a0a056f..9f58aaa 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -109,7 +109,7 @@ /* UMTS via Iu */ MM_CTX_T_UTRAN_Iu, /* GPRS/EDGE via Iu */ - MM_CTX_T_GERAN_Iu, + MM_CTX_T_GERAN_Iu, /* FIXME: not supported */ }; struct service_info { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:39:08 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 16:39:08 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 ) Change subject: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f Gerrit-Change-Number: 15183 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 16:39:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 16:40:55 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 2: (1 comment) will rename it. https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c at 153 PS2, Line 153: llist_del(&iter->list); > No need for this flag, simply move the llist_del inside the loop. if I do this, the llist would crash or i've to use the _safe() list -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:40:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:41:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:41:05 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15177 ) Change subject: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15177/1/include/osmocom/ranap/iu_client.h File include/osmocom/ranap/iu_client.h: https://gerrit.osmocom.org/#/c/15177/1/include/osmocom/ranap/iu_client.h at 38 PS1, Line 38: RANAP_IU_EVENT_SECURITY_MODE_FAILED, /* FIXME: unimplemented */ Why do you define it if you don't use it? That's breaking ABI compatibility, better put it at the end. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd Gerrit-Change-Number: 15177 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:41:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:43:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:43:14 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15178 ) Change subject: iu_client: ensure UE is not NULL on CO primitives ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15178/1/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15178/1/src/iu_client.c at 801 PS1, Line 801: if (!ue) You are returning unset value for rc here, as well as in the other addition. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 Gerrit-Change-Number: 15178 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:43:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:44:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:44:01 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15179 ) Change subject: iu_client: sccp_sap_up: set rc early ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15179/1/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15179/1/src/iu_client.c at 768 PS1, Line 768: int rc = -1; Ok, then better rebse and put this patch before the other one, or merge them. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idd803774612719df144bef569fb734289aa31282 Gerrit-Change-Number: 15179 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:44:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:44:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:44:55 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15180 ) Change subject: iu_client: sccp_sap_up: don't decode empty disconnect indications ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 Gerrit-Change-Number: 15180 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 13 Aug 2019 16:44:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:46:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:46:09 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15181 ) Change subject: iu_client: introduce a connection state ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15181/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15181/1//COMMIT_MSG at 9 PS1, Line 9: When the SCCP stack indicate a disconnect, save this in the UE connection indicates https://gerrit.osmocom.org/#/c/15181/1/include/osmocom/ranap/iu_client.h File include/osmocom/ranap/iu_client.h: https://gerrit.osmocom.org/#/c/15181/1/include/osmocom/ranap/iu_client.h at 38 PS1, Line 38: enum ranap_conn_state conn_state; What about a bool conn_state_connected? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:46:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:47:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:47:04 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15182 ) Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:47:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 16:51:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 16:51:19 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c at 153 PS2, Line 153: llist_del(&iter->list); > if I do this, the llist would crash or i've to use the _safe() list Not really, afaiu it's fine because you are breaking after deleting it. And btw, I'm pretty sure you can check if you need to call llist_del without iterating the whole list (by checking pointers or whatever). -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 16:51:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Aug 13 16:55:08 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 16:55:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d52eb7933010_2e9a2b28397e05f4212328@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 362s] | #define HAVE_STDLIB_H 1 [ 362s] | #define HAVE_STRING_H 1 [ 362s] | #define HAVE_MEMORY_H 1 [ 362s] | #define HAVE_STRINGS_H 1 [ 362s] | #define HAVE_INTTYPES_H 1 [ 362s] | #define HAVE_STDINT_H 1 [ 362s] | #define HAVE_UNISTD_H 1 [ 362s] | #define HAVE_DLFCN_H 1 [ 362s] | #define LT_OBJDIR ".libs/" [ 362s] | #define PACKAGE "osmo-hlr" [ 362s] | #define VERSION "1.1.0.2-b07f" [ 362s] | #define STDC_HEADERS 1 [ 362s] | [ 362s] | configure: exit 0 [ 362s] [ 362s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 362s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 362s] make: *** [debian/rules:7: build] Error 2 [ 362s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 362s] [ 362s] lamb06 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 16:54:59 UTC 2019. [ 362s] [ 362s] ### VM INTERACTION START ### [ 365s] [ 348.034262] sysrq: SysRq : Power Off [ 365s] [ 348.049277] reboot: Power down [ 365s] ### VM INTERACTION END ### [ 365s] [ 365s] lamb06 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 16:55:02 UTC 2019. [ 365s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Aug 13 17:12:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 17:12:37 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 Change subject: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static ...................................................................... gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/15185/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index a91a9b6..61c5908 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -136,7 +136,7 @@ } } -void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) return; @@ -162,7 +162,7 @@ ctx->pmm_state = state; } -void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { if (ctx->ran_type != MM_CTX_T_GERAN_Gb) return; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d Gerrit-Change-Number: 15185 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 17:12:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 17:12:37 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type For new readers it's very confusing why PMM states and MM states are in the same enum, but handled with different functions, and sometimes called one right after the other with different enums. Calling them when on a different ran_type makes the function early return, so let's better conditionally call the function to make it clear in the flow when the function is expected to do something. Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 --- M src/gprs/gprs_gmm.c 1 file changed, 34 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/15186/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 61c5908..1e586c2 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -138,9 +138,6 @@ static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { - if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) - return; - if (ctx->pmm_state == state) return; @@ -164,9 +161,6 @@ static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { - if (ctx->ran_type != MM_CTX_T_GERAN_Gb) - return; - if (ctx->pmm_state == state) return; @@ -206,7 +200,7 @@ else LOGMMCTXP(LOGL_INFO, mm, "IU release for UE conn 0x%x\n", ctx->conn_id); - if (mm && mm->pmm_state == PMM_CONNECTED) + if (mm && mm->ran_type == MM_CTX_T_UTRAN_Iu && mm->pmm_state == PMM_CONNECTED) mmctx_set_pmm_state(mm, PMM_IDLE); rc = 0; break; @@ -326,8 +320,17 @@ /* Mark MM state as deregistered */ ctx->gmm_state = GMM_DEREGISTERED; - mmctx_set_pmm_state(ctx, PMM_DETACHED); - mmctx_set_mm_state(ctx, MM_IDLE); + + switch(ctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(ctx, PMM_DETACHED); + break; + case MM_CTX_T_GERAN_Gb: + mmctx_set_mm_state(ctx, MM_IDLE); + break; + case MM_CTX_T_GERAN_Iu: + break; + } sgsn_mm_ctx_cleanup_free(ctx); } @@ -1092,7 +1095,8 @@ #ifdef BUILD_IU case GSM48_MT_GMM_SERVICE_REQ: ctx->pending_req = 0; - mmctx_set_pmm_state(ctx, PMM_CONNECTED); + if (ctx->ran_type == MM_CTX_T_UTRAN_Iu) + mmctx_set_pmm_state(ctx, PMM_CONNECTED); rc = gsm48_tx_gmm_service_ack(ctx); if (ctx->iu.service.type != GPRS_SERVICE_T_SIGNALLING) @@ -2073,16 +2077,22 @@ mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; mmctx->pending_req = 0; - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + mmctx->gmm_state = GMM_REGISTERED_NORMAL; + switch(mmctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + break; + case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llme_copy_key(mmctx, mmctx->gb.llme); gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); + mmctx_set_mm_state(mmctx, MM_READY); + break; + case MM_CTX_T_GERAN_Iu: + break; } - mmctx->gmm_state = GMM_REGISTERED_NORMAL; - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); - mmctx_set_mm_state(mmctx, MM_READY); rc = 0; osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 0); @@ -2099,15 +2109,21 @@ mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; mmctx->pending_req = 0; - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + mmctx->gmm_state = GMM_REGISTERED_NORMAL; + switch(mmctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + break; + case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); + mmctx_set_mm_state(mmctx, MM_READY); + break; + case MM_CTX_T_GERAN_Iu: + break; } - mmctx->gmm_state = GMM_REGISTERED_NORMAL; - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); - mmctx_set_mm_state(mmctx, MM_READY); rc = 0; memset(&sig_data, 0, sizeof(sig_data)); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 18:23:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 18:23:16 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Clarify comment during TLLI assignment Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15187 Change subject: gprs_gmm: Clarify comment during TLLI assignment ...................................................................... gprs_gmm: Clarify comment during TLLI assignment TS 04.64 sec 7.2.1.1 LLGMM-ASSIGN specifies: """ If TLLI Old all 1's and TLLI New all 1's then TLLI Old and TLLI New are assigned, and TLLI New shall be used when (re-)transmitting LLC frames. Both TLLI Old and TLLI New shall be accepted when received from the peer. It shall be treated as a TLLI change according to subclause 8.3.2. """ Change-Id: I3a17715bf2dba7b03c1335ad106307eb4d5f564a --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/15187/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c8bc0f7..0fcf1bb 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1794,7 +1794,7 @@ * foreign TLLI to local TLLI */ mmctx->gb.tlli_new = gprs_tmsi2tlli(mmctx->p_tmsi, TLLI_LOCAL); - /* Inform LLC layer about new TLLI but keep old active */ + /* Inform LLC layer about new TLLI but keep accepting the old one during Rx */ gprs_llgmm_assign(mmctx->gb.llme, mmctx->gb.tlli, mmctx->gb.tlli_new); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3a17715bf2dba7b03c1335ad106307eb4d5f564a Gerrit-Change-Number: 15187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 18:23:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 18:23:16 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 Change subject: gprs_sgsn.c: Remove recently introduced assert ...................................................................... gprs_sgsn.c: Remove recently introduced assert Recent commit added an assert to make sure unexpected conditions were happening in sgsn_mm_ctx_cleanup_free(). Old code was passing mm->gb.tlli to gprs_llgmm_assign with "new tlli" being all-1's (aka unassign mm->gb.tlli). The commit changed the code to use gprs_llgmm_unassign, which uses llme->tlli instead of mm->gb.tlli, and the assert was used to make sure no behavior change occured with the commit. It seems TTCN3 test TC_attach_auth_id_timeout triggers that assert, and after closer debug it seems mm->gb.tlli == llme->old_tlli, which makes sense since there's a mm->gb.tlli_new which is expected to be llme->tlli. When TLLI changes in GMM, it is stored into mm->gb.tlli_new and assigned on the LLC layer using gprs_llgm_assign(), and at the end of the function (after handling messages) it is assigned to mm->gb.tlli (and value kept in mm->gb.tlli_new). So mm->gb.tlli and mm->gb.tlli_new usually contain the same value unless a new TLLI is allocated, and during the span of the Rx path it is kept different, the LLC layer having assigned the value of mm->gb.tlli_new. So, old code (before the commit adding the assert) was wrongly using mm->gb.tlli instead of mm->gb.tlli_new at the moment of unassigning (but not really problematic in practice since behavior is the same as long as "old TLLI" value is not all-1's. So we are fine and correct using gprs_llgm_unassign() (which passes llme->tlli as "old TLLI") instead of what used to be done before. In any case, the expected behavior is to free the llme object and get rid of everything... Fixes: 788863cda53298c24110d0fe0f8cd3309cdec747 Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b --- M src/gprs/gprs_sgsn.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/88/15188/1 diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 8f1e54a..eb04846 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -313,7 +313,6 @@ void sgsn_mm_ctx_cleanup_free(struct sgsn_mm_ctx *mm) { struct gprs_llc_llme *llme = NULL; - uint32_t tlli = mm->gb.tlli; struct sgsn_pdp_ctx *pdp, *pdp2; struct sgsn_signal_data sig_data; @@ -362,7 +361,6 @@ if (llme) { /* TLLI unassignment, must be called after sgsn_mm_ctx_free */ - OSMO_ASSERT(llme->tlli == tlli); if (gprs_llgmm_unassign(llme) < 0) LOGMMCTXP(LOGL_ERROR, mm, "gprs_llgmm_unassign failed, llme not freed!\n"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b Gerrit-Change-Number: 15188 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 18:30:04 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 18:30:04 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 ) Change subject: gprs_sgsn.c: Remove recently introduced assert ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b Gerrit-Change-Number: 15188 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 18:30:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 18:39:00 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 18:39:00 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Clarify comment during TLLI assignment In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15187 ) Change subject: gprs_gmm: Clarify comment during TLLI assignment ...................................................................... Patch Set 1: Code-Review+2 If I look into the trace from ttcn, I can still see the old tlli -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3a17715bf2dba7b03c1335ad106307eb4d5f564a Gerrit-Change-Number: 15187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 18:39:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 18:41:01 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 18:41:01 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15178 ) Change subject: iu_client: ensure UE is not NULL on CO primitives ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15178/1/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15178/1/src/iu_client.c at 801 PS1, Line 801: if (!ue) > You are returning unset value for rc here, as well as in the other addition. right. this patch is in the wrong order. there is a commit for that. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 Gerrit-Change-Number: 15178 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 18:41:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:07:14 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:07:14 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 to look at the new patch set (#2). Change subject: iu_client: sccp_sap_up: don't decode empty disconnect indications ...................................................................... iu_client: sccp_sap_up: don't decode empty disconnect indications Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 --- M src/iu_client.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/15180/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 Gerrit-Change-Number: 15180 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:07:14 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:07:14 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 to look at the new patch set (#3). Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... iu_client: introduce ranap_iu_free_ue() to free the UE connections When freeing the UE connection object, disconnect the SCTP connection. Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/15161/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:07:14 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:07:14 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 to look at the new patch set (#2). Change subject: iu_client: introduce a connection state ...................................................................... iu_client: introduce a connection state When the SCCP stack indicate a disconnect, save this in the UE connection to allow the application to free() the instance later. Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/15181/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:11:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 19:11:19 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert In-Reply-To: References: Message-ID: Hello lynxis lazus, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 to look at the new patch set (#2). Change subject: gprs_sgsn.c: Remove recently introduced assert ...................................................................... gprs_sgsn.c: Remove recently introduced assert Recent commit added an assert to make sure unexpected conditions were happening in sgsn_mm_ctx_cleanup_free(). Old code was passing mm->gb.tlli to gprs_llgmm_assign with "new tlli" being all-1's (aka unassign mm->gb.tlli). The commit changed the code to use gprs_llgmm_unassign, which uses llme->tlli instead of mm->gb.tlli, and the assert was used to make sure no behavior change occured with the commit. It seems TTCN3 test TC_attach_auth_id_timeout triggers that assert, and after closer debug it seems mm->gb.tlli == llme->old_tlli, which makes sense since there's a mm->gb.tlli_new which is expected to be llme->tlli. When TLLI changes in GMM (Attach Request or RA Update), it is stored into mm->gb.tlli_new and assigned on the LLC layer using gprs_llgm_assign(), and upon completion signalling from MS, (after handling response to initial request) it is assigned to mm->gb.tlli (and value kept in mm->gb.tlli_new). So mm->gb.tlli and mm->gb.tlli_new usually contain the same value unless a new TLLI is allocated, and during the span of Request->Response->Complete it is kept different, the LLC layer having assigned the value of mm->gb.tlli_new. So, old code (before the commit adding the assert) was wrongly using mm->gb.tlli instead of mm->gb.tlli_new at the moment of unassigning (but not really problematic in practice since behavior is the same as long as "old TLLI" value is not all-1's. So we are fine and correct using gprs_llgm_unassign() (which passes llme->tlli as "old TLLI") instead of what used to be done before. In any case, the expected behavior is to free the llme object and get rid of everything... Fixes: 788863cda53298c24110d0fe0f8cd3309cdec747 Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b --- M src/gprs/gprs_sgsn.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/88/15188/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b Gerrit-Change-Number: 15188 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:13:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 19:13:16 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Fix typo in log message Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 Change subject: gprs_gmm.c: Fix typo in log message ...................................................................... gprs_gmm.c: Fix typo in log message Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/89/15189/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c8bc0f7..94a181f 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2117,7 +2117,7 @@ case GSM48_MT_GMM_PTMSI_REALL_COMPL: if (!mmctx) goto null_mmctx; - LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLLICATION COMPLETE\n"); + LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLOCATION COMPLETE\n"); mmctx_timer_stop(mmctx, 3350); mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a Gerrit-Change-Number: 15189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:15:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 19:15:15 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/15161/3/include/osmocom/ranap/iu_client.h File include/osmocom/ranap/iu_client.h: https://gerrit.osmocom.org/#/c/15161/3/include/osmocom/ranap/iu_client.h at 76 PS3, Line 76: void ranap_iu_free_ue(struct ranap_ue_conn_ctx *ue); ue_ctx https://gerrit.osmocom.org/#/c/15161/3/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15161/3/src/iu_client.c at 142 PS3, Line 142: osmo_sccp_tx_disconn(g_scu, ue_ctx->conn_id, NULL, 0); lol is it really called disconn instead of disconnect? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 19:15:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:17:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 19:17:01 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15181 ) Change subject: iu_client: introduce a connection state ...................................................................... Patch Set 2: My previous comments were still not discussed/applied. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 19:17:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:25:10 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:25:10 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15177 to look at the new patch set (#2). Change subject: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED ...................................................................... iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED To inform the application about failed security modes Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/77/15177/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd Gerrit-Change-Number: 15177 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:25:10 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:25:10 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 to look at the new patch set (#3). Change subject: iu_client: introduce a connection state ...................................................................... iu_client: introduce a connection state When the SCCP stack indicate a disconnect, save this in the UE connection to allow the application to free() the instance later. Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/15181/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:28:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 19:28:31 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15177 ) Change subject: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED ...................................................................... Patch Set 2: Can we keep it out and merge this one once it makes sense to have it? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd Gerrit-Change-Number: 15177 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 19:28:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:32:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 19:32:42 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15181 ) Change subject: iu_client: introduce a connection state ...................................................................... Patch Set 3: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/15181/3/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15181/3/src/iu_client.c at 119 PS3, Line 119: ctx->conn_state = RANAP_CONN_STATE_CONNECTED; Should be DISCONNECTED. https://gerrit.osmocom.org/#/c/15181/3/src/iu_client.c at 143 PS3, Line 143: if (ue->conn_state == RANAP_CONN_STATE_CONNECTED) You are missing setting state=CONNECTED somehwere. https://gerrit.osmocom.org/#/c/15181/3/src/iu_client.c at 823 PS3, Line 823: ue->conn_state = RANAP_CONN_STATE_CONNECTED; Should be DISCONNECTED. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 19:32:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:57:51 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:57:51 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 to look at the new patch set (#5). Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... iu_client: introduce ranap_iu_free_ue() to free the UE connections When freeing the UE connection object, disconnect the SCTP connection. Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/15161/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 19:57:51 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 19:57:51 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in... In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 to look at the new patch set (#4). Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication ...................................................................... iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/82/15182/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:21:28 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 20:21:28 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 ) Change subject: gprs_sgsn.c: Remove recently introduced assert ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b Gerrit-Change-Number: 15188 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 13 Aug 2019 20:21:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:21:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 20:21:30 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 5: Comments still not applied/discussed. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 20:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:22:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 20:22:55 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Clarify comment during TLLI assignment In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15187 ) Change subject: gprs_gmm: Clarify comment during TLLI assignment ...................................................................... gprs_gmm: Clarify comment during TLLI assignment TS 04.64 sec 7.2.1.1 LLGMM-ASSIGN specifies: """ If TLLI Old all 1's and TLLI New all 1's then TLLI Old and TLLI New are assigned, and TLLI New shall be used when (re-)transmitting LLC frames. Both TLLI Old and TLLI New shall be accepted when received from the peer. It shall be treated as a TLLI change according to subclause 8.3.2. """ Change-Id: I3a17715bf2dba7b03c1335ad106307eb4d5f564a --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index c8bc0f7..0fcf1bb 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1794,7 +1794,7 @@ * foreign TLLI to local TLLI */ mmctx->gb.tlli_new = gprs_tmsi2tlli(mmctx->p_tmsi, TLLI_LOCAL); - /* Inform LLC layer about new TLLI but keep old active */ + /* Inform LLC layer about new TLLI but keep accepting the old one during Rx */ gprs_llgmm_assign(mmctx->gb.llme, mmctx->gb.tlli, mmctx->gb.tlli_new); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3a17715bf2dba7b03c1335ad106307eb4d5f564a Gerrit-Change-Number: 15187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:22:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 20:22:55 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 ) Change subject: gprs_sgsn.c: Remove recently introduced assert ...................................................................... gprs_sgsn.c: Remove recently introduced assert Recent commit added an assert to make sure unexpected conditions were happening in sgsn_mm_ctx_cleanup_free(). Old code was passing mm->gb.tlli to gprs_llgmm_assign with "new tlli" being all-1's (aka unassign mm->gb.tlli). The commit changed the code to use gprs_llgmm_unassign, which uses llme->tlli instead of mm->gb.tlli, and the assert was used to make sure no behavior change occured with the commit. It seems TTCN3 test TC_attach_auth_id_timeout triggers that assert, and after closer debug it seems mm->gb.tlli == llme->old_tlli, which makes sense since there's a mm->gb.tlli_new which is expected to be llme->tlli. When TLLI changes in GMM (Attach Request or RA Update), it is stored into mm->gb.tlli_new and assigned on the LLC layer using gprs_llgm_assign(), and upon completion signalling from MS, (after handling response to initial request) it is assigned to mm->gb.tlli (and value kept in mm->gb.tlli_new). So mm->gb.tlli and mm->gb.tlli_new usually contain the same value unless a new TLLI is allocated, and during the span of Request->Response->Complete it is kept different, the LLC layer having assigned the value of mm->gb.tlli_new. So, old code (before the commit adding the assert) was wrongly using mm->gb.tlli instead of mm->gb.tlli_new at the moment of unassigning (but not really problematic in practice since behavior is the same as long as "old TLLI" value is not all-1's. So we are fine and correct using gprs_llgm_unassign() (which passes llme->tlli as "old TLLI") instead of what used to be done before. In any case, the expected behavior is to free the llme object and get rid of everything... Fixes: 788863cda53298c24110d0fe0f8cd3309cdec747 Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b --- M src/gprs/gprs_sgsn.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 8f1e54a..eb04846 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -313,7 +313,6 @@ void sgsn_mm_ctx_cleanup_free(struct sgsn_mm_ctx *mm) { struct gprs_llc_llme *llme = NULL; - uint32_t tlli = mm->gb.tlli; struct sgsn_pdp_ctx *pdp, *pdp2; struct sgsn_signal_data sig_data; @@ -362,7 +361,6 @@ if (llme) { /* TLLI unassignment, must be called after sgsn_mm_ctx_free */ - OSMO_ASSERT(llme->tlli == tlli); if (gprs_llgmm_unassign(llme) < 0) LOGMMCTXP(LOGL_ERROR, mm, "gprs_llgmm_unassign failed, llme not freed!\n"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I482acdbdf05ce0cb0a5804206672512854067f5b Gerrit-Change-Number: 15188 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:27:50 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 20:27:50 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 to look at the new patch set (#2). Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present ...................................................................... gprs_gmm: only update gb/iu cell information when Iu/Gb present This function should not do the transistion of Iu/Gb. Only copy simple data Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a --- M src/gprs/gprs_gmm.c 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/72/15172/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a Gerrit-Change-Number: 15172 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:27:50 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 20:27:50 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 to look at the new patch set (#2). Change subject: gprs_gmm: clarify comment of Iu follow-on request ...................................................................... gprs_gmm: clarify comment of Iu follow-on request Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60 --- M src/gprs/gprs_gmm.c 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/73/15173/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60 Gerrit-Change-Number: 15173 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:27:50 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 20:27:50 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 to look at the new patch set (#2). Change subject: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code ...................................................................... gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854 --- M src/gprs/gprs_gmm.c 1 file changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/74/15174/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854 Gerrit-Change-Number: 15174 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:29:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 20:29:15 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 ) Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a Gerrit-Change-Number: 15172 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 20:29:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:31:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 20:31:28 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 ) Change subject: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854 Gerrit-Change-Number: 15174 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 20:31:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:32:45 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 13 Aug 2019 20:32:45 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 to look at the new patch set (#6). Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... iu_client: introduce ranap_iu_free_ue() to free the UE connections When freeing the UE connection object, disconnect the SCTP connection. Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/15161/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 20:41:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 13 Aug 2019 20:41:01 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 20:41:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:28:35 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:28:35 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 13 Aug 2019 21:28:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:32:39 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:32:39 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 to look at the new patch set (#3). Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... add 'encryption uea 1 2' cfg / fix ttcn3 iu tests Recently, the ability to run UTRAN without encryption was added, but the config for it was tied to the A5 GERAN encryption configuration. This affected osmo-msc's default behavior of Iu, breaking osmo-msc ttcn3 Iu tests: the ttcn3 test suite sets A5 to 0 (no encryption) but still expects Iu to enable air encryption. Fix this "regression". Add a separate vty config option for UEA encryption, even if it does not provide full granularity to select individual UEA algorithms yet. As a result, Iu default behavior remains to enable encryption regardless of the A5 config. UTRAN encryption can be disabled by the new cfg option "encryption uea 0" alone. Even though the new vty command already allows passing various combinations of the UEA algorithm numbers, only '0' and '1 2' are accepted as valid combinations, to reflect current osmo-msc capabilities. Revert most changes to the msc_vlr test suite in commit "do not force encryption on UTRAN" (I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7): use new net->iu_encryption instead of net->a5_encryption_mask. Adjust/add to test_nodes.vty transcript tests. Related: OS#4144 Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b --- M doc/manuals/chapters/net.adoc M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.h M tests/test_nodes.vty 10 files changed, 141 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/75/15175/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:44:45 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:44:45 +0000 Subject: Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14768 ) Change subject: add vty 'no neighbors' to remove all HO targets ...................................................................... Patch Set 3: Code-Review+2 > I did not add any further comments as my original comments remain unmodified. I did explain my reasons and didn't see them nacked. I still argue that, in general, using llist_for_each_entry_safe() is actually not safe when entries get removed. I'd prefer not spending time on it. > If you merge it like this I will likely send a follow-up patch to use llist iteration helpers. I take this as an ok to merge this, then; Follow up if you might. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 Gerrit-Change-Number: 14768 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 13 Aug 2019 21:44:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:45:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:45:34 +0000 Subject: Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14768 ) Change subject: add vty 'no neighbors' to remove all HO targets ...................................................................... add vty 'no neighbors' to remove all HO targets This is required for an upcoming TTCN3 test that plays through various neighbor configurations. Related: OS#4056 Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc (osmo-ttcn3-hacks) Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 111 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 203b150..2b8cd7e 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -372,6 +372,82 @@ return CMD_SUCCESS; } +struct nil_match_bts_data { + int bts_nr; + const struct neighbor_ident_key *found; +}; + +static bool nil_match_bts(const struct neighbor_ident_key *key, + const struct gsm0808_cell_id_list2 *val, + void *cb_data) +{ + struct nil_match_bts_data *d = cb_data; + if (key->from_bts == d->bts_nr) { + d->found = key; + return false; + } + return true; +} + +static int neighbor_del_all(struct vty *vty) +{ + int rc; + int removed = 0; + struct gsm_bts *bts = vty->index; + + OSMO_ASSERT((vty->node == BTS_NODE) && bts); + + /* Remove all local neighbors and print to VTY for the user to know what changed */ + while (1) { + struct gsm_bts_ref *neigh = llist_first_entry_or_null(&bts->local_neighbors, struct gsm_bts_ref, entry); + struct gsm_bts *neigh_bts; + if (!neigh) + break; + + neigh_bts = neigh->bts; + OSMO_ASSERT(neigh_bts); + + /* It would be more efficient to just llist_del() the gsm_bts_ref directly, but for the sake of + * safe/sane API use and against code dup, rather invoke the central gsm_bts_local_neighbor_del() + * function intended for this task. */ + rc = gsm_bts_local_neighbor_del(bts, neigh_bts); + if (rc > 0) { + vty_out(vty, "%% Removed local neighbor bts %u to bts %u%s", + bts->nr, neigh_bts->nr, VTY_NEWLINE); + removed += rc; + } else { + vty_out(vty, "%% Error while removing local neigbor bts %u to bts %u, aborted%s", + bts->nr, neigh_bts->nr, VTY_NEWLINE); + return CMD_WARNING; + } + } + + /* Remove all remote-BSS neighbors */ + while (1) { + struct neighbor_ident_key k; + struct nil_match_bts_data d = { + .bts_nr = bts->nr, + }; + neighbor_ident_iter(g_neighbor_cells, nil_match_bts, &d); + if (!d.found) + break; + k = *d.found; + if (neighbor_ident_del(g_neighbor_cells, &k)) { + vty_out(vty, "%% Removed remote BSS neighbor %s%s", + neighbor_ident_key_name(&k), VTY_NEWLINE); + removed++; + } else { + vty_out(vty, "%% Error while removing remote BSS neighbor %s, aborted%s", + neighbor_ident_key_name(&k), VTY_NEWLINE); + return CMD_WARNING; + } + } + + if (!removed) + vty_out(vty, "%% No neighbors configured%s", VTY_NEWLINE); + return CMD_SUCCESS; +} + DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd, NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) @@ -430,6 +506,15 @@ return del_by_key(vty, &key); } +DEFUN(cfg_neighbor_del_all, cfg_neighbor_del_all_cmd, + "no neighbors", + NO_STR + "Remove all local and remote-BSS neighbor config for this cell." + " Note that this falls back to the legacy behavior of regarding all local cells as neighbors.\n") +{ + return neighbor_del_all(vty); +} + struct write_neighbor_ident_entry_data { struct vty *vty; const char *indent; @@ -576,5 +661,6 @@ install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd); install_element(BTS_NODE, &cfg_neighbor_del_bts_nr_cmd); install_element(BTS_NODE, &cfg_neighbor_del_arfcn_bsic_cmd); + install_element(BTS_NODE, &cfg_neighbor_del_all_cmd); install_element_ve(&show_bts_neighbor_cmd); } diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 4aeb6cc..ce414e1 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -89,6 +89,7 @@ neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) no neighbor bts <0-255> no neighbor arfcn <0-1023> bsic (<0-63>|any) + no neighbors ... OsmoBSC(config-net-bts)# neighbor? @@ -158,6 +159,9 @@ OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# no neighbors? + neighbors Remove all local and remote-BSS neighbor config for this cell. Note that this falls back to the legacy behavior of regarding all local cells as neighbors. + OsmoBSC(config-net-bts)# no neighbor? neighbor Remove local or remote-BSS neighbor cell @@ -332,3 +336,24 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor + +OsmoBSC(config-net-bts)# neighbor bts 1 +% BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 +OsmoBSC(config-net-bts)# neighbor bts 2 +% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 +OsmoBSC(config-net-bts)# neighbor cgi 023 42 423 5 arfcn 23 bsic 42 +% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45 +% BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry +OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any +% BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry + +OsmoBSC(config-net-bts)# no neighbors +% Removed local neighbor bts 0 to bts 1 +% Removed local neighbor bts 0 to bts 2 +% Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 +% Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45 +% Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC) + +OsmoBSC(config-net-bts)# show running-config +... !neighbor -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 Gerrit-Change-Number: 14768 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:52:40 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:52:40 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 to look at the new patch set (#4). Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... add 'encryption uea 1 2' cfg / fix ttcn3 iu tests Recently, the ability to run UTRAN without encryption was added, but the config for it was tied to the A5 GERAN encryption configuration. This affected osmo-msc's default behavior of Iu, breaking osmo-msc ttcn3 Iu tests: the ttcn3 test suite sets A5 to 0 (no encryption) but still expects Iu to enable air encryption. Fix this "regression". Add a separate vty config option for UEA encryption, even if it does not provide full granularity to select individual UEA algorithms yet. As a result, Iu default behavior remains to enable encryption regardless of the A5 config. UTRAN encryption can be disabled by the new cfg option "encryption uea 0" alone. Even though the new vty command already allows passing various combinations of the UEA algorithm numbers, only '0' and '1 2' are accepted as valid combinations, to reflect current osmo-msc capabilities. Revert most changes to the msc_vlr test suite in commit "do not force encryption on UTRAN" (I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7): use new net->iu_encryption instead of net->a5_encryption_mask. Adjust/add to test_nodes.vty transcript tests. Related: OS#4144 Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b --- M doc/manuals/chapters/net.adoc M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.h M tests/test_nodes.vty 10 files changed, 153 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/75/15175/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:53:50 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:53:50 +0000 Subject: Change in ...docker-playground[master]: adjust osmo-bsc.cfg for TC_ho_neighbor_config_1 thru _7 In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/14764 ) Change subject: adjust osmo-bsc.cfg for TC_ho_neighbor_config_1 thru _7 ...................................................................... adjust osmo-bsc.cfg for TC_ho_neighbor_config_1 thru _7 - Actually enable handover. - Add bts 3 Related: osmo-ttcn3-hacks Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc Change-Id: I1c57a04747f5ec004ccf4657954dcb0b003c24fc --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 30 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve neels: Verified diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 3d226e9..6cfaf7c 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -66,7 +66,7 @@ encryption a5 0 1 3 neci 1 paging any use tch 0 - handover 0 + handover 1 handover window rxlev averaging 10 handover window rxqual averaging 1 handover window rxlev neighbor averaging 10 @@ -350,6 +350,35 @@ timeslot 7 phys_chan_config PDCH hopping enabled 0 + bts 3 + type sysmobts + band DCS1800 + cell_identity 3 + location_area_code 3 + # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config) + base_station_id_code 12 + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/H + timeslot 6 + phys_chan_config PDCH + timeslot 7 + phys_chan_config PDCH msc 0 ip.access rtp-base 4000 no bsc-welcome-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1c57a04747f5ec004ccf4657954dcb0b003c24fc Gerrit-Change-Number: 14764 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:54:56 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:54:56 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: add TC_ho_neighbor_config_1 thru _7 In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14765 ) Change subject: bsc: add TC_ho_neighbor_config_1 thru _7 ...................................................................... bsc: add TC_ho_neighbor_config_1 thru _7 Add tests to play through various neighbor configurations. Tests will pass as soon as osmo-bsc I29bca59ab232eddc74e0d4698efb9c9992443983 is merged. Add RSL2 to allow triggering handover to BTS 2. Adjust osmo-bsc.cfg to match the new tests. Also applied in docker-playground I1c57a04747f5ec004ccf4657954dcb0b003c24fc. - Actually enable handover. - Add bts 3 Depends: osmo-bsc I8623ab581639e9f8af6a9ff1eca990518d1b1211 ('no neighbors') Related: OS#4056 Change-Id: Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc --- M bsc/BSC_Tests.ttcn M bsc/osmo-bsc.cfg M library/RSL_Emulation.ttcn 3 files changed, 396 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 44a9172..4497a2e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1719,6 +1719,10 @@ connect(vc_conn:RSL1, bts[1].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL1_PROC, bts[1].rsl.vc_RSL:RSL_PROC); } + if (isvalue(bts[2])) { + connect(vc_conn:RSL2, bts[2].rsl.vc_RSL:CLIENT_PT); + connect(vc_conn:RSL2_PROC, bts[2].rsl.vc_RSL:RSL_PROC); + } connect(vc_conn:BSSAP, g_bssap.vc_RAN:CLIENT); connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT); connect(vc_conn:MGCP_MULTI, vc_MGCP:MGCP_CLIENT_MULTI); @@ -2837,6 +2841,11 @@ f_vty_transceive(BSCVTY, cmd & suffix); } +/* Even though the VTY command to trigger handover takes a new BTS number as argument, behind the scenes osmo-bsc always + * translates that to a target ARFCN+BSIC first. See bsc_vty.c trigger_ho_or_as(), which puts the selected BTS' neighbor + * ident key (ARFCN + BSIC) in the struct passed on to handover_request(). handover_start() then resolves that to a + * viable actual neighbor cell. So from the internal osmo-bsc perspective, we always request handover to an ARFCN + BSIC + * pair, not really to a specific BTS number. */ private function f_vty_handover(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, integer new_bts_nr) runs on MSC_ConnHdlr { @@ -3587,6 +3596,353 @@ vc_conn.done; } +type record of charstring Commands; + +private function f_bts_0_cfg(Commands cmds := {}) runs on MSC_ConnHdlr +{ + f_vty_enter_cfg_bts(BSCVTY, 0); + for (var integer i := 0; i < sizeof(cmds); i := i+1) { + f_vty_transceive(BSCVTY, cmds[i]); + } + f_vty_transceive(BSCVTY, "end"); +} + +private function f_probe_for_handover(charstring log_label, + charstring log_descr, + charstring handover_vty_cmd, + boolean expect_handover, + boolean is_inter_bsc_handover := false) +runs on MSC_ConnHdlr +{ + var RSL_Message rsl; + + var charstring log_msg := " (expecting handover)" + if (not expect_handover) { + log_msg := " (expecting NO handover)"; + } + log("f_probe_for_handover starting: " & log_label & ": " & log_descr & log_msg); + f_vty_transceive(BSCVTY, handover_vty_cmd); + + /* We're going to thwart any and all handover attempts, just be ready to handle (and ignore) handover target + * lchans to be established on bts 1 or bts 2. */ + f_rslem_suspend(RSL1_PROC); + f_rslem_suspend(RSL2_PROC); + + timer T := 2.0; + T.start; + + alt { + [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr)) -> value rsl { + var PDU_ML3_NW_MS l3 := dec_PDU_ML3_NW_MS(rsl.ies[2].body.l3_info.payload); + log("Rx L3 from net: ", l3); + if (ischosen(l3.msgs.rrm.handoverCommand)) { + var RslChannelNr new_chan_nr; + var GsmArfcn arfcn; + f_ChDesc2RslChanNr(l3.msgs.rrm.handoverCommand.channelDescription2, + new_chan_nr, arfcn); + log("Handover to new chan ", new_chan_nr, " on ARFCN ", arfcn); + log(l3.msgs.rrm.handoverCommand); + + /* Need to register for new lchan on new BTS -- it's either bts 1 or bts 2. It doesn't really + * matter on which BTS it really is, we're not going to follow through an entire handover + * anyway. */ + f_rslem_register(0, new_chan_nr, RSL1_PROC); + f_rslem_resume(RSL1_PROC); + f_rslem_register(0, new_chan_nr, RSL2_PROC); + f_rslem_resume(RSL2_PROC); + + if (expect_handover and not is_inter_bsc_handover) { + setverdict(pass); + log("f_probe_for_handover(" & log_label & "): Got RSL Handover Command as expected."); + } else { + setverdict(fail, "f_probe_for_handover(" & log_label & "): Expected none, but got RSL Handover Command. " + & log_label & ": " & log_descr); + } + + log("f_probe_for_handover(" & log_label & "): Ending the test: Handover Failure stops the procedure."); + /* osmo-bsc has triggered Handover. That's all we need to know for this test, reply with + * Handover Failure. */ + f_rsl_send_l3(ts_RRM_HandoverFailure('00'O)); + + /* target BTS is told to release lchan again; don't care which BTS nor what messages. */ + f_sleep(0.5); + RSL1.clear; + RSL2.clear; + log("f_probe_for_handover(" & log_label & "): done (got RSL Handover Command)"); + break; + } else { + repeat; + } + } + [] BSSAP.receive(tr_BSSMAP_HandoverRequired) { + if (expect_handover and is_inter_bsc_handover) { + setverdict(pass); + log("f_probe_for_handover(" & log_label & "): Got BSSMAP Handover Required as expected."); + } else { + setverdict(fail, "f_probe_for_handover(" & log_label & "): Expected none, but got BSSMAP Handover Required. " + & log_label & ": " & log_descr); + } + + log("f_probe_for_handover(" & log_label & "): done (got BSSMAP Handover Required)"); + + /* Note: f_tc_ho_neighbor_config_start() sets T7, the timeout for BSSMAP Handover Required, to + * 1 second. There is no legal way to quickly abort a handover after a BSSMAP Handover Required, + * setting a short timeout and waiting is the only way. */ + log("f_probe_for_handover(" & log_label & "): waiting for inter-BSC HO to time out..."); + f_sleep(1.5); + log("f_probe_for_handover(" & log_label & "): ...done"); + + break; + } + [] T.timeout { + if (expect_handover) { + setverdict(fail, "f_probe_for_handover(" & log_label & "): Expected Handover, but got none. " + & log_label & ": " & log_descr); + } else { + setverdict(pass); + log("f_probe_for_handover(" & log_label & "): Got no Handover, as expected."); + } + log("f_probe_for_handover(" & log_label & "): done (got no Handover)"); + break; + } + } + + f_rslem_resume(RSL1_PROC); + f_rslem_resume(RSL2_PROC); + f_sleep(3.0); + RSL.clear; + + log("f_probe_for_handover(" & log_label & "): done clearing"); +} + +/* Test the effect of various neighbor configuration scenarios: + * + * To avoid complexity, block off any actual handover operation, and always remain on the lchan at bts 0. + * Reconfigure the neighbors for bts 0, trigger a Handover, and probe whether osmo-bsc does or doesn't start HO. + */ +private function f_tc_ho_neighbor_config_start() runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + const OCT8 kc := '0001020304050607'O; + + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + + /* Establish lchan at bts 0 */ + f_establish_fully(ass_cmd, exp_compl); + + /* Shorten the inter-BSC Handover timeout, to not wait so long for inter-BSC Handovers */ + f_vty_enter_cfg_network(BSCVTY); + f_vty_transceive(BSCVTY, "timer T7 1"); + f_vty_transceive(BSCVTY, "end"); +} + +private function f_tc_ho_neighbor_config_1(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 1. No 'neighbor' config"); + f_bts_0_cfg({"no neighbors"}); + f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)", + "handover any to arfcn 871 bsic 11", + true); + + f_probe_for_handover("1.b", "HO to unknown cell does not start", + "handover any to arfcn 13 bsic 39", + false); + + f_probe_for_handover("1.c", "HO to 871-12 is ambiguous = error", + "handover any to arfcn 871 bsic 12", + false); + + f_probe_for_handover("1.d", "HO to 871-11 still works (verify that this test properly cleans up)", + "handover any to arfcn 871 bsic 11", + true); +} +private function f_tc_ho_neighbor_config_2(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 2. explicit local neighbor: 'neighbor bts 1'"); + f_bts_0_cfg({"neighbor bts 1"}); + f_sleep(0.5); + + f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor", + "handover any to arfcn 871 bsic 11", + true); + + f_probe_for_handover("2.b", "HO to bts 2 doesn't work, not listed as neighbor", + "handover any to arfcn 871 bsic 12", + false); +} +private function f_tc_ho_neighbor_config_3(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 3. explicit local neighbor: 'neighbor bts 2'"); + f_bts_0_cfg({"no neighbors", "neighbor bts 2"}); + f_sleep(0.5); + + f_probe_for_handover("3.a", "HO to bts 1 doesn't work, not listed as neighbor", + "handover any to arfcn 871 bsic 11", + false); + f_probe_for_handover("3.b", "HO to bts 2 works, explicitly listed as neighbor; no ambiguity because bts 3 is not listed as neighbor", + "handover any to arfcn 871 bsic 12", + true); +} +private function f_tc_ho_neighbor_config_4(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 4. explicit remote neighbor: 'neighbor lac 99 arfcn 123 bsic 45'"); + f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); + f_sleep(0.5); + + f_probe_for_handover("4.a", "HO to bts 1 doesn't work, not listed as neighbor", + "handover any to arfcn 871 bsic 11", + false); + f_probe_for_handover("4.b", "HO to bts 2 doesn't work, not listed as neighbor", + "handover any to arfcn 871 bsic 12", + false); + f_probe_for_handover("4.c", "HO to 123-45 triggers inter-BSC HO", + "handover any to arfcn 123 bsic 45", + true, true); +} +private function f_tc_ho_neighbor_config_5(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 5. explicit remote neighbor re-using ARFCN+BSIC: 'neighbor lac 99 arfcn 871 bsic 12'"); + f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); + f_sleep(0.5); + + f_probe_for_handover("5.a", "HO to 871-12 triggers inter-BSC HO (ignoring local cells with same ARFCN+BSIC)", + "handover any to arfcn 871 bsic 12", + true, true); +} +private function f_tc_ho_neighbor_config_6(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 6. config error: explicit local and remote neighbors with ambiguous ARFCN+BSIC:" + & " 'neighbor bts 2; neighbor lac 99 arfcn 871 bsic 12'"); + f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); + f_sleep(0.5); + + f_probe_for_handover("6.a", "HO to 871-12 is ambiguous = error", + "handover any to arfcn 871 bsic 12", + false); +} +private function f_tc_ho_neighbor_config_7(charstring id) runs on MSC_ConnHdlr { + f_tc_ho_neighbor_config_start(); + + /* + * bts 0 ARFCN 871 BSIC 10 + * bts 1 ARFCN 871 BSIC 11 + * bts 2 ARFCN 871 BSIC 12 + * bts 3 ARFCN 871 BSIC 12 serves as ambiguity for bts 2, re-using the ARFCN+BSIC + */ + + log("f_tc_ho_neighbor_config: 7. explicit local and remote neighbors:" + & " 'neighbor bts 2; neighbor lac 99 arfcn 123 bsic 45'"); + f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); + f_sleep(0.5); + + f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2", + "handover any to arfcn 871 bsic 12", + true); + f_probe_for_handover("7.b", "HO to 123-45 triggers inter-BSC HO", + "handover any to arfcn 123 bsic 45", + true, true); +} + +testcase TC_ho_neighbor_config_1() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_1)); + vc_conn.done; +} +testcase TC_ho_neighbor_config_2() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_2)); + vc_conn.done; +} +testcase TC_ho_neighbor_config_3() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_3)); + vc_conn.done; +} +testcase TC_ho_neighbor_config_4() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_4)); + vc_conn.done; +} +testcase TC_ho_neighbor_config_5() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_5)); + vc_conn.done; +} +testcase TC_ho_neighbor_config_6() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_6)); + vc_conn.done; +} +testcase TC_ho_neighbor_config_7() runs on test_CT { + var MSC_ConnHdlr vc_conn; + f_init(3, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_7)); + vc_conn.done; +} + /* OS#3041: Open and close N connections in a normal fashion, and expect no * BSSMAP Reset just because of that. */ testcase TC_bssap_rlsd_does_not_cause_bssmap_reset() runs on test_CT { @@ -4140,6 +4496,14 @@ execute( TC_ho_in_fail_no_detect() ); execute( TC_ho_in_fail_no_detect2() ); + execute( TC_ho_neighbor_config_1() ); + execute( TC_ho_neighbor_config_2() ); + execute( TC_ho_neighbor_config_3() ); + execute( TC_ho_neighbor_config_4() ); + execute( TC_ho_neighbor_config_5() ); + execute( TC_ho_neighbor_config_6() ); + execute( TC_ho_neighbor_config_7() ); + execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); execute( TC_bssmap_clear_does_not_cause_bssmap_reset() ); execute( TC_ms_rel_ind_does_not_cause_bssmap_reset() ); diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index bca5b20..9384491 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -57,7 +57,7 @@ encryption a5 0 1 3 neci 1 paging any use tch 0 - handover 0 + handover 1 handover window rxlev averaging 10 handover window rxqual averaging 1 handover window rxlev neighbor averaging 10 @@ -339,6 +339,35 @@ timeslot 7 phys_chan_config PDCH hopping enabled 0 + bts 3 + type sysmobts + band DCS1800 + cell_identity 3 + location_area_code 3 + # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config) + base_station_id_code 12 + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/H + timeslot 6 + phys_chan_config PDCH + timeslot 7 + phys_chan_config PDCH msc 0 ip.access rtp-base 4000 no bsc-welcome-text diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 790dd7a..309ec13 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -45,6 +45,8 @@ /* second BTS / DChan during hand-over */ port RSL_DCHAN_PT RSL1; port RSLEM_PROC_PT RSL1_PROC; + port RSL_DCHAN_PT RSL2; + port RSLEM_PROC_PT RSL2_PROC; }; type record RSLDC_ChanRqd { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14765 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: Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc Gerrit-Change-Number: 14765 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:57:18 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:57:18 +0000 Subject: Change in ...osmo-bsc[master]: neighbor config: allow re-using ARFCN+BSIC pairs In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14769 ) Change subject: neighbor config: allow re-using ARFCN+BSIC pairs ...................................................................... neighbor config: allow re-using ARFCN+BSIC pairs Fix neighbor config to match OsmoBSC manual: implement the plan for neighbor configuration that was so far only described in the manual without actually being in operation. This first allows re-using ARFCN+BSIC pairs in and across BSS. So far the handover_start() code always looked for handover target cells across *all* local cells, even if they were not listed as neighbors to a source cell. Imply all cells as neighbors only as long as there are no explicit neighbors configured. As soon as the first 'neighbor' line appears in a 'bts' config, only the listed neighbors are regarded as handover target cells. (The 'neighbor-list' commands are not related to this, only the relatively new 'neighbor (bts|lac|cgi|...)' commands affect actual handover procedures.) TTCN3 tests TC_ho_neighbor_config_1 thru _7 play through the various aspects of neighbor configuration: both the legacy implicit all-cells-are-neighbors as well as allowing only explicit neighbors by config. Related: OS#4056 Related: osmo-ttcn3-hacks Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc Change-Id: I29bca59ab232eddc74e0d4698efb9c9992443983 --- M include/osmocom/bsc/handover.h M include/osmocom/bsc/handover_fsm.h M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/handover_logic.c M src/osmo-bsc/neighbor_ident_vty.c M tests/bsc/bsc_test.c 8 files changed, 241 insertions(+), 61 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index 322913d..b00ee60 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -10,6 +10,15 @@ #include #include +#define LOG_HO(conn, level, fmt, args...) do { \ + if (conn->ho.fi) \ + LOGPFSML(conn->ho.fi, level, "%s: " fmt, \ + handover_status(conn), ## args); \ + else \ + LOGP(DHODEC, level, "%s: " fmt, \ + handover_status(conn), ## args); \ + } while(0) + struct gsm_network; struct gsm_lchan; struct gsm_bts; @@ -25,6 +34,8 @@ HO_RESULT_ERROR, }; +const char *handover_status(struct gsm_subscriber_connection *conn); + extern const struct value_string handover_result_names[]; inline static const char *handover_result_name(enum handover_result val) { return get_value_string(handover_result_names, val); } @@ -70,8 +81,11 @@ struct gsm_lchan *lchan); void bsc_tx_bssmap_ho_failure(struct gsm_subscriber_connection *conn); -struct gsm_bts *bts_by_neighbor_ident(const struct gsm_network *net, - const struct neighbor_ident_key *search_for); +int find_handover_target_cell(struct gsm_bts **local_target_cell_p, + const struct gsm0808_cell_id_list2 **remote_target_cell_p, + struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for, + bool log_errors); + struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn, diff --git a/include/osmocom/bsc/handover_fsm.h b/include/osmocom/bsc/handover_fsm.h index 7c2145e..1628d8f 100644 --- a/include/osmocom/bsc/handover_fsm.h +++ b/include/osmocom/bsc/handover_fsm.h @@ -4,18 +4,6 @@ #include #include -const char *handover_status(struct gsm_subscriber_connection *conn); - -/* This macro automatically includes a final \n, if omitted. */ -#define LOG_HO(conn, level, fmt, args...) do { \ - if (conn->ho.fi) \ - LOGPFSML(conn->ho.fi, level, "%s: " fmt, \ - handover_status(conn), ## args); \ - else \ - LOGP(DHODEC, level, "%s: " fmt, \ - handover_status(conn), ## args); \ - } while(0) - /* Terminology: * Intra-Cell: stays within one BTS, this should actually be an Assignment. * Intra-BSC: stays within one BSC, but moves between BTSes. diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h index 17bffbc..aa38276 100644 --- a/include/osmocom/bsc/neighbor_ident.h +++ b/include/osmocom/bsc/neighbor_ident.h @@ -47,6 +47,8 @@ void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil); void neighbor_ident_vty_write(struct vty *vty, const char *indent, struct gsm_bts *bts); +bool neighbor_ident_bts_entry_exists(uint8_t from_bts); + #define NEIGHBOR_IDENT_VTY_KEY_PARAMS "arfcn <0-1023> bsic (<0-63>|any)" #define NEIGHBOR_IDENT_VTY_KEY_DOC \ "ARFCN of neighbor cell\n" "ARFCN value\n" \ diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index a8fff63..0e24c0d 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -900,18 +900,8 @@ return; } - neighbor_bts = bts_by_neighbor_ident(bts->network, &ni); - - neighbor_cil = neighbor_ident_get(bts->network->neighbor_bss_cells, &ni); - - if (neighbor_bts && neighbor_cil) { - LOGPHOBTS(bts, LOGL_ERROR, "Configuration error: %s exists as both local" - " neighbor (bts %u) and remote-BSS neighbor (%s). Will consider only" - " the local-BSS neighbor.\n", - neighbor_ident_key_name(&ni), - neighbor_bts->nr, gsm0808_cell_id_list_name(neighbor_cil)); - neighbor_cil = NULL; - } + find_handover_target_cell(&neighbor_bts, &neighbor_cil, + lchan->conn, &ni, false); if (!neighbor_bts && !neighbor_cil) { LOGPHOBTS(bts, LOGL_DEBUG, "no neighbor ARFCN %u BSIC %u configured for this cell\n", diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 6d0c2d4..d159347 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -200,6 +201,9 @@ conn = req->old_lchan->conn; OSMO_ASSERT(conn && conn->fi); + /* Make sure the handover target neighbor_ident_key contains the correct source bts nr */ + req->target_nik.from_bts = req->old_lchan->ts->trx->bts->nr; + /* To make sure we're allowed to start a handover, go through a gscon event dispatch. If that is accepted, the * same req is passed to handover_start(). */ osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_HANDOVER_START, req); @@ -285,9 +289,10 @@ OSMO_ASSERT(req && req->old_lchan && req->old_lchan->conn); struct gsm_subscriber_connection *conn = req->old_lchan->conn; + const struct neighbor_ident_key *search_for = &req->target_nik; struct handover *ho = &conn->ho; - struct gsm_bts *bts; - const struct gsm0808_cell_id_list2 *cil; + struct gsm_bts *local_target_cell = NULL; + const struct gsm0808_cell_id_list2 *remote_target_cell = NULL; if (conn->ho.fi) { LOG_HO(conn, LOGL_ERROR, "Handover requested while another handover is ongoing; Ignore\n"); @@ -295,6 +300,9 @@ } handover_reset(conn); + /* When handover_start() is invoked by the gscon, it expects a HANDOVER_END event. The best way to ensure this + * is to always create a handover_fsm instance, even if the target cell is not resolved yet. Any failure should + * then call handover_end(), which ensures that the conn snaps back to a valid state. */ handover_fsm_alloc(conn); ho->from_hodec_id = req->from_hodec_id; @@ -302,21 +310,25 @@ req->old_lchan->type : req->new_lchan_type; ho->target_cell = req->target_nik; - bts = bts_by_neighbor_ident(conn->network, &req->target_nik); - if (bts) { - ho->new_bts = bts; + if (find_handover_target_cell(&local_target_cell, &remote_target_cell, + conn, search_for, true)) + goto no_handover; + + if (local_target_cell) { + ho->new_bts = local_target_cell; handover_start_intra_bsc(conn); return; } - cil = neighbor_ident_get(conn->network->neighbor_bss_cells, &req->target_nik); - if (cil) { - handover_start_inter_bsc_out(conn, cil); + if (remote_target_cell) { + handover_start_inter_bsc_out(conn, remote_target_cell); return; } - LOG_HO(conn, LOGL_ERROR, "Cannot handover %s: neighbor unknown\n", - neighbor_ident_key_name(&req->target_nik)); + /* should never reach this, because find_handover_target_cell() would have returned error. */ + OSMO_ASSERT(false); + +no_handover: handover_end(conn, HO_RESULT_FAIL_NO_CHANNEL); } diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index 5725213..5be8383 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -125,42 +125,205 @@ return count; } -struct gsm_bts *bts_by_neighbor_ident(const struct gsm_network *net, - const struct neighbor_ident_key *search_for) +/* Find out a handover target cell for the given neighbor_ident_key, + * and make sure there are no ambiguous matches. + * Given a source BTS and a target ARFCN+BSIC, find which cell is the right handover target. + * ARFCN+BSIC may be re-used within and/or across BSS, so make sure that only those cells that are explicitly + * listed as neighbor of the source cell are viable handover targets. + * The (legacy) default configuration is that, when no explicit neighbors are listed, that all local cells are + * neighbors, in which case each ARFCN+BSIC must exist at most once. + * If there is more than one viable handover target cell found for the given ARFCN+BSIC, that constitutes a + * configuration error and should not result in handover, so that the system's misconfiguration is more likely + * to be found. + */ +int find_handover_target_cell(struct gsm_bts **local_target_cell_p, + const struct gsm0808_cell_id_list2 **remote_target_cell_p, + struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for, + bool log_errors) { - struct gsm_bts *found = NULL; - struct gsm_bts *bts; - struct gsm_bts *wildcard_match = NULL; + struct gsm_network *net = conn->network; + struct gsm_bts *from_bts; + struct gsm_bts *local_target_cell = NULL; + const struct gsm0808_cell_id_list2 *remote_target_cell = NULL; + struct gsm_bts_ref *neigh; + bool ho_active; + bool as_active; - llist_for_each_entry(bts, &net->bts_list, list) { - struct neighbor_ident_key entry = { - .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, - .arfcn = bts->c0->arfcn, - .bsic = bts->bsic, - }; - if (neighbor_ident_key_match(&entry, search_for, true)) { - if (found) { - LOGP(DHO, LOGL_ERROR, "CONFIG ERROR: Multiple BTS match %s: %d and %d\n", - neighbor_ident_key_name(search_for), - found->nr, bts->nr); - return found; - } - found = bts; - } - if (neighbor_ident_key_match(&entry, search_for, false)) - wildcard_match = bts; + if (local_target_cell_p) + *local_target_cell_p = NULL; + if (remote_target_cell_p) + *remote_target_cell_p = NULL; + + if (!search_for) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, "Handover without target cell\n"); + return -EINVAL; } - if (found) - return found; + from_bts = gsm_bts_num(net, search_for->from_bts); + if (!from_bts) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, "Handover without source cell\n"); + return -EINVAL; + } - return wildcard_match; + ho_active = ho_get_ho_active(from_bts->ho); + as_active = (ho_get_algorithm(from_bts->ho) == 2) + && ho_get_hodec2_as_active(from_bts->ho); + if (!ho_active && !as_active) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, "Cannot start Handover: Handover and Assignment disabled for this source cell (%s)\n", + neighbor_ident_key_name(search_for)); + return -EINVAL; + } + + if (llist_empty(&from_bts->local_neighbors) + && !neighbor_ident_bts_entry_exists(from_bts->nr)) { + /* No explicit neighbor entries exist for this BTS. Hence apply the legacy default behavior that all + * local cells are neighbors. */ + struct gsm_bts *bts; + struct gsm_bts *wildcard_match = NULL; + + LOG_HO(conn, LOGL_DEBUG, "No explicit neighbors, regarding all local cells as neighbors\n"); + + llist_for_each_entry(bts, &net->bts_list, list) { + struct neighbor_ident_key bts_key = *bts_ident_key(bts); + if (neighbor_ident_key_match(&bts_key, search_for, true)) { + if (local_target_cell) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, + "NEIGHBOR CONFIGURATION ERROR: Multiple local cells match %s" + " (BTS %d and BTS %d)." + " Aborting Handover because of ambiguous network topology.\n", + neighbor_ident_key_name(search_for), + local_target_cell->nr, bts->nr); + return -EINVAL; + } + local_target_cell = bts; + } + if (neighbor_ident_key_match(&bts_key, search_for, false)) + wildcard_match = bts; + } + + if (!local_target_cell) + local_target_cell = wildcard_match; + + if (!local_target_cell) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, "Cannot Handover, no cell matches %s\n", + neighbor_ident_key_name(search_for)); + return -EINVAL; + } + + if (local_target_cell == from_bts && !as_active) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, + "Cannot start re-assignment, Assignment disabled for this cell (%s)\n", + neighbor_ident_key_name(search_for)); + return -EINVAL; + } + if (local_target_cell != from_bts && !ho_active) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, + "Cannot start Handover, Handover disabled for this cell (%s)\n", + neighbor_ident_key_name(search_for)); + return -EINVAL; + } + + if (local_target_cell_p) + *local_target_cell_p = local_target_cell; + return 0; + } + + /* One or more local- or remote-BSS cell neighbors are configured. Find a match among those, but also detect + * ambiguous matches (if multiple cells match, it is a configuration error). */ + + LOG_HO(conn, LOGL_DEBUG, "There are explicit neighbors configured for this cell\n"); + + /* Iterate explicit local neighbor cells */ + llist_for_each_entry(neigh, &from_bts->local_neighbors, entry) { + struct gsm_bts *neigh_bts = neigh->bts; + struct neighbor_ident_key neigh_bts_key = *bts_ident_key(neigh_bts); + neigh_bts_key.from_bts = from_bts->nr; + + LOG_HO(conn, LOGL_DEBUG, "Local neighbor %s\n", neighbor_ident_key_name(&neigh_bts_key)); + + if (!neighbor_ident_key_match(&neigh_bts_key, search_for, true)) { + LOG_HO(conn, LOGL_DEBUG, "Doesn't match %s\n", neighbor_ident_key_name(search_for)); + continue; + } + + if (local_target_cell) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, + "NEIGHBOR CONFIGURATION ERROR: Multiple BTS match %s (BTS %d and BTS %d)." + " Aborting Handover because of ambiguous network topology.\n", + neighbor_ident_key_name(search_for), local_target_cell->nr, neigh_bts->nr); + return -EINVAL; + } + + local_target_cell = neigh_bts; + } + + /* Any matching remote-BSS neighbor cell? */ + remote_target_cell = neighbor_ident_get(net->neighbor_bss_cells, search_for); + + if (remote_target_cell) + LOG_HO(conn, LOGL_DEBUG, "Found remote target cell %s\n", + gsm0808_cell_id_list_name(remote_target_cell)); + + if (local_target_cell && remote_target_cell) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, "NEIGHBOR CONFIGURATION ERROR: Both a local and a remote-BSS cell match %s" + " (BTS %d and remote %s)." + " Aborting Handover because of ambiguous network topology.\n", + neighbor_ident_key_name(search_for), local_target_cell->nr, + gsm0808_cell_id_list_name(remote_target_cell)); + return -EINVAL; + } + + if (local_target_cell == from_bts && !as_active) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, + "Cannot start re-assignment, Assignment disabled for this cell (%s)\n", + neighbor_ident_key_name(search_for)); + return -EINVAL; + } + + if (((local_target_cell && local_target_cell != from_bts) + || remote_target_cell) + && !ho_active) { + if (log_errors) + LOG_HO(conn, LOGL_ERROR, + "Cannot start Handover, Handover disabled for this cell (%s)\n", + neighbor_ident_key_name(search_for)); + return -EINVAL; + } + + if (local_target_cell) { + if (local_target_cell_p) + *local_target_cell_p = local_target_cell; + return 0; + } + + if (remote_target_cell) { + if (remote_target_cell_p) + *remote_target_cell_p = remote_target_cell; + return 0; + } + + if (log_errors) + LOG_HO(conn, LOGL_ERROR, "Cannot handover %s: neighbor unknown\n", + neighbor_ident_key_name(search_for)); + + return -ENODEV; } struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) { static struct neighbor_ident_key key; key = (struct neighbor_ident_key){ + .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, .arfcn = bts->c0->arfcn, .bsic = bts->bsic, }; diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 2b8cd7e..f158e7f 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -389,6 +389,15 @@ return true; } +bool neighbor_ident_bts_entry_exists(uint8_t from_bts) +{ + struct nil_match_bts_data d = { + .bts_nr = from_bts, + }; + neighbor_ident_iter(g_neighbor_cells, nil_match_bts, &d); + return (bool)d.found; +} + static int neighbor_del_all(struct vty *vty) { int rc; diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 492f0c5..103e0bb 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -250,3 +250,5 @@ struct msgb *msg, int link_id, int allow_sacch) {} void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} void lchan_activate(struct gsm_lchan *lchan, void *info) {} +bool neighbor_ident_bts_entry_exists(uint8_t from_bts) { return false; } +const char *handover_status(struct gsm_subscriber_connection *conn) { return "x"; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29bca59ab232eddc74e0d4698efb9c9992443983 Gerrit-Change-Number: 14769 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 21:58:04 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 21:58:04 +0000 Subject: Change in ...libosmocore[master]: add vty logp command to echo on all log targets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14986 ) Change subject: add vty logp command to echo on all log targets ...................................................................... Patch Set 1: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9 Gerrit-Change-Number: 14986 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 13 Aug 2019 21:58:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 22:09:56 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 22:09:56 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15142/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15142/1//COMMIT_MSG at 9 PS1, Line 9: mncc.c often calls stop_cmd_timer() even if no timer is running. If no timer is > I can't say I've seen this "often". [?] "often": I thought I saw it every time I end a call...? not positively sure since recently I always ran with this patch. But I did see it repeatedly before patching. There are various places calling the stop_cmd_timer() function. Each one of those invocations would have to become if (...timer->active) stop_cmd_timer(); thus it makes more sense to me to check for that once, inside the function. https://gerrit.osmocom.org/#/c/15142/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15142/1/src/mncc.c at 74 PS1, Line 74: if (!osmo_timer_pending(&leg->cmd_timeout)) > As far as I can make out, we only start timers immediately before sending an MNCC command to which w [?] I got this: http://people.osmocom.org/neels/izap8No0/osmo-sip-connector.log.txt so it seems that the REL_CNF stopped the timer as a "stop it in case it is running" measure. those should IMHO not cause error logs if none was running. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: keith Gerrit-Comment-Date: Tue, 13 Aug 2019 22:09:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 22:18:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 22:18:53 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15132/2/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15132/2/src/libosmo-mgcp/mgcp_codec.c at 252 PS2, Line 252: conn->end.codecs_assigned++; > Is the some scenario where we shrink the list and this counter is decreased? It's only set to 0 upon [?] There would be a theoretical scenario where codec negotiation ends up changing / decreasing the set of permitted codecs. In code there should be a place that completely clears the codecs somewhere, IIRC when it starts parsing the SDP, which might come in any number of times (MDCX) on a given conn. It is cleared also when the conn gets deallocated (DLCX). This is preparation to fix a memory leak that keeps cleared entries in memory until the conn gets deallocated. So any number of MDCXes might clear the list and read new entries, and the talloc ctx being the conn still keeps the audio names of the cleared entries until the conn gets DLCXed) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 22:18:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 22:21:56 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 22:21:56 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135 ) Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15135/3/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/#/c/15135/3/tests/mgcp/mgcp_test.c at 1795 PS3, Line 1795: .descr = "both sides have the same payload_type numbers assigned to conflicting codecs", > Are they really conflicting? This looks misleading, since it's actually fine, right? with conflicting I mean the same number means something different on the other side. The test verifies that even those get translated properly. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 22:21:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 23:03:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 23:03:55 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15138/3/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15138/3/src/libosmo-mgcp/mgcp_codec.c at 218 PS3, Line 218: * payload type number is unknown in this function??? */ > you may find information with git blame? Or send an email to ML asking the author. [?] This dynamic number (e.g. 96) would be the one stored in codec->payload_type. But I found it... it's for codecs in the MGCP header, without SDP. Opened https://osmocom.org/issues/4150 So that's for a different issue then. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 23:03:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 23:10:44 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 23:10:44 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 ) Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15140/1//COMMIT_MSG at 12 PS1, Line 12: - instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more > What you say makes sense, but still not sure if the specs talks about whitespacing at the start of t [?] No spaces at line beginnings. https://tools.ietf.org/html/rfc4566#page-4 An SDP session description consists of a number of lines of text of the form: = where MUST be exactly one case-significant character and is structured text whose format depends on . In general, is either a number of fields delimited by a single space character or a free format string,... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 13 Aug 2019 23:10:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 23:15:33 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 23:15:33 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 to look at the new patch set (#4). Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... test_mgcp_codec_pt_translate(): more tests Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 76 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/15135/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 13 23:15:33 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 13 Aug 2019 23:15:33 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 to look at the new patch set (#4). Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... mgcp_codec: codec_set(): log about all possible errors In codec_set(), for each 'goto error', log the specific error cause. Also add a TODO and a FIXME comment about inventing dynamic payload type numbers. Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 25 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/38/15138/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Aug 13 23:30:35 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 13 Aug 2019 23:30:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d534824df37a_2e9a2b28397e05f426663a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 319s] | #define HAVE_STDLIB_H 1 [ 319s] | #define HAVE_STRING_H 1 [ 319s] | #define HAVE_MEMORY_H 1 [ 319s] | #define HAVE_STRINGS_H 1 [ 319s] | #define HAVE_INTTYPES_H 1 [ 319s] | #define HAVE_STDINT_H 1 [ 319s] | #define HAVE_UNISTD_H 1 [ 319s] | #define HAVE_DLFCN_H 1 [ 319s] | #define LT_OBJDIR ".libs/" [ 319s] | #define PACKAGE "osmo-hlr" [ 319s] | #define VERSION "1.1.0.2-b07f" [ 319s] | #define STDC_HEADERS 1 [ 319s] | [ 319s] | configure: exit 0 [ 319s] [ 319s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 319s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 319s] make: *** [debian/rules:7: build] Error 2 [ 319s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 319s] [ 319s] lamb09 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 23:30:20 UTC 2019. [ 319s] [ 319s] ### VM INTERACTION START ### [ 322s] [ 305.734455] sysrq: SysRq : Power Off [ 322s] [ 305.741575] reboot: Power down [ 322s] ### VM INTERACTION END ### [ 322s] [ 322s] lamb09 failed "build osmo-hlr_1.1.0.2.b07f.dsc" at Tue Aug 13 23:30:23 UTC 2019. [ 322s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 14 08:31:54 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 14 Aug 2019 08:31:54 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: > (2 comments) hmm.. so I'm totally missing something. They way I understand it, we set the timer because we expect something to happen. If that thing does not happen, or something else happens it it's place, then that is an unexpected condition, indicating that something went wrong. Your log has: 20190809011936621 DMNCC DEBUG MNCC rcvd message type: MNCC_SETUP_COMPL_IND (mncc.c:946) 20190809011936621 DMNCC INFO leg(2147483649) is now connected. (mncc.c:627) 20190809011936622 DMNCC DEBUG Got response(MNCC_SETUP_COMPL_IND), stopping timer on leg(2147483649) (mncc.c:82) 20190809012014858 DMNCC DEBUG MNCC rcvd message type: MNCC_REL_CNF (mncc.c:946) Why is the MSC sending MNCC_REL_CNF now? Something is out of sequence. 20190809012014859 DMNCC ERROR Wanted response(MNCC_RTP_CREATE) but got(MNCC_REL_CNF) for leg(5002) (mncc.c:76) The commit message suggests this is random, but it looks precise to me. We wanted RTP_CREATE, but got REL_CNF. I do not see this with nitb, and this MNCC send-expect logic was written to match it. I would assume something has happened in osmo-msc to change the sequence. This log message is showing that up. hiding the log message does not seem like the way to go, either osmo-msc or sip-connector, should be fixed so that the sequence matches. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: keith Gerrit-Comment-Date: Wed, 14 Aug 2019 08:31:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 08:50:42 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 14 Aug 2019 08:50:42 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: Looking closer, Log is kind of hard on the eyes for sure, I see that we got the response (RTP_CREATE) and stopped the timer. Maybe we should clear leg->rsp_wanted when we stop the timer, so that the LOG message can be more clear in that we got an UNEXPECTED or out of sequence command from the other side of the MNCC. Maybe my knowledge of the MNCC sequence is missing something, but the osmo-sip-connector is only expecting MNCC_REL_CNF in response to it having sent a MNCC_REL_REQ. Is this wrong? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: keith Gerrit-Comment-Date: Wed, 14 Aug 2019 08:50:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 09:06:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 09:06:38 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 09:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 09:10:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 09:10:52 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15138/4/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15138/4/src/libosmo-mgcp/mgcp_codec.c at 182 PS4, Line 182: if (strlen(audio_name) > sizeof(audio_codec)) { this should probably be >= -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 09:10:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 09:11:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 09:11:45 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135 ) Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... Patch Set 4: Code-Review+1 Thanks, much clearer now -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 09:11:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 10:01:51 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 10:01:51 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15175/4/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15175/4/src/libmsc/msc_vty.c at 152 PS4, Line 152: Cosmetic: alignment. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 10:01:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 10:33:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 10:33:59 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 Change subject: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh ...................................................................... bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh Trapping SIGTERM is done in order to get extra logging about that event. Related: OS#4151 Change-Id: I2c7649dee8f5ecdaa08274806ccd8948d197ffdb --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/90/15190/1 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 93e3c62..b3738d2 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -224,12 +224,14 @@ echo "received signal handler $sig, killing $mypid" kill $mypid } + trap 'sign_handler SIGTERM' SIGTERM trap 'sign_handler SIGINT' SIGINT trap 'sign_handler SIGHUP' SIGHUP "$@" & mypid=$! echo "waiting for $mypid" wait $mypid + echo "process $mypid finished" """ f.write(r) st = os.stat(wrapper_script) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I2c7649dee8f5ecdaa08274806ccd8948d197ffdb Gerrit-Change-Number: 15190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 10:33:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 10:33:59 +0000 Subject: Change in ...osmo-gsm-tester[master]: default-suites: Drop multi-trx osmo-trx-lms tests Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15191 Change subject: default-suites: Drop multi-trx osmo-trx-lms tests ...................................................................... default-suites: Drop multi-trx osmo-trx-lms tests The feature is not supported yet and it seems to be leaving osmo-trx-lms in a zombie state preventing it to exit and blocking other tests. Let's disable it until this feature is working properly under manual use. Related: OS#4151 Change-Id: Ic255481e6f1fbbf06c4576f924cf27ae80567801 --- M example/default-suites.conf 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/91/15191/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index f93c933..27522bf 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -103,12 +103,10 @@ - voice:trx-lms+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-lms+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-lms+mod-bts0-dynts-osmo -- voice:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-lms - gprs:trx-lms+mod-bts0-egprs - gprs:trx-lms+mod-bts0-dynts-ipa - gprs:trx-lms+mod-bts0-dynts-osmo -- gprs:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:trx-lms+mod-bts0-dynts67-ipa+cfg-codec-fr-any - dynts:trx-lms+mod-bts0-dynts67-osmo -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic255481e6f1fbbf06c4576f924cf27ae80567801 Gerrit-Change-Number: 15191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: Add commented-out section for using custom TITAN Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 Change subject: start-testsuite.sh: Add commented-out section for using custom TITAN ...................................................................... start-testsuite.sh: Add commented-out section for using custom TITAN Sometimes it's useful to test with a non-installed locally-compiled version of Eclipse TITAN. This adds an example on how to do that. Change-Id: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a --- M start-testsuite.sh 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/15192/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 54332bb..e5bc756 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -36,8 +36,16 @@ TEST=$3 fi +# this is an example for using a non-installed custom (e.g. git master) TITAN +#TTCN3_DIR="/home/laforge/projects/git/titan/titan.core/Install" +#export TTCN3_DIR +#TITAN_LIBRARY_PATH="$TTCN3_DIR/lib" +#TTCN3_BIN_DIR="$TTCN3_DIR/bin" + +# below is for the debian packages +TTCN3_BIN_DIR="/usr/bin" TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" -LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" "$TTCN3_BIN_DIR/ttcn3_start" $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 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: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a Gerrit-Change-Number: 15192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: initial skeleton for MME / SGsAP tetss Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15193 Change subject: mme: initial skeleton for MME / SGsAP tetss ...................................................................... mme: initial skeleton for MME / SGsAP tetss Change-Id: Idbd54838daaf12acccc3253dc4278de75eaaaf31 --- M library/SGsAP_Emulation.ttcn A mme/MME_Tests.ttcn A mme/MME_Tests_SGsAP.ttcn A mme/gen_links.sh A mme/regen_makefile.sh 5 files changed, 385 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/15193/1 diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn index f91e076..6cd1052 100644 --- a/library/SGsAP_Emulation.ttcn +++ b/library/SGsAP_Emulation.ttcn @@ -47,6 +47,12 @@ inout PDU_SGsAP, PDU_ML3_MS_NW, PDU_ML3_NW_MS; } with { extension "internal" }; +/* global test port e.g. for non-imsi/conn specific messages */ +type port SGsAP_PT message { + inout PDU_SGsAP; +} with { extension "internal" }; + + /* represents a single SGsAP Association */ type record AssociationData { SGsAP_ConnHdlr comp_ref, @@ -66,6 +72,8 @@ var ExpectData SgsapExpectTable[8]; /* procedure based port to register for incoming connections */ port SGsAPEM_PROC_PT SGsAP_PROC; + /* test port for unit data messages */ + port SGsAP_PT SGsAP_UNIT; var charstring g_sgsap_id; var integer g_sgsap_conn_id := -1; diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn new file mode 100644 index 0000000..3ba0677 --- /dev/null +++ b/mme/MME_Tests.ttcn @@ -0,0 +1,118 @@ +/* MME (Mobility Management Engine) test suite in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module MME_Tests { + +import from SGsAP_Types all; +import from SGsAP_Templates all; +import from SGsAP_Emulation all; + +import from L3_Templates all; +import from DNS_Helpers all; + +friend module MME_Tests_SGsAP; + +type component MTC_CT { + var SGsAP_Emulation_CT vc_SGsAP; + port SGsAP_PT SGsAP_UNIT; + port SGsAPEM_PROC_PT SGsAP_PROC; +} + +type component ConnHdlr extends SGsAP_ConnHdlr { + var ConnHdlrPars g_pars; + timer g_Tguard := 30.0; +} + +type record ConnHdlrPars { + hexstring imsi +} + +modulepar { + charstring mp_sgs_local_ip := "127.0.0.1"; + integer mp_sgs_local_port := 29118; + charstring mp_vlr_name := "vlr.example.net"; + charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; +} + +/* send incoming unit data messages (like reset) to global SGsAP_UNIT port */ +friend function ForwardUnitdataCallback(PDU_SGsAP msg) +runs on SGsAP_Emulation_CT return template PDU_SGsAP { + SGsAP_UNIT.send(msg); + return omit; +} + +friend function f_init_sgsap(charstring id) runs on MTC_CT { + id := id & "-SGsAP"; + var SGsAPOps ops := { + create_cb := refers(SGsAP_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(ForwardUnitdataCallback) + } + var SGsAP_conn_parameters pars := { + remote_ip := "", + remote_sctp_port := -1, + local_ip := mp_sgs_local_ip, + local_sctp_port := mp_sgs_local_port + } + + vc_SGsAP := SGsAP_Emulation_CT.create(id); + map(vc_SGsAP:SGsAP, system:SGsAP_CODEC_PT); + connect(vc_SGsAP:SGsAP_PROC, self:SGsAP_PROC); + connect(vc_SGsAP:SGsAP_UNIT, self:SGsAP_UNIT); + vc_SGsAP.start(SGsAP_Emulation.main(ops, pars, id)); +} + +/* generate parameters for a connection handler */ +friend function f_init_pars(integer imsi_suffix) +runs on MTC_CT return ConnHdlrPars { + var ConnHdlrPars pars := { + imsi := f_gen_imsi(imsi_suffix) + }; + return pars; +} + +type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; + +/* start a connection handler with given parameters */ +friend function f_start_handler_with_pars(void_fn fn, ConnHdlrPars pars, integer s1ap_idx := 0) +runs on MTC_CT return ConnHdlr { + var ConnHdlr vc_conn; + var charstring id := testcasename() & int2str(s1ap_idx); + + vc_conn := ConnHdlr.create(id); + /* SGsAP part */ + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + + /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have + * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ + vc_conn.start(derefers(fn)(pars)); + return vc_conn; +} + +/* altstep for the global guard timer */ +private altstep as_Tguard()runs on ConnHdlr { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +friend function f_init_handler(ConnHdlrPars pars, float t_guard := 30.0) runs on ConnHdlr { + /* make parameters available via component variable */ + g_pars := pars; + /* start guard timre and activate it as default */ + g_Tguard.start(t_guard); + activate(as_Tguard()); + /* Route all SGsAP mesages for our IMSIto us */ + f_create_sgsap_expect(pars.imsi); +} + + +} diff --git a/mme/MME_Tests_SGsAP.ttcn b/mme/MME_Tests_SGsAP.ttcn new file mode 100644 index 0000000..935a59e --- /dev/null +++ b/mme/MME_Tests_SGsAP.ttcn @@ -0,0 +1,210 @@ +module MME_Tests_SGsAP { + +/* Osmocom MME test suite in in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from SGsAP_Types all; +import from SGsAP_Templates all; +import from SGsAP_Emulation all; + +import from General_Types all; +import from Osmocom_Types all; +import from L3_Templates all; +import from DNS_Helpers all; +import from MME_Tests all; + +/* performa SGs reset procedure */ +function f_sgsap_vlr_reset() runs on ConnHdlr { + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + + SGsAP.send(ts_SGsAP_RESET_IND_VLR(vlr_name)); + alt { + [] SGsAP.receive(tr_SGsAP_RESET_ACK(mme_name, vlr_name)) { + setverdict(pass); + } + [] SGsAP.receive(tr_SGsAP_RESET_ACK(?, ?)) { + setverdict(fail, "Received unexpected VLR/MME name in SGsAP RESET ACK"); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected response to SGsAP RESET"); + } + } +} + +/* perform a SGs paging procedure */ +function f_sgsap_page(Service_Indicator serv_ind, template (omit) OCT4 tmsi, + template (omit) SGs_Cause exp_cause) runs on ConnHdlr { + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var boolean exp_success := true; + var PDU_SGsAP rx; + if (not istemplatekind(exp_cause, "omit")) { + exp_success := false; + } + SGsAP.send(ts_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, serv_ind, tmsi)); + alt { + /* we expect success */ + [exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + setverdict(pass); + } + [exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + setverdict(fail, "Received unexpected PAGING REJECT"); + } + /* we expect failure */ + [not exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + setverdict(fail, "Received SERVICE REQ waiting for PAGING REJECT"); + } + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, exp_cause)) { + setverdict(pass); + } + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + setverdict(fail, "Received unexpected PAGING REJECT cause"); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected SgSAP"); + } + } +} + +/* perform a SGs alert procedure */ +function f_sgsap_alert(template (omit) SGs_Cause exp_cause) runs on ConnHdlr{ + var boolean exp_success := true; + var PDU_SGsAP rx; + if (not istemplatekind(exp_cause, "omit")) { + exp_success := false; + } + SGsAP.send(ts_SGsAP_ALERT_REQ(g_pars.imsi)); + alt { + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + setverdict(pass); + } + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + setverdict(fail, "Received unexpected ALERT REJECT ", rx); + } + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + setverdict(fail, "Received unexpected ALERT ACK"); + } + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, exp_cause)) { + setverdict(pass) + } + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + setverdict(fail, "Received ALERT REJECT with unexpected cause ", rx); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected SGsAP"); + } + } +} + +/* Test if MME responds to VLR-originated RESET procedure as expected */ +private function f_TC_sgsap_vlr_reset(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + f_sgsap_vlr_reset(); +} +testcase TC_sgsap_vlr_reset() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(1); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_vlr_reset), pars); + vc_conn.done; +} + +/* Page known subscriber for SMS */ +private function f_TC_sgsap_paging_sms(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* TODO: register subscriber on S1 */ + f_sgsap_page(SMS_indicator, omit, omit); +} +testcase TC_sgsap_paging_sms() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(2); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_paging_sms), pars); + vc_conn.done; +} + +/* Page known subscriber for CS call */ +private function f_TC_sgsap_paging_cs(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* TODO: register subscriber on S1 */ + f_sgsap_page(CS_call_indicator, omit, omit); +} +testcase TC_sgsap_paging_cs() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(3); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_paging_cs), pars); + vc_conn.done; +} + + +/* Page unknown subscriber; expect PAGING REJECT from MME */ +private function f_TC_sgsap_paging_reject(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + f_sgsap_page(SMS_indicator, omit, IMSI_unknown); +} +testcase TC_sgsap_paging_reject() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(4); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_paging_reject), pars); + vc_conn.done; +} + +/* Send ALERT-REQ to MME; perform S1AP activity; expect ALERT-ACK on SGs */ +private function f_TC_sgsap_alert(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* TODO: register subscriber on S1 */ + f_sgsap_alert(omit); + /* TOOD: do something on S1 triggering UE ACT IND */ + SGsAP.receive(tr_SGsAP_UE_ACT_IND(g_pars.imsi)); +} +testcase TC_sgsap_alert() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(5); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_alert), pars); + vc_conn.done; +} + +/* Send ALERT-REQ to MME for unidentified IMSI; expect ALERT-REJ on SGs */ +private function f_TC_sgsap_alert_rej(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* IMSI doesn't register and is hence unknown */ + f_sgsap_alert(IMSI_unknown); +} +testcase TC_sgsap_alert_rej() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(6); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_alert_rej), pars); + vc_conn.done; +} + + +/* Test SGsAP-DOWNLINK-UNITDATA (SGs -> S1) */ +/* Test SGsAP-UPLINK-UNITDATA (S1 -> SGs)*/ +/* Test SGSAP-DETACH-IND; detach on S1; expect DETACH-IND on SGs; send DETACH-ACK */ +/* Test SGsAP-LU-REQ; perform combined attach on S1; expect LU-REQ; acknowlege it */ +/* Test SGsAP-LU-REQ; perform combined attach on S1; expect LU-REQ; reject it */ +/* Test SGsAP-MMINFO-REQ; establish SGs association; send it on SGs; expect on S1 */ + +/* Test MT SERVICE ABORT; send PAGING; expect SERVICE REQ; send SERVICE ABORT */ + +/* Test EPS DETACH */ +/* Test IMSI DETACH */ + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh new file mode 100755 index 0000000..2a98c70 --- /dev/null +++ b/mme/gen_links.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +# Required by MGCP and IPA +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +#FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.SGsAP_13.2.0/src +FILES="SGsAP_Types.ttcn" +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " +FILES+="L3_Templates.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh new file mode 100755 index 0000000..4d6d7c6 --- /dev/null +++ b/mme/regen_makefile.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc " + +export CPPFLAGS_TTCN3="" + +../regen-makefile.sh MME_Tests.ttcn $FILES + +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15193 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: Idbd54838daaf12acccc3253dc4278de75eaaaf31 Gerrit-Change-Number: 15193 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:31 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP Templates Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15195 Change subject: library: Add S1AP Templates ...................................................................... library: Add S1AP Templates Change-Id: I148b33eb5074d3549e7cd533af2cbf90f1c6d23f --- A library/s1ap/S1AP_Templates.ttcn 1 file changed, 907 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/15195/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn new file mode 100644 index 0000000..6c5dbce --- /dev/null +++ b/library/s1ap/S1AP_Templates.ttcn @@ -0,0 +1,907 @@ +/* S1AP Templates in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module S1AP_Templates { + +import from S1AP_IEs all; +import from S1AP_CommonDataTypes all; +import from S1AP_Constants all; +import from S1AP_Containers all; +import from S1AP_PDU_Contents all; +import from S1AP_PDU_Descriptions all; + +/********************************************************************************* + * non-UE related + *********************************************************************************/ + +/********************************************************************************* + * 9.1.8 Management Messages + *********************************************************************************/ + +/* 9.1.8.4 S1 SETUP REQUEST */ +template (value) S1AP_PDU +ts_S1AP_SetupReq(template (value) Global_ENB_ID p_global_ENB_ID, + template (value) SupportedTAs p_supportedTAs, + template (value) PagingDRX p_pagingDRXs) := { + initiatingMessage := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_Global_ENB_ID, + criticality := ignore, + value_ := { Global_ENB_ID := p_global_ENB_ID } + }, { + id := S1AP_Constants.id_SupportedTAs, + criticality := reject, + value_ := {SupportedTAs := p_supportedTAs} + } /* HACK: work around nextepc bug + , { + id := S1AP_Constants.id_pagingDRX, + criticality := ignore, + value_ := {PagingDRX := p_pagingDRXs} + } */ + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_SetupReq(template (present) Global_ENB_ID p_global_ENB_ID := ?, + template (present) SupportedTAs p_supportedTAs := ?, + template (present) PagingDRX p_pagingDRXs := ?) := { + initiatingMessage := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_Global_ENB_ID, + criticality := ignore, + value_ := { Global_ENB_ID := p_global_ENB_ID } + }, { + id := S1AP_Constants.id_SupportedTAs, + criticality := reject, + value_ := {SupportedTAs := p_supportedTAs} + }, * + } + } + } + } +} + +/* 9.1.8.5 S1 SETUP RESPONSE */ +template (value) S1AP_PDU +ts_S1AP_SetupResp(template (value) ServedGUMMEIs served_gummeis, + template (value) RelativeMMECapacity rel_mme_capacity) := { + successfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_ServedGUMMEIs, + criticality := reject, + value_ := { ServedGUMMEIs := served_gummeis } + }, { + id := S1AP_Constants.id_RelativeMMECapacity, + criticality := ignore, + value_ := { RelativeMMECapacity := rel_mme_capacity } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_SetupResp(template (present) ServedGUMMEIs served_gummeis := ?, + template (present) RelativeMMECapacity rel_mme_capacity := ?) := { + successfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_ServedGUMMEIs, + criticality := reject, + value_ := { ServedGUMMEIs := served_gummeis } + }, { + id := S1AP_Constants.id_RelativeMMECapacity, + criticality := ignore, + value_ := { RelativeMMECapacity := rel_mme_capacity } + }, * + } + } + } + } +} + +/* 9.1.8.6 S1 SETUP FAILURE */ +template (value) S1AP_PDU +ts_S1AP_SetupFail(template (value) Cause cause) := { + unsuccessfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_SetupFail(template (present) Cause cause := ?) := { + unsuccessfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + }, * + } + } + } + } +} + +/* 9.1.8.1 RESET */ +template (value) S1AP_PDU +ts_S1AP_Reset(template (value) Cause cause, + template (value) ResetType reset_type) := { + initiatingMessage := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + Reset := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } , { + id := S1AP_Constants.id_ResetType, + criticality := reject, + value_ := { resetType := reset_type } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_Reset(template (present) Cause cause := ?, + template (present) ResetType reset_type := ?) := { + initiatingMessage := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + Reset := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } , { + id := S1AP_Constants.id_ResetType, + criticality := reject, + value_ := { resetType := reset_type } + }, * + } + } + } + } +} + +/* 9.1.8.2 RESET ACKNOWLEDGE */ +template (value) S1AP_PDU +ts_S1AP_ResetAck(template (value) UE_associatedLogicalS1_ConnectionListResAck val) := { + successfulOutcome := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + ResetAcknowledge := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_associatedLogicalS1_ConnectionListResAck, + criticality := ignore, + value_ := { UE_associatedLogicalS1_ConnectionListResAck := val } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_ResetAck(template (present) UE_associatedLogicalS1_ConnectionListResAck val := ?) := { + successfulOutcome := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + ResetAcknowledge := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_associatedLogicalS1_ConnectionListResAck, + criticality := ignore, + value_ := { UE_associatedLogicalS1_ConnectionListResAck := val } + }, * + } + } + } + } +} + + + + +/********************************************************************************* + * 9.1.7 NAS Transport + *********************************************************************************/ + +/* 9.1.7.1 INITIAL UE MESSAGE */ +template (value) S1AP_PDU +ts_S1AP_InitialUE(template (value) ENB_UE_S1AP_ID p_eNB_value, + template (value) NAS_PDU p_nasPdu, + template (value) TAI p_tAI, + template (value) EUTRAN_CGI p_eUTRAN_CGI, + template (value) RRC_Establishment_Cause p_rrcCause) := { + initiatingMessage := { + procedureCode := id_initialUEMessage, + criticality := ignore, + value_ := { + InitialUEMessage := { + protocolIEs := { + { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := p_eNB_value} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_RRC_Establishment_Cause, + criticality := ignore, + value_ := {RRC_Establishment_Cause := p_rrcCause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_InitialUE(template (present) ENB_UE_S1AP_ID p_eNB_value := ?, + template (present) NAS_PDU p_nasPdu := ?, + template (present) TAI p_tAI := ?, + template (present) EUTRAN_CGI p_eUTRAN_CGI := ?, + template (present) RRC_Establishment_Cause p_rrcCause := ?) := { + initiatingMessage := { + procedureCode := id_initialUEMessage, + criticality := ignore, + value_ := { + InitialUEMessage := { + protocolIEs := { + { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := p_eNB_value} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_RRC_Establishment_Cause, + criticality := ignore, + value_ := {RRC_Establishment_Cause := p_rrcCause} + }, * + } + } + } + } +} + + +/* 9.1.7.2 DOWNLINK NAS TRANSPORT */ +template (value) S1AP_PDU +ts_S1AP_DlNasTransport(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) octetstring p_nasPdu) := { + initiatingMessage := { + procedureCode := id_downlinkNASTransport, + criticality := ignore, + value_ := { + DownlinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_DlNasTransport(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) octetstring p_nasPdu := ?) := { + initiatingMessage := { + procedureCode := id_downlinkNASTransport, + criticality := ignore, + value_ := { + DownlinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, * + } + } + } + } +} + + +/* 9.1.7.3 UPNLINK NAS TRANSPORT */ +template (value) S1AP_PDU +ts_S1AP_UlNasTransport(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) octetstring p_nasPdu, + template (value) EUTRAN_CGI p_eUTRAN_CGI, + template (value) TAI p_tAI) := { + initiatingMessage := { + procedureCode := id_uplinkNASTransport, + criticality := ignore, + value_ := { + UplinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UlNasTransport(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) octetstring p_nasPdu := ?, + template (present) EUTRAN_CGI p_eUTRAN_CGI := ?, + template (present) TAI p_tAI := ?) := { + initiatingMessage := { + procedureCode := id_uplinkNASTransport, + criticality := ignore, + value_ := { + UplinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + }, * + } + } + } + } +} + +/********************************************************************************* + * 9.1.4 Context Management + *********************************************************************************/ + +/* 9.1.4.1 INITIAL CONTEXT SETUP REQ */ +template (value) S1AP_PDU +ts_S1AP_IntialCtxSetupReq(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) UEAggregateMaximumBitrate max_br, + template (value) E_RABToBeSetupListCtxtSUReq rab_setup_items, + template (value) UESecurityCapabilities ue_sec_par, + template (value) SecurityKey sec_key) := { + initiatingMessage := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + initialContextSetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_uEaggregateMaximumBitrate, + criticality := reject, + value_ := {UEAggregateMaximumBitrate := max_br} + }, { + id := S1AP_Constants.id_E_RABToBeSetupListCtxtSUReq, + criticality := reject, + value_ := {E_RABToBeSetupListCtxtSUReq := rab_setup_items} + }, { + id := S1AP_Constants.id_UESecurityCapabilities, + criticality := reject, + value_ := {UESecurityCapabilities := ue_sec_par} + }, { + id := S1AP_Constants.id_SecurityKey, + criticality := reject, + value_ := {SecurityKey := sec_key} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_IntialCtxSetupReq(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) UEAggregateMaximumBitrate max_br := ?, + template (present) E_RABToBeSetupListCtxtSUReq rab_setup_items := ?, + template (present) UESecurityCapabilities ue_sec_par := ?, + template (present) SecurityKey sec_key := ?) := { + initiatingMessage := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + initialContextSetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_uEaggregateMaximumBitrate, + criticality := reject, + value_ := {UEAggregateMaximumBitrate := max_br} + }, { + id := S1AP_Constants.id_E_RABToBeSetupListCtxtSUReq, + criticality := reject, + value_ := {E_RABToBeSetupListCtxtSUReq := rab_setup_items} + }, { + id := S1AP_Constants.id_UESecurityCapabilities, + criticality := reject, + value_ := {UESecurityCapabilities := ue_sec_par} + }, { + id := S1AP_Constants.id_SecurityKey, + criticality := reject, + value_ := {SecurityKey := sec_key} + }, * + } + } + } + } +} + +/* 9.1.4.3 INITIAL CONTEXT SETUP RESPONSE */ +template (value) S1AP_PDU +ts_S1AP_InitialCtxSetupResp(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABSetupListCtxtSURes rab_setup_items, + template (value) E_RABList rab_items) := { + successfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_E_RABSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABSetupListCtxtSURes := rab_setup_items} + }, { + id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABList := rab_items} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_InitialCtxSetupResp(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABSetupListCtxtSURes rab_setup_items := ?, + template (present) E_RABList rab_items := ?) := { + successfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_E_RABSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABSetupListCtxtSURes := rab_setup_items} + }, { + id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABList := rab_items} + } + } + } + } + } +} + +/* 9.1.4.4 INITIAL CONTEXT SETUP FAILURE */ +template (value) S1AP_PDU +ts_S1AP_InitialCtxSetupFail(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) Cause cause) := { + unsuccessfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_InitialCtxSetupFail(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) Cause cause := ?) := { + unsuccessfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + }, * + } + } + } + } +} + +/* 9.1.4.5 UE CONTEXT RELEASE REQUEST */ +template (value) S1AP_PDU +ts_S1AP_UeContextReleaseReq(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) Cause cause) := { + initiatingMessage := { + procedureCode := id_UEContextReleaseRequest, + criticality := reject, + value_ := { + UEContextReleaseRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UeContextReleaseReq(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) Cause cause := ?) := { + initiatingMessage := { + procedureCode := id_UEContextReleaseRequest, + criticality := reject, + value_ := { + UEContextReleaseRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + }, * + } + } + } + } +} + +/* 9.1.4.6 UE CONTEXT RELEASE COMMAND */ +template (value) S1AP_PDU +ts_S1AP_UeContextReleaseCmd(template (value) UE_S1AP_IDs mme_ids, + template (value) Cause cause) := { + initiatingMessage := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_S1AP_IDs, + criticality := ignore, + value_ := {UE_S1AP_IDs := mme_ids} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UeContextReleaseCmd(template (present) UE_S1AP_IDs ue_ids := ?, + template (present) Cause cause := ?) := { + initiatingMessage := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_S1AP_IDs, + criticality := reject, + value_ := {UE_S1AP_IDs := ue_ids} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + }, * + } + } + } + } +} + +/* 9.1.4.7 UE CONTEXT RELEASE COMPLETE */ +template (value) S1AP_PDU +ts_S1AP_UeContextReleaseCompl(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id) := { + successfulOutcome := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseComplete := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UeContextReleaseCompl(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?) := { + successfulOutcome := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseComplete := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, * + } + } + } + } +} + +/* 9.1.4.20 CONNECTION ESTABLISHMENT INDICATION */ +template (value) S1AP_PDU +ts_S1AP_ConnEstInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id) := { + initiatingMessage := { + procedureCode := id_ConnectionEstablishmentIndication, + criticality := reject, + value_ := { + ConnectionEstablishmentIndication := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_ConnEstInd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?) := { + initiatingMessage := { + procedureCode := id_ConnectionEstablishmentIndication, + criticality := reject, + value_ := { + ConnectionEstablishmentIndication := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, * + } + } + } + } +} + + + +/* all non-UE-related S1AP messages */ +template (present) S1AP_PDU +tr_S1AP_nonUErelated := (tr_S1AP_SetupReq, tr_S1AP_SetupResp, tr_S1AP_SetupFail, + tr_S1AP_Reset, tr_S1AP_ResetAck + ); + + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15195 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: I148b33eb5074d3549e7cd533af2cbf90f1c6d23f Gerrit-Change-Number: 15195 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP CodecPort/Emulation Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 Change subject: library: Add S1AP CodecPort/Emulation ...................................................................... library: Add S1AP CodecPort/Emulation Change-Id: I9bfba3ab2a3830e590b203c44c03b9c9383fff99 --- A library/S1AP_CodecPort.ttcn A library/S1AP_CodecPort_CtrlFunct.ttcn A library/S1AP_CodecPort_CtrlFunctDef.cc A library/S1AP_Emulation.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 6 files changed, 871 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/15196/1 diff --git a/library/S1AP_CodecPort.ttcn b/library/S1AP_CodecPort.ttcn new file mode 100644 index 0000000..59cef18 --- /dev/null +++ b/library/S1AP_CodecPort.ttcn @@ -0,0 +1,82 @@ +module S1AP_CodecPort { + +/* Simple S1AP Codec Port, translating between raw SCTP primitives with + * octetstring payload towards the IPL4asp provider, and S1AP primitives + * which carry the decoded S1AP data types as payload. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from S1AP_PDU_Descriptions all; + import from S1AP_Types all; + + type record S1AP_RecvFrom { + ConnectionId connId, + HostName remName, + PortNumber remPort, + HostName locName, + PortNumber locPort, + S1AP_PDU msg + }; + + template S1AP_RecvFrom t_S1AP_RecvFrom(template S1AP_PDU msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + + type record S1AP_Send { + ConnectionId connId, + S1AP_PDU msg + } + + template S1AP_Send t_S1AP_Send(template ConnectionId connId, template S1AP_PDU msg) := { + connId := connId, + msg := msg + } + + private function IPL4_to_S1AP_RecvFrom(in ASP_RecvFrom pin, out S1AP_RecvFrom pout) { + pout.connId := pin.connId; + pout.remName := pin.remName; + pout.remPort := pin.remPort; + pout.locName := pin.locName; + pout.locPort := pin.locPort; + pout.msg := dec_S1AP_PDU(pin.msg); + } with { extension "prototype(fast)" }; + + private function S1AP_to_IPL4_Send(in S1AP_Send pin, out ASP_Send pout) { + pout.connId := pin.connId; + pout.proto := { + sctp := { + sinfo_stream := omit, + sinfo_ppid := 18, + remSocks := omit, + assocId := omit + } + }; + pout.msg := enc_S1AP_PDU(pin.msg); + } with { extension "prototype(fast)" }; + + type port S1AP_CODEC_PT message { + out S1AP_Send; + in S1AP_RecvFrom, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(S1AP_Send -> ASP_Send:function(S1AP_to_IPL4_Send)) + in(ASP_RecvFrom -> S1AP_RecvFrom: function(IPL4_to_S1AP_RecvFrom); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" + } +} diff --git a/library/S1AP_CodecPort_CtrlFunct.ttcn b/library/S1AP_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..0399199 --- /dev/null +++ b/library/S1AP_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,44 @@ +module S1AP_CodecPort_CtrlFunct { + + import from S1AP_CodecPort all; + import from IPL4asp_Types all; + + external function f_IPL4_listen( + inout S1AP_CODEC_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_connect( + inout S1AP_CODEC_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_close( + inout S1AP_CODEC_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } + ) return Result; + + external function f_IPL4_setUserData( + inout S1AP_CODEC_PT portRef, + in ConnectionId id, + in UserData userData + ) return Result; + + external function f_IPL4_getUserData( + inout S1AP_CODEC_PT portRef, + in ConnectionId id, + out UserData userData + ) return Result; + +} + diff --git a/library/S1AP_CodecPort_CtrlFunctDef.cc b/library/S1AP_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..dc73046 --- /dev/null +++ b/library/S1AP_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,56 @@ +#include "IPL4asp_PortType.hh" +#include "S1AP_CodecPort.hh" +#include "IPL4asp_PT.hh" + +namespace S1AP__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} + diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn new file mode 100644 index 0000000..d09b499 --- /dev/null +++ b/library/S1AP_Emulation.ttcn @@ -0,0 +1,681 @@ +module S1AP_Emulation { + +/* S1AP Emulation, runs on top of S1AP_CodecPort. It multiplexes/demultiplexes + * the individual IMSIs/subscribers, so there can be separate TTCN-3 components handling + * each of them. + * + * The S1AP_Emulation.main() function processes S1AP primitives from the S1AP + * socket via the S1AP_CodecPort, and dispatches them to the per-IMSI components. + * + * For each new IMSI, the S1apOps.create_cb() is called. It can create + * or resolve a TTCN-3 component, and returns a component reference to which that IMSI + * is routed/dispatched. + * + * If a pre-existing component wants to register to handle a future inbound IMSI, it can + * do so by registering an "expect" with the expected IMSI. + * + * Inbound non-UE related S1AP messages (such as RESET, SETUP, OVERLOAD) are dispatched to + * the S1apOps.unitdata_cb() callback, which is registered with an argument to the + * main() function below. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from S1AP_CodecPort all; +import from S1AP_CodecPort_CtrlFunct all; +import from S1AP_Types all; +import from S1AP_Constants all; +import from S1AP_PDU_Contents all; +import from S1AP_PDU_Descriptions all; +import from S1AP_IEs all; +import from S1AP_Templates all; + +import from NAS_EPS_Types all; +import from NAS_Templates all; + +import from LTE_CryptoFunctions all; + +import from General_Types all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from DNS_Helpers all; + + +type component S1AP_ConnHdlr { + port S1AP_Conn_PT S1AP; + /* procedure based port to register for incoming connections */ + port S1APEM_PROC_PT S1AP_PROC; +} + +/* port between individual per-connection components and this dispatcher */ +type port S1AP_Conn_PT message { + inout S1AP_PDU, PDU_NAS_EPS, S1APEM_Config; +} with { extension "internal" }; + +type record NAS_Keys { + octetstring k_nas_int, + octetstring k_nas_enc +}; +type union S1APEM_Config { + NAS_Keys set_nas_keys +}; + +type enumerated S1APEM_EventUpDown { + S1APEM_EVENT_DOWN, + S1APEM_EVENT_UP +} + +/* an event indicating us whether or not a connection is physically up or down, + * and whether we have received an ID_ACK */ +type union S1APEM_Event { + S1APEM_EventUpDown up_down +} + +/* global test port e.g. for non-imsi/conn specific messages */ +type port S1AP_PT message { + inout S1AP_PDU, S1APEM_Event; +} with { extension "internal" }; + + +/* represents a single S1AP Association */ +type record AssociationData { + S1AP_ConnHdlr comp_ref, /* component handling this UE connection */ + uint24_t enb_ue_s1ap_id optional, /* eNB side S1AP ID */ + uint32_t mme_ue_s1ap_id optional, /* MME side S1AP ID */ + EUTRAN_CGI cgi optional, + TAI tai optional, + NAS_UE_State nus + + //hexstring imsi optional +}; + +type component S1AP_Emulation_CT { + /* Port facing to the UDP SUT */ + port S1AP_CODEC_PT S1AP; + /* All S1AP_ConnHdlr S1AP ports connect here + * S1AP_Emulation_CT.main needs to figure out what messages + * to send where with CLIENT.send() to vc_conn */ + port S1AP_Conn_PT S1AP_CLIENT; + /* currently tracked connections */ + var AssociationData S1apAssociationTable[16]; + /* pending expected CRCX */ + var ExpectData S1apExpectTable[8]; + /* procedure based port to register for incoming connections */ + port S1APEM_PROC_PT S1AP_PROC; + /* test port for unit data messages */ + port S1AP_PT S1AP_UNIT; + + var S1AP_conn_parameters g_pars; + var charstring g_s1ap_id; + var integer g_s1ap_conn_id := -1; +} + +type function S1APCreateCallback(S1AP_PDU msg, template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id, charstring id) +runs on S1AP_Emulation_CT return S1AP_ConnHdlr; + +type function S1APUnitdataCallback(S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_PDU; + +type record S1APOps { + S1APCreateCallback create_cb, + S1APUnitdataCallback unitdata_cb +} + +type record S1AP_conn_parameters { + HostName remote_ip, + PortNumber remote_sctp_port, + HostName local_ip, + PortNumber local_sctp_port, + NAS_Role role +} + +function tr_S1AP_RecvFrom_R(template S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_RecvFrom { + var template S1AP_RecvFrom mrf := { + connId := g_s1ap_conn_id, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + return mrf; +} + +private function f_s1ap_ids_known(template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT return boolean { + var integer i; + log("f_s1ap_ids_known(",mme_id,", ",enb_id,")"); + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + log("tbl[",i,"]: mme=", S1apAssociationTable[i].mme_ue_s1ap_id, + ", enb=", S1apAssociationTable[i].enb_ue_s1ap_id); + /* skip empty records */ + if (S1apAssociationTable[i].mme_ue_s1ap_id == omit and + S1apAssociationTable[i].enb_ue_s1ap_id == omit) { + log("skipping empty ", i); + continue; + } + if (S1apAssociationTable[i].mme_ue_s1ap_id == omit) { + log("entry ", i, " has no MME ID yet (enb=", S1apAssociationTable[i].enb_ue_s1ap_id); + /* Table doesn't yet know the MME side ID, let's look-up only + * based on the eNB side ID */ + if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + /* update table with MME side ID */ + S1apAssociationTable[i].mme_ue_s1ap_id := valueof(mme_id); + return true; + } + } else if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id) and + match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { + return true; + } + } + return false; +} + +private function f_comp_known(S1AP_ConnHdlr client) +runs on S1AP_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (S1apAssociationTable[i].comp_ref == client) { + return true; + } + } + return false; +} + +private function f_assoc_id_by_s1ap_ids(template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + if (istemplatekind(mme_id, "omit")) { + return i; + } else { + if (match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { + return i; + } + } + } + } + setverdict(fail, "S1AP Association Table not found by ENB-ID=", enb_id, " MME-ID=", mme_id); + mtc.stop; +} + +private function f_assoc_id_by_comp(S1AP_ConnHdlr client) +runs on S1AP_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (S1apAssociationTable[i].comp_ref == client) { + return i; + } + } + setverdict(fail, "S1AP Association Table not found by component ", client); + mtc.stop; +} + +private function f_assoc_by_comp(S1AP_ConnHdlr client) +runs on S1AP_Emulation_CT return AssociationData { + var integer i := f_assoc_id_by_comp(client); + return S1apAssociationTable[i]; +} + +private function f_s1ap_id_table_add(S1AP_ConnHdlr comp_ref, + template (omit) MME_UE_S1AP_ID mme_id, ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (not isvalue(S1apAssociationTable[i].enb_ue_s1ap_id)) { + S1apAssociationTable[i].enb_ue_s1ap_id := enb_id; + if (istemplatekind(mme_id, "omit")) { + S1apAssociationTable[i].mme_ue_s1ap_id := omit; + } else { + S1apAssociationTable[i].mme_ue_s1ap_id := valueof(mme_id); + } + S1apAssociationTable[i].comp_ref := comp_ref; + return i; + } + } + testcase.stop("S1AP Association Table full!"); + return -1; +} + +private function f_s1ap_id_table_del(S1AP_ConnHdlr comp_ref, ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (S1apAssociationTable[i].comp_ref == comp_ref and + S1apAssociationTable[i].mme_ue_s1ap_id == enb_id) { + S1apAssociationTable[i].enb_ue_s1ap_id := omit; + S1apAssociationTable[i].mme_ue_s1ap_id := omit; + S1apAssociationTable[i].comp_ref := null; + return; + } + } + setverdict(fail, "S1AP Association Table: Couldn't find to-be-deleted entry!"); + mtc.stop; +} + + +private function f_s1ap_id_table_init() +runs on S1AP_Emulation_CT { + for (var integer i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + S1apAssociationTable[i].mme_ue_s1ap_id := omit; + S1apAssociationTable[i].enb_ue_s1ap_id := omit; + S1apAssociationTable[i].cgi := omit; + S1apAssociationTable[i].tai := omit; + S1apAssociationTable[i].nus := valueof(t_NAS_UE_State(g_pars.role)); + } +} + +private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := 18) := { + sinfo_stream := omit, + sinfo_ppid := ppid, + remSocks := omit, + assocId := omit +}; + +private template PortEvent tr_SctpAssocChange := { + sctpEvent := { + sctpAssocChange := ? + } +} +private template PortEvent tr_SctpPeerAddrChange := { + sctpEvent := { + sctpPeerAddrChange := ? + } +} + +private function f_s1ap_xceive(template (value) S1AP_PDU tx, + template S1AP_PDU rx_t := ?) +runs on S1AP_Emulation_CT return S1AP_PDU { + timer T := 10.0; + var S1AP_RecvFrom mrf; + + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, tx)); + alt { + [] S1AP.receive(tr_S1AP_RecvFrom_R(rx_t)) -> value mrf { } + [] S1AP.receive(tr_SctpAssocChange) { repeat; } + [] S1AP.receive(tr_SctpPeerAddrChange) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_t); + mtc.stop; + } + } + return mrf.msg; +} + +/* +private function f_nas_try_decaps(PDU_NAS_EPS nas) return PDU_NAS_EPS +{ + var PDU_NAS_EPS_SecurityProtectedNASMessage secp_nas; + if (not match(nas, tr_NAS_EMM_SecurityProtected)) { + return nas; + } + secp_nas := nas.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_SecurityProtectedNASMessage; + select (secp_nas.securityHeaderType) { + case ('0011'B) { + var octetstring knas_int := '530ce32318f26264eab26bc116870b86'O; + var octetstring data_with_seq := int2oct(secp_nas.sequenceNumber, 1) & secp_nas.nAS_Message; + var OCT4 exp_mac := f_snow_3g_f9(knas_int, secp_nas.sequenceNumber, 0, + is_downlink:=true, data:=data_with_seq); + if (exp_mac != secp_nas.messageAuthenticationCode) { + setverdict(fail, "Received NAS MAC ", secp_nas.messageAuthenticationCode, + " doesn't match expected MAC ", exp_mac, ": ", nas); + mtc.stop; + } + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case else { + setverdict(fail, "Implement SecHdrType for ", secp_nas); + mtc.stop; + } + } +} +*/ + +function main(S1APOps ops, S1AP_conn_parameters p, charstring id) runs on S1AP_Emulation_CT { + var Result res; + g_pars := p; + g_s1ap_id := id; + f_s1ap_id_table_init(); + f_expect_table_init(); + + map(self:S1AP, system:S1AP_CODEC_PT); + if (p.remote_sctp_port == -1) { + res := S1AP_CodecPort_CtrlFunct.f_IPL4_listen(S1AP, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + } else { + res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP, p.remote_ip, p.remote_sctp_port, + p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + } + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect S1AP socket, check your configuration"); + mtc.stop; + } + g_s1ap_conn_id := res.connId; + + /* notify user about SCTP establishment */ + if (p.remote_sctp_port != -1) { + S1AP_UNIT.send(S1APEM_Event:{up_down:=S1APEM_EVENT_UP}) + } + + while (true) { + var S1AP_ConnHdlr vc_conn; + var PDU_NAS_EPS nas; + var hexstring imsi; + var S1AP_RecvFrom mrf; + var S1AP_PDU msg; + var S1APEM_Config s1cfg; + var charstring vlr_name, mme_name; + var integer ai; + + alt { + /* Configuration primitive from client */ + [] S1AP_CLIENT.receive(S1APEM_Config:{set_nas_keys:=?}) -> value s1cfg sender vc_conn { + var integer assoc_id := f_assoc_id_by_comp(vc_conn); + S1apAssociationTable[assoc_id].nus.k_nas_int := s1cfg.set_nas_keys.k_nas_int; + S1apAssociationTable[assoc_id].nus.k_nas_enc := s1cfg.set_nas_keys.k_nas_enc; + } + /* S1AP from client: InitialUE */ + [] S1AP_CLIENT.receive(tr_S1AP_InitialUE) -> value msg sender vc_conn { + /* create a table entry about this connection */ + ai := f_s1ap_id_table_add(vc_conn, omit, valueof(f_S1AP_get_ENB_UE_S1AP_ID(msg))); + /* Store CGI + TAI so we can use it for generating UlNasTransport from NAS */ + S1apAssociationTable[ai].tai := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[2].value_.TAI; + S1apAssociationTable[ai].cgi := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[3].value_.EUTRAN_CGI; + /* Pass message through */ + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); + } + /* NAS from client: Wrap in S1AP Uplink NAS Transport */ + [] S1AP_CLIENT.receive(PDU_NAS_EPS:?) -> value nas sender vc_conn { + var integer assoc_id := f_assoc_id_by_comp(vc_conn); + var AssociationData ad := S1apAssociationTable[assoc_id]; + nas := f_nas_encaps(S1apAssociationTable[assoc_id].nus, nas, new_ctx := false); + var octetstring nas_enc := enc_PDU_NAS_EPS(nas); + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, + ts_S1AP_UlNasTransport(ad.mme_ue_s1ap_id, + ad.enb_ue_s1ap_id, + nas_enc, ad.cgi, ad.tai))); + } + /* S1AP from client: pass on transparently */ + [] S1AP_CLIENT.receive(S1AP_PDU:?) -> value msg sender vc_conn { + /* Pass message through */ + /* FIXME: validate S1AP_IDs ? */ + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); + } + + /* non-UE related S1AP: pass through unmodified/unverified */ + [] S1AP_UNIT.receive(S1AP_PDU:?) -> value msg sender vc_conn { + /* Pass message through */ + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); + } + + /* S1AP received from peer (MME) */ + [] S1AP.receive(tr_S1AP_RecvFrom_R(?)) -> value mrf { + if (match(mrf.msg, tr_S1AP_nonUErelated)) { + /* non-UE-related S1AP message */ + var template S1AP_PDU resp := ops.unitdata_cb.apply(mrf.msg); + if (isvalue(resp)) { + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, valueof(resp))); + } + } else if (match(mrf.msg, tr_S1AP_UeContextReleaseCmd)) { + /* TODO: special handling, as it contains multiple eNB or MME IDs */ + setverdict(fail, "implement UeContextReleaseCmd handling"); + mtc.stop; + } else { + /* Ue-related S1AP message */ + /* obtain MME + ENB UE S1AP ID */ + var template (omit) MME_UE_S1AP_ID mme_ue_id := f_S1AP_get_MME_UE_S1AP_ID(mrf.msg); + var template (omit) ENB_UE_S1AP_ID enb_ue_id := f_S1AP_get_ENB_UE_S1AP_ID(mrf.msg); + /* check if those IDs are known in our table */ + if (f_s1ap_ids_known(mme_ue_id, enb_ue_id)) { + /* if yes, dispatch to the ConnHdlr for this Ue-Connection */ + var template (omit) octetstring nas_enc; + var integer assoc_id := f_assoc_id_by_s1ap_ids(mme_ue_id, enb_ue_id); + vc_conn := S1apAssociationTable[assoc_id].comp_ref; + nas_enc := f_S1AP_get_NAS_PDU(mrf.msg); + if (isvalue(nas_enc)) { + nas := dec_PDU_NAS_EPS(valueof(nas_enc)); + if (match(nas, tr_NAS_EMM_SecurityProtected)) { + nas := f_nas_try_decaps(S1apAssociationTable[assoc_id].nus, nas); + } + /* send decoded NAS */ + S1AP_CLIENT.send(nas) to vc_conn; + } else { + /* send raw S1AP */ + S1AP_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* if not, call create_cb so it can create new ConnHdlr */ + vc_conn := ops.create_cb.apply(mrf.msg, mme_ue_id, enb_ue_id, id); + f_s1ap_id_table_add(vc_conn, mme_ue_id, valueof(enb_ue_id)); + S1AP_CLIENT.send(mrf.msg) to vc_conn; + } + } + } + [] S1AP.receive(tr_SctpAssocChange) { } + [] S1AP.receive(tr_SctpPeerAddrChange) { } + [] S1AP_PROC.getcall(S1APEM_register:{?,?}) -> param(imsi, vc_conn) { + f_create_expect(imsi, vc_conn); + S1AP_PROC.reply(S1APEM_register:{imsi, vc_conn}) to vc_conn; + } + } + + } +} + +/* "Expect" Handling */ + +type record ExpectData { + hexstring imsi optional, + S1AP_ConnHdlr vc_conn +} + +signature S1APEM_register(in hexstring imsi, in S1AP_ConnHdlr hdlr); + +type port S1APEM_PROC_PT procedure { + inout S1APEM_register; +} with { extension "internal" }; + +/* Function that can be used as create_cb and will usse the expect table */ +function ExpectedCreateCallback(S1AP_PDU msg, hexstring imsi, charstring id) +runs on S1AP_Emulation_CT return S1AP_ConnHdlr { + var S1AP_ConnHdlr ret := null; + var integer i; + + for (i := 0; i < sizeof(S1apExpectTable); i := i+1) { + if (not ispresent(S1apExpectTable[i].imsi)) { + continue; + } + if (imsi == S1apExpectTable[i].imsi) { + ret := S1apExpectTable[i].vc_conn; + /* Release this entry */ + S1apExpectTable[i].imsi := omit; + S1apExpectTable[i].vc_conn := null; + log("Found Expect[", i, "] for ", msg, " handled at ", ret); + return ret; + } + } + setverdict(fail, "Couldn't find Expect for ", msg); + mtc.stop; +} + +private function f_create_expect(hexstring imsi, S1AP_ConnHdlr hdlr) +runs on S1AP_Emulation_CT { + var integer i; + + /* Check an entry like this is not already presnt */ + for (i := 0; i < sizeof(S1apExpectTable); i := i+1) { + if (imsi == S1apExpectTable[i].imsi) { + setverdict(fail, "IMSI already present", imsi); + mtc.stop; + } + } + for (i := 0; i < sizeof(S1apExpectTable); i := i+1) { + if (not ispresent(S1apExpectTable[i].imsi)) { + S1apExpectTable[i].imsi := imsi; + S1apExpectTable[i].vc_conn := hdlr; + log("Created Expect[", i, "] for ", imsi, " to be handled at ", hdlr); + return; + } + } + testcase.stop("No space left in S1apExpectTable") +} + +/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +function f_create_s1ap_expect(hexstring imsi) runs on S1AP_ConnHdlr { + S1AP_PROC.call(S1APEM_register:{imsi, self}) { + [] S1AP_PROC.getreply(S1APEM_register:{?,?}) {}; + } +} + + +private function f_expect_table_init() +runs on S1AP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(S1apExpectTable); i := i + 1) { + S1apExpectTable[i].imsi := omit; + } +} + +function DummyUnitdataCallback(S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_PDU { + log("Ignoring S1AP ", msg); + return omit; +} + + +function f_S1AP_get_ENB_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) ENB_UE_S1AP_ID +{ + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_InitialUE) { + return im.value_.InitialUEMessage.protocolIEs[0].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_DlNasTransport) { + return im.value_.DownlinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UlNasTransport) { + return im.value_.UplinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_IntialCtxSetupReq) { + return im.value_.initialContextSetupRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseReq) { + return im.value_.UEContextReleaseRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* UeContextReleaseCmd needs special handling; it can contain any number of MME/UE IDs */ + case (tr_S1AP_ConnEstInd) { + return im.value_.ConnectionEstablishmentIndication.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.successfulOutcome)) { + var SuccessfulOutcome so := s1ap.successfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupResp) { + return so.value_.initialContextSetupResponse.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCompl) { + return so.value_.UEContextReleaseComplete.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.unsuccessfulOutcome)) { + var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupFail) { + return uo.value_.initialContextSetupFailure.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } + return omit; +} + +function f_S1AP_get_MME_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) MME_UE_S1AP_ID +{ + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_DlNasTransport) { + return im.value_.DownlinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UlNasTransport) { + return im.value_.UplinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_IntialCtxSetupReq) { + return im.value_.initialContextSetupRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseReq) { + return im.value_.UEContextReleaseRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* UeContextReleaseCmd needs special handling; it can contain any number of MME/UE IDs */ + case (tr_S1AP_ConnEstInd) { + return im.value_.ConnectionEstablishmentIndication.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.successfulOutcome)) { + var SuccessfulOutcome so := s1ap.successfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupResp) { + return so.value_.initialContextSetupResponse.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCompl) { + return so.value_.UEContextReleaseComplete.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.unsuccessfulOutcome)) { + var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupFail) { + return uo.value_.initialContextSetupFailure.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } + return omit; +} + +function f_S1AP_get_NAS_PDU(S1AP_PDU s1ap) return template (omit) NAS_PDU +{ + var integer i; + + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_DlNasTransport) { + var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (tr_S1AP_UlNasTransport) { + var UplinkNASTransport msg := im.value_.UplinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + } + } + return omit; +} + + + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 2a98c70..1f2d85b 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -31,10 +31,17 @@ FILES="SGsAP_Types.ttcn" gen_links $DIR $FILES +DIR=../library/s1ap +FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn +S1AP_PDU_Descriptions.asn " +FILES+="S1AP_EncDec.cc S1AP_Types.ttcn " +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " +FILES+="S1AP_CodecPort.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 4d6d7c6..ee73658 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc " +FILES="*.ttcn *.asn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 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: I9bfba3ab2a3830e590b203c44c03b9c9383fff99 Gerrit-Change-Number: 15196 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add initial set of LTE/EPC NAS templates Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15197 Change subject: library: Add initial set of LTE/EPC NAS templates ...................................................................... library: Add initial set of LTE/EPC NAS templates Change-Id: I53a598011041d642f03dcd9cca128f4e9da4adfd --- M deps/Makefile A library/NAS_Templates.ttcn M mme/gen_links.sh 3 files changed, 1,017 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/15197/1 diff --git a/deps/Makefile b/deps/Makefile index cdca8f1..61afb37 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -51,6 +51,7 @@ titan.ProtocolModules.GTPv2_v13.7.0 \ titan.ProtocolModules.ISUP_Q.762 \ titan.ProtocolModules.MobileL3_v13.4.0 \ + titan.ProtocolModules.NAS_EPS_15.2.0.1 \ titan.ProtocolModules.NS_v7.3.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ titan.ProtocolEmulations.SCCP diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn new file mode 100644 index 0000000..f819862 --- /dev/null +++ b/library/NAS_Templates.ttcn @@ -0,0 +1,1011 @@ +/* EPC (Evolved Packet Core) NAS (Non-Access Stratum) templates in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module NAS_Templates { + +import from General_Types all; +import from NAS_EPS_Types all; + +template (value) PDU_NAS_EPS +ts_NAS_SM(template (value) EPS_SessionManagement sm) := { + protocolDiscriminator := '0010'B, + ePS_messages := { + ePS_SessionManagement := sm + } +} +template (present) PDU_NAS_EPS +tr_NAS_SM(template (present) EPS_SessionManagement sm) := { + protocolDiscriminator := '0010'B, + ePS_messages := { + ePS_SessionManagement := sm + } +} + +template (value) PDU_NAS_EPS +ts_NAS_MM(template (value) EPS_MobilityManagement mm) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := mm + } +} +template (present) PDU_NAS_EPS +tr_NAS_MM(template (present) EPS_MobilityManagement mm) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := mm + } +} + +const BIT4 c_EPS_SEC_NONE := '0000'B; +const BIT4 c_EPS_NAS_PD_EMM := '0111'B; +const BIT4 c_EPS_NAS_PD_ESM := '0010'B; + +private template (value) ESM_MessageContainerLVE +ts_NAS_EsmMsgContLVE(template (value) octetstring inp) := { + lengthIndicator := 0, + content := inp +} +private template (present) ESM_MessageContainerLVE +tr_NAS_EsmMsgContLVE(template (present) octetstring inp) := { + lengthIndicator := ?, + content := inp +} + +private template (value) MobileIdentityLV +ts_NAS_MobileIdLV(template (value) MobileIdentityV mid) := { + lengthIndicator := 0, + mobileIdentityV := mid +} +private template (present) MobileIdentityLV +tr_NAS_MobileIdLV(template (present) MobileIdentityV mid) := { + lengthIndicator := ?, + mobileIdentityV := mid +} + +private function f_enc_IMSI_NAS(hexstring digits) return IMSI { + var IMSI l3; + var integer len := lengthof(digits); + if (len rem 2 == 1) { /* modulo remainder */ + l3.oddevenIndicator := '1'B; + l3.fillerDigit := omit; + } else { + l3.oddevenIndicator := '0'B; + l3.fillerDigit := '1111'B; + } + l3.digits := digits; + return l3; +} + +private function f_enc_IMEI_NAS(hexstring digits) return IMEI { + var IMEI l3; + var integer len := lengthof(digits); + if (len rem 2 == 1) { /* modulo remainder */ + l3.oddevenIndicator := '1'B; + } else { + l3.oddevenIndicator := '0'B; + } + l3.digits := digits; + return l3; +} + +private function f_enc_IMEI_SV(hexstring digits) return IMEI_SV { + var IMEI_SV l3; + var integer len := lengthof(digits); + if (len rem 2 == 1) { /* modulo remainder */ + l3.oddevenIndicator := '1'B; + } else { + l3.oddevenIndicator := '0'B; + } + l3.digits := digits; + l3.fillerDigit := '1111'B; + return l3; +} + +template (value) GUTI ts_NAS_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := { + oddevenIndicator := '0'B, + spare := '1111'B, + /* mcc_mnc specified in format 262f42 */ + mccDigit1 := mcc_mnc[0], + mccDigit2 := mcc_mnc[1], + mccDigit3 := mcc_mnc[2], + mncDigit3 := mcc_mnc[5], + mncDigit1 := mcc_mnc[3], + mncDigit2 := mcc_mnc[4], + mMEGI := mmegi, + mMEC := mmec, + mTMSI := tmsi +} + +template (value) EPS_MobileIdentityV +ts_NAS_MobileId_IMSI(hexstring imsi) := { + typeOfIdentity := '001'B, + oddEvenInd_identity := { + imsi := f_enc_IMSI_NAS(imsi) + } +} + +template (value) EPS_MobileIdentityV +ts_NAS_MobileId_IMEI(hexstring imei) := { + typeOfIdentity := '011'B, + oddEvenInd_identity := { + imei := f_enc_IMEI_NAS(imei) + } +} + +template (value) EPS_MobileIdentityV +ts_NAS_MobileId_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := { + typeOfIdentity := '110'B, + oddEvenInd_identity := { + guti := ts_NAS_GUTI(mcc_mnc, mmegi, mmec, tmsi) + } +} + +template (value) PDU_NAS_EPS +ts_NAS_EMM_SecurityProtected(BIT4 sec_hdr_t, integer seq_nr, octetstring inner_nas) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityProtectedNASMessage := { + securityHeaderType := sec_hdr_t, + messageAuthenticationCode := '00000000'O, + sequenceNumber := seq_nr, + nAS_Message := inner_nas + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_EMM_SecurityProtected := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityProtectedNASMessage := ? + } + } +} + +const BIT3 NAS_PDN_T_IPv4 := '001'B; +const BIT3 NAS_PDN_T_IPv6 := '010'B; +const BIT3 NAS_PDN_T_IPv4v6 := '011'B; +const BIT3 NAS_PDN_T_NonIP := '101'B; + + +/********************************************************************************* + * Mobility Management + *********************************************************************************/ + +/* 8.2.1 Attach Accept */ +template (value) PDU_NAS_EPS +ts_NAS_AttachAccept(template (value) EPS_AttachResultV result, + template (value) GPRSTimerV t3412, + template (value) TAI_Lists tai_lists, + template (value) octetstring esm_enc) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachAccept := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000010'B, + ePS_AttachResult := result, + spare := '0000'B, + t3412 := t3412, + tAI_List := { + lengthIndicator := 0, + trackingAreaIdentityLists := tai_lists + }, + eSM_MessageContainer := ts_NAS_EsmMsgContLVE(esm_enc), + gUTI := omit, + locationAreaIdentification := omit, + msIdentity := omit, + eMMCause := omit, + t3402 := omit, + t3423 := omit, + equivalentPLMNs := omit, + emergencyNumberList := omit, + ePS_NetworkFeatureSupport := omit, + additionalUpdateResult := omit, + t3412_Extended := omit, + t3324 := omit, + extendedDRXParameters := omit, + dNCID := omit, + sMS_ServiceStatus := omit, + non3GPP_NW_ProvidedPolicies := omit, + t3448 := omit, + networkPolicy := omit, + t3447 := omit, + extendedEmergencyNumberList := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachAccept(template (present) EPS_AttachResultV result := ?, + template (present) GPRSTimerV t3412 := ?, + template (present) TAI_Lists tai_lists := ?, + template (present) octetstring esm_enc := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachAccept := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000010'B, + ePS_AttachResult := result, + spare := ?, + t3412 := t3412, + tAI_List := { + lengthIndicator := ?, + trackingAreaIdentityLists := tai_lists + }, + eSM_MessageContainer := tr_NAS_EsmMsgContLVE(esm_enc), + gUTI := *, + locationAreaIdentification := *, + msIdentity := *, + eMMCause := *, + t3402 := *, + t3423 := *, + equivalentPLMNs := *, + emergencyNumberList := *, + ePS_NetworkFeatureSupport := *, + additionalUpdateResult := *, + t3412_Extended := *, + t3324 := *, + extendedDRXParameters := *, + dNCID := *, + sMS_ServiceStatus := *, + non3GPP_NW_ProvidedPolicies := *, + t3448 := *, + networkPolicy := *, + t3447 := *, + extendedEmergencyNumberList := * + } + } + } +} + + +/* 8.2.2 Attach Complete */ +template (value) PDU_NAS_EPS +ts_NAS_AttachComplete(template (value) octetstring esm_enc) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000011'B, + eSM_MessageContainer := ts_NAS_EsmMsgContLVE(esm_enc) + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachComplete(template (present) octetstring esm_enc := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000011'B, + eSM_MessageContainer := tr_NAS_EsmMsgContLVE(esm_enc) + } + } + } +} + + +/* 8.2.3 Attach Reject */ +template (value) PDU_NAS_EPS +ts_NAS_AttachReject(template (value) EMM_CauseV cause) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000100'B, + emmCause := cause, + eSM_MessageContainer := omit, + t3346 := omit, + t3402 := omit, + extendedEmmCause := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachReject(template (present) EMM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000100'B, + emmCause := cause, + eSM_MessageContainer := omit, + t3346 := omit, + t3402 := omit, + extendedEmmCause := omit + } + } + } +} + +/* 8.2.4 Attach Request */ +template (value) PDU_NAS_EPS +ts_NAS_AttachRequest(template (value) BIT3 att_type, + template (value) BIT3 kset_id, + template (value) EPS_MobileIdentityV mobile_id, + template (value) UENetworkCapabilityV ue_net_cap, + template (value) octetstring esm_enc) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000001'B, + ePS_attachType := { + typeOfAttach := att_type, + spare := '0'B + }, + nasKeySetId := { + identifier := kset_id, + tSC := '1'B + }, + ePSMobileId := { + lengthIndicator := 0, + ePS_MobileIdentity := mobile_id + }, + uENetworkCapability := { + lengthIndicator := 0, + uENetworkCapabilityV := ue_net_cap + }, + eSM_MessageContainer := ts_NAS_EsmMsgContLVE(esm_enc), + old_P_TMSISignature := omit, + additionalGUTI := omit, + lastVisitedRegisteredTAI := omit, + dRXParameter := omit, + mSNetworkCapability := omit, + oldLocationAreaIdentification := omit, + tMSIStatusTV := omit, + mobileStationClassmark2 := omit, + mobileStationClassmark3 := omit, + supportedCodecList := omit, + additionalUpdateType := omit, + voiceDomainPrefandUEsettings := omit, + deviceProperties := omit, + oldGUTI_Type := omit, + mS_NetworkFeatureSupport := omit, + tMSIBasedNRIContainer := omit, + t3324 := omit, + t3412_Extended := omit, + extendedDRXParameters := omit, + uEAdditionalSecurityCapability := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachRequest(template (present) BIT3 att_type := ?, + template (present) BIT3 kset_id := ?, + template (present) EPS_MobileIdentityV mobile_id := ?, + template (present) UENetworkCapabilityV ue_net_cap := ?, + template (present) octetstring esm_enc := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachRequest := { + securityHeaderType := ?, + messageType := '01000001'B, + ePS_attachType := { + typeOfAttach := att_type, + spare := ? + }, + nasKeySetId := { + identifier := kset_id, + tSC := ? + }, + ePSMobileId := { + lengthIndicator := ?, + ePS_MobileIdentity := mobile_id + }, + uENetworkCapability := { + lengthIndicator := ?, + uENetworkCapabilityV := ue_net_cap + }, + eSM_MessageContainer := tr_NAS_EsmMsgContLVE(esm_enc), + old_P_TMSISignature := *, + additionalGUTI := *, + lastVisitedRegisteredTAI := *, + dRXParameter := *, + mSNetworkCapability := *, + oldLocationAreaIdentification := *, + tMSIStatusTV := *, + mobileStationClassmark2 := *, + mobileStationClassmark3 := *, + supportedCodecList := *, + additionalUpdateType := *, + voiceDomainPrefandUEsettings := *, + deviceProperties := *, + oldGUTI_Type := *, + mS_NetworkFeatureSupport := *, + tMSIBasedNRIContainer := *, + t3324 := *, + t3412_Extended := *, + extendedDRXParameters := *, + uEAdditionalSecurityCapability := * + } + } + } +} + + +/* 8.2.5 Authentication Failure */ +template (value) PDU_NAS_EPS +ts_NAS_AuthFail(template (value) EMM_CauseV cause /* template (omit) OCT14 auth_fail_par */) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationFailure := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011100'B, + emmCause := cause, + authenticationFailureParameter := omit + } + } + } +} +template (value) PDU_NAS_EPS +ts_NAS_AuthFail_par(template (value) EMM_CauseV cause, + template (value) OCT14 auth_fail_par) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationFailure := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011100'B, + emmCause := cause, + authenticationFailureParameter := { + elementIdentifier := '30'O, + lengthIndicator := lengthof(auth_fail_par), + authenticationFailureParameter := auth_fail_par + } + } + } + } +} + +/* 8.2.6 Authentication Reject */ +template (value) PDU_NAS_EPS +ts_NAS_AuthRej := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010100'B + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AuthRej := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationReject := { + securityHeaderType := ?, + messageType := '01010100'B + } + } + } +} + +/* 8.2.7 Authentication Request */ +template (value) PDU_NAS_EPS +ts_NAS_AuthReq(template (value) NAS_KeySetIdentifierV kset_id, + OCT16 rand, OCT16 autn) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010010'B, + nasKeySetId := kset_id, + spare := '0000'B, + authenticationParameterRAND := { + rAND := rand + }, + authenticationParameterAUTN := { + lengthIndicator := lengthof(autn), + aUTN := autn + } + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AuthReq(template (present) NAS_KeySetIdentifierV kset_id := ?, + template (present) OCT16 rand := ?, + template (present) OCT16 autn := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationRequest := { + securityHeaderType := ?, + messageType := '01010010'B, + nasKeySetId := kset_id, + spare := '0000'B, + authenticationParameterRAND := { + rAND := rand + }, + authenticationParameterAUTN := { + lengthIndicator := ?, + aUTN := autn + } + } + } + } +} + +/* 8.2.8 Authentication Response */ +template (value) PDU_NAS_EPS +ts_NAS_AuthResp(octetstring res) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationResponse := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010011'B, + authenticationResponseParameter := { + lengthIndicator := lengthof(res), + authenticationResponseParameter := { + rES := res + } + } + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AuthResp(template OCT16 res := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationResponse := { + securityHeaderType := ?, + messageType := '01010011'B, + authenticationResponseParameter := { + lengthIndicator := ?, + authenticationResponseParameter := { + rES := res + } + } + } + } + } +} + +/* 8.2.18 Identity Request */ +template (value) PDU_NAS_EPS +ts_NAS_IdentityReq(template (value) IdentityType2V id_type) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010101'B, + identityType := id_type, + spareHalfOctet := '0000'B + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_IdentityReq(template (present) IdentityType2V id_type := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010101'B, + identityType := id_type, + spareHalfOctet := ? + } + } + } +} + +/* 8.2.19 Identity Response */ +template (value) PDU_NAS_EPS +ts_NAS_IdentityResp(template (value) MobileIdentityV mobile_id) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityResponse := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010110'B, + mobileIdentity := ts_NAS_MobileIdLV(mobile_id) + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_IdentityResp(template (present) MobileIdentityV mobile_id := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityResponse := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010110'B, + mobileIdentity := tr_NAS_MobileIdLV(mobile_id) + } + } + } +} + + + + +/* 8.2.20 Security Mode Command */ +template (value) PDU_NAS_EPS +ts_NAS_SecModeCmd(template (value) NAS_SecurityAlgorithmsV alg, + template (value) NAS_KeySetIdentifierV kset_id, + template (value) UESecurityCapabilityLV ue_sec_cap) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeCommand := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011101'B, + selected_NAS_SecurityAlgorithms := alg, + nasKeySetId := kset_id, + spareHalfOctet := '0000'B, + replayed_UE_SecurityCapability := ue_sec_cap, + iMEISV_Request := omit, + replayedNonceUE := omit, + nonceMME := omit, + hashMME := omit, + uEAdditionalSecurityCapability := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_SecModeCmd(template (present) NAS_SecurityAlgorithmsV alg := ?, + template (present) NAS_KeySetIdentifierV kset_id := ?, + template (present) UESecurityCapabilityLV ue_sec_cap := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeCommand := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011101'B, + selected_NAS_SecurityAlgorithms := alg, + nasKeySetId := kset_id, + spareHalfOctet := ?, + replayed_UE_SecurityCapability := ue_sec_cap, + iMEISV_Request := *, + replayedNonceUE := *, + nonceMME := *, + hashMME := *, + uEAdditionalSecurityCapability := * + } + } + } +} + +/* 8.2.21 Security Mode Complete */ +template (value) PDU_NAS_EPS +ts_NAS_SecModeCmpl := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011110'B, + iMEISV := omit, + replayedNASMessageContainer := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_SecModeCmpl := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011110'B, + iMEISV := *, + replayedNASMessageContainer := * + } + } + } +} + +/********************************************************************************* + * Session Management + *********************************************************************************/ + +/* 9.9.4.11 - 10.5.6.3/24.008 */ +private function ts_NAS_PCO_TLV(template (omit) ProtocolConfigOptionsV pco) +return template (omit) ProtocolConfigOptionsTLV { + var template (value) ProtocolConfigOptionsTLV ret; + if (istemplatekind(pco, "omit")) { + return omit; + } + ret := { + elementIdentifier := '27'O, + protocolConfigOptions := { + lengthIndicator := 0, + protocolConfigOptionsV := pco + } + } + return ret; +} +private function tr_NAS_PCO_TLV(template ProtocolConfigOptionsV pco := ?) +return template ProtocolConfigOptionsTLV { + var template ProtocolConfigOptionsTLV ret := { + elementIdentifier := '27'O, + protocolConfigOptions := { + lengthIndicator := ?, + protocolConfigOptionsV := pco + } + } + if (istemplatekind(pco, "omit")) { + return omit; + } else if (istemplatekind(pco, "*")) { + return *; + } else { + return ret; + } +} + + + +/* 8.3.20 PDN Connectivity Request */ +template (value) PDU_NAS_EPS +ts_NAS_PdnConnReq(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) BIT3 pdn_type, + template (value) BIT3 req_type) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010000'B, + requestType := { + requestTypeValue := req_type, + spare := '0'B + }, + pDN_Type := { + pDN_TypeValue := pdn_type, + spare := '0'B + }, + eSM_InformationTransferFlag := omit, + accessPointName := omit, + protocolConfigOptions := omit, + deviceProperties := omit, + nBIFOMContainer := omit, + headerCompressinConfiguration := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_PdnConnReq(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) BIT3 pdn_type := ?, + template (present) BIT3 req_type := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010000'B, + requestType := { + requestTypeValue := req_type, + spare := '0'B + }, + pDN_Type := { + pDN_TypeValue := pdn_type, + spare := '0'B + }, + eSM_InformationTransferFlag := omit, + accessPointName := omit, + protocolConfigOptions := omit, + deviceProperties := omit, + nBIFOMContainer := omit, + headerCompressinConfiguration := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} + +/* 8.3.19 PDN Connectivity Reject */ +template (value) PDU_NAS_EPS +ts_NAS_PdnConnRej(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) ESM_CauseV cause) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010001'B, + esmCause := cause, + protocolConfigOptions := omit, + backOffTimer := omit, + reAttemptIndicator := omit, + nBIFOMContainer := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_PdnConnRej(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) ESM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010001'B, + esmCause := cause, + protocolConfigOptions := *, + backOffTimer := *, + reAttemptIndicator := *, + nBIFOMContainer := *, + extendedProtocolConfigurationOptions := * + } + } + } +} + + +/* 8.3.6 Activate Default EPS Bearer Context Request */ +template (value) PDU_NAS_EPS +ts_NAS_ActDefEpsBearCtxReq(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) EPS_QualityOfServiceV qos, + template (value) octetstring apn, + template (value) BIT3 addr_type, + template (value) octetstring addr_info) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000001'B, + ePS_QoS := { + lengthIndicator := 0, + ePS_QualityOfServiceV := qos + }, + accessPointName := { + lengthIndicator := 0, + accessPointNameValue := apn + }, + pDN_Address := { + lengthIndicator := 0, + typeValue := addr_type, + spare := '00000'B, + addressInformation := addr_info + }, + transactionIdentifier := omit, + negotiatedQoS := omit, + negotiated_LLC_SAPI := omit, + radioPriority := omit, + packetFlowID := omit, + aPN_AMBR := omit, + esmCause := omit, + protocolConfigOptions := omit, + connectivityType := omit, + wLANOffloadIndication := omit, + nBIFOMContainer := omit, + headerCompressinConfiguration := omit, + controlPlaneOnlyIndication := omit, + extendedProtocolConfigurationOptions := omit, + servingPLMNRateControl := omit, + extended_APN_AMBR := omit, + extendedQoS := omit + } + } + } +} + +/* 8.3.4 Activate Default EPS Bearer Context Accept */ +template (value) PDU_NAS_EPS +ts_NAS_ActDefEpsBearCtxAck(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (omit) ProtocolConfigOptionsV pco) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextAccept := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000010'B, + protocolConfigOptions := ts_NAS_PCO_TLV(pco), + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_ActDefEpsBearCtxAck(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template ProtocolConfigOptionsV pco := *) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextAccept := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000010'B, + protocolConfigOptions := tr_NAS_PCO_TLV(pco), + extendedProtocolConfigurationOptions := * + } + } + } +} + + +/* 8.3.5 Activate Default EPS Bearer Context Reject */ +template (value) PDU_NAS_EPS +ts_NAS_ActDefEpsBearCtxRej(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) ESM_CauseV cause) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000011'B, + esmCause := cause, + protocolConfigOptions := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_ActDefEpsBearCtxRej(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) ESM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000011'B, + esmCause := cause, + protocolConfigOptions := *, + extendedProtocolConfigurationOptions := * + } + } + } +} + + + + + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 1f2d85b..8c1da59 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -31,6 +31,10 @@ FILES="SGsAP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.NAS_EPS_15.2.0.1/src +FILES="NAS_EPS_Types.ttcn" +gen_links $DIR $FILES + DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " @@ -42,6 +46,7 @@ FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn " +FILES+="NAS_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15197 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: I53a598011041d642f03dcd9cca128f4e9da4adfd Gerrit-Change-Number: 15197 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Import snow-3g.[ch] from nextepc source code Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 Change subject: Import snow-3g.[ch] from nextepc source code ...................................................................... Import snow-3g.[ch] from nextepc source code Change-Id: I938de2ad17210aa1561240c0a96d0df216243be1 --- A mme/snow-3g.c A mme/snow-3g.h 2 files changed, 660 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/15198/1 diff --git a/mme/snow-3g.c b/mme/snow-3g.c new file mode 100644 index 0000000..4c728fe --- /dev/null +++ b/mme/snow-3g.c @@ -0,0 +1,592 @@ +/*------------------------------------------------------------------------ +* SNOW_3G.c +*------------------------------------------------------------------------*/ + +#include "snow-3g.h" + +/* LFSR */ + +static u32 LFSR_S0 = 0x00; +static u32 LFSR_S1 = 0x00; +static u32 LFSR_S2 = 0x00; +static u32 LFSR_S3 = 0x00; +static u32 LFSR_S4 = 0x00; +static u32 LFSR_S5 = 0x00; +static u32 LFSR_S6 = 0x00; +static u32 LFSR_S7 = 0x00; +static u32 LFSR_S8 = 0x00; +static u32 LFSR_S9 = 0x00; +static u32 LFSR_S10 = 0x00; +static u32 LFSR_S11 = 0x00; +static u32 LFSR_S12 = 0x00; +static u32 LFSR_S13 = 0x00; +static u32 LFSR_S14 = 0x00; +static u32 LFSR_S15 = 0x00; + +/* FSM */ + +static u32 FSM_R1 = 0x00; +static u32 FSM_R2 = 0x00; +static u32 FSM_R3 = 0x00; + +/* Rijndael S-box SR */ + +static u8 SR[256] = { +0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76, +0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0, +0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15, +0x04,0xC7,0x23,0xC3,0x18,0x96,0x05,0x9A,0x07,0x12,0x80,0xE2,0xEB,0x27,0xB2,0x75, +0x09,0x83,0x2C,0x1A,0x1B,0x6E,0x5A,0xA0,0x52,0x3B,0xD6,0xB3,0x29,0xE3,0x2F,0x84, +0x53,0xD1,0x00,0xED,0x20,0xFC,0xB1,0x5B,0x6A,0xCB,0xBE,0x39,0x4A,0x4C,0x58,0xCF, +0xD0,0xEF,0xAA,0xFB,0x43,0x4D,0x33,0x85,0x45,0xF9,0x02,0x7F,0x50,0x3C,0x9F,0xA8, +0x51,0xA3,0x40,0x8F,0x92,0x9D,0x38,0xF5,0xBC,0xB6,0xDA,0x21,0x10,0xFF,0xF3,0xD2, +0xCD,0x0C,0x13,0xEC,0x5F,0x97,0x44,0x17,0xC4,0xA7,0x7E,0x3D,0x64,0x5D,0x19,0x73, +0x60,0x81,0x4F,0xDC,0x22,0x2A,0x90,0x88,0x46,0xEE,0xB8,0x14,0xDE,0x5E,0x0B,0xDB, +0xE0,0x32,0x3A,0x0A,0x49,0x06,0x24,0x5C,0xC2,0xD3,0xAC,0x62,0x91,0x95,0xE4,0x79, +0xE7,0xC8,0x37,0x6D,0x8D,0xD5,0x4E,0xA9,0x6C,0x56,0xF4,0xEA,0x65,0x7A,0xAE,0x08, +0xBA,0x78,0x25,0x2E,0x1C,0xA6,0xB4,0xC6,0xE8,0xDD,0x74,0x1F,0x4B,0xBD,0x8B,0x8A, +0x70,0x3E,0xB5,0x66,0x48,0x03,0xF6,0x0E,0x61,0x35,0x57,0xB9,0x86,0xC1,0x1D,0x9E, +0xE1,0xF8,0x98,0x11,0x69,0xD9,0x8E,0x94,0x9B,0x1E,0x87,0xE9,0xCE,0x55,0x28,0xDF, +0x8C,0xA1,0x89,0x0D,0xBF,0xE6,0x42,0x68,0x41,0x99,0x2D,0x0F,0xB0,0x54,0xBB,0x16 +}; + +/* S-box SQ */ + +static u8 SQ[256] = { +0x25,0x24,0x73,0x67,0xD7,0xAE,0x5C,0x30,0xA4,0xEE,0x6E,0xCB,0x7D,0xB5,0x82,0xDB, +0xE4,0x8E,0x48,0x49,0x4F,0x5D,0x6A,0x78,0x70,0x88,0xE8,0x5F,0x5E,0x84,0x65,0xE2, +0xD8,0xE9,0xCC,0xED,0x40,0x2F,0x11,0x28,0x57,0xD2,0xAC,0xE3,0x4A,0x15,0x1B,0xB9, +0xB2,0x80,0x85,0xA6,0x2E,0x02,0x47,0x29,0x07,0x4B,0x0E,0xC1,0x51,0xAA,0x89,0xD4, +0xCA,0x01,0x46,0xB3,0xEF,0xDD,0x44,0x7B,0xC2,0x7F,0xBE,0xC3,0x9F,0x20,0x4C,0x64, +0x83,0xA2,0x68,0x42,0x13,0xB4,0x41,0xCD,0xBA,0xC6,0xBB,0x6D,0x4D,0x71,0x21,0xF4, +0x8D,0xB0,0xE5,0x93,0xFE,0x8F,0xE6,0xCF,0x43,0x45,0x31,0x22,0x37,0x36,0x96,0xFA, +0xBC,0x0F,0x08,0x52,0x1D,0x55,0x1A,0xC5,0x4E,0x23,0x69,0x7A,0x92,0xFF,0x5B,0x5A, +0xEB,0x9A,0x1C,0xA9,0xD1,0x7E,0x0D,0xFC,0x50,0x8A,0xB6,0x62,0xF5,0x0A,0xF8,0xDC, +0x03,0x3C,0x0C,0x39,0xF1,0xB8,0xF3,0x3D,0xF2,0xD5,0x97,0x66,0x81,0x32,0xA0,0x00, +0x06,0xCE,0xF6,0xEA,0xB7,0x17,0xF7,0x8C,0x79,0xD6,0xA7,0xBF,0x8B,0x3F,0x1F,0x53, +0x63,0x75,0x35,0x2C,0x60,0xFD,0x27,0xD3,0x94,0xA5,0x7C,0xA1,0x05,0x58,0x2D,0xBD, +0xD9,0xC7,0xAF,0x6B,0x54,0x0B,0xE0,0x38,0x04,0xC8,0x9D,0xE7,0x14,0xB1,0x87,0x9C, +0xDF,0x6F,0xF9,0xDA,0x2A,0xC4,0x59,0x16,0x74,0x91,0xAB,0x26,0x61,0x76,0x34,0x2B, +0xAD,0x99,0xFB,0x72,0xEC,0x33,0x12,0xDE,0x98,0x3B,0xC0,0x9B,0x3E,0x18,0x10,0x3A, +0x56,0xE1,0x77,0xC9,0x1E,0x9E,0x95,0xA3,0x90,0x19,0xA8,0x6C,0x09,0xD0,0xF0,0x86 +}; + +/* MULx. +* Input V: an 8-bit input. +* Input c: an 8-bit input. +* Output : an 8-bit output. +* See section 3.1.1 for details. +*/ + +u8 MULx(u8 V, u8 c) +{ + if ( V & 0x80 ) + return ( (V << 1) ^ c); + else + return ( V << 1); +} + +/* MULxPOW. +* Input V: an 8-bit input. +* Input i: a positive integer. +* Input c: an 8-bit input. +* Output : an 8-bit output. +* See section 3.1.2 for details. +*/ + +u8 MULxPOW(u8 V, u8 i, u8 c) +{ + if ( i == 0) + return V; + else + return MULx( MULxPOW( V, i-1, c ), c); +} + +/* The function MUL alpha. +* Input c: 8-bit input. +* Output : 32-bit output. +* See section 3.4.2 for details. +*/ + +u32 MULalpha(u8 c) +{ + return ( ( ((u32)MULxPOW(c, 23, 0xa9)) << 24 ) | + ( ((u32)MULxPOW(c, 245, 0xa9)) << 16 ) | + ( ((u32)MULxPOW(c, 48, 0xa9)) << 8 ) | + ( ((u32)MULxPOW(c, 239, 0xa9)) ) ) ; +} + +/* The function DIV alpha. +* Input c: 8-bit input. +* Output : 32-bit output. +* See section 3.4.3 for details. +*/ + +u32 DIValpha(u8 c) +{ + return ( ( ((u32)MULxPOW(c, 16, 0xa9)) << 24 ) | + ( ((u32)MULxPOW(c, 39, 0xa9)) << 16 ) | + ( ((u32)MULxPOW(c, 6, 0xa9)) << 8 ) | + ( ((u32)MULxPOW(c, 64, 0xa9)) ) ) ; +} + +/* The 32x32-bit S-Box S1 +* Input: a 32-bit input. +* Output: a 32-bit output of S1 box. +* See section 3.3.1. +*/ + +u32 S1(u32 w) +{ + u8 r0=0, r1=0, r2=0, r3=0; + u8 srw0 = SR[ (u8)((w >> 24) & 0xff) ]; + u8 srw1 = SR[ (u8)((w >> 16) & 0xff) ]; + u8 srw2 = SR[ (u8)((w >> 8) & 0xff) ]; + u8 srw3 = SR[ (u8)((w) & 0xff) ]; + r0 = ( ( MULx( srw0 , 0x1b) ) ^ + ( srw1 ) ^ + ( srw2 ) ^ + ( (MULx( srw3, 0x1b)) ^ srw3 ) + ); + r1 = ( ( ( MULx( srw0 , 0x1b) ) ^ srw0 ) ^ + ( MULx(srw1, 0x1b) ) ^ + ( srw2 ) ^ + ( srw3 ) + ); + r2 = ( ( srw0 ) ^ + ( ( MULx( srw1 , 0x1b) ) ^ srw1 ) ^ + ( MULx(srw2, 0x1b) ) ^ + ( srw3 ) + ); + r3 = ( ( srw0 ) ^ + ( srw1 ) ^ + ( ( MULx( srw2 , 0x1b) ) ^ srw2 ) ^ + ( MULx( srw3, 0x1b) ) + ); + + return ( ( ((u32)r0) << 24 ) | ( ((u32)r1) << 16 ) | ( ((u32)r2) << 8 ) | + ( ((u32)r3) ) ); +} + +/* The 32x32-bit S-Box S2 +* Input: a 32-bit input. +* Output: a 32-bit output of S2 box. +* See section 3.3.2. +*/ + +u32 S2(u32 w) +{ + u8 r0=0, r1=0, r2=0, r3=0; + u8 sqw0 = SQ[ (u8)((w >> 24) & 0xff) ]; + u8 sqw1 = SQ[ (u8)((w >> 16) & 0xff) ]; + u8 sqw2 = SQ[ (u8)((w >> 8) & 0xff) ]; + u8 sqw3 = SQ[ (u8)((w) & 0xff) ]; + r0 = ( ( MULx( sqw0 , 0x69) ) ^ + ( sqw1 ) ^ + ( sqw2 ) ^ + ( (MULx( sqw3, 0x69)) ^ sqw3 ) + ); + r1 = ( ( ( MULx( sqw0 , 0x69) ) ^ sqw0 ) ^ + ( MULx(sqw1, 0x69) ) ^ + ( sqw2 ) ^ + ( sqw3 ) + ); + r2 = ( ( sqw0 ) ^ + ( ( MULx( sqw1 , 0x69) ) ^ sqw1 ) ^ + ( MULx(sqw2, 0x69) ) ^ + ( sqw3 ) + ); + r3 = ( ( sqw0 ) ^ + ( sqw1 ) ^ + ( ( MULx( sqw2 , 0x69) ) ^ sqw2 ) ^ + ( MULx( sqw3, 0x69) ) + ); + return ( ( ((u32)r0) << 24 ) | ( ((u32)r1) << 16 ) | ( ((u32)r2) << 8 ) | + ( ((u32)r3) ) ); +} + +/* Clocking LFSR in initialization mode. +* LFSR Registers S0 to S15 are updated as the LFSR receives a single clock. +* Input F: a 32-bit word comes from output of FSM. +* See section 3.4.4. +*/ + +void ClockLFSRInitializationMode(u32 F) +{ + u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ + ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ + ( LFSR_S2 ) ^ + ( (LFSR_S11 >> 8) & 0x00ffffff ) ^ + ( DIValpha( (u8)( ( LFSR_S11) & 0xff ) ) ) ^ + ( F ) + ); + LFSR_S0 = LFSR_S1; + LFSR_S1 = LFSR_S2; + LFSR_S2 = LFSR_S3; + LFSR_S3 = LFSR_S4; + LFSR_S4 = LFSR_S5; + LFSR_S5 = LFSR_S6; + LFSR_S6 = LFSR_S7; + LFSR_S7 = LFSR_S8; + LFSR_S8 = LFSR_S9; + LFSR_S9 = LFSR_S10; + LFSR_S10 = LFSR_S11; + LFSR_S11 = LFSR_S12; + LFSR_S12 = LFSR_S13; + LFSR_S13 = LFSR_S14; + LFSR_S14 = LFSR_S15; + LFSR_S15 = v; +} + +/* Clocking LFSR in keystream mode. +* LFSR Registers S0 to S15 are updated as the LFSR receives a single clock. +* See section 3.4.5. +*/ + +void ClockLFSRKeyStreamMode() +{ + u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ + ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ + ( LFSR_S2 ) ^ + ( (LFSR_S11 >> 8) & 0x00ffffff ) ^ + ( DIValpha( (u8)( ( LFSR_S11) & 0xff ) ) ) + ); + LFSR_S0 = LFSR_S1; + LFSR_S1 = LFSR_S2; + LFSR_S2 = LFSR_S3; + LFSR_S3 = LFSR_S4; + LFSR_S4 = LFSR_S5; + LFSR_S5 = LFSR_S6; + LFSR_S6 = LFSR_S7; + LFSR_S7 = LFSR_S8; + LFSR_S8 = LFSR_S9; + LFSR_S9 = LFSR_S10; + LFSR_S10 = LFSR_S11; + LFSR_S11 = LFSR_S12; + LFSR_S12 = LFSR_S13; + LFSR_S13 = LFSR_S14; + LFSR_S14 = LFSR_S15; + LFSR_S15 = v; +} + +/* Clocking FSM. +* Produces a 32-bit word F. +* Updates FSM registers R1, R2, R3. +* See Section 3.4.6. +*/ + +u32 ClockFSM() +{ + u32 F = ( ( LFSR_S15 + FSM_R1 ) & 0xffffffff ) ^ FSM_R2 ; + u32 r = ( FSM_R2 + ( FSM_R3 ^ LFSR_S5 ) ) & 0xffffffff ; + FSM_R3 = S2(FSM_R2); + FSM_R2 = S1(FSM_R1); + FSM_R1 = r; + return F; +} + +/* Initialization. +* Input k[4]: Four 32-bit words making up 128-bit key. +* Input IV[4]: Four 32-bit words making 128-bit initialization variable. +* Output: All the LFSRs and FSM are initialized for key generation. +* See Section 4.1. +*/ + +void snow_3g_initialize(u32 k[4], u32 IV[4]) +{ + u8 i=0; + u32 F = 0x0; + LFSR_S15 = k[3] ^ IV[0]; + LFSR_S14 = k[2]; + LFSR_S13 = k[1]; + LFSR_S12 = k[0] ^ IV[1]; + LFSR_S11 = k[3] ^ 0xffffffff; + LFSR_S10 = k[2] ^ 0xffffffff ^ IV[2]; + LFSR_S9 = k[1] ^ 0xffffffff ^ IV[3]; + LFSR_S8 = k[0] ^ 0xffffffff; + LFSR_S7 = k[3]; + LFSR_S6 = k[2]; + LFSR_S5 = k[1]; + LFSR_S4 = k[0]; + LFSR_S3 = k[3] ^ 0xffffffff; + LFSR_S2 = k[2] ^ 0xffffffff; + LFSR_S1 = k[1] ^ 0xffffffff; + LFSR_S0 = k[0] ^ 0xffffffff; + FSM_R1 = 0x0; + FSM_R2 = 0x0; + FSM_R3 = 0x0; + for(i=0;i<32;i++) + { + F = ClockFSM(); + ClockLFSRInitializationMode(F); + } +} + +/* Generation of Keystream. +* input n: number of 32-bit words of keystream. +* input z: space for the generated keystream, assumes +* memory is allocated already. +* output: generated keystream which is filled in z +* See section 4.2. +*/ + +void snow_3g_generate_key_stream(u32 n, u32 *ks) +{ + u32 t = 0; + u32 F = 0x0; + ClockFSM(); /* Clock FSM once. Discard the output. */ + ClockLFSRKeyStreamMode(); /* Clock LFSR in keystream mode once. */ + for ( t=0; t +#include +#include +*/ + +/* f8. +* Input key: 128 bit Confidentiality Key. +* Input count:32-bit Count, Frame dependent input. +* Input bearer: 5-bit Bearer identity (in the LSB side). +* Input dir:1 bit, direction of transmission. +* Input data: length number of bits, input bit stream. +* Input length: 32 bit Length, i.e., the number of bits to be encrypted or +* decrypted. +* Output data: Output bit stream. Assumes data is suitably memory +* allocated. +* Encrypts/decrypts blocks of data between 1 and 2^32 bits in length as +* defined in Section 3. +*/ + +void snow_3g_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, u32 length) +{ + u32 K[4],IV[4]; + int n = ( length + 31 ) / 32; + int i=0; + int lastbits = (8-(length%8)) % 8; + u32 *KS; + + /*Initialisation*/ + /* Load the confidentiality key for SNOW 3G initialization as in section + 3.4. */ + for (i=0; i<4; i++) + K[3-i] = (key[4*i] << 24) ^ (key[4*i+1] << 16) + ^ (key[4*i+2] << 8) ^ (key[4*i+3]); + + /* Prepare the initialization vector (IV) for SNOW 3G initialization as in + section 3.4. */ + IV[3] = count; + IV[2] = (bearer << 27) | ((dir & 0x1) << 26); + IV[1] = IV[3]; + IV[0] = IV[2]; + + /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ + snow_3g_initialize(K,IV); + KS = (u32 *)ogs_malloc(4*n); + snow_3g_generate_key_stream(n,(u32*)KS); + + /* Exclusive-OR the input data with keystream to generate the output bit + stream */ + for (i=0; i> 24) & 0xff; + data[4*i+1] ^= (u8) (KS[i] >> 16) & 0xff; + data[4*i+2] ^= (u8) (KS[i] >> 8) & 0xff; + data[4*i+3] ^= (u8) (KS[i] ) & 0xff; + } + + ogs_free(KS); + + /* zero last bits of data in case its length is not byte-aligned + this is an addition to the C reference code, which did not handle it */ + if (lastbits) + data[length/8] &= 256 - (1<>i ) & 0x1 ) + result ^= MUL64xPOW(V,i,c); + } + return result; +} + +/* mask8bit. + * Input n: an integer in 1-7. + * Output : an 8 bit mask. + * Prepares an 8 bit mask with required number of 1 bits on the MSB side. + */ +u8 mask8bit(int n) +{ + return 0xFF ^ ((1<<(8-n)) - 1); +} + +/* f9. + * Input key: 128 bit Integrity Key. + * Input count:32-bit Count, Frame dependent input. + * Input fresh: 32-bit Random number. + * Input dir:1 bit, direction of transmission (in the LSB). + * Input data: length number of bits, input bit stream. + * Input length: 64 bit Length, i.e., the number of bits to be MAC'd. + * Output : 32 bit block used as MAC + * Generates 32-bit MAC using UIA2 algorithm as defined in Section 4. + */ +void snow_3g_f9(u8* key, u32 count, u32 fresh, u32 dir, u8 *data, u64 length, + u8 *out) +{ + u32 K[4],IV[4], z[5]; + u32 i=0, D; + u64 EVAL; + u64 V; + u64 P; + u64 Q; + u64 c; + + u64 M_D_2; + int rem_bits = 0; + + /* Load the Integrity Key for SNOW3G initialization as in section 4.4. */ + for (i=0; i<4; i++) + { + K[3-i] = (key[4*i] << 24) ^ (key[4*i+1] << 16) ^ + (key[4*i+2] << 8) ^ (key[4*i+3]); + } + + /* Prepare the Initialization Vector (IV) for SNOW3G initialization as + in section 4.4. */ + IV[3] = count; + IV[2] = fresh; + IV[1] = count ^ ( dir << 31 ) ; + IV[0] = fresh ^ (dir << 15); + + z[0] = z[1] = z[2] = z[3] = z[4] = 0; + + /* Run SNOW 3G to produce 5 keystream words z_1, z_2, z_3, z_4 and z_5. */ + snow_3g_initialize(K, IV); + snow_3g_generate_key_stream(5, z); + + P = (u64)z[0] << 32 | (u64)z[1]; + Q = (u64)z[2] << 32 | (u64)z[3]; + + /* Calculation */ + if ((length % 64) == 0) + D = (length>>6) + 1; + else + D = (length>>6) + 2; + EVAL = 0; + c = 0x1b; + + /* for 0 <= i <= D-3 */ + for (i=0; i 7) + { + M_D_2 |= (u64)data[8*(D-2)+i] << (8*(7-i)); + rem_bits -= 8; + i++; + } + if (rem_bits > 0) + M_D_2 |= (u64)(data[8*(D-2)+i] & mask8bit(rem_bits)) << (8*(7-i)); + + V = EVAL ^ M_D_2; + EVAL = MUL64(V,P,c); + + /* for D-1 */ + EVAL ^= length; + + /* Multiply by Q */ + EVAL = MUL64(EVAL,Q,c); + + /* XOR with z_5: this is a modification to the reference C code, + which forgot to XOR z[5] */ + for (i=0; i<4; i++) + /* + MAC_I[i] = (mac32 >> (8*(3-i))) & 0xff; + */ + out[i] = ((EVAL >> (56-(i*8))) ^ (z[4] >> (24-(i*8)))) & 0xff; +} + +/* End of f9.c */ +/*------------------------------------------------------------------------*/ diff --git a/mme/snow-3g.h b/mme/snow-3g.h new file mode 100644 index 0000000..a5320bb --- /dev/null +++ b/mme/snow-3g.h @@ -0,0 +1,68 @@ +#ifndef __SNOW_3G__ +#define __SNOW_3G__ + +#include "ogs-core.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef uint8_t u8; +typedef uint32_t u32; +typedef uint64_t u64; + +/* Initialization. +* Input k[4]: Four 32-bit words making up 128-bit key. +* Input IV[4]: Four 32-bit words making 128-bit initialization variable. +* Output: All the LFSRs and FSM are initialized for key generation. +* See Section 4.1. +*/ + +void snow_3g_initialize(u32 k[4], u32 IV[4]); + +/* Generation of Keystream. +* input n: number of 32-bit words of keystream. +* input z: space for the generated keystream, assumes +* memory is allocated already. +* output: generated keystream which is filled in z +* See section 4.2. +*/ + +void snow_3g_generate_key_stream(u32 n, u32 *z); + +/* f8. +* Input key: 128 bit Confidentiality Key. +* Input count:32-bit Count, Frame dependent input. +* Input bearer: 5-bit Bearer identity (in the LSB side). +* Input dir:1 bit, direction of transmission. +* Input data: length number of bits, input bit stream. +* Input length: 32 bit Length, i.e., the number of bits to be encrypted or +* decrypted. +* Output data: Output bit stream. Assumes data is suitably memory +* allocated. +* Encrypts/decrypts blocks of data between 1 and 2^32 bits in length as +* defined in Section 3. +*/ + +void snow_3g_f8( u8 *key, u32 count, u32 bearer, u32 dir, + u8 *data, u32 length ); + +/* f9. +* Input key: 128 bit Integrity Key. +* Input count:32-bit Count, Frame dependent input. +* Input fresh: 32-bit Random number. +* Input dir:1 bit, direction of transmission (in the LSB). +* Input data: length number of bits, input bit stream. +* Input length: 64 bit Length, i.e., the number of bits to be MAC'd. +* Output : 32 bit block used as MAC +* Generates 32-bit MAC using UIA2 algorithm as defined in Section 4. +*/ + +void snow_3g_f9( u8* key, u32 count, u32 fresh, u32 dir, + u8 *data, u64 length, u8 *out); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __SNOW_3G__ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 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: I938de2ad17210aa1561240c0a96d0df216243be1 Gerrit-Change-Number: 15198 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: snow-3g: const-ify S-boxes Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15199 Change subject: snow-3g: const-ify S-boxes ...................................................................... snow-3g: const-ify S-boxes Change-Id: I3a85120aad95011954f25bb42900133cb30cddb7 --- M mme/snow-3g.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/15199/1 diff --git a/mme/snow-3g.c b/mme/snow-3g.c index 4c728fe..6d4fe2a 100644 --- a/mme/snow-3g.c +++ b/mme/snow-3g.c @@ -31,7 +31,7 @@ /* Rijndael S-box SR */ -static u8 SR[256] = { +static const u8 SR[256] = { 0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76, 0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0, 0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15, @@ -52,7 +52,7 @@ /* S-box SQ */ -static u8 SQ[256] = { +static const u8 SQ[256] = { 0x25,0x24,0x73,0x67,0xD7,0xAE,0x5C,0x30,0xA4,0xEE,0x6E,0xCB,0x7D,0xB5,0x82,0xDB, 0xE4,0x8E,0x48,0x49,0x4F,0x5D,0x6A,0x78,0x70,0x88,0xE8,0x5F,0x5E,0x84,0x65,0xE2, 0xD8,0xE9,0xCC,0xED,0x40,0x2F,0x11,0x28,0x57,0xD2,0xAC,0xE3,0x4A,0x15,0x1B,0xB9, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15199 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: I3a85120aad95011954f25bb42900133cb30cddb7 Gerrit-Change-Number: 15199 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:33 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: snow-3g.c: Mark all internal primitive functions as static Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15200 Change subject: snow-3g.c: Mark all internal primitive functions as static ...................................................................... snow-3g.c: Mark all internal primitive functions as static We don't need to pollute the public namespace Change-Id: I55347320383b173d1aca622997e7cfb98cd9caff --- M mme/snow-3g.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/15200/1 diff --git a/mme/snow-3g.c b/mme/snow-3g.c index 6d4fe2a..992b107 100644 --- a/mme/snow-3g.c +++ b/mme/snow-3g.c @@ -78,7 +78,7 @@ * See section 3.1.1 for details. */ -u8 MULx(u8 V, u8 c) +static u8 MULx(u8 V, u8 c) { if ( V & 0x80 ) return ( (V << 1) ^ c); @@ -94,7 +94,7 @@ * See section 3.1.2 for details. */ -u8 MULxPOW(u8 V, u8 i, u8 c) +static u8 MULxPOW(u8 V, u8 i, u8 c) { if ( i == 0) return V; @@ -108,7 +108,7 @@ * See section 3.4.2 for details. */ -u32 MULalpha(u8 c) +static u32 MULalpha(u8 c) { return ( ( ((u32)MULxPOW(c, 23, 0xa9)) << 24 ) | ( ((u32)MULxPOW(c, 245, 0xa9)) << 16 ) | @@ -122,7 +122,7 @@ * See section 3.4.3 for details. */ -u32 DIValpha(u8 c) +static u32 DIValpha(u8 c) { return ( ( ((u32)MULxPOW(c, 16, 0xa9)) << 24 ) | ( ((u32)MULxPOW(c, 39, 0xa9)) << 16 ) | @@ -136,7 +136,7 @@ * See section 3.3.1. */ -u32 S1(u32 w) +static u32 S1(u32 w) { u8 r0=0, r1=0, r2=0, r3=0; u8 srw0 = SR[ (u8)((w >> 24) & 0xff) ]; @@ -174,7 +174,7 @@ * See section 3.3.2. */ -u32 S2(u32 w) +static u32 S2(u32 w) { u8 r0=0, r1=0, r2=0, r3=0; u8 sqw0 = SQ[ (u8)((w >> 24) & 0xff) ]; @@ -211,7 +211,7 @@ * See section 3.4.4. */ -void ClockLFSRInitializationMode(u32 F) +static void ClockLFSRInitializationMode(u32 F) { u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ @@ -243,7 +243,7 @@ * See section 3.4.5. */ -void ClockLFSRKeyStreamMode() +static void ClockLFSRKeyStreamMode() { u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ @@ -275,7 +275,7 @@ * See Section 3.4.6. */ -u32 ClockFSM() +static u32 ClockFSM() { u32 F = ( ( LFSR_S15 + FSM_R1 ) & 0xffffffff ) ^ FSM_R2 ; u32 r = ( FSM_R2 + ( FSM_R3 ^ LFSR_S5 ) ) & 0xffffffff ; @@ -433,7 +433,7 @@ * function. * See section 4.3.2 for details. */ -u64 MUL64x(u64 V, u64 c) +static u64 MUL64x(u64 V, u64 c) { if ( V & 0x8000000000000000 ) return (V << 1) ^ c; @@ -449,7 +449,7 @@ * A 64-bit memory is allocated which is to be freed by the calling function. * See section 4.3.3 for details. */ -u64 MUL64xPOW(u64 V, u8 i, u64 c) +static u64 MUL64xPOW(u64 V, u8 i, u64 c) { if ( i == 0) return V; @@ -466,7 +466,7 @@ * function. * See section 4.3.4 for details. */ -u64 MUL64(u64 V, u64 P, u64 c) +static u64 MUL64(u64 V, u64 P, u64 c) { u64 result = 0; int i = 0; @@ -484,7 +484,7 @@ * Output : an 8 bit mask. * Prepares an 8 bit mask with required number of 1 bits on the MSB side. */ -u8 mask8bit(int n) +static u8 mask8bit(int n) { return 0xFF ^ ((1<<(8-n)) - 1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15200 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: I55347320383b173d1aca622997e7cfb98cd9caff Gerrit-Change-Number: 15200 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:33 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: remove ogslib dependency from snow Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15201 Change subject: remove ogslib dependency from snow ...................................................................... remove ogslib dependency from snow * don't use ogslib specific header files * don't use ogs_{malloc,free} but simply use the stack Change-Id: I5604c594934b03d2fd83e1e465fc150fc542a475 --- M mme/snow-3g.c M mme/snow-3g.h 2 files changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/15201/1 diff --git a/mme/snow-3g.c b/mme/snow-3g.c index 992b107..60bdffd 100644 --- a/mme/snow-3g.c +++ b/mme/snow-3g.c @@ -381,7 +381,7 @@ int n = ( length + 31 ) / 32; int i=0; int lastbits = (8-(length%8)) % 8; - u32 *KS; + u32 KS[n]; /*Initialisation*/ /* Load the confidentiality key for SNOW 3G initialization as in section @@ -399,7 +399,6 @@ /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ snow_3g_initialize(K,IV); - KS = (u32 *)ogs_malloc(4*n); snow_3g_generate_key_stream(n,(u32*)KS); /* Exclusive-OR the input data with keystream to generate the output bit @@ -412,8 +411,6 @@ data[4*i+3] ^= (u8) (KS[i] ) & 0xff; } - ogs_free(KS); - /* zero last bits of data in case its length is not byte-aligned this is an addition to the C reference code, which did not handle it */ if (lastbits) diff --git a/mme/snow-3g.h b/mme/snow-3g.h index a5320bb..0ba6a84 100644 --- a/mme/snow-3g.h +++ b/mme/snow-3g.h @@ -1,7 +1,7 @@ #ifndef __SNOW_3G__ #define __SNOW_3G__ -#include "ogs-core.h" +#include #ifdef __cplusplus extern "C" { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15201 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: I5604c594934b03d2fd83e1e465fc150fc542a475 Gerrit-Change-Number: 15201 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:33 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: TTCN-3 native function wrapper for SNOW-3G Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15202 Change subject: TTCN-3 native function wrapper for SNOW-3G ...................................................................... TTCN-3 native function wrapper for SNOW-3G Change-Id: I7fca69ea8b4aed48d5a64885b762ab85be71ef03 --- A mme/LTE_CryptoFunctionDefs.cc A mme/LTE_CryptoFunctions.ttcn A mme/key_derivation.c A mme/key_derivation.h M mme/regen_makefile.sh 5 files changed, 557 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/15202/1 diff --git a/mme/LTE_CryptoFunctionDefs.cc b/mme/LTE_CryptoFunctionDefs.cc new file mode 100644 index 0000000..da2d521 --- /dev/null +++ b/mme/LTE_CryptoFunctionDefs.cc @@ -0,0 +1,189 @@ +/* Utility functions from ogslib imported to TTCN-3 + * + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "snow-3g.h" +#include "key_derivation.h" + +//#define DEBUG + +#ifdef DEBUG +static __thread char hexd_buff[4096]; +static const char hex_chars[] = "0123456789abcdef"; + +static const char *_osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, + bool delim_after_last) +{ + int i; + char *cur = out_buf; + size_t delim_len; + + if (!out_buf || !out_buf_size) + return ""; + + delim = delim ? : ""; + delim_len = strlen(delim); + + for (i = 0; i < len; i++) { + const char *delimp = delim; + int len_remain = out_buf_size - (cur - out_buf) - 1; + if (len_remain < (2 + delim_len) + && !(!delim_after_last && i == (len - 1) && len_remain >= 2)) + break; + + *cur++ = hex_chars[buf[i] >> 4]; + *cur++ = hex_chars[buf[i] & 0xf]; + + if (i == (len - 1) && !delim_after_last) + break; + + while (len_remain > 1 && *delimp) { + *cur++ = *delimp++; + len_remain--; + } + } + *cur = '\0'; + return out_buf; +} + +static char *_osmo_hexdump(const unsigned char *buf, int len) +{ + _osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true); + return hexd_buff; +} +#endif + +namespace LTE__CryptoFunctions { + + +/* f8. +* Input key: 128 bit Confidentiality Key as OCT16. +* Input count:32-bit Count, Frame dependent input as INTEGER. +* Input bearer: 5-bit Bearer identity (in the LSB side) as BIT5. +* Input is_dlwnlink: Direction of transmission. +* Input data: length number of bits, input bit stream as OCTETSTRING. +* Output data: Output bit stream. Assumes data is suitably memory +* allocated. +* Encrypts/decrypts blocks of data between 1 and 2^32 bits in length as +* defined in Section 3. +*/ +OCTETSTRING f__snow__3g__f8(const OCTETSTRING& key, const INTEGER& count, const INTEGER & bearer, + const BOOLEAN& is_downlink, const OCTETSTRING& data) +{ + TTCN_Buffer ttcn_buf_data(data); + TTCN_Buffer ttcn_buf_key(key); + uint32_t direction = (uint32_t)is_downlink; + + snow_3g_f8((u8 *)ttcn_buf_key.get_data(), (u32) count, (u32)bearer, direction, + (u8 *)ttcn_buf_data.get_data(), ttcn_buf_data.get_len()); + + return OCTETSTRING(ttcn_buf_data.get_len(), ttcn_buf_data.get_data()); +} + +/* f9. +* Input key: 128 bit Integrity Key as OCT16. +* Input count:32-bit Count, Frame dependent input as UINT32. +* Input fresh: 32-bit Random number as UINT32. +* Input is_downlink:1 Direction of transmission. +* Input data: input bit stream. +* Output : 32 bit block used as MAC +* Generates 32-bit MAC using UIA2 algorithm as defined in Section 4. +*/ + +OCTETSTRING f__snow__3g__f9(const OCTETSTRING& key, const INTEGER& count, const INTEGER& fresh, + const BOOLEAN& is_downlink, const OCTETSTRING& data) +{ + TTCN_Buffer ttcn_buf_data(data); + TTCN_Buffer ttcn_buf_key(key); + uint32_t direction = (uint32_t)is_downlink; + uint8_t tmp[4]; + TTCN_Buffer ttcn_buf_mac; + +#ifdef DEBUG + printf("F9: key=%s, count=%u, fresh=%u, direction=%u, ", + _osmo_hexdump((u8 *)ttcn_buf_key.get_data(), ttcn_buf_key.get_len()), (u32) count, + (u32) fresh, direction); + printf("data=%s -> ", _osmo_hexdump(ttcn_buf_data.get_data(), ttcn_buf_data.get_len())); +#endif + snow_3g_f9((u8 *)ttcn_buf_key.get_data(), (u32) count, (u32) fresh, direction, + (u8 *)ttcn_buf_data.get_data(), ttcn_buf_data.get_len()*8, tmp); +#ifdef DEBUG + printf("%s\n", _osmo_hexdump(tmp, sizeof(tmp))); +#endif + + return OCTETSTRING(4, tmp); +} + +OCTETSTRING f__kdf__kasme(const OCTETSTRING& ck, const OCTETSTRING& ik, const OCTETSTRING& plmn_id, + const OCTETSTRING& sqn, const OCTETSTRING& ak) +{ + TTCN_Buffer ttcn_buf_ck(ck); + TTCN_Buffer ttcn_buf_ik(ik); + TTCN_Buffer ttcn_buf_plmn_id(plmn_id); + TTCN_Buffer ttcn_buf_sqn(sqn); + TTCN_Buffer ttcn_buf_ak(ak); + uint8_t kasme[32]; + + hss_auc_kasme(ttcn_buf_ck.get_data(), ttcn_buf_ik.get_data(), ttcn_buf_plmn_id.get_data(), + ttcn_buf_sqn.get_data(), ttcn_buf_ak.get_data(), kasme); + return OCTETSTRING(sizeof(kasme), kasme); +} + +OCTETSTRING f__kdf__nas__int(const INTEGER& alg_id, const OCTETSTRING &kasme) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + uint8_t knas[16]; + + mme_kdf_nas(MME_KDF_NAS_INT_ALG, (int)alg_id, (const u8*) ttcn_buf_kasme.get_data(), knas); + return OCTETSTRING(sizeof(knas), knas); +} + +OCTETSTRING f__kdf__nas__enc(const INTEGER& alg_id, const OCTETSTRING &kasme) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + uint8_t knas[16]; + + mme_kdf_nas(MME_KDF_NAS_ENC_ALG, (int)alg_id, (const u8*) ttcn_buf_kasme.get_data(), knas); + return OCTETSTRING(sizeof(knas), knas); +} + + +OCTETSTRING f__kdf__enb(const OCTETSTRING &kasme, const INTEGER &ul_count) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + uint8_t kenb[32]; + + mme_kdf_enb(ttcn_buf_kasme.get_data(), (int)ul_count, kenb); + return OCTETSTRING(sizeof(kenb), kenb); +} + +OCTETSTRING f__kdf__nh(const OCTETSTRING &kasme, const OCTETSTRING &sync_inp) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + TTCN_Buffer ttcn_buf_sync_inp(sync_inp); + uint8_t kenb[32]; + + mme_kdf_nh(ttcn_buf_kasme.get_data(), ttcn_buf_sync_inp.get_data(), kenb); + return OCTETSTRING(sizeof(kenb), kenb); +} + + + +} // namespace diff --git a/mme/LTE_CryptoFunctions.ttcn b/mme/LTE_CryptoFunctions.ttcn new file mode 100644 index 0000000..687caab --- /dev/null +++ b/mme/LTE_CryptoFunctions.ttcn @@ -0,0 +1,263 @@ +/* Utility functions from ogslib imported to TTCN-3 + * + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module LTE_CryptoFunctions { + +import from General_Types all; + +import from S1AP_Types all; +import from S1AP_PDU_Descriptions all; + +import from NAS_EPS_Types all; +import from NAS_Templates all; + +/********************************************************************************* + * low-level API (external C/C++ code) + *********************************************************************************/ + +external function f_snow_3g_f8(in OCT16 key, in integer count, in integer bearer, + in boolean is_downlink, in octetstring data) return octetstring; + +external function f_snow_3g_f9(in OCT16 key, in integer count, in integer fresh, + in boolean is_downlink, in octetstring data) return OCT4; + +external function f_kdf_kasme(in OCT16 ck, in OCT16 ik, in OCT3 plmn_id, + in OCT6 sqn, in OCT6 ak) return OCT32; + +external function f_kdf_nas_int(in integer alg_id, in OCT32 kasme) return OCT32; +external function f_kdf_nas_enc(in integer alg_id, in OCT32 kasme) return OCT32; + +external function f_kdf_enb(in OCT16 kasme, in integer ul_count) return OCT32; + +external function f_kdf_nh(in OCT16 kasme, in OCT32 sync_inp) return OCT32; + +/********************************************************************************* + * mid-level API + *********************************************************************************/ + +function f_nas_mac_calc(NAS_ALG_INT alg, octetstring k_nas_int, integer seq_nr, + integer bearer, boolean is_downlink, octetstring data) return OCT4 { + select (alg) { + case (NAS_ALG_IP_EIA0) { + return '00000000'O; + } + case (NAS_ALG_IP_EIA1) { + return f_snow_3g_f9(k_nas_int, seq_nr, bearer, is_downlink, data); + } + case else { + setverdict(fail, "Unsupported EIA: ", alg); + mtc.stop; + } + } +} + +function f_nas_encrypt(NAS_ALG_ENC alg, octetstring k_nas_enc, integer count, + integer bearer, boolean is_downlink, inout octetstring data) { + select (alg) { + case (NAS_ALG_ENC_EEA0) { } + case (NAS_ALG_ENC_EEA1) { + f_snow_3g_f8(k_nas_enc, count, bearer, is_downlink, data); + } + case else { + setverdict(fail, "Unsupported EEA: ", alg); + mtc.stop; + } + } +} + + +/********************************************************************************* + * high-level API (full NAS encapsulation/decapsulation) + *********************************************************************************/ + +type record NAS_UE_State { + NAS_Role role, /* ATS implements UE or MME role? */ + + NAS_ALG_INT alg_int, /* NAS Integrity Protection Algorithm */ + octetstring k_nas_int, /* NAS Integrity Protection Key */ + NAS_ALG_ENC alg_enc, /* NAS Encryption Algorithm */ + octetstring k_nas_enc, /* NAS Encryption Key */ + integer rx_count, /* frame counter (ATS rx side) */ + integer tx_count /* frame counter (ATS tx side) */ +}; + +template (value) NAS_UE_State t_NAS_UE_State(NAS_Role role) := { + role := role, + alg_int := NAS_ALG_IP_EIA0, + k_nas_int := ''O, + alg_enc := NAS_ALG_ENC_EEA0, + k_nas_enc := ''O, + rx_count := 0, + tx_count := 0 +}; + +type enumerated NAS_Role { + NAS_ROLE_UE, /* ATS implements/emulates UE */ + NAS_ROLE_MME /* ATS implements/emulates MME */ +}; +type enumerated NAS_ALG_INT { + NAS_ALG_IP_EIA0, /* no integrity protection */ + NAS_ALG_IP_EIA1, /* SNOW-3G F9 based */ + NAS_ALG_IP_EIA2, /* AES based */ + NAS_ALG_IP_EIA3 /* ZUC */ +}; +type enumerated NAS_ALG_ENC { + NAS_ALG_ENC_EEA0, /* no encryption */ + NAS_ALG_ENC_EEA1, /* SNOW-3G F8 based */ + NAS_ALG_ENC_EEA2, /* AES based */ + NAS_ALG_ENC_EEA3 /* ZUC */ +}; + +/* port between individual per-connection components and this translator */ +type port S1AP_NAS_Conn_PT message { + inout S1AP_PDU, PDU_NAS_EPS; +} with { extension "internal" }; + +/* determine if a received (from the IUT) message is downlink or not */ +private function f_rx_is_downlink(in NAS_UE_State nus) return boolean +{ + if (nus.role == NAS_ROLE_UE) { + return true; + } else { + return false; + } +} + +/* determine if a message transmitted to the IUT message is downlink or not */ +private function f_tx_is_downlink(in NAS_UE_State nus) return boolean +{ + return not f_rx_is_downlink(nus); +} + +private function f_nas_check_ip(inout NAS_UE_State nus, + in PDU_NAS_EPS_SecurityProtectedNASMessage secp_nas) return boolean +{ + var octetstring data_with_seq := int2oct(secp_nas.sequenceNumber, 1) & secp_nas.nAS_Message; + var OCT4 exp_mac := f_nas_mac_calc(nus.alg_int, nus.k_nas_int, nus.rx_count, 0, + f_rx_is_downlink(nus), data_with_seq); + if (exp_mac != secp_nas.messageAuthenticationCode) { + setverdict(fail, "Received NAS MAC ", secp_nas.messageAuthenticationCode, + " doesn't match expected MAC ", exp_mac, ": ", secp_nas); + return false; + } + return true; +} + +/* try to decapsulate (MAC verify, decrypt) NAS message */ +function f_nas_try_decaps(inout NAS_UE_State nus, PDU_NAS_EPS nas) return PDU_NAS_EPS +{ + var PDU_NAS_EPS_SecurityProtectedNASMessage secp_nas; + + /* transparently pass through any non-protected NAS */ + if (not match(nas, tr_NAS_EMM_SecurityProtected)) { + return nas; + } + + /* process any security-protected NAS */ + secp_nas := nas.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_SecurityProtectedNASMessage; + select (secp_nas.securityHeaderType) { + case ('0011'B) { /* IP with new EPS security context */ + nus.rx_count := 0; + nus.alg_int := NAS_ALG_IP_EIA1; /* FIXME: from decoded inner message! */ + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case ('0001'B) { /* IP only */ + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case ('0010'B) { /* IP + ciphered */ + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.rx_count, 0, + f_rx_is_downlink(nus), secp_nas.nAS_Message); + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case ('0100'B) { /* IP + ciphered; new EPS security context */ + nus.rx_count := 0; + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.rx_count, 0, + f_rx_is_downlink(nus), secp_nas.nAS_Message); + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + //case ('0101'B) { /* IP + partially ciphered */ } + //case ('1100'B) { /* Service Request Message */ } + case else { + setverdict(fail, "Implement SecHdrType for ", secp_nas); + mtc.stop; + } + } +} + +private function f_nas_determine_sec_hdr_t(boolean encrypt, boolean authenticate, boolean new_ctx) +return BIT4 +{ + if (encrypt == false and authenticate == false and new_ctx == false) { + return '0000'B; + } else if (encrypt == false and authenticate == true and new_ctx == false) { + return '0001'B; + } else if (encrypt == false and authenticate == true and new_ctx == true) { + return '0011'B; + } else if (encrypt == true and authenticate == true and new_ctx == true) { + return '0100'B; + } else if (encrypt == true and authenticate == true and new_ctx == false) { + return '0010'B; + } else { + setverdict(fail, "invalid sec_hdr conditions"); + mtc.stop; + } +} + +/* encapsulate a NAS message (encrypt, MAC) */ +function f_nas_encaps(inout NAS_UE_State nus, PDU_NAS_EPS nas_in, boolean new_ctx := false) +return PDU_NAS_EPS +{ + var boolean encrypt := false; + var boolean authenticate := false; + if (nus.alg_int != NAS_ALG_IP_EIA0) { + authenticate := true; + } + if (nus.alg_enc != NAS_ALG_ENC_EEA0) { + encrypt := true; + } + + if (encrypt == false and authenticate == false) { + return nas_in; + } + + if (new_ctx) { + nus.tx_count := 0; + } + + var BIT4 sec_hdr_t := f_nas_determine_sec_hdr_t(encrypt, authenticate, new_ctx); + var octetstring nas_enc := enc_PDU_NAS_EPS(nas_in); + if (encrypt) { + f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.tx_count, 0, + f_tx_is_downlink(nus), nas_enc); + } + var PDU_NAS_EPS nas_out; + nas_out := valueof(ts_NAS_EMM_SecurityProtected(sec_hdr_t, nus.tx_count, nas_enc)); + if (authenticate) { + var OCT4 mac := f_nas_mac_calc(nus.alg_int, nus.k_nas_int, nus.tx_count, 0, + f_tx_is_downlink(nus), '00'O & nas_enc); + nas_out.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_SecurityProtectedNASMessage.messageAuthenticationCode := mac; + } + return nas_out; +} + +} // namespace diff --git a/mme/key_derivation.c b/mme/key_derivation.c new file mode 100644 index 0000000..36e4c91 --- /dev/null +++ b/mme/key_derivation.c @@ -0,0 +1,82 @@ +#include +#include +#include +#include + +/* From nextepc/src/mme/mme-kdf.c under AGPLv3+ */ + +void mme_kdf_nas(uint8_t algorithm_type_distinguishers, + uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas) +{ + uint8_t s[7]; + uint8_t out[32]; + + s[0] = 0x15; /* FC Value */ + + s[1] = algorithm_type_distinguishers; + s[2] = 0x00; + s[3] = 0x01; + + s[4] = algorithm_identity; + s[5] = 0x00; + s[6] = 0x01; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, kasme, 32, s, 7, out); + memcpy(knas, out+16, 16); +} + +void mme_kdf_enb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb) +{ + uint8_t s[7]; + + s[0] = 0x11; /* FC Value */ + + ul_count = htonl(ul_count); + memcpy(s+1, &ul_count, 4); + + s[5] = 0x00; + s[6] = 0x04; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, kasme, 32, s, 7, kenb); +} + +void mme_kdf_nh(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb) +{ + uint8_t s[35]; + + s[0] = 0x12; /* FC Value */ + + memcpy(s+1, sync_input, 32); + + s[33] = 0x00; + s[34] = 0x20; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, kasme, 32, s, 35, kenb); +} + +/* From nextepc/src/hss/hss-auc.c under AGPLv3+ */ + +#define FC_VALUE 0x10 + +void hss_auc_kasme(const uint8_t *ck, const uint8_t *ik, const uint8_t plmn_id[3], + const uint8_t *sqn, const uint8_t *ak, uint8_t *kasme) +{ + uint8_t s[14]; + uint8_t k[32]; + int i; + + memcpy(&k[0], ck, 16); + memcpy(&k[16], ik, 16); + + s[0] = FC_VALUE; + memcpy(&s[1], plmn_id, 3); + s[4] = 0x00; + s[5] = 0x03; + + for (i = 0; i < 6; i++) + s[6+i] = sqn[i] ^ ak[i]; + s[12] = 0x00; + s[13] = 0x06; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, k, 32, s, 14, kasme); +} diff --git a/mme/key_derivation.h b/mme/key_derivation.h new file mode 100644 index 0000000..496f52b --- /dev/null +++ b/mme/key_derivation.h @@ -0,0 +1,21 @@ +#pragma once + +#include + +#define HSS_SQN_LEN 6 +#define HSS_AK_LEN 6 + +void hss_auc_kasme(const uint8_t *ck, const uint8_t *ik, + const uint8_t plmn_id[3], const uint8_t *sqn, const uint8_t *ak, + uint8_t *kasme); + +/* Algorithm Type Distinguishers */ +#define MME_KDF_NAS_ENC_ALG 0x01 +#define MME_KDF_NAS_INT_ALG 0x02 + +void mme_kdf_nas(uint8_t algorithm_type_distinguishers, + uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas); + +void mme_kdf_enb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb); + +void mme_kdf_nh(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb); diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index ee73658..4752302 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,9 +1,9 @@ #!/bin/sh -FILES="*.ttcn *.asn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " export CPPFLAGS_TTCN3="" ../regen-makefile.sh MME_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode -lgnutls/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15202 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: I7fca69ea8b4aed48d5a64885b762ab85be71ef03 Gerrit-Change-Number: 15202 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:34 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Extend MME tests to also include S1AP interface testing Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15203 Change subject: mme: Extend MME tests to also include S1AP interface testing ...................................................................... mme: Extend MME tests to also include S1AP interface testing The tests so far only tested SGsAP alone, which doesn't get us very far. Let's add interfacing with the S1, too. Change-Id: Id54071b901db720a0f88b91cdc5a8e09bea0fb58 --- A mme/MME_Tests.cfg A mme/MME_Tests.default M mme/MME_Tests.ttcn M mme/MME_Tests_SGsAP.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 6 files changed, 399 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/15203/1 diff --git a/mme/MME_Tests.cfg b/mme/MME_Tests.cfg new file mode 100644 index 0000000..3e478c3 --- /dev/null +++ b/mme/MME_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./MME_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +MME_Tests.control diff --git a/mme/MME_Tests.default b/mme/MME_Tests.default new file mode 100644 index 0000000..1c220d8 --- /dev/null +++ b/mme/MME_Tests.default @@ -0,0 +1,12 @@ +[LOGGING] +FileMask := LOG_ALL | TTCN_MATCHING; +mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; + +[TESTPORT_PARAMETERS] + + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 3ba0677..ae71173 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -10,31 +10,84 @@ module MME_Tests { +import from General_Types all; + +import from S1AP_Types all; +import from S1AP_Templates all; +import from S1AP_Emulation all; +import from S1AP_PDU_Descriptions all; +import from S1AP_IEs all; + +import from NAS_EPS_Types all; +import from NAS_Templates all; + import from SGsAP_Types all; import from SGsAP_Templates all; import from SGsAP_Emulation all; +import from LTE_CryptoFunctions all; + import from L3_Templates all; import from DNS_Helpers all; +import from Osmocom_Types all; friend module MME_Tests_SGsAP; +/* (maximum) number of emulated eNBs */ +const integer NUM_ENB := 3; + +/* (maximum) number of emulated UEs */ +const integer NUM_UE := 3; + +/* parameters of emulated ENB */ +type record EnbParams { + Global_ENB_ID global_enb_id, + integer cell_identity, + SupportedTAs supported_tas +} + +/* parameters of emulated UE */ +type record UeParams { + hexstring imsi +} + type component MTC_CT { + /* S1 intreface of emulated ENBs */ + var EnbParams g_enb_pars[NUM_ENB]; + var S1AP_Emulation_CT vc_S1AP[NUM_ENB]; + port S1AP_PT S1AP_UNIT[NUM_ENB]; + port S1APEM_PROC_PT S1AP_PROC[NUM_ENB]; + + /* SGs interface of emulated MSC/VLR */ var SGsAP_Emulation_CT vc_SGsAP; port SGsAP_PT SGsAP_UNIT; port SGsAPEM_PROC_PT SGsAP_PROC; + + var UeParams g_ue_pars[NUM_UE]; } -type component ConnHdlr extends SGsAP_ConnHdlr { +type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; } type record ConnHdlrPars { - hexstring imsi + /* copied over from MTC_CT on start of component */ + EnbParams enb_pars[NUM_ENB], + /* copied over from MTC_CT on start of component */ + UeParams ue_pars, + /* currently used MME (index into enb_pars, S1AP, ...) */ + integer mme_idx } modulepar { + /* S1 interface */ + charstring mp_mme_ip := "127.0.0.1"; + integer mp_mme_s1ap_port := 36412; + charstring mp_s1_local_ip := "127.0.0.1"; + integer mp_s1_local_port := 50000; + + /* SGs interface */ charstring mp_sgs_local_ip := "127.0.0.1"; integer mp_sgs_local_port := 29118; charstring mp_vlr_name := "vlr.example.net"; @@ -68,11 +121,96 @@ vc_SGsAP.start(SGsAP_Emulation.main(ops, pars, id)); } +/* send incoming unit data messages (like reset) to global S1AP_UNIT port */ +friend function S1apForwardUnitdataCallback(S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_PDU { + S1AP_UNIT.send(msg); + return omit; +} + +friend function S1apCreateCallback(S1AP_PDU msg, template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id, charstring id) +runs on S1AP_Emulation_CT return S1AP_ConnHdlr +{ + setverdict(fail, "implement this"); + mtc.stop; +} + +friend function f_init_one_enb(charstring id, integer num := 0) runs on MTC_CT { + id := id & "-S1AP" & int2str(num); + var S1APOps ops := { + create_cb := refers(S1apCreateCallback), + unitdata_cb := refers(S1apForwardUnitdataCallback) + } + var S1AP_conn_parameters pars := { + remote_ip := mp_mme_ip, + remote_sctp_port := mp_mme_s1ap_port, + local_ip := mp_s1_local_ip, + local_sctp_port := mp_s1_local_port + num, + role := NAS_ROLE_UE + } + var PLMNidentity plmn_id := '00f110'O; + var EnbParams enb_pars := { + global_enb_id := { + pLMNidentity := plmn_id, + eNB_ID := { + macroENB_ID := int2bit(num, 20) + }, + iE_Extensions := omit + }, + cell_identity := num, + supported_tas := { + { + tAC := int2oct(12345, 2), + broadcastPLMNs := { plmn_id }, + iE_Extensions := omit + } + } + }; + + g_enb_pars[num] := enb_pars; + vc_S1AP[num] := S1AP_Emulation_CT.create(id); + map(vc_S1AP[num]:S1AP, system:S1AP_CODEC_PT); + connect(vc_S1AP[num]:S1AP_PROC, self:S1AP_PROC[num]); + connect(vc_S1AP[num]:S1AP_UNIT, self:S1AP_UNIT[num]); + vc_S1AP[num].start(S1AP_Emulation.main(ops, pars, id)); + S1AP_UNIT[num].receive(S1APEM_Event:{up_down:=S1APEM_EVENT_UP}); +} +friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { + uep := { + imsi := f_gen_imsi(imsi_suffix) + } +} +friend function f_init_s1ap(charstring id, integer imsi_suffix) runs on MTC_CT { + var integer i; + for (i := 0; i < NUM_ENB; i := i+1) { + f_init_one_enb(id, i); + } + for (i := 0; i < NUM_UE; i := i+1) { + f_init_one_ue(g_ue_pars[i], i*1000 + imsi_suffix); + } +} + +friend template (value) TAI ts_enb_S1AP_TAI(EnbParams enb) := { + pLMNidentity := enb.global_enb_id.pLMNidentity, + tAC := enb.supported_tas[0].tAC, + iE_Extensions := omit +} + +friend template (value) EUTRAN_CGI ts_enb_S1AP_CGI(EnbParams enb) := { + pLMNidentity := enb.global_enb_id.pLMNidentity, + cell_ID := int2bit(enb.cell_identity, 28), + iE_Extensions := omit +} + + /* generate parameters for a connection handler */ -friend function f_init_pars(integer imsi_suffix) +friend function f_init_pars(integer ue_idx := 0) runs on MTC_CT return ConnHdlrPars { var ConnHdlrPars pars := { - imsi := f_gen_imsi(imsi_suffix) + enb_pars := g_enb_pars, + ue_pars := g_ue_pars[ue_idx], + mme_idx := 0 }; return pars; } @@ -86,9 +224,14 @@ var charstring id := testcasename() & int2str(s1ap_idx); vc_conn := ConnHdlr.create(id); - /* SGsAP part */ - connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); - connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + /* S1AP part */ + connect(vc_conn:S1AP, vc_S1AP[s1ap_idx]:S1AP_CLIENT); + connect(vc_conn:S1AP_PROC, vc_S1AP[s1ap_idx]:S1AP_PROC); + if (isbound(vc_SGsAP)) { + /* SGsAP part */ + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -110,8 +253,209 @@ /* start guard timre and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard()); - /* Route all SGsAP mesages for our IMSIto us */ - f_create_sgsap_expect(pars.imsi); + if (SGsAP_PROC.checkstate("Connected")) { + /* Route all SGsAP mesages for our IMSIto us */ + f_create_sgsap_expect(pars.ue_pars.imsi); + } +} + + + +friend function f_s1ap_setup(integer idx := 0, template Cause cause := omit) runs on MTC_CT { + var template (present) Cause exp_cause; + var boolean exp_fail := false; + timer T := 5.0; + if (not istemplatekind(cause, "omit")) { + exp_fail := true; + exp_cause := cause; + } + + S1AP_UNIT[idx].send(ts_S1AP_SetupReq(g_enb_pars[idx].global_enb_id, + g_enb_pars[idx].supported_tas, v32)); + T.start; + alt { + [exp_fail] S1AP_UNIT[idx].receive(tr_S1AP_SetupFail(exp_cause)) { + setverdict(pass); + } + [not exp_fail] S1AP_UNIT[idx].receive(tr_S1AP_SetupResp) { + setverdict(pass); + } + [] S1AP_UNIT[idx].receive { + setverdict(fail, "Received unexpected S1AP"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP Setup result"); + } + } +} + +/* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */ +testcase TC_s1ap_setup_wrong_plmn() runs on MTC_CT { + var charstring id := testcasename(); + f_init_s1ap(id, 1); + g_enb_pars[0].global_enb_id.pLMNidentity := '62F224'O; + f_s1ap_setup(0, {misc:=unknown_PLMN}); +} + +/* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */ +testcase TC_s1ap_setup_wrong_tac() runs on MTC_CT { + var charstring id := testcasename(); + f_init_s1ap(id, 2); + g_enb_pars[0].supported_tas[0].broadcastPLMNs[0] := '62F224'O; + f_s1ap_setup(0, {misc:=unknown_PLMN}); +} + +/* Successful S1 Setup procedure to MME */ +testcase TC_s1ap_setup() runs on MTC_CT { + var charstring id := testcasename(); + f_init_s1ap(id, 3); + f_s1ap_setup(0); +} + +private const EPS_QualityOfServiceV c_NAS_defaultQoS := { + qCI := '00'O, + maxBitRateUplink := omit, + maxBitRateDownlink := omit, + guaranteedBitRateUplink := omit, + guaranteedBitRateDownlink := omit, + maxBitRateUplinkExt := omit, + maxBitRateDownlinkExt := omit, + guaranteedBitRateUplinkExt := omit, + guaranteedBitRateDownlinkExt := omit, + maxBitRateUplinkExt2 := omit, + maxBitRateDownlinkExt2 := omit, + guaranteedBitRateUplinkExt2 := omit, + guaranteedBitRateDownlinkExt2 := omit +}; + +private const UENetworkCapabilityV c_NAS_defaultUeNetCap := { + eEA := '10000000'B, + eIA := '11000000'B, + uEA := omit, + uIA := omit, + uCS2 := omit, + nF := omit, + vCC := omit, + lCS := omit, + lPP := omit, + aCC_CSFB := omit, + h245_ASH := omit, + proSe := omit, + proSe_dd := omit, + proSe_dc := omit, + proSe_relay := omit, + cP_CIoT := omit, + uP_CIoT := omit, + s1_Udata := omit, + eRwoPDN := omit, + hC_CP_CIoT := omit, + ePCO := omit, + multipleDRB := omit, + v2XPC5 := omit, + restrictEC := omit, + cPbackoff := omit, + dCNR := omit, + n1Mode := omit, + sGC := omit, + spare1 := omit, + spare := omit +}; + +private const octetstring c_NAS_defaultAPN := '00'O; + +private altstep as_s1ap_handle_auth() runs on ConnHdlr { + var PDU_NAS_EPS rx_nas; + [] S1AP.receive(tr_NAS_AuthReq) -> value rx_nas { + /* static XRES result as we fixed the HSS RAND value and always have the following + RAND: 20080c3818183b522614162c07601d0d + AUTN: f11b89a2a8be00001f9c526f3d75d44c + IK: 11329aae8e8d2941bb226b2061137c58 + CK: 740d62df9803eebde5120acf358433d0 + RES: 6a91970e838fd079 + SRES: e91e4777 + Kc: 3b0f999e42198874 + SQN: 32 + IND: 0 + */ + /* KASME: 95AFAD9A0D29AFAA079A9451DF7161D7EE4CBF2AF9387F766D058BB6B44B905D */ + const OCT16 ck := '740d62df9803eebde5120acf358433d0'O; + const OCT16 ik := '11329aae8e8d2941bb226b2061137c58'O; + const OCT16 autn := 'f11b89a2a8be00001f9c526f3d75d44c'O; + const OCT8 res := '6a91970e838fd079'O; + const OCT3 plmn_id := '00F110'O; + const OCT6 sqn := '000000000020'O; + const OCT6 ak := substr(autn, 0, 6) xor4b sqn; + var octetstring kasme := f_kdf_kasme(ck, ik, plmn_id, sqn, ak); + var S1APEM_Config cfg := { + set_nas_keys := { + k_nas_int := f_kdf_nas_int(1, kasme), + k_nas_enc := f_kdf_nas_enc(1, kasme) + } + }; + S1AP.send(cfg); + S1AP.send(ts_NAS_AuthResp(res)); + } +} + +private altstep as_s1ap_handle_sec_mode() runs on ConnHdlr { + var PDU_NAS_EPS rx_nas; + var NAS_SecurityAlgorithmsV alg := { + typeOfIntegrityProtection := '001'B, + spare1 := '0'B, + typeOfCiphering := '000'B, + spare2 := '0'B + }; + var NAS_KeySetIdentifierV kset_id := { + identifier := '000'B, + tSC := '0'B + }; + [] S1AP.receive(tr_NAS_SecModeCmd(alg, kset_id, ?)) { + S1AP.send(ts_NAS_SecModeCmpl); + } +} + +private function f_TC_attach(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI('001010000000001'H); + var template (value) PDU_NAS_EPS nas_esm, nas_emm; +/* + nas_esm := ts_NAS_ActDefEpsBearCtxReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), + qos := c_NAS_defaultQoS, apn := c_NAS_defaultAPN, + addr_type := '000'B, addr_info := ''O); +*/ + nas_esm := ts_NAS_PdnConnReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), + pdn_type := NAS_PDN_T_IPv4, req_type := '001'B); + nas_emm := ts_NAS_AttachRequest(att_type := '000'B, kset_id := '000'B, mobile_id := mi, + ue_net_cap := c_NAS_defaultUeNetCap, + esm_enc := enc_PDU_NAS_EPS(valueof(nas_esm))); + var template (value) S1AP_PDU tx; + tx := ts_S1AP_InitialUE(p_eNB_value := 0, p_nasPdu := enc_PDU_NAS_EPS(valueof(nas_emm)), + p_tAI := ts_enb_S1AP_TAI(g_pars.enb_pars[g_pars.mme_idx]), + p_eUTRAN_CGI := ts_enb_S1AP_CGI(g_pars.enb_pars[g_pars.mme_idx]), + p_rrcCause := mo_Signalling); + S1AP.send(tx); + + as_s1ap_handle_auth(); + as_s1ap_handle_sec_mode(); + + f_sleep(10.0); +} +testcase TC_s1ap_attach() runs on MTC_CT { + var charstring id := testcasename(); + + f_init_s1ap(id, 4); + f_s1ap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_attach), pars); + vc_conn.done; +} + +control { + execute( TC_s1ap_setup_wrong_plmn() ); + execute( TC_s1ap_setup_wrong_tac() ); + execute( TC_s1ap_setup() ); } diff --git a/mme/MME_Tests_SGsAP.ttcn b/mme/MME_Tests_SGsAP.ttcn index 935a59e..d20479c 100644 --- a/mme/MME_Tests_SGsAP.ttcn +++ b/mme/MME_Tests_SGsAP.ttcn @@ -48,23 +48,23 @@ if (not istemplatekind(exp_cause, "omit")) { exp_success := false; } - SGsAP.send(ts_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, serv_ind, tmsi)); + SGsAP.send(ts_SGsAP_PAGING_REQ(g_pars.ue_pars.imsi, vlr_name, serv_ind, tmsi)); alt { /* we expect success */ - [exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + [exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.ue_pars.imsi, serv_ind, ?)) { setverdict(pass); } - [exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + [exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.ue_pars.imsi, ?)) { setverdict(fail, "Received unexpected PAGING REJECT"); } /* we expect failure */ - [not exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + [not exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.ue_pars.imsi, serv_ind, ?)) { setverdict(fail, "Received SERVICE REQ waiting for PAGING REJECT"); } - [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, exp_cause)) { + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.ue_pars.imsi, exp_cause)) { setverdict(pass); } - [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.ue_pars.imsi, ?)) { setverdict(fail, "Received unexpected PAGING REJECT cause"); } [] SGsAP.receive { @@ -80,21 +80,21 @@ if (not istemplatekind(exp_cause, "omit")) { exp_success := false; } - SGsAP.send(ts_SGsAP_ALERT_REQ(g_pars.imsi)); + SGsAP.send(ts_SGsAP_ALERT_REQ(g_pars.ue_pars.imsi)); alt { - [exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.ue_pars.imsi)) { setverdict(pass); } - [exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.ue_pars.imsi, ?)) -> value rx { setverdict(fail, "Received unexpected ALERT REJECT ", rx); } - [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.ue_pars.imsi)) { setverdict(fail, "Received unexpected ALERT ACK"); } - [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, exp_cause)) { + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.ue_pars.imsi, exp_cause)) { setverdict(pass) } - [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.ue_pars.imsi, ?)) -> value rx { setverdict(fail, "Received ALERT REJECT with unexpected cause ", rx); } [] SGsAP.receive { @@ -168,7 +168,7 @@ /* TODO: register subscriber on S1 */ f_sgsap_alert(omit); /* TOOD: do something on S1 triggering UE ACT IND */ - SGsAP.receive(tr_SGsAP_UE_ACT_IND(g_pars.imsi)); + SGsAP.receive(tr_SGsAP_UE_ACT_IND(g_pars.ue_pars.imsi)); } testcase TC_sgsap_alert() runs on MTC_CT { var ConnHdlrPars pars; diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 8c1da59..66effb5 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -38,14 +38,14 @@ DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " -FILES+="S1AP_EncDec.cc S1AP_Types.ttcn " +FILES+="S1AP_EncDec.cc S1AP_Types.ttcn S1AP_Templates.ttcn " gen_links $DIR $FILES DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " -FILES+="S1AP_CodecPort.ttcn " +FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " FILES+="NAS_Templates.ttcn " gen_links $DIR $FILES diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 4752302..75fc31d 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15203 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: Id54071b901db720a0f88b91cdc5a8e09bea0fb58 Gerrit-Change-Number: 15203 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:34 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add GTPv2 support Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 Change subject: mme: Add GTPv2 support ...................................................................... mme: Add GTPv2 support this includes a GTPv2_CodecPort (for the usual transcoding) as wella as an empty GTPv2_PrivateExtensions.ttcn without which the TITAN GTPv2 ProtocolModule won't compile. Change-Id: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 --- A library/GTPv2_CodecPort.ttcn A library/GTPv2_PrivateExtensions.ttcn A library/GTPv2_Templates.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 5 files changed, 411 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/15204/1 diff --git a/library/GTPv2_CodecPort.ttcn b/library/GTPv2_CodecPort.ttcn new file mode 100644 index 0000000..c1f3456 --- /dev/null +++ b/library/GTPv2_CodecPort.ttcn @@ -0,0 +1,57 @@ +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTPv2C + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + +module GTPv2_CodecPort { + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from GTPv2C_Types all; + + /* identifies a remote peer (sender or receiver) */ + type record GtpPeer { + ConnectionId connId, + HostName remName, + PortNumber remPort + } + + /* Decoded GTP2C (Control Plane), used in send and receive direction */ + type record Gtp2cUnitdata { + GtpPeer peer, + PDU_GTPCv2 gtpc + } + + /* Translation port on top of IPL4asp; ASP_Event passed through transparently */ + type port GTPv2C_PT message { + out Gtp2cUnitdata; + in Gtp2cUnitdata, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(Gtp2cUnitdata -> ASP_SendTo: function(f_enc_Gtp2cUD)) + in(ASP_RecvFrom -> Gtp1cUnitdata: function(f_dec_Gtp2cUD); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" } + + private function f_enc_Gtp1cUD(in Gtp2cUnitdata in_ud, out ASP_SendTo out_ud) { + out_ud.connId := in_ud.peer.connId; + out_ud.remName := in_ud.peer.remName; + out_ud.remPort := in_ud.peer.remPort; + out_ud.proto := { udp := {} }; + out_ud.msg := enc_PDU_GTPCv2(in_ud.gtpc); + } with { extension "prototype(fast)" }; + + private function f_dec_Gtp2cUD(in ASP_RecvFrom in_ud, out Gtp2cUnitdata out_ud) { + out_ud.peer.connId := in_ud.connId; + out_ud.peer.remName := in_ud.remName; + out_ud.peer.remPort := in_ud.remPort; + out_ud.gtpc := dec_PDU_GTPCv2(in_ud.msg); + } with { extension "prototype(fast)" }; + +} diff --git a/library/GTPv2_PrivateExtensions.ttcn b/library/GTPv2_PrivateExtensions.ttcn new file mode 100644 index 0000000..63552f2 --- /dev/null +++ b/library/GTPv2_PrivateExtensions.ttcn @@ -0,0 +1,21 @@ +module GTPv2_PrivateExtensions { + +/* This is a small stub module to make GTPv2_Types.ttcn from + * titan.ProtocolModules.GTPv2_v13.7.0 compile */ + +import from General_Types all; + +type record PrivateExtension { + OCT1 elementIdentifier, + LIN2_BO_LAST lengthIndicator, + BIT4 instance, + BIT4 spare, + octetstring data +} with { + variant (lengthIndicator) "LENGTHTO(data)"; + variant "PRESENCE (elementIdentifier = 'FE'O; )" +} + +type record of PrivateExtension PrivateExtension_List; + +} with{ encode "RAW" } diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn new file mode 100644 index 0000000..23b0053 --- /dev/null +++ b/library/GTPv2_Templates.ttcn @@ -0,0 +1,323 @@ +module GTPv2_Templates { + +/* (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from GTPv2_Types all; + +private function fs_GTP2C_t_bit(template (omit) OCT4 teid) return BIT1 { + if (istemplatekind(teid, "omit")) { + return '0'B; + } else { + return '1'B; + } +} + +private function fs_GTP2C_p_bit(template (omit) PDU_GTPCv2 piggyback) return BIT1 { + if (istemplatekind(piggyback, "omit")) { + return '0'B; + } else { + return '1'B; + } +} + +template (present) PDU_GTPCv2 tr_PDU_GTP2C(template OCT4 teid := ?, + template (present) GTPCv2_PDUs pdus := ?, + template PDU_GTPCv2 piggyback := omit) := { + spare := '000'B, + t_Bit := ?, + p_Bit := ?, + version := '010'B, + messageType := ?, + lengthf := ?, + tEID := teid, + sequenceNumber := ?, + spare3 := '00'O, + gtpcv2_pdu := pdus, + piggybackPDU_GTPCv2 := piggyback +} + + +/* 8.3 */ +template (value) IMSI ts_GTP2C_Imsi(template (value) hexstring imsi) := { + elementIdentifier := '01'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + iMSI_Value := imsi +} +template (present) IMSI tr_GTP2C_Imsi(template (present) hexstring imsi) := { + elementIdentifier := '01'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + iMSI_Value := imsi +} + +/* 8.4-1 */ +/* +type enumerated GTP2C_Cause { + Local_Detach (2), + Complete_Detach (3), + RAT_changed_from_3GPP_to_Non_3GPP (4), + ISR_deactivation (5), + Error_Ind_from_RNC_eNB_SGSN_MME (5), + IMSI_Detach_Only (7), + Reactivation_Required (8), +} +*/ + +const integer c_GTP2C_Cause_LocalDetach := 1; + +/* 8.4 */ +template (value) Cause ts_GTP2C_Cause(template (value) OCT1 cause, + template (value) BIT1 cs) := { + elementIdentifier := '02'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + causeValue := cause, + cS := cs, + bCE := '0'B, + pCE := '0'B, + spare2 := '00000'B, + typeOfOffendingIE := omit, + lengthIndicator2 := omit, + instanceOfOffendingIE := omit, + spare3 := omit +} +template (present) Cause tr_GTP2C_Cause(template (present) OCT1 cause) := { + elementIdentifier := '02'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + causeValue := cause, + cS := ?, + bCE := ?, + pCE := ?, + spare2 := '00000'B, + typeOfOffendingIE := *, + lengthIndicator2 := *, + instanceOfOffendingIE := *, + spare3 := * +} + +/* 8.5 */ +template (value) AccessPointName ts_GTP2C_APN(template (value) octetstring apn) := { + elementIdentifier := '48'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + aPN_Value := apn +} +template (present) AccessPointName tr_GTP2C_APN(template (present) octetstring apn) := { + elementIdentifier := '48'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + aPN_Value := apn +} + +/* 8.14 */ +template (value) PDN_AddressAllocation +ts_GTP2C_PdnAddrAlloc(template (value) BIT3 pdn_type, + template (value) PDN_Address_and_Prefix addr_pfx) := { + elementIdentifier := '4F'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + pDN_Type := pdn_type, + spare2 := '00000'B, + pDN_Address_and_Prefix := addr_pfx +} +template (present) PDN_AddressAllocation +tr_GTP2C_PdnAddrAlloc(template (present) BIT3 pdn_type, + template (present) PDN_Address_and_Prefix addr_pfx) := { + elementIdentifier := '4F'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + pDN_Type := pdn_type, + spare2 := '00000'B, + pDN_Address_and_Prefix := addr_pfx +} +template (value) PDN_AddressAllocation +ts_GTP2C_PdnAddrAlloc_v4(template (value) OCT4 addr) := + ts_GTP2C_PdnAddrAlloc('001'B, {iPv4_Address:=addr}); +template (present) PDN_AddressAllocation +tr_GTP2C_PdnAddrAlloc_v4(template (present) OCT4 addr) := + ts_GTP2C_PdnAddrAlloc('001'B, {iPv4_Address:=addr}); + +/* 8.17 */ +template (value) RAT_Type ts_GTP2C_RatType(template (value) integer rat) := { + elementIdentifier := '53'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + rAT_TypeValue := rat, + additionalOctets := omit +} +template (present) RAT_Type tr_GTP2C_RatType(template (present) integer rat) := { + elementIdentifier := '53'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + rAT_TypeValue := rat, + additionalOctets := * +} + + +/* 8.22 */ +private function f_bit4oct(template (omit) octetstring os) return BIT1 +{ + if (istemplatekind(os, "omit")) { + return '0'B; + } else { + return '1'B; + } +} +template (value) FullyQualifiedTEID +ts_GTP2C_FTEID(integer if_type, OCT4 teid, template (omit) OCT4 v4_addr := omit, + template (omit) OCT16 v6_addr := omit) := { + elementIdentifier := '57'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + interfaceType := if_type, + v6_Flag := f_bit4oct(v4_addr), + v4_Flag := f_bit4oct(v6_addr), + tEID_GRE_Key := teid, + iPv4_Address := v4_addr, + iPv6_Address := v6_addr, + additionalOctets := omit +} +template (present) FullyQualifiedTEID +tr_GTP2C_FTEID(template (present) integer if_type, template (present) OCT4 teid, + template OCT4 v4_addr := omit, + template OCT16 v6_addr := omit) := { + elementIdentifier := '57'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + interfaceType := if_type, + v6_Flag := ?, + v4_Flag := ?, + tEID_GRE_Key := teid, + iPv4_Address := v4_addr, + iPv6_Address := v6_addr, + additionalOctets := omit +} + + + +template (value) PDU_GTPCv2 ts_PDU_GTP2C(template (omit) OCT4 teid, template (value) OCT3 seq, + template (value) OCT1 msg_type, + template (value) GTPCv2_PDUs pdus, + template (omit) PDU_GTPCv2 piggyback := omit) := { + spare := '000'B, + t_Bit := fs_GTP2C_t_bit(teid), + p_Bit := fs_GTP2C_p_bit(piggyback), + version := '010'B, + messageType := msg_type, + lengthf := 0, /* overwritten */ + tEID := teid, + sequenceNumber := seq, + spare3 := '00'O, + gtpcv2_pdu := pdus, + piggybackPDU_GTPCv2 := piggyback +} + + +template (present) PDU_GTPCv2 +tr_GTP2C_CreateSessionReq(template (present) hexstring imsi) := tr_PDU_GTP2C('00000000'O, { + createSessionRequest := { + iMSI := tr_GTP2C_Imsi(imsi), + mSISDN := *, + mEI := *, + userLocationInfo := ?, + servingNetwork := ?, + rAT_Type := tr_GTP2C_RatType(6), + indication := *, + fullyQualifiedTEID := ?, + accessPointName := tr_GTP2C_APN('012a'O), // '*' + selectionMode := ?, + pDN_Type := ?, + pDN_AddressAllocation := ?, + maxAPN_Restriction := ?, + ambr := *, + linkedEPS_Bearer_ID := omit, + trustedWLANModeIndication := omit, + protocolConfigOptions := omit, + bearerContextGrouped := ?, + traceInformation := *, + recovery := omit, + csid := omit, + uE_TimeZone := ?, + user_CSG_Information := omit, + chargingCharacteristics := ?, + lDN := omit, + signallingPriorityIndication := *, + iP_Addr := omit, + portNumber := omit, + aPCO := omit, + trustedWLANAccessNetworkIdentifier := omit, + cNOperatorSelectionEntity := omit, + presenceReportingAreaInformation := omit, + overloadControlInformationGrouped := omit, + originationTimeStamp := *, + maximumWaitTime := *, + wLANLocationTimestamp := omit, + nBIFOMContainer := omit, + remoteUEContextGrouped := *, + nodeIdentifier := *, + extendedProtocolConfigOptions := omit, + servingPLMNRateControl := omit, + counter := omit, + privateExtension := omit + }}); + +template (value) PDU_GTPCv2 +ts_GTP2C_CreateSessionResp(template (value) FullyQualifiedTEID_List fteids, + template (value) PDN_AddressAllocation addr) := +ts_PDU_GTP2C('00000000'O, '000000'O, '20'O, { + createSessionResponse := { + cause := ts_GTP2C_Cause(int2oct(16, 1), '0'B), + changeReportingAction := omit, + cSG_InformationReportingAction := omit, + heNBInformationReporting := omit, + fullyQualifiedTEID := fteids, + pDN_AddressAllocation := addr, + aPN_Restriction := omit, + ambr := omit, + linkedEPS_Bearer_ID := omit, + protocolConfigOptions := omit, + bearerContextGrouped := omit, + recovery := omit, + chargingGatewayName := omit, + chargingGatewayAddress := omit, + csid := omit, + lDN := omit, + pGW_Back_OffTime := omit, + aPCO := omit, + trustedWLANIPv4Parameters := omit, + indicationFlags := omit, + presenceReportingAreaAction := omit, + loadControlInformationGrouped := omit, + overloadControlInformationGrouped := omit, + nBIFOMContainer := omit, + pDNConnectionChargingID := omit, + extendedProtocolConfigOptions := omit, + privateExtension := omit + }}); + + + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 66effb5..5664711 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -35,6 +35,14 @@ FILES="NAS_EPS_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.GTPv2_v13.7.0/src +FILES="GTPv2_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.GTP_v13.5.0/src +FILES="GTPC_EncDec.cc GTPC_Types.ttcn GTPU_EncDec.cc GTPU_Types.ttcn" +gen_links $DIR $FILES + DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " @@ -46,7 +54,7 @@ FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " -FILES+="NAS_Templates.ttcn " +FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 75fc31d..9fb5f88 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 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: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 Gerrit-Change-Number: 15204 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:34 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add [generated] DIAMETER_Types.ttcn Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15205 Change subject: library: Add [generated] DIAMETER_Types.ttcn ...................................................................... library: Add [generated] DIAMETER_Types.ttcn The way how the TITAN support for DIAMETER works, is that there's an awk-based shell script and lots of DIAMETER dictionaries in the https://github.com/eclipse/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator repository. I've used 'AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf MobileIPv6_HA_IETF_RFC5778.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf' to generate the DIAMETER_Types file we use here. DIAMETER is used as signaling protocol between the HSS and other core element nodes in the EPC, such as the MME and S-GW. Change-Id: I85834e98e238b7ff6058264a0f365d05c15cd669 --- A library/DIAMETER_Types.ttcn 1 file changed, 6,652 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/15205/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15205 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: I85834e98e238b7ff6058264a0f365d05c15cd669 Gerrit-Change-Number: 15205 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add DIAMETER Templates, Emulation, CodecPort Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15206 Change subject: library: Add DIAMETER Templates, Emulation, CodecPort ...................................................................... library: Add DIAMETER Templates, Emulation, CodecPort Contrary to the DIAMETER_Types.ttcn, these files are not generated but written by hand. Change-Id: Iafbf55ab25bbaa40960eb1744cff36dcd7970c17 --- A library/DIAMETER_CodecPort.ttcn A library/DIAMETER_CodecPort_CtrlFunct.ttcn A library/DIAMETER_CodecPort_CtrlFunctDef.cc A library/DIAMETER_Emulation.ttcn A library/DIAMETER_Templates.ttcn 5 files changed, 1,429 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/15206/1 diff --git a/library/DIAMETER_CodecPort.ttcn b/library/DIAMETER_CodecPort.ttcn new file mode 100644 index 0000000..65ae42b --- /dev/null +++ b/library/DIAMETER_CodecPort.ttcn @@ -0,0 +1,81 @@ +module DIAMETER_CodecPort { + +/* Simple DIAMETER Codec Port, translating between raw SCTP primitives with + * octetstring payload towards the IPL4asp provider, and DIAMETER primitives + * which carry the decoded DIAMETER data types as payload. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from DIAMETER_Types all; + + type record DIAMETER_RecvFrom { + ConnectionId connId, + HostName remName, + PortNumber remPort, + HostName locName, + PortNumber locPort, + PDU_DIAMETER msg + }; + + template DIAMETER_RecvFrom t_DIAMETER_RecvFrom(template PDU_DIAMETER msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + + type record DIAMETER_Send { + ConnectionId connId, + PDU_DIAMETER msg + } + + template DIAMETER_Send t_DIAMETER_Send(template ConnectionId connId, template PDU_DIAMETER msg) := { + connId := connId, + msg := msg + } + + private function IPL4_to_DIAMETER_RecvFrom(in ASP_RecvFrom pin, out DIAMETER_RecvFrom pout) { + pout.connId := pin.connId; + pout.remName := pin.remName; + pout.remPort := pin.remPort; + pout.locName := pin.locName; + pout.locPort := pin.locPort; + pout.msg := f_DIAMETER_Dec(pin.msg); + } with { extension "prototype(fast)" }; + + private function DIAMETER_to_IPL4_Send(in DIAMETER_Send pin, out ASP_Send pout) { + pout.connId := pin.connId; + pout.proto := { + sctp := { + sinfo_stream := omit, + sinfo_ppid := 46, /* plain text Diameter in SCTP DATA */ + remSocks := omit, + assocId := omit + } + }; + pout.msg := f_DIAMETER_Enc(pin.msg); + } with { extension "prototype(fast)" }; + + type port DIAMETER_CODEC_PT message { + out DIAMETER_Send; + in DIAMETER_RecvFrom, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(DIAMETER_Send -> ASP_Send:function(DIAMETER_to_IPL4_Send)) + in(ASP_RecvFrom -> DIAMETER_RecvFrom: function(IPL4_to_DIAMETER_RecvFrom); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" + } +} diff --git a/library/DIAMETER_CodecPort_CtrlFunct.ttcn b/library/DIAMETER_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..3b2230d --- /dev/null +++ b/library/DIAMETER_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,44 @@ +module DIAMETER_CodecPort_CtrlFunct { + + import from DIAMETER_CodecPort all; + import from IPL4asp_Types all; + + external function f_IPL4_listen( + inout DIAMETER_CODEC_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_connect( + inout DIAMETER_CODEC_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_close( + inout DIAMETER_CODEC_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } + ) return Result; + + external function f_IPL4_setUserData( + inout DIAMETER_CODEC_PT portRef, + in ConnectionId id, + in UserData userData + ) return Result; + + external function f_IPL4_getUserData( + inout DIAMETER_CODEC_PT portRef, + in ConnectionId id, + out UserData userData + ) return Result; + +} + diff --git a/library/DIAMETER_CodecPort_CtrlFunctDef.cc b/library/DIAMETER_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..782d176 --- /dev/null +++ b/library/DIAMETER_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,56 @@ +#include "IPL4asp_PortType.hh" +#include "DIAMETER_CodecPort.hh" +#include "IPL4asp_PT.hh" + +namespace DIAMETER__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} + diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn new file mode 100644 index 0000000..dc7bc94 --- /dev/null +++ b/library/DIAMETER_Emulation.ttcn @@ -0,0 +1,427 @@ +module DIAMETER_Emulation { + +/* DIAMETER Emulation, runs on top of DIAMETER_CodecPort. It multiplexes/demultiplexes + * the individual IMSIs/subscribers, so there can be separate TTCN-3 components handling + * each of them. + * + * The DIAMETER_Emulation.main() function processes DIAMETER primitives from the DIAMETER + * socket via the DIAMETER_CodecPort, and dispatches them to the per-IMSI components. + * + * For each new IMSI, the DiameterOps.create_cb() is called. It can create + * or resolve a TTCN-3 component, and returns a component reference to which that IMSI + * is routed/dispatched. + * + * If a pre-existing component wants to register to handle a future inbound IMSI, it can + * do so by registering an "expect" with the expected IMSI. + * + * Inbound DIAMETER messages without IMSI (such as RESET-IND/ACK) are dispatched to + * the DiameterOps.unitdata_cb() callback, which is registered with an argument to the + * main() function below. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from DIAMETER_CodecPort all; +import from DIAMETER_CodecPort_CtrlFunct all; +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from DNS_Helpers all; +import from MobileL3_Types all; + +type hexstring IMSI; + +type component DIAMETER_ConnHdlr { + port DIAMETER_Conn_PT DIAMETER; + /* procedure based port to register for incoming connections */ + port DIAMETEREM_PROC_PT DIAMETER_PROC; +} + +/* port between individual per-connection components and this dispatcher */ +type port DIAMETER_Conn_PT message { + inout PDU_DIAMETER, PDU_ML3_MS_NW, PDU_ML3_NW_MS; +} with { extension "internal" }; + +/* global test port e.g. for non-imsi/conn specific messages */ +type port DIAMETER_PT message { + inout PDU_DIAMETER; +} with { extension "internal" }; + + +/* represents a single DIAMETER Association */ +type record AssociationData { + DIAMETER_ConnHdlr comp_ref, + hexstring imsi optional +}; + +type component DIAMETER_Emulation_CT { + /* Port facing to the UDP SUT */ + port DIAMETER_CODEC_PT DIAMETER; + /* All DIAMETER_ConnHdlr DIAMETER ports connect here + * DIAMETER_Emulation_CT.main needs to figure out what messages + * to send where with CLIENT.send() to vc_conn */ + port DIAMETER_Conn_PT DIAMETER_CLIENT; + /* currently tracked connections */ + var AssociationData SgsapAssociationTable[16]; + /* pending expected CRCX */ + var ExpectData DiameterExpectTable[8]; + /* procedure based port to register for incoming connections */ + port DIAMETEREM_PROC_PT DIAMETER_PROC; + /* test port for unit data messages */ + port DIAMETER_PT DIAMETER_UNIT; + + var charstring g_diameter_id; + var integer g_diameter_conn_id := -1; +} + +type function DIAMETERCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr; + +type function DIAMETERUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER; + +type record DIAMETEROps { + DIAMETERCreateCallback create_cb, + DIAMETERUnitdataCallback unitdata_cb +} + +type record DIAMETER_conn_parameters { + HostName remote_ip, + PortNumber remote_sctp_port, + HostName local_ip, + PortNumber local_sctp_port +} + +function tr_DIAMETER_RecvFrom_R(template PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template DIAMETER_RecvFrom { + var template DIAMETER_RecvFrom mrf := { + connId := g_diameter_conn_id, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + return mrf; +} + +private function f_imsi_known(hexstring imsi) +runs on DIAMETER_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].imsi == imsi) { + return true; + } + } + return false; +} + +private function f_comp_known(DIAMETER_ConnHdlr client) +runs on DIAMETER_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == client) { + return true; + } + } + return false; +} + +private function f_comp_by_imsi(hexstring imsi) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].imsi == imsi) { + return SgsapAssociationTable[i].comp_ref; + } + } + setverdict(fail, "DIAMETER Association Table not found by IMSI", imsi); + mtc.stop; +} + +private function f_imsi_by_comp(DIAMETER_ConnHdlr client) +runs on DIAMETER_Emulation_CT return hexstring { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == client) { + return SgsapAssociationTable[i].imsi; + } + } + setverdict(fail, "DIAMETER Association Table not found by component ", client); + mtc.stop; +} + +private function f_imsi_table_add(DIAMETER_ConnHdlr comp_ref, hexstring imsi) +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (not isvalue(SgsapAssociationTable[i].imsi)) { + SgsapAssociationTable[i].imsi := imsi; + SgsapAssociationTable[i].comp_ref := comp_ref; + return; + } + } + testcase.stop("DIAMETER Association Table full!"); +} + +private function f_imsi_table_del(DIAMETER_ConnHdlr comp_ref, hexstring imsi) +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == comp_ref and + SgsapAssociationTable[i].imsi == imsi) { + SgsapAssociationTable[i].imsi := omit; + SgsapAssociationTable[i].comp_ref := null; + return; + } + } + setverdict(fail, "DIAMETER Association Table: Couldn't find to-be-deleted entry!"); + mtc.stop; +} + + +private function f_imsi_table_init() +runs on DIAMETER_Emulation_CT { + for (var integer i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + SgsapAssociationTable[i].comp_ref := null; + SgsapAssociationTable[i].imsi := omit; + } +} + +function f_DIAMETER_get_avp(PDU_DIAMETER pdu, template (present) AVP_Code avp_code) +return template (omit) AVP +{ + var integer i; + + for (i := 0; i < lengthof(pdu.avps); i := i+1) { + if (not ispresent(pdu.avps[i].avp)) { + continue; + } + var AVP_Header hdr := pdu.avps[i].avp.avp_header; + if (match(hdr.avp_code, avp_code)) { + return pdu.avps[i].avp; + } + } + return omit; +} + +function f_DIAMETER_get_imsi(PDU_DIAMETER pdu) return template (omit) IMSI +{ + var template (omit) AVP imsi_avp; + + imsi_avp := f_DIAMETER_get_avp(pdu, c_AVP_Code_BASE_NONE_User_Name); + if (istemplatekind(imsi_avp, "omit")) { + return omit; + } else { + var octetstring imsi_oct := valueof(imsi_avp.avp_data.avp_BASE_NONE_User_Name); + return str2hex(oct2char(imsi_oct)); + } +} + +private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { + sinfo_stream := omit, + sinfo_ppid := ppid, + remSocks := omit, + assocId := omit +}; + +private template PortEvent tr_SctpAssocChange := { + sctpEvent := { + sctpAssocChange := ? + } +} +private template PortEvent tr_SctpPeerAddrChange := { + sctpEvent := { + sctpPeerAddrChange := ? + } +} + +private function f_diameter_xceive(template (value) PDU_DIAMETER tx, + template PDU_DIAMETER rx_t := ?) +runs on DIAMETER_Emulation_CT return PDU_DIAMETER { + timer T := 10.0; + var DIAMETER_RecvFrom mrf; + + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, tx)); + alt { + [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(rx_t)) -> value mrf { } + [] DIAMETER.receive(tr_SctpAssocChange) { repeat; } + [] DIAMETER.receive(tr_SctpPeerAddrChange) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_t); + mtc.stop; + } + } + return mrf.msg; +} + +function main(DIAMETEROps ops, DIAMETER_conn_parameters p, charstring id) runs on DIAMETER_Emulation_CT { + var Result res; + g_diameter_id := id; + f_imsi_table_init(); + f_expect_table_init(); + + map(self:DIAMETER, system:DIAMETER_CODEC_PT); + if (p.remote_sctp_port == -1) { + res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_listen(DIAMETER, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + } else { + res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_connect(DIAMETER, p.remote_ip, p.remote_sctp_port, + p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + } + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect DIAMETER socket, check your configuration"); + mtc.stop; + } + g_diameter_conn_id := res.connId; + + while (true) { + var DIAMETER_ConnHdlr vc_conn; + var PDU_ML3_MS_NW l3_mo; + var PDU_ML3_NW_MS l3_mt; + var template IMSI imsi_t; + var hexstring imsi; + var DIAMETER_RecvFrom mrf; + var PDU_DIAMETER msg; + var charstring vlr_name, mme_name; + var PortEvent port_evt; + + alt { + [] DIAMETER.receive(PortEvent:{connOpened := ?}) -> value port_evt { + g_diameter_conn_id := port_evt.connOpened.connId; + } + [] DIAMETER.receive(PortEvent:?) { } + /* DIAMETER from client */ + [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg sender vc_conn { + /* Pass message through */ + /* TODO: check which ConnectionID client has allocated + store in table? */ + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, msg)); + } + + /* handle CER/CEA handshake */ + [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(tr_DIAMETER_R(cmd_code := Capabilities_Exchange))) -> value mrf { + var template (value) PDU_DIAMETER resp; + resp := ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id); + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, resp)); + } + + /* DIAMETER from remote peer */ + [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(?)) -> value mrf { + imsi_t := f_DIAMETER_get_imsi(mrf.msg); + if (isvalue(imsi_t)) { + imsi := valueof(imsi_t); + if (f_imsi_known(imsi)) { + vc_conn := f_comp_by_imsi(imsi); + DIAMETER_CLIENT.send(mrf.msg) to vc_conn; + } else { + vc_conn := ops.create_cb.apply(mrf.msg, imsi, id); + f_imsi_table_add(vc_conn, imsi); + DIAMETER_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* message contained no IMSI; is not IMSI-oriented */ + var template PDU_DIAMETER resp := ops.unitdata_cb.apply(mrf.msg); + if (isvalue(resp)) { + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, valueof(resp))); + } + } + } + [] DIAMETER.receive(tr_SctpAssocChange) { } + [] DIAMETER.receive(tr_SctpPeerAddrChange) { } + [] DIAMETER_PROC.getcall(DIAMETEREM_register:{?,?}) -> param(imsi, vc_conn) { + f_create_expect(imsi, vc_conn); + DIAMETER_PROC.reply(DIAMETEREM_register:{imsi, vc_conn}) to vc_conn; + } + + } + + } +} + +/* "Expect" Handling */ + +type record ExpectData { + hexstring imsi optional, + DIAMETER_ConnHdlr vc_conn +} + +signature DIAMETEREM_register(in hexstring imsi, in DIAMETER_ConnHdlr hdlr); + +type port DIAMETEREM_PROC_PT procedure { + inout DIAMETEREM_register; +} with { extension "internal" }; + +/* Function that can be used as create_cb and will usse the expect table */ +function ExpectedCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { + var DIAMETER_ConnHdlr ret := null; + var integer i; + + for (i := 0; i < sizeof(DiameterExpectTable); i := i+1) { + if (not ispresent(DiameterExpectTable[i].imsi)) { + continue; + } + if (imsi == DiameterExpectTable[i].imsi) { + ret := DiameterExpectTable[i].vc_conn; + /* Release this entry */ + DiameterExpectTable[i].imsi := omit; + DiameterExpectTable[i].vc_conn := null; + log("Found Expect[", i, "] for ", msg, " handled at ", ret); + return ret; + } + } + setverdict(fail, "Couldn't find Expect for ", msg); + mtc.stop; +} + +private function f_create_expect(hexstring imsi, DIAMETER_ConnHdlr hdlr) +runs on DIAMETER_Emulation_CT { + var integer i; + + /* Check an entry like this is not already presnt */ + for (i := 0; i < sizeof(DiameterExpectTable); i := i+1) { + if (imsi == DiameterExpectTable[i].imsi) { + setverdict(fail, "IMSI already present", imsi); + mtc.stop; + } + } + for (i := 0; i < sizeof(DiameterExpectTable); i := i+1) { + if (not ispresent(DiameterExpectTable[i].imsi)) { + DiameterExpectTable[i].imsi := imsi; + DiameterExpectTable[i].vc_conn := hdlr; + log("Created Expect[", i, "] for ", imsi, " to be handled at ", hdlr); + return; + } + } + testcase.stop("No space left in DiameterExpectTable") +} + +/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +function f_diameter_expect(hexstring imsi) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC.call(DIAMETEREM_register:{imsi, self}) { + [] DIAMETER_PROC.getreply(DIAMETEREM_register:{?,?}) {}; + } +} + +private function f_expect_table_init() +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(DiameterExpectTable); i := i + 1) { + DiameterExpectTable[i].imsi := omit; + } +} + +function DummyUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + log("Ignoring DIAMETER ", msg); + return omit; +} + + +} diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn new file mode 100644 index 0000000..2779536 --- /dev/null +++ b/library/DIAMETER_Templates.ttcn @@ -0,0 +1,821 @@ +module DIAMETER_Templates { + +/* (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from DIAMETER_Types all; +import from Osmocom_Types all; + +/* https://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml#aaa-parameters-4 */ +type enumerated DIAMETER_Resultcode { + /* Informational */ + DIAMETER_MULTI_ROUND_AUTH (1001), + + /* Success */ + DIAMETER_SUCCESS (2001), + DIAMETER_LIMITED_SUCCESS (2002), + DIAMETER_FIRST_REGISTRATION (2003), + DIAMETER_SUBSEQUENT_REGISTRATION (2004), + DIAMETER_UNREGISTERED_SERVICE (2005), + DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED (2006), + DIAMETER_SERVER_SELECTION (2007), + DIAMETER_SUCCESS_AUTH_SENT_SERVER_NOT_STORED (2008), + DIAMETER_SUCCESS_RELOCATE_HA (2009), + + /* Protocol Errors */ + DIAMETER_COMMAND_UNSUPPORTED (3001), + DIAMETER_UNABLE_TO_DELIVER (3002), + DIAMETER_REALM_NOT_SERVED (3003), + DIAMETER_TOO_BUSY (3004), + DIAMETER_LOOP_DETECTED (3005), + DIAMETER_REDIRECT_INDICATION (3006), + DIAMETER_APPLICATION_UNSUPPORTED (3007), + DIAMETER_INVALID_HDR_BITS (3008), + DIAMETER_INVALID_AVP_BITS (3009), + DIAMETER_UNKNOWN_PEER (3010), + DIAMETER_REALM_REDIRECT_INDICATION (3011), + + /* Transient Failures */ + DIAMETER_AUTHENTICATION_REJECTED (4001), + DIAMETER_OUT_OF_SPACE (4002), + ELECTION_LOST (4003), + DIAMETER_ERROR_MIP_REPLY_FAILURE (4005), + DIAMETER_ERROR_HA_NOT_AVAILABLE (4006), + DIAMETER_ERROR_BAD_KEY (4007), + DIAMETER_ERROR_MIP_FILTER_NOT_SUPPORTED (4008), + DIAMETER_END_USER_SERVICE_DENIED (4010), + DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE (4011), + DIAMETER_CREDIT_LIMIT_REACHED (4012), + DIAMETER_USER_NAME_REQUIRED (4013), + RESOURCE_FAILURE (4014), + + DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE (4181), + DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT (4882), + + /* Permanent Failure */ + DIAMETER_AVP_UNSUPPORTED (5001), + DIAMETER_UNKNOWN_SESSION_ID (5002), + DIAMETER_AUTHORIZATION_REJECTED (5003), + DIAMETER_INVALID_AVP_VALUE (5004), + DIAMETER_MISSING_AVP (5005), + DIAMETER_RESOURCES_EXCEEDED (5006), + DIAMETER_CONTRADICTING_AVPS (5007), + DIAMETER_AVP_NOT_ALLOWED (5008), + DIAMETER_AVP_OCCURS_TOO_MANY_TIMES (5009), + DIAMETER_NO_COMMON_APPLICATION (5010), + DIAMETER_UNSUPPORTED_VERSION (5011), + DIAMETER_UNABLE_TO_COMPLY (5012), + DIAMETER_INVALID_BIT_IN_HEADER (5013), + DIAMETER_INVALID_AVP_LENGTH (5014), + DIAMETER_INVALID_MESSAGE_LENGTH (5015), + DIAMETER_INVALID_AVP_BIT_COMBO (5016), + DIAMETER_NO_COMMON_SECURITY (5017), + DIAMETER_RADIUS_AVP_UNTRANSLATABLE (5018), + DIAMETER_ERROR_NO_FOREIGN_HA_SERVICE (5024), + DIAMETER_ERROR_END_TO_END_MIP_KEY_ENCRYPTION (5025), + DIAMETER_USER_UNKNOWN (5030), + DIAMETER_RATING_FAILED (5031), + DIAMETER_ERROR_USER_UNKNOWN (5032), + DIAMETER_ERROR_IDENTITIES_DONT_MATCH (5033), + DIAMETER_ERROR_IDENTITY_NOT_REGISTERED (5034), + DIAMETER_ERROR_ROAMING_NOT_ALLOWED (5035), + DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED (5036), + DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED (5037), + DIAMETER_ERROR_IN_ASSIGNMENT_TYPE (5038), + DIAMETER_ERROR_TOO_MUCH_DATA (5039), + DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA (5040), + DIAMETER_ERROR_MIP6_AUTH_MODE (5041), + UNKNOWN_BINDING_TEMPLATE_NAME (5042), + BINDING_FAILURE (5043), + MAX_BINDINGS_SET_FAILURE (5044), + MAXIMUM_BINDINGS_REACHED_FOR_ENDPOINT (5045), + SESSION_EXISTS (5046), + INSUFFICIENT_CLASSIFIERS (5047), + DIAMETER_ERROR_EAP_CODE_UNKNOWN (5048) +}; + +/* 3GPP TS 29.272 Section 7.1.8 */ +const uint32_t c_DIAMETER_3GPP_S6_AID := 16777251; +const uint32_t c_DIAMETER_3GPP_S13_AID := 16777252; +const uint32_t c_DIAMETER_3GPP_S7_AID := 16777308; + +template (value) PDU_DIAMETER +ts_DIAMETER(template (value) BIT8 flags, + template (value) Command_Code cmd_code, + template (value) OCTET4 app_id := '00000000'O, + template (value) UINT32 hbh_id, + template (value) UINT32 ete_id, + template (value) AVP_list avps := {} +) := { + version := 1, + message_length := 0, /* overwritten */ + RPETxxxx := flags, + command_code := cmd_code, + application_id := app_id, + hop_by_hop_id := hbh_id, + end_to_end_id := ete_id, + avps := avps +} +template (present) PDU_DIAMETER +tr_DIAMETER(template (present) BIT8 flags := ?, + template (present) Command_Code cmd_code := ?, + template (present) OCTET4 app_id := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) AVP_list avps := ?) := { + version := 1, + message_length := ?, + RPETxxxx := flags, + command_code := cmd_code, + application_id := app_id, + hop_by_hop_id := hbh_id, + end_to_end_id := ete_id, + avps := avps +} +template (present) PDU_DIAMETER +tr_DIAMETER_A( + template (present) Command_Code cmd_code := ?, + template (present) OCTET4 app_id := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) AVP_list avps := ?) := + tr_DIAMETER('0???????'B, cmd_code, app_id, hbh_id, ete_id, avps); +template (present) PDU_DIAMETER +tr_DIAMETER_R( + template (present) Command_Code cmd_code := ?, + template (present) OCTET4 app_id := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) AVP_list avps := ?) := + tr_DIAMETER('1???????'B, cmd_code, app_id, hbh_id, ete_id, avps); + + +template (value) AVP_Header +ts_DIA_Hdr(template (value) AVP_Code avp_code, + template (value) BIT8 flags := '01000000'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := 0, /* overwritten */ + vendor_id := omit +} +template (present) AVP_Header +tr_DIA_Hdr(template (present) AVP_Code avp_code, + template (present) BIT8 flags := '0???????'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := ?, /* overwritten */ + vendor_id := omit +} + +template (value) AVP_Header +ts_DIA_Hdr_3GPP(template (value) AVP_Code avp_code, + template (value) BIT8 flags := '11000000'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := 0, /* overwritten */ + vendor_id := vendor_id_3GPP +} +template (present) AVP_Header +tr_DIA_Hdr_3GPP(template (present) AVP_Code avp_code, + template (present) BIT8 flags := '1???????'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := ?, /* overwritten */ + vendor_id := vendor_id_3GPP +} + + +template (value) GenericAVP ts_AVP_OriginHost(template (value) charstring host) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Host), + avp_data := { + avp_BASE_NONE_Origin_Host := host + } + } +} +template (present) GenericAVP tr_AVP_OriginHost(template (present) charstring host := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Host), + avp_data := { + avp_BASE_NONE_Origin_Host := host + } + } +} + + +template (value) GenericAVP ts_AVP_OriginRealm(template (value) charstring realm) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Realm), + avp_data := { + avp_BASE_NONE_Origin_Realm := realm + } + } +} +template (present) GenericAVP tr_AVP_OriginRealm(template (present) charstring realm := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Realm), + avp_data := { + avp_BASE_NONE_Origin_Realm := realm + } + } +} + + +template (value) GenericAVP ts_AVP_OriginStateId(template (value) OCTET4 state_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_State_Id), + avp_data := { + avp_BASE_NONE_Origin_State_Id := state_id + } + } +} + +template (value) GenericAVP ts_AVP_HostIpAddr(template (value) OCTET4 ipv4_addr) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Host_IP_Address), + avp_data := { + avp_BASE_NONE_Host_IP_Address := { + address_type := IP, + address_data := ipv4_addr + } + } + } +} + +template (value) GenericAVP ts_AVP_VendorId(Vendor_Id vendor_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Id, '00000000'B), + avp_data := { + avp_BASE_NONE_Vendor_Id := int2oct(enum2int(vendor_id), 4) + } + } +} + +template (value) GenericAVP ts_AVP_ProductName(charstring name) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Product_Name, '00000000'B), + avp_data := { + avp_BASE_NONE_Product_Name := char2oct(name) + } + } +} + +template (value) GenericAVP ts_AVP_FwRevision(octetstring fw_version) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Firmware_Revision, '00000000'B), + avp_data := { + avp_BASE_NONE_Firmware_Revision := fw_version + } + } +} + +template (value) GenericAVP ts_AVP_InbSecId(template (value) OCTET4 inb_sec_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Inband_Security_Id), + avp_data := { + avp_BASE_NONE_Inband_Security_Id := inb_sec_id + } + } +} + +template (value) GenericAVP ts_AVP_VendorSpecAppId(Vendor_Id vendor_id, uint32_t auth_app_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id), + avp_data := { + avp_BASE_NONE_Vendor_Specific_Application_Id := { + { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Id), + avp_data := { + avp_BASE_NONE_Vendor_Id := int2oct(enum2int(vendor_id), 4) + } + } + }, { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Application_Id), + avp_data := { + avp_BASE_NONE_Auth_Application_Id := int2oct(auth_app_id, 4) + } + } + } + } + } + } +} + +template (value) GenericAVP ts_AVP_AuthAppId(template (value) OCTET4 auth_app_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Application_Id), + avp_data := { + avp_BASE_NONE_Auth_Application_Id := auth_app_id + } + } +} + +template (value) GenericAVP ts_AVP_SuppVendorIdRaw(uint32_t vendor_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Supported_Vendor_Id), + avp_data := { + avp_BASE_NONE_Supported_Vendor_Id := int2oct(vendor_id, 4) + } + } +} +template (value) GenericAVP ts_AVP_SuppVendorId(Vendor_Id vendor_id) := + ts_AVP_SuppVendorIdRaw(enum2int(vendor_id)); + +template (value) GenericAVP ts_AVP_ResultCode(DIAMETER_Resultcode res_code) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Result_Code), + avp_data := { + avp_BASE_NONE_Result_Code := int2oct(enum2int(res_code), 4) + } + } +} + +template (value) GenericAVP ts_AVP_AuthSessionState(template (value) BASE_NONE_Auth_Session_State ass := NO_STATE_MAINTAINED) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Session_State), + avp_data := { + avp_BASE_NONE_Auth_Session_State := ass + } + } +} +template (present) GenericAVP tr_AVP_AuthSessionState(template (present) BASE_NONE_Auth_Session_State ass := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Session_State), + avp_data := { + avp_BASE_NONE_Auth_Session_State := ass + } + } +} + +template (value) GenericAVP ts_AVP_SessionId(template (value) octetstring session_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Session_Id), + avp_data := { + avp_BASE_NONE_Session_Id := session_id + } + } +} +template (present) GenericAVP tr_AVP_SessionId(template (present) octetstring session_id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Session_Id), + avp_data := { + avp_BASE_NONE_Session_Id := session_id + } + } +} + +/* 3.3 Destination Realm */ +template (value) GenericAVP ts_AVP_DestinationRealm(template (value) charstring dest_realm) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Realm), + avp_data := { + avp_BASE_NONE_Destination_Realm := dest_realm + } + } +} +template (present) GenericAVP tr_AVP_DestinationRealm(template (present) charstring dest_realm := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Realm), + avp_data := { + avp_BASE_NONE_Destination_Realm := dest_realm + } + } +} + +/* 8.14 User-Name */ +template (value) GenericAVP ts_AVP_UserName(template (value) octetstring uid) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_User_Name), + avp_data := { + avp_BASE_NONE_User_Name := uid + } + } +} +template (present) GenericAVP tr_AVP_UserName(template (present) octetstring uid := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_User_Name), + avp_data := { + avp_BASE_NONE_User_Name := uid + } + } +} +template (value) GenericAVP ts_AVP_UserNameImsi(hexstring imsi) := ts_AVP_UserName(char2oct(hex2str(imsi))); +template (present) GenericAVP tr_AVP_UserNameImsi(hexstring imsi) := tr_AVP_UserName(char2oct(hex2str(imsi))); + + + +/* TS 29.262 7.3.53 RAND */ +template (value) GenericAVP ts_AVP_RAND(template (value) octetstring rand) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_RAND), + avp_data := { + avp_AAA_3GPP_RAND := rand + } + } +} + +/* TS 29.262 7.3.54 XRES */ +template (value) GenericAVP ts_AVP_XRES(template (value) octetstring xres) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_XRES), + avp_data := { + avp_AAA_3GPP_XRES := xres + } + } +} + +/* TS 29.262 7.3.55 XRES */ +template (value) GenericAVP ts_AVP_AUTN(template (value) octetstring autn) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AUTN), + avp_data := { + avp_AAA_3GPP_AUTN := autn + } + } +} + +/* TS 29.262 7.3.56 KASME */ +template (value) GenericAVP ts_AVP_KASME(template (value) octetstring kasme) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), + avp_data := { + avp_AAA_3GPP_KASME := kasme + } + } +} + +/* TS 29.262 7.3.23 Item-Number */ +template (value) GenericAVP ts_AVP_ItemNumber(uint32_t num) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), + avp_data := { + avp_AAA_3GPP_Item_Number := int2oct(num, 4) + } + } +} + +/* TS 29.262 7.3.18 E-UTRAN Vector */ +template (value) GenericAVP ts_AVP_EutranVec(uint32_t item_num, octetstring rand, octetstring xres, + octetstring autn, octetstring kasme) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_E_UTRAN_Vector), + avp_data := { + avp_AAA_3GPP_E_UTRAN_Vector := { + ts_AVP_ItemNumber(item_num), + ts_AVP_RAND(rand), + ts_AVP_XRES(xres), + ts_AVP_AUTN(autn), + ts_AVP_KASME(kasme) + } + } + } +} + +/* TS 29.262 7.3.2 Subscription-Data */ +template (value) GenericAVP ts_AVP_3GPP_SubscriptionData(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscription_Data), + avp_data := { + avp_AAA_3GPP_Subscription_Data := content + } + } +} + + +/* TS 29.262 7.3.17 Authentication-Info */ +template (value) GenericAVP ts_AVP_3GPP_AuthInfo(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Authentication_Info), + avp_data := { + avp_AAA_3GPP_Authentication_Info := content + } + } +} + +/* TS 29.262 7.3.9 Visited-PLMN-Id */ +template (value) GenericAVP ts_AVP_3GPP_VisitedPlmnId(template (value) octetstring id) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Visited_PLMN_Id), + avp_data := { + avp_AAA_3GPP_Visited_PLMN_Id := id + } + } +} +template (present) GenericAVP tr_AVP_3GPP_VisitedPlmnId(template (present) octetstring id := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Visited_PLMN_Id), + avp_data := { + avp_AAA_3GPP_Visited_PLMN_Id := id + } + } +} + +/* TS 29.262 7.3.13 RAT-Type */ +template (value) GenericAVP ts_AVP_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), + avp_data := { + avp_PCC_3GPP_RAT_Type := rat_type + } + } +} +template (present) GenericAVP tr_AVP_3GPP_RatType(template (present) PCC_3GPP_RAT_Type rat_type := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), + avp_data := { + avp_PCC_3GPP_RAT_Type := rat_type + } + } +} + +/* TS 29.262 7.3.7 ULR-Flags */ +template (value) GenericAVP ts_AVP_3GPP_UlrFlags(template (value) UINT32 flags) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULR_Flags), + avp_data := { + avp_AAA_3GPP_ULR_Flags := flags + } + } +} +template (present) GenericAVP tr_AVP_3GPP_UlrFlags(template (present) UINT32 flags := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULR_Flags), + avp_data := { + avp_AAA_3GPP_ULR_Flags := flags + } + } +} + +/* TS 29.262 7.3.8 ULA-Flags */ +template (value) GenericAVP ts_AVP_3GPP_UlaFlags(template (value) UINT32 flags) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULA_Flags), + avp_data := { + avp_AAA_3GPP_ULA_Flags := flags + } + } +} +template (present) GenericAVP tr_AVP_3GPP_UlaFlags(template (present) UINT32 flags := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULA_Flags), + avp_data := { + avp_AAA_3GPP_ULA_Flags := flags + } + } +} + +/* TS 29.262 7.3.27 Context-Identifier */ +template (value) GenericAVP ts_AVP_3GPP_ContextId(uint32_t ctx) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Context_Identifier), + avp_data := { + avp_AAA_3GPP_Context_Identifier := int2oct(ctx, 4) + } + } +} + +/* Ts 29.262 7.3.29 Subscriber-Status */ +template (value) GenericAVP ts_AVP_3GPP_SubscriberStatus(template (value) AAA_3GPP_Subscriber_Status sts) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscriber_Status), + avp_data := { + avp_AAA_3GPP_Subscriber_Status := sts + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_SubscrRauTauTmr(uint32_t tmr) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer), + avp_data := { + avp_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer := int2oct(tmr, 4) + } + } +} + +/* TS 29.262 7.3.33 All-APN-Configurations-Included-Indicator */ +template (value) GenericAVP ts_AVP_3GPP_AllApnConfigsIncl(template (value) AAA_3GPP_All_APN_Configurations_Included_Indicator ind := All_APN_CONFIGURATIONS_INCLUDED) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_All_APN_Configurations_Included_Indicator), + avp_data := { + avp_AAA_3GPP_All_APN_Configurations_Included_Indicator := ind + } + } +} + +/* TS 29.262 7.3.34 APN-Configuration-Profile */ +template (value) GenericAVP ts_AVP_3GPP_ApnConfigProfile(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile), + avp_data := { + avp_AAA_3GPP_APN_Configuration_Profile := content + } + } +} + +/* TS 29.262 7.3.35 APN-Configuration */ +template (value) GenericAVP ts_AVP_3GPP_ApnConfig(uint32_t ctx, AAA_3GPP_PDN_Type pdn_type, + charstring apn) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile), + avp_data := { + avp_AAA_3GPP_APN_Configuration := { + ts_AVP_3GPP_ContextId(ctx), + ts_AVP_3GPP_PdnType(pdn_type), + ts_AVP_3GPP_EpsSubscrQosProfile(1, 1), + ts_AVP_ServiceSelection(apn) + } + } + } +} + +/* TS 29.262 7.3.36 Service-Selection (refers to RFC 5778) */ +template (value) GenericAVP ts_AVP_ServiceSelection(charstring apn) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_MIPv6_NONE_Service_Selection), + avp_data := { + avp_MIPv6_NONE_Service_Selection := char2oct(apn) + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_QosClassId(uint32_t id) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Class_Identifier), + avp_data := { + avp_PCC_3GPP_QoS_Class_Identifier := int2oct(id, 4) + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_PriorityLevel(uint32_t prio) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_Priority_Level), + avp_data := { + avp_PCC_3GPP_Priority_Level := int2oct(prio, 4) + } + } +} + + +template (value) GenericAVP ts_AVP_3GPP_AllocRetenPrio(uint32_t prio) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_Allocation_Retention_Priority), + avp_data := { + avp_PCC_3GPP_Allocation_Retention_Priority := { + ts_AVP_3GPP_PriorityLevel(prio) + /* pre-emption capability */ + /* pre-emption vulnerability */ + } + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_EpsSubscrQosProfile(uint32_t qos_class, uint32_t prio) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_EPS_Subscribed_QoS_Profile), + avp_data := { + avp_AAA_3GPP_EPS_Subscribed_QoS_Profile := { + ts_AVP_3GPP_QosClassId(qos_class), + ts_AVP_3GPP_AllocRetenPrio(prio) + } + } + } +} + + +/* TS 29.262 7.3.41 AMBR */ +template (value) GenericAVP ts_AVP_3GPP_AMBR(uint32_t ul, uint32_t dl) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AMBR), + avp_data := { + avp_AAA_3GPP_AMBR := { + ts_AVP_3GPP_MaxReqBwUL(ul), + ts_AVP_3GPP_MaxReqBwDL(dl) + } + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_MaxReqBwUL(uint32_t bw) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_RX_3GPP_Max_Requested_Bandwidth_UL), + avp_data := { + avp_RX_3GPP_Max_Requested_Bandwidth_UL := int2oct(bw, 4) + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_MaxReqBwDL(uint32_t bw) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_RX_3GPP_Max_Requested_Bandwidth_DL), + avp_data := { + avp_RX_3GPP_Max_Requested_Bandwidth_DL := int2oct(bw, 4) + } + } +} + + + +/* TS 29.262 7.3.62 PDN-Type */ +template (value) GenericAVP ts_AVP_3GPP_PdnType(template (value) AAA_3GPP_PDN_Type pdn_type) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_PDN_Type), + avp_data := { + avp_AAA_3GPP_PDN_Type := pdn_type + } + } +} + + + +/* 5.3.2 Capabilities Exchange Answer */ +template (value) PDU_DIAMETER +ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id) +:= ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost("hss.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_HostIpAddr('7E000004'O), + ts_AVP_VendorId(vendor_id_3GPP), + ts_AVP_ProductName("TTCN-3 Testsuite"), + ts_AVP_OriginStateId('00000001'O), + ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */ + ts_AVP_SuppVendorId(vendor_id_3GPP), + ts_AVP_SuppVendorIdRaw(13019), /* ETSI */ + ts_AVP_AuthAppId('FFFFFFFF'O), + ts_AVP_InbSecId('00000000'O), + ts_AVP_VendorSpecAppId(vendor_id_3GPP, c_DIAMETER_3GPP_S6_AID) + }); + +template (present) PDU_DIAMETER +tr_DIA_AIR(hexstring imsi) := tr_DIAMETER(flags := '11000000'B, cmd_code:=Authentication_Information, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), + avps := superset( + tr_AVP_SessionId, + tr_AVP_DestinationRealm, + tr_AVP_UserNameImsi(imsi), + tr_AVP_3GPP_VisitedPlmnId + )); + +/* TS 29.262 5.2.3.1 + 7.2.6 Authentication Information Answer */ +template (value) PDU_DIAMETER +ts_DIA_AIA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) AVP_list auth_info_contents) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Authentication_Information, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost("hss.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_3GPP_AuthInfo(auth_info_contents) + }); + + +/* TS 29.262 7.2.3 Update Location Request */ +template (present) PDU_DIAMETER +tr_DIA_ULR(hexstring imsi) := tr_DIAMETER(flags:='11000000'B, cmd_code:=Update_Location, + app_id:=int2oct(c_DIAMETER_3GPP_S6_AID, 4), + avps := superset( + tr_AVP_SessionId, + tr_AVP_AuthSessionState, + tr_AVP_OriginHost, + tr_AVP_OriginRealm, + tr_AVP_DestinationRealm, + tr_AVP_UserNameImsi(imsi), + tr_AVP_3GPP_RatType(EUTRAN), + tr_AVP_3GPP_UlrFlags, + tr_AVP_3GPP_VisitedPlmnId + )); + +template (value) PDU_DIAMETER +ts_DIA_ULA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) AVP_list sub_data_content) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Update_Location, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), /* optional */ + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost("hss.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_3GPP_UlaFlags('00000002'O), + ts_AVP_3GPP_SubscriptionData(sub_data_content) + }); + + + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15206 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: Iafbf55ab25bbaa40960eb1744cff36dcd7970c17 Gerrit-Change-Number: 15206 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:07:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:07:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Integrate DIAMETER support into MME testsuite Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15207 Change subject: mme: Integrate DIAMETER support into MME testsuite ...................................................................... mme: Integrate DIAMETER support into MME testsuite The test suite can now send/receive DIAMETER messages via related test ports. Change-Id: I1691f87e19cced79ab0f9c3bb87608fc63e21eab --- M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 3 files changed, 115 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/15207/1 diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index ae71173..da45485 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -21,6 +21,10 @@ import from NAS_EPS_Types all; import from NAS_Templates all; +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_Emulation all; + import from SGsAP_Types all; import from SGsAP_Templates all; import from SGsAP_Emulation all; @@ -58,6 +62,11 @@ port S1AP_PT S1AP_UNIT[NUM_ENB]; port S1APEM_PROC_PT S1AP_PROC[NUM_ENB]; + /* S6a/S6d interface of emulated HSS */ + var DIAMETER_Emulation_CT vc_DIAMETER; + port DIAMETER_PT DIAMETER_UNIT; + port DIAMETEREM_PROC_PT DIAMETER_PROC; + /* SGs interface of emulated MSC/VLR */ var SGsAP_Emulation_CT vc_SGsAP; port SGsAP_PT SGsAP_UNIT; @@ -66,7 +75,7 @@ var UeParams g_ue_pars[NUM_UE]; } -type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr { +type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr, DIAMETER_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; } @@ -87,6 +96,10 @@ charstring mp_s1_local_ip := "127.0.0.1"; integer mp_s1_local_port := 50000; + /* S6 interface */ + charstring mp_s6_local_ip := "127.0.0.4"; + integer mp_s6_local_port := 3868; + /* SGs interface */ charstring mp_sgs_local_ip := "127.0.0.1"; integer mp_sgs_local_port := 29118; @@ -191,6 +204,30 @@ } } +friend function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + DIAMETER_UNIT.send(msg); + return omit; +} + +friend function f_init_diameter(charstring id) runs on MTC_CT { + var DIAMETEROps ops := { + create_cb := refers(DIAMETER_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(DiameterForwardUnitdataCallback) + }; + var DIAMETER_conn_parameters pars := { + remote_ip := mp_mme_ip, + remote_sctp_port := -1, + local_ip := mp_s6_local_ip, + local_sctp_port := mp_s6_local_port + }; + vc_DIAMETER := DIAMETER_Emulation_CT.create(id); + map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); + connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); + vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); +} + friend template (value) TAI ts_enb_S1AP_TAI(EnbParams enb) := { pLMNidentity := enb.global_enb_id.pLMNidentity, tAC := enb.supported_tas[0].tAC, @@ -232,6 +269,10 @@ connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); } + if (isbound(vc_DIAMETER)) { + connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -253,6 +294,9 @@ /* start guard timre and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard()); + if (DIAMETER_PROC.checkstate("Connected")) { + f_diameter_expect(g_pars.ue_pars.imsi); + } if (SGsAP_PROC.checkstate("Connected")) { /* Route all SGsAP mesages for our IMSIto us */ f_create_sgsap_expect(pars.ue_pars.imsi); @@ -414,9 +458,64 @@ } } +/* Exepect AuthInfoReq (AIR) from HSS; respond with AuthInforAnswer (AIA) */ +private altstep as_DIA_AuthInfo() runs on ConnHdlr { + var PDU_DIAMETER rx_dia; + [] DIAMETER.receive(tr_DIA_AIR(g_pars.ue_pars.imsi)) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + var octetstring vplmn_id; + var hexstring imsi; + var template (value) AVP_list auth_info_content; + + /* retrieve input data */ + imsi := valueof(f_DIAMETER_get_imsi(rx_dia)); + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_AAA_3GPP_Visited_PLMN_Id); + vplmn_id := valueof(avp.avp_data.avp_AAA_3GPP_Visited_PLMN_Id); + + /* compute tuple */ + auth_info_content := { ts_AVP_EutranVec(1, '20080c3818183b522614162c07601d0d'O, '6a91970e838fd079'O, 'f11b89a2a8be00001f9c526f3d75d44c'O, '95AFAD9A0D29AFAA079A9451DF7161D7EE4CBF2AF9387F766D058BB6B44B905D'O) }; + + DIAMETER.send(ts_DIA_AIA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, + sess_id, auth_info_content)); + } +} + +/* Expect UpdateLocationReq (ULR); respond with UpdateLocationAnswer (ULA) */ +private altstep as_DIA_UpdLoc() runs on ConnHdlr { + var PDU_DIAMETER rx_dia; + [] DIAMETER.receive(tr_DIA_ULR(g_pars.ue_pars.imsi)) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + var hexstring imsi; + var template (value) AVP_list sub_data; + + /* retrieve input data */ + imsi := valueof(f_DIAMETER_get_imsi(rx_dia)); + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + sub_data := { + ts_AVP_3GPP_SubscriberStatus(SERVICE_GRANTED), + ts_AVP_3GPP_SubscrRauTauTmr(30), + ts_AVP_3GPP_AMBR(1000, 2000), + ts_AVP_3GPP_ApnConfigProfile({ + ts_AVP_3GPP_ContextId(1), + ts_AVP_3GPP_AllApnConfigsIncl, + ts_AVP_3GPP_ApnConfig(1, IPv4, "*") + }) + }; + + DIAMETER.send(ts_DIA_ULA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, sub_data)); + } +} + private function f_TC_attach(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); - var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI('001010000000001'H); + var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI(pars.ue_pars.imsi); var template (value) PDU_NAS_EPS nas_esm, nas_emm; /* nas_esm := ts_NAS_ActDefEpsBearCtxReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), @@ -435,14 +534,24 @@ p_rrcCause := mo_Signalling); S1AP.send(tx); + as_DIA_AuthInfo(); as_s1ap_handle_auth(); - as_s1ap_handle_sec_mode(); + alt { + [] as_DIA_UpdLoc() { + as_s1ap_handle_sec_mode(); + } + [] as_s1ap_handle_sec_mode() { + as_DIA_UpdLoc(); + } + } f_sleep(10.0); } testcase TC_s1ap_attach() runs on MTC_CT { var charstring id := testcasename(); + f_init_diameter(id); + f_sleep(10.0); f_init_s1ap(id, 4); f_s1ap_setup(0); @@ -456,6 +565,7 @@ execute( TC_s1ap_setup_wrong_plmn() ); execute( TC_s1ap_setup_wrong_tac() ); execute( TC_s1ap_setup() ); + execute( TC_s1ap_attach() ); } diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 5664711..b59410b 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -55,6 +55,7 @@ FILES+="L3_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " +FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 9fb5f88..2d3bf59 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15207 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: I1691f87e19cced79ab0f9c3bb87608fc63e21eab Gerrit-Change-Number: 15207 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:08:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:08:18 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 ) Change subject: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I2c7649dee8f5ecdaa08274806ccd8948d197ffdb Gerrit-Change-Number: 15190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 14 Aug 2019 11:08:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:08:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:08:33 +0000 Subject: Change in ...osmo-gsm-tester[master]: default-suites: Drop multi-trx osmo-trx-lms tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15191 ) Change subject: default-suites: Drop multi-trx osmo-trx-lms tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic255481e6f1fbbf06c4576f924cf27ae80567801 Gerrit-Change-Number: 15191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 14 Aug 2019 11:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:11:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:11:27 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:11:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:21:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:21:29 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: Add commented-out section for using custom TITAN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 ) Change subject: start-testsuite.sh: Add commented-out section for using custom TITAN ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15192/1/start-testsuite.sh File start-testsuite.sh: https://gerrit.osmocom.org/#/c/15192/1/start-testsuite.sh at 41 PS1, Line 41: #export TTCN3_DIR Why not putting this 2 lines together? export TTCN3_DIR="..." Do you really need the export? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 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: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a Gerrit-Change-Number: 15192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:21:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:22:08 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 14 Aug 2019 11:22:08 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: I'm actually not getting this error with osmo-msc either. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: keith Gerrit-Comment-Date: Wed, 14 Aug 2019 11:22:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:23:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:23:06 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: initial skeleton for MME / SGsAP tetss In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15193 ) Change subject: mme: initial skeleton for MME / SGsAP tetss ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15193 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: Idbd54838daaf12acccc3253dc4278de75eaaaf31 Gerrit-Change-Number: 15193 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:23:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:26:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:26:15 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 ) Change subject: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V15.5.0 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/S1AP_CommonDataTypes.asn File library/s1ap/S1AP_CommonDataTypes.asn: https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/S1AP_CommonDataTypes.asn at 10 PS1, Line 10: itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) whitespace https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/regen_makefile.sh File library/s1ap/regen_makefile.sh: https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/regen_makefile.sh at 7 PS1, Line 7: sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile It would be great to add some check to make sure pkg-config finds libfftranscode so people can realize LD_LIBRARY_PATH is not corret (for instance, I have libfftranscode out of regular library paths). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 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: Ie019bef1f3ef9cc5f6c94a64c7f352c510fb5633 Gerrit-Change-Number: 15194 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:26:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:26:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:26:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP Templates In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15195 ) Change subject: library: Add S1AP Templates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15195 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: I148b33eb5074d3549e7cd533af2cbf90f1c6d23f Gerrit-Change-Number: 15195 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:26:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:27:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:27:56 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP CodecPort/Emulation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 ) Change subject: library: Add S1AP CodecPort/Emulation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 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: I9bfba3ab2a3830e590b203c44c03b9c9383fff99 Gerrit-Change-Number: 15196 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:27:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:28:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:28:29 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add initial set of LTE/EPC NAS templates In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15197 ) Change subject: library: Add initial set of LTE/EPC NAS templates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15197 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: I53a598011041d642f03dcd9cca128f4e9da4adfd Gerrit-Change-Number: 15197 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:28:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:29:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:29:13 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Import snow-3g.[ch] from nextepc source code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 ) Change subject: Import snow-3g.[ch] from nextepc source code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 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: I938de2ad17210aa1561240c0a96d0df216243be1 Gerrit-Change-Number: 15198 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:29:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:29:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:29:27 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: snow-3g: const-ify S-boxes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15199 ) Change subject: snow-3g: const-ify S-boxes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15199 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: I3a85120aad95011954f25bb42900133cb30cddb7 Gerrit-Change-Number: 15199 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:29:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:29:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:29:42 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: snow-3g.c: Mark all internal primitive functions as static In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15200 ) Change subject: snow-3g.c: Mark all internal primitive functions as static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15200 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: I55347320383b173d1aca622997e7cfb98cd9caff Gerrit-Change-Number: 15200 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:29:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:30:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:30:06 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: remove ogslib dependency from snow In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15201 ) Change subject: remove ogslib dependency from snow ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15201 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: I5604c594934b03d2fd83e1e465fc150fc542a475 Gerrit-Change-Number: 15201 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:30:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:32:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:32:16 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: TTCN-3 native function wrapper for SNOW-3G In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15202 ) Change subject: TTCN-3 native function wrapper for SNOW-3G ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15202 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: I7fca69ea8b4aed48d5a64885b762ab85be71ef03 Gerrit-Change-Number: 15202 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:32:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:33:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:33:12 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Extend MME tests to also include S1AP interface testing In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15203 ) Change subject: mme: Extend MME tests to also include S1AP interface testing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15203 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: Id54071b901db720a0f88b91cdc5a8e09bea0fb58 Gerrit-Change-Number: 15203 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:33:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:44:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:44:22 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add GTPv2 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 ) Change subject: mme: Add GTPv2 support ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15204/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15204/1//COMMIT_MSG at 10 PS1, Line 10: as wella as an empty GTPv2_PrivateExtensions.ttcn without which typo wella https://gerrit.osmocom.org/#/c/15204/1/library/GTPv2_CodecPort.ttcn File library/GTPv2_CodecPort.ttcn: https://gerrit.osmocom.org/#/c/15204/1/library/GTPv2_CodecPort.ttcn at 42 PS1, Line 42: private function f_enc_Gtp1cUD(in Gtp2cUnitdata in_ud, out ASP_SendTo out_ud) { Why is one called "Gtp1" and the other one "Gtp2"? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 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: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 Gerrit-Change-Number: 15204 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:44:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:45:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:45:20 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add [generated] DIAMETER_Types.ttcn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15205 ) Change subject: library: Add [generated] DIAMETER_Types.ttcn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15205 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: I85834e98e238b7ff6058264a0f365d05c15cd669 Gerrit-Change-Number: 15205 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:45:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:46:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:46:25 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add DIAMETER Templates, Emulation, CodecPort In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15206 ) Change subject: library: Add DIAMETER Templates, Emulation, CodecPort ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15206 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: Iafbf55ab25bbaa40960eb1744cff36dcd7970c17 Gerrit-Change-Number: 15206 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:46:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:47:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:47:06 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Integrate DIAMETER support into MME testsuite In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15207 ) Change subject: mme: Integrate DIAMETER support into MME testsuite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15207 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: I1691f87e19cced79ab0f9c3bb87608fc63e21eab Gerrit-Change-Number: 15207 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:47:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:49:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:49:27 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: Add commented-out section for using custom TITAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 ) Change subject: start-testsuite.sh: Add commented-out section for using custom TITAN ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15192/1/start-testsuite.sh File start-testsuite.sh: https://gerrit.osmocom.org/#/c/15192/1/start-testsuite.sh at 41 PS1, Line 41: #export TTCN3_DIR > Why not putting this 2 lines together? export TTCN3_DIR="..." [?] I remember some shells don't like/support putting the export and the variable definition in one row. I got burnt by that too often in the past to try it anymore. The export is needed AFAIR, yes. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 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: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a Gerrit-Change-Number: 15192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:49:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:50:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:50:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: Add commented-out section for using custom TITAN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 ) Change subject: start-testsuite.sh: Add commented-out section for using custom TITAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 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: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a Gerrit-Change-Number: 15192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:51:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:51:09 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 ) Change subject: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V15.5.0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/regen_makefile.sh File library/s1ap/regen_makefile.sh: https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/regen_makefile.sh at 7 PS1, Line 7: sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile > It would be great to add some check to make sure pkg-config finds libfftranscode so people can reali [?] i agree it would be nice. However, this merely follows what we do in other test suites (like those using libfftranscode for Iu). One can adress that problem in a generic way in a separate patch, as changing it here but not in the other code is even more weird. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 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: Ie019bef1f3ef9cc5f6c94a64c7f352c510fb5633 Gerrit-Change-Number: 15194 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:51:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:52:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:52:07 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 ) Change subject: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V15.5.0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/S1AP_CommonDataTypes.asn File library/s1ap/S1AP_CommonDataTypes.asn: https://gerrit.osmocom.org/#/c/15194/1/library/s1ap/S1AP_CommonDataTypes.asn at 10 PS1, Line 10: itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) > whitespace those files are copied verbatim from wiresshark [who hopefully hve it from some official 3GPP source], introducing whitespace changes here is just going to lead to clashes further down the road if we ever want to update anything. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 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: Ie019bef1f3ef9cc5f6c94a64c7f352c510fb5633 Gerrit-Change-Number: 15194 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:52:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:52:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 14 Aug 2019 11:52:50 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add GTPv2 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 ) Change subject: mme: Add GTPv2 support ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15204/1/library/GTPv2_CodecPort.ttcn File library/GTPv2_CodecPort.ttcn: https://gerrit.osmocom.org/#/c/15204/1/library/GTPv2_CodecPort.ttcn at 42 PS1, Line 42: private function f_enc_Gtp1cUD(in Gtp2cUnitdata in_ud, out ASP_SendTo out_ud) { > Why is one called "Gtp1" and the other one "Gtp2"? that's of course wrong. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 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: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 Gerrit-Change-Number: 15204 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:52:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 11:53:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 11:53:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 ) Change subject: library: S1AP encoding/decoding using libfftranscode and ASN.1 from V15.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15194 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: Ie019bef1f3ef9cc5f6c94a64c7f352c510fb5633 Gerrit-Change-Number: 15194 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 11:53:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 12:50:30 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 14 Aug 2019 12:50:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: Change test-expectation of TC_paging_resp_unsol Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 Change subject: BSC_Tests: Change test-expectation of TC_paging_resp_unsol ...................................................................... BSC_Tests: Change test-expectation of TC_paging_resp_unsol The testcase TC_paging_resp_unsol expects the BSC to close the channel when an unsolicit paging response is received. This expectation is due to the fact that osmo-bsc supports multiple MSC, which is not specified in 3gpp specs. Therefore the BSC needs to know which MSC is in charge. However, with MT-CSFB calls it is a normal situation that the BSC receives a paging response on abis without sending a paging first since the MSC has paged the UE via the SGs interface. In those cases we expect the BSC to forward the paging response to the first configured MSC. Related: SYS#4624 Change-Id: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe --- M bsc/BSC_Tests.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/15208/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 44a9172..3884928 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1604,17 +1604,22 @@ f_shutdown_helper(); } -/* Verify how we handle unsolicited Paging Response, for instance because we - * receive a Paging Response after T3113 expired (and subscriber information was - * dropped). See OS#3680. +/* Verify how we handle unsolicited Paging Response. In case of an unsolicit + * paging response we can not know which MSC is in charge, so we will blindly + * pick the first configured MSC. This behavior is required in order to make + * MT-CSFB calls working because in those cases the BSC can not know that the + * MSC has already paged the subscriver via SGs. So any MT-CSFB call will look + * like an unsolicited Paging Response to the MSC. */ testcase TC_paging_resp_unsol() runs on test_CT { f_init(1); + timer T := 5.0; var BSSAP_N_CONNECT_ind rx_c_ind; var DchanTuple dt; var PDU_ML3_MS_NW l3 := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010008880018'H)))); + var octetstring rr_pag_resp := enc_PDU_ML3_MS_NW(l3); /* Send CHAN RQD and wait for allocation; acknowledge it */ dt.rsl_chan_nr := f_chreq_act_ack(); @@ -1622,10 +1627,22 @@ /* Send unsolicited Paging response (no matching Paging CMD stored in BSC) */ f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), enc_PDU_ML3_MS_NW(l3))); - /* expect BSC to disable the channel */ - f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + /* Expevct a CR with a matching Paging response on the A-Interface */ + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(rr_pag_resp))) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Received unexpected message on A-Interface!"); + } + [] T.timeout { + setverdict(fail, "Received nothing on A-Interface!"); + } + } + + setverdict(pass); } /* Test RSL link drop causes counter increment */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 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: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe Gerrit-Change-Number: 15208 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 13:21:43 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 14 Aug 2019 13:21:43 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... gsm_08_08.c: always pick first msc for unsolicit paging responses When osmo-bsc receives a paging response via the A-bis interface it tries to find the MSC which is in charge for the paging. This is due to the fact that osmo-bsc supports multiple msc connections, which is not specified by 3gpp specs. In an MT-CSFB call the MSC pages the UE via the SGs interface. Then the UE falls back to 2G. It then reports back as MS on the A-Bis interface with the paging response directly. In those cases osmo-bsc will not be able to determine an MSC in charge, so we will forward the paging response to the first configured MSC. Change-Id: I633870030fad35d0a29dfafd6d118e2caa4ec3c9 Related SYS#4624 Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/15209/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 6ca5455..6dbb1b0 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -325,8 +325,8 @@ subscr = extract_sub(conn, msg); if (!subscr) { - LOGP(DMSC, LOGL_ERROR, "Got paged but no subscriber found.\n"); - return NULL; + LOGP(DMSC, LOGL_ERROR, "Got paged but no subscriber found, will now (blindly) deliver the paging response to the first configured MSC!\n"); + goto blind; } pag_msc = paging_get_msc(conn_get_bts(conn), subscr); @@ -346,7 +346,20 @@ return msc; } - LOGP(DMSC, LOGL_ERROR, "Got paged but no request found.\n"); + LOGP(DMSC, LOGL_ERROR, "Got paged but no request found, will now (blindly) deliver the paging response to the first configured MSC!\n"); + +blind: + /* In the case of an MT CSFB call we will get a paging response from + * the BTS without a preceding paging request via A-Interface. In those + * cases the MSC will page the subscriber via SGs interface, so the BSC + * can not know about the paging in advance. In those cases we can not + * know the MSC which is in charge. The only meaningful option we have + * is to deliver the paging response to the first configured MSC + * blindly. */ + msc = llist_first_entry_or_null(&bsc->mscs, struct bsc_msc_data, entry); + if (msc) + return msc; + LOGP(DMSC, LOGL_ERROR, "Unable to find any suitable MSC to deliver paging response!\n"); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 13:55:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 13:55:43 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: Change test-expectation of TC_paging_resp_unsol In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 ) Change subject: BSC_Tests: Change test-expectation of TC_paging_resp_unsol ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15208/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15208/1//COMMIT_MSG at 17 PS1, Line 17: the BSC to forward the paging response to the first configured MSC. Should target MSC be cnfigurable through VTY here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 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: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe Gerrit-Change-Number: 15208 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 13:55:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 13:57:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 13:57:52 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c at 358 PS1, Line 358: * blindly. */ As commented on other patch, shouldn't this be VTY configurable? (to which MSC send them). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 13:57:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 14:25:12 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 14:25:12 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15209/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15209/1//COMMIT_MSG at 23 PS1, Line 23: C There should be only one Change-Id. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 14:25:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 14:29:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 14:29:51 +0000 Subject: Change in ...osmo-trx[master]: osmo-trx: log to stderr on signal received Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15210 Change subject: osmo-trx: log to stderr on signal received ...................................................................... osmo-trx: log to stderr on signal received Since osmo-trx it's a big multithreaded process and shutdown sequence can be complex, better use stderr to log signal received events to make sure log is outputted straigh away and not buffered. In general stdout is usually line-buffered, but buffering strategy can be more conservative if output is for instance redirected to a file. Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c --- M Transceiver52M/osmo-trx.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/10/15210/1 diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 15f744c..ab0b631 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -173,11 +173,11 @@ action like printing */ return; - fprintf(stdout, "signal %d received\n", signo); + fprintf(stderr, "signal %d received\n", signo); switch (signo) { case SIGINT: case SIGTERM: - fprintf(stdout, "shutting down\n"); + fprintf(stderr, "shutting down\n"); gshutdown = true; break; case SIGABRT: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c Gerrit-Change-Number: 15210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 14:31:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 14:31:32 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Introduce and use log macros when no mm ctx available Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 --- M include/osmocom/sgsn/gprs_llc.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_llc.c 4 files changed, 46 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/11/15211/1 diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 8a0b9ef..ce0e63c 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -96,6 +96,7 @@ GPRS_LLMS_UNASSIGNED = 1, /* No TLLI yet */ GPRS_LLMS_ASSIGNED = 2, /* TLLI assigned */ }; +extern const struct value_string gprs_llc_llme_state_names[]; /* Section 8.9.9 LLC layer parameter default values */ struct gprs_llc_params { diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 9f58aaa..2446028 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -260,6 +260,28 @@ LOGP(DMM, level, "MM(%s/%08x) " fmt, (mm) ? (mm)->imsi : "---", \ (mm) ? (mm)->p_tmsi : GSM_RESERVED_TMSI, ## args) +#ifdef BUILD_IU +#define LOGIUP(level, ue, fmt, args...) \ + LOGP(DMM, level, "UE(0x%x){%s} " fmt, ue->conn_id, osmo_rai_name(&(ue)->ra_id), ## args) +#else +#define LOGIUP(level, ue, fmt, args...) \ + LOGP(DMM, level, "UE(%p){NOTSUPPORTED} " fmt, ue, ## args) +#endif + +#define LOGGBP(level, llme, fmt, args...) \ + LOGP(DMM, level, "LLME(%08x/%08x){%s} " fmt, (llme)->old_tlli, \ + (llme)->tlli, get_value_string_or_null(gprs_llc_llme_state_names, (llme)->state), ## args); + +#define LOGGBIUP(level, llme, msg, fmt, args...) \ + do { \ + struct ranap_ue_conn_ctx * _ue; \ + if (llme) { \ + LOGGBP(level, llme, fmt, ## args); \ + } else if ((msg) && (_ue = MSG_IU_UE_CTX(msg))) { \ + LOGIUP(level, _ue, fmt, ## args); \ + } else { OSMO_ASSERT(0); } \ + } while (0) + /* look-up a SGSN MM context based on TLLI + RAI */ struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli(uint32_t tlli, const struct gprs_ra_id *raid); diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index e6e7aad..9ab09c4 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -182,7 +182,7 @@ #define REQUIRE_MM \ if (!mm) { \ - LOGP(DRANAP, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \ + LOGIUP(LOGL_NOTICE, ctx, "Cannot find mm ctx for IU event %d\n", type); \ return rc; \ } @@ -198,8 +198,7 @@ if (mm) LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); else - LOGMMCTXP(LOGL_INFO, mm, "IU release for UE conn 0x%x\n", - ctx->conn_id); + LOGIUP(LOGL_INFO, ctx, "IU release\n"); if (mm && mm->ran_type == MM_CTX_T_UTRAN_Iu && mm->pmm_state == PMM_CONNECTED) mmctx_set_pmm_state(mm, PMM_IDLE); rc = 0; @@ -216,7 +215,10 @@ osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Unknown event received: %i\n", type); + if (mm) + LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type); + else + LOGIUP(LOGL_NOTICE, ctx, "Unknown event received: %i\n", type); rc = -1; break; } @@ -628,7 +630,7 @@ /* 3GPP TS 24.008 ? 10.5.5.19: */ rc = osmo_get_rand_id(&rbyte, 1); if (rc < 0) { - LOGP(DMM, LOGL_ERROR, "osmo_get_rand_id() failed for A&C ref: %s\n", strerror(-rc)); + LOGMMCTXP(LOGL_ERROR, mm, "osmo_get_rand_id() failed for A&C ref: %s\n", strerror(-rc)); return rc; } @@ -1658,7 +1660,7 @@ upd_type = *cur++ & 0x07; rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_REQUEST]); - LOGP(DMM, LOGL_INFO, "-> GMM RA UPDATE REQUEST type=\"%s\"\n", + LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM RA UPDATE REQUEST type=\"%s\"\n", get_value_string(gprs_upd_t_strs, upd_type)); /* Old routing area identification 10.5.5.15 */ @@ -1668,7 +1670,7 @@ /* MS Radio Access Capability 10.5.5.12a */ ms_ra_acc_cap_len = *cur++; if (ms_ra_acc_cap_len > 52) { - LOGP(DMM, LOGL_ERROR, + LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS Radio Access Capability too long" " (ms_ra_acc_cap_len = %u > 52)\n", ms_ra_acc_cap_len); reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; @@ -1684,7 +1686,7 @@ switch (upd_type) { case GPRS_UPD_T_RA_LA: case GPRS_UPD_T_RA_LA_IMSI_ATT: - LOGP(DMM, LOGL_NOTICE, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type); + LOGMMCTXP(LOGL_NOTICE, mmctx, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type); reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; goto rejected; case GPRS_UPD_T_RA: @@ -1721,7 +1723,8 @@ mmctx = sgsn_mm_ctx_by_ptmsi(tmsi); } #else - LOGP(DMM, LOGL_ERROR, "Rejecting GMM RA Update Request: No Iu support\n"); + LOGIUP(LOGL_ERROR, MSG_IU_UE_CTX(msg), + "Rejecting GMM RA Update Request: No Iu support\n"); goto rejected; #endif } @@ -1756,13 +1759,13 @@ if (llme) { /* send a XID reset to re-set all LLC sequence numbers * in the MS */ - LOGMMCTXP(LOGL_NOTICE, mmctx, "LLC XID RESET\n"); + LOGGBP(LOGL_NOTICE, llme, "LLC XID RESET\n"); gprs_llgmm_reset(llme); } /* The MS has to perform GPRS attach */ /* Device is still IMSI attached for CS but initiate GPRS ATTACH, * see GSM 04.08, 4.7.5.1.4 and G.6 */ - LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS should GMM Attach first\n"); + LOGGBIUP(LOGL_ERROR, llme, msg, "Rejecting GMM RA Update Request: MS should GMM Attach first\n"); reject_cause = GMM_CAUSE_IMPL_DETACHED; goto rejected; } @@ -1984,7 +1987,7 @@ if (llme && !mmctx && gh->msg_type != GSM48_MT_GMM_ATTACH_REQ && gh->msg_type != GSM48_MT_GMM_RA_UPD_REQ) { - LOGP(DMM, LOGL_NOTICE, "Cannot handle GMM for unknown MM CTX\n"); + LOGGBP(LOGL_NOTICE, llme, "Cannot handle GMM for unknown MM CTX\n"); /* 4.7.10 */ if (gh->msg_type == GSM48_MT_GMM_STATUS) { /* TLLI unassignment */ @@ -2170,7 +2173,7 @@ return rc; null_mmctx: - LOGP(DMM, LOGL_ERROR, + LOGGBIUP(LOGL_ERROR, llme, msg, "Received GSM 04.08 message type 0x%02x," " but no MM context available\n", gh->msg_type); @@ -2844,7 +2847,7 @@ /* MMCTX can be NULL when called */ if (!mmctx) { - LOGP(DMM, LOGL_NOTICE, "Cannot handle SM for unknown MM CTX\n"); + LOGGBIUP(LOGL_NOTICE, llme, msg, "Cannot handle SM for unknown MM CTX\n"); /* 6.1.3.6 */ if (gh->msg_type == GSM48_MT_GSM_STATUS) return 0; diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c index a301a63..2a27da8 100644 --- a/src/gprs/gprs_llc.c +++ b/src/gprs/gprs_llc.c @@ -41,6 +41,12 @@ #include #include +const struct value_string gprs_llc_llme_state_names[] = { + { GPRS_LLMS_UNASSIGNED, "UNASSIGNED" }, + { GPRS_LLMS_ASSIGNED, "ASSIGNED" }, + { 0, NULL } +}; + static struct gprs_llc_llme *llme_alloc(uint32_t tlli); static int gprs_llc_tx_xid(struct gprs_llc_lle *lle, struct msgb *msg, int command); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 14:35:23 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 14:35:23 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15175/4/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15175/4/src/libmsc/msc_vty.c at 152 PS4, Line 152: > Cosmetic: alignment. yes I know. Am keeping the previous alignment, decided to not fix it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 14:35:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 14:35:26 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 14:35:26 +0000 Subject: Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... add 'encryption uea 1 2' cfg / fix ttcn3 iu tests Recently, the ability to run UTRAN without encryption was added, but the config for it was tied to the A5 GERAN encryption configuration. This affected osmo-msc's default behavior of Iu, breaking osmo-msc ttcn3 Iu tests: the ttcn3 test suite sets A5 to 0 (no encryption) but still expects Iu to enable air encryption. Fix this "regression". Add a separate vty config option for UEA encryption, even if it does not provide full granularity to select individual UEA algorithms yet. As a result, Iu default behavior remains to enable encryption regardless of the A5 config. UTRAN encryption can be disabled by the new cfg option "encryption uea 0" alone. Even though the new vty command already allows passing various combinations of the UEA algorithm numbers, only '0' and '1 2' are accepted as valid combinations, to reflect current osmo-msc capabilities. Revert most changes to the msc_vlr test suite in commit "do not force encryption on UTRAN" (I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7): use new net->iu_encryption instead of net->a5_encryption_mask. Adjust/add to test_nodes.vty transcript tests. Related: OS#4144 Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b --- M doc/manuals/chapters/net.adoc M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.h M tests/test_nodes.vty 10 files changed, 153 insertions(+), 62 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc index 4bf34a3..6edb9ee 100644 --- a/doc/manuals/chapters/net.adoc +++ b/doc/manuals/chapters/net.adoc @@ -188,11 +188,22 @@ While authentication is always required on 3G, ciphering is optional. -So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim -solution, ciphering is enabled on 3G exactly when ciphering is enabled on 2G, -i.e. when any cipher other than A5/0 is enabled in the configuration. If only -A5/0 is configured, ciphering will be disabled on both 2G and 3G. The future -aim is to add comprehensive configuration for 3G ciphering that is independent -from the 2G setting. +So far OsmoMSC allows switching ciphering on 3G either on or off -- the default +behavior is to enable ciphering. (Individual choice of algorithms may be added +in the future.) + +Disable 3G ciphering: + +---- +network + encryption uea 0 +---- + +Enable 3G ciphering (default): + +---- +network + encryption uea 1 2 +---- OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G. diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index e926b3f..a90b732 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -149,6 +149,11 @@ bool authentication_required; int send_mm_info; + /* Whether to use encryption on UTRAN. + * TODO: we should offer a choice of UEA1 and/or UEA2, and probably replace this bool with a bit-mask of + * permitted Iu encryption algorithms. See also OS#4143 and the 'encryption uea' vty command. */ + bool uea_encryption; + struct rate_ctr_group *msc_ctrs; struct osmo_stat_item_group *statg; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index cd37cff..086116f 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -375,7 +375,7 @@ net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - net->a5_encryption_mask > 0x01, + is_utran ? net->uea_encryption : net->a5_encryption_mask > 0x01, lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -780,7 +780,7 @@ req->cm_service_type, mi-1, &msc_a->via_cell.lai, is_utran || net->authentication_required, - net->a5_encryption_mask > 0x01, + is_utran ? net->uea_encryption : net->a5_encryption_mask > 0x01, req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1152,7 +1152,7 @@ net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, mi_lv, &msc_a->via_cell.lai, is_utran || net->authentication_required, - net->a5_encryption_mask > 0x01, + is_utran ? net->uea_encryption : net->a5_encryption_mask > 0x01, pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 11920f3..91b6165 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -49,6 +49,7 @@ /* Permit a compile-time default of A5/3 and A5/1 */ net->a5_encryption_mask = (1 << 3) | (1 << 1); + net->uea_encryption = true; /* Use 30 min periodic update interval as sane default */ net->t3212 = 5; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 5bf9701..4674e2e 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -144,14 +144,13 @@ return CMD_SUCCESS; } +#define ENCRYPTION_STR "Encryption options\n" + DEFUN(cfg_net_encryption, cfg_net_encryption_cmd, "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]", - "Encryption options\n" - "GSM A5 Air Interface Encryption." - " NOTE: as long as OsmoMSC lacks distinct configuration for 3G encryption," - " 3G encryption is enabled exactly when any 2G encryption is enabled." - " Hence configuring only A5/0 here switches off 3G encryption.\n" + ENCRYPTION_STR + "GSM A5 Air Interface Encryption.\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" @@ -166,6 +165,45 @@ return CMD_SUCCESS; } +/* So far just a boolean switch, a future patch might add individual config for UEA1 and UEA2, see OS#4143 */ +DEFUN(cfg_net_encryption_uea, + cfg_net_encryption_uea_cmd, + "encryption uea <0-2> [<0-2>] [<0-2>]", + ENCRYPTION_STR + "UTRAN (3G) encryption algorithms to allow: 0 = UEA0 (no encryption), 1 = UEA1, 2 = UEA2." + " NOTE: the current implementation does not allow free choice of combining encryption algorithms yet." + " The only valid settings are either 'encryption uea 0' or 'encryption uea 1 2'.\n" + "UEAn Algorithm Number\n" + "UEAn Algorithm Number\n" + "UEAn Algorithm Number\n" + ) +{ + unsigned int i; + uint8_t mask = 0; + + for (i = 0; i < argc; i++) + mask |= (1 << atoi(argv[i])); + + if (mask == (1 << 0)) { + /* UEA0. Disable encryption. */ + gsmnet->uea_encryption = false; + } else if (mask == ((1 << 1) | (1 << 2))) { + /* UEA1 and UEA2. Enable encryption. */ + gsmnet->uea_encryption = true; + } else { + vty_out(vty, + "%% Error: the current implementation does not allow free choice of combining%s" + "%% encryption algorithms yet. The only valid settings are either%s" + "%% encryption uea 0%s" + "%% or%s" + "%% encryption uea 1 2%s", + VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + DEFUN(cfg_net_authentication, cfg_net_authentication_cmd, "authentication (optional|required)", @@ -308,6 +346,11 @@ vty_out(vty, " %u", i); } vty_out(vty, "%s", VTY_NEWLINE); + + if (!gsmnet->uea_encryption) + vty_out(vty, " encryption uea 0%s", VTY_NEWLINE); + else + vty_out(vty, " encryption uea 1 2%s", VTY_NEWLINE); vty_out(vty, " authentication %s%s", gsmnet->authentication_required ? "required" : "optional", VTY_NEWLINE); vty_out(vty, " rrlp mode %s%s", msc_rrlp_mode_name(gsmnet->rrlp.mode), @@ -1894,6 +1937,7 @@ install_element(GSMNET_NODE, &cfg_net_name_short_cmd); install_element(GSMNET_NODE, &cfg_net_name_long_cmd); install_element(GSMNET_NODE, &cfg_net_encryption_cmd); + install_element(GSMNET_NODE, &cfg_net_encryption_uea_cmd); install_element(GSMNET_NODE, &cfg_net_authentication_cmd); install_element(GSMNET_NODE, &cfg_net_rrlp_mode_cmd); install_element(GSMNET_NODE, &cfg_net_mm_info_cmd); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index 62ea6c7..d73a5f8 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -266,8 +266,6 @@ static void test_auth_use_twice_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 1, 1, true); comment_end(); } @@ -275,8 +273,6 @@ static void test_auth_use_twice_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 1, 1, true); comment_end(); } @@ -284,8 +280,6 @@ static void test_auth_use_infinitely_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, -1, 3, false); comment_end(); } @@ -293,8 +287,6 @@ static void test_auth_use_infinitely_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, -1, 3, false); comment_end(); } @@ -302,8 +294,6 @@ static void test_no_auth_reuse_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_auth_reuse(OSMO_RAT_GERAN_A, 0, 0, true); comment_end(); } @@ -311,8 +301,6 @@ static void test_no_auth_reuse_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_auth_reuse(OSMO_RAT_UTRAN_IU, 0, 0, true); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index cec2f8d..065af25 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -46,7 +46,6 @@ struct vlr_subscr *vsub; net->authentication_required = true; - net->a5_encryption_mask = A5_0_3; net->vlr->cfg.assign_tmsi = true; rx_from_ran = OSMO_RAT_UTRAN_IU; diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 1bf6cd2..761db55 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -49,6 +49,8 @@ "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e" "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" "0c7ac3e9e9b7db05"; + bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1) + || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption); net->authentication_required = true; net->vlr->cfg.assign_tmsi = true; @@ -122,8 +124,7 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -197,8 +198,7 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -265,8 +265,7 @@ EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -327,8 +326,6 @@ static void test_umts_authen_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen(OSMO_RAT_GERAN_A); comment_end(); } @@ -336,8 +333,7 @@ static void test_umts_authen_utran() { comment_start(); - /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0; + net->uea_encryption = false; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -345,8 +341,7 @@ static void test_umts_auth_ciph_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; + net->uea_encryption = true; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -365,6 +360,8 @@ { struct vlr_subscr *vsub; const char *imsi = "901700000010650"; + bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1) + || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption); net->authentication_required = true; net->vlr->cfg.assign_tmsi = true; @@ -519,8 +516,7 @@ VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); - if (net->a5_encryption_mask > 0x1) { - /* Encryption enabled */ + if (encryption) { if (via_ran == OSMO_RAT_GERAN_A) { btw("Test code not implemented"); OSMO_ASSERT(false); @@ -585,8 +581,6 @@ static void test_umts_authen_resync_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_resync(OSMO_RAT_GERAN_A); comment_end(); } @@ -594,8 +588,7 @@ static void test_umts_authen_resync_utran() { comment_start(); - /* A5/0 = no encryption; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0; + net->uea_encryption = false; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -603,8 +596,7 @@ static void test_umts_auth_ciph_resync_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; + net->uea_encryption = true; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -698,8 +690,6 @@ static void test_umts_authen_too_short_res_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_too_short_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -707,8 +697,6 @@ static void test_umts_authen_too_short_res_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_short_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -802,8 +790,6 @@ static void test_umts_authen_too_long_res_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_too_long_res(OSMO_RAT_GERAN_A); comment_end(); } @@ -811,8 +797,6 @@ static void test_umts_authen_too_long_res_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_umts_authen_too_long_res(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -911,8 +895,6 @@ static void test_umts_authen_only_sres_geran() { comment_start(); - /* A5/0 = no encryption */ - net->a5_encryption_mask = A5_0; _test_umts_authen_only_sres(OSMO_RAT_GERAN_A); comment_end(); } @@ -920,8 +902,6 @@ static void test_umts_authen_only_sres_utran() { comment_start(); - /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */ - net->a5_encryption_mask = A5_0_3; _test_umts_authen_only_sres(OSMO_RAT_UTRAN_IU); comment_end(); } diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 4330ea8..9df9cf0 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -32,9 +32,6 @@ #include #include -#define A5_0 (1 << 0) -#define A5_0_3 ((1 << 0) | (1 << 3)) - extern bool _log_lines; #define _log(fmt, args...) do { \ if (_log_lines) \ diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index fb7b1c5..0ad390f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -17,6 +17,7 @@ short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] + encryption uea <0-2> [<0-2>] [<0-2>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) @@ -26,6 +27,21 @@ periodic location update <6-1530> no periodic location update +OsmoMSC(config-net)# encryption? + encryption Encryption options +OsmoMSC(config-net)# encryption ? + a5 GSM A5 Air Interface Encryption. + uea UTRAN (3G) encryption algorithms to allow: 0 = UEA0 (no encryption), 1 = UEA1, 2 = UEA2. NOTE: the current implementation does not allow free choice of combining encryption algorithms yet. The only valid settings are either 'encryption uea 0' or 'encryption uea 1 2'. + +OsmoMSC(config-net)# encryption uea ? + <0-2> UEAn Algorithm Number +OsmoMSC(config-net)# encryption uea 0 ? + [<0-2>] UEAn Algorithm Number +OsmoMSC(config-net)# encryption uea 0 1 ? + [<0-2>] UEAn Algorithm Number +OsmoMSC(config-net)# encryption uea 0 1 2 ? + + OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list @@ -130,6 +146,7 @@ short name OsmoMSC long name OsmoMSC encryption a5 0 + encryption uea 1 2 authentication optional rrlp mode none mm info 1 @@ -157,3 +174,52 @@ local-ip 0.0.0.0 vlr-name vlr.example.net end + +OsmoMSC# configure terminal +OsmoMSC(config)# network +OsmoMSC(config-net)# encryption uea 0 +OsmoMSC(config-net)# show running-config +... + encryption uea 0 +... + +OsmoMSC(config-net)# encryption uea 1 +% Error: the current implementation does not allow free choice of combining +% encryption algorithms yet. The only valid settings are either +% encryption uea 0 +% or +% encryption uea 1 2 +OsmoMSC(config-net)# show running-config +... + encryption uea 0 +... + +OsmoMSC(config-net)# encryption uea 2 +% Error: the current implementation does not allow free choice of combining +... +OsmoMSC(config-net)# show running-config +... + encryption uea 0 +... + +OsmoMSC(config-net)# encryption uea 0 1 +% Error: the current implementation does not allow free choice of combining +... +OsmoMSC(config-net)# show running-config +... + encryption uea 0 +... + +OsmoMSC(config-net)# encryption uea 0 2 +% Error: the current implementation does not allow free choice of combining +... +OsmoMSC(config-net)# show running-config +... + encryption uea 0 +... + +OsmoMSC(config-net)# encryption uea 1 2 +OsmoMSC(config-net)# show running-config +... + encryption uea 1 2 +... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 14:57:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 14:57:56 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... gprs_gmm: Avoid spaces in fsm events and enum strings FSM doesn't expect receiving event names containing spaces (log lines generated are confusing). Similar for enums, it's better using code names to match easily and make log lines more clear. Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 --- M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c 2 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/12/15212/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 9ab09c4..5d03923 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -107,12 +107,12 @@ }; static const struct value_string gprs_pmm_state_names[] = { - { PMM_DETACHED, "PMM DETACH" }, - { PMM_CONNECTED, "PMM CONNECTED" }, - { PMM_IDLE, "PMM IDLE" }, - { MM_IDLE, "MM IDLE" }, - { MM_READY, "MM READY" }, - { MM_STANDBY, "MM STANDBY" }, + { PMM_DETACHED, "PMM_DETACH" }, + { PMM_CONNECTED, "PMM_CONNECTED" }, + { PMM_IDLE, "PMM_IDLE" }, + { MM_IDLE, "MM_IDLE" }, + { MM_READY, "MM_READY" }, + { MM_STANDBY, "MM_STANDBY" }, { 0, NULL } }; diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 1ab11f7..84a2cf5 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -316,16 +316,16 @@ }; const struct value_string gmm_attach_req_fsm_event_names[] = { - { E_ATTACH_REQ_RECV, "Received an attach request" }, - { E_IDEN_RESP_RECV, "Identity Request received" }, - { E_AUTH_RESP_RECV_SUCCESS, "Authentication Response received" }, - { E_AUTH_RESP_RECV_RESYNC, "Authentication Failure with resync received" }, - { E_ATTACH_ACCEPTED, "Attach accepted" }, - { E_ATTACH_ACCEPT_SENT, "Attach accept sent" }, - { E_ATTACH_COMPLETE_RECV, "Attach complete received." }, - { E_IU_SECURITY_CMD_COMPLETE, "IU Security Command Complete received." }, - { E_REJECT, "Reject the MS"}, - { E_VLR_ANSWERED, "VLR answered"}, + { E_ATTACH_REQ_RECV, "ATTACH_REQ_RECV" }, + { E_IDEN_RESP_RECV, "IDEN_RESP_RECV" }, + { E_AUTH_RESP_RECV_SUCCESS, "AUTH_RESP_RECV_SUCCESS" }, + { E_AUTH_RESP_RECV_RESYNC, "AUTH_RESP_RECV_RESYNC" }, + { E_ATTACH_ACCEPTED, "ATTACH_ACCEPTED" }, + { E_ATTACH_ACCEPT_SENT, "ATTACH_ACCEPT_SENT" }, + { E_ATTACH_COMPLETE_RECV, "ATTACH_COMPLETE_RECV" }, + { E_IU_SECURITY_CMD_COMPLETE, "IU_SECURITY_CMD_COMPLETE" }, + { E_REJECT, "REJECT"}, + { E_VLR_ANSWERED, "VLR_ANSWERED"}, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 17:25:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 17:25:47 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 ) Change subject: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I2c7649dee8f5ecdaa08274806ccd8948d197ffdb Gerrit-Change-Number: 15190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 14 Aug 2019 17:25:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 17:25:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 17:25:52 +0000 Subject: Change in ...osmo-gsm-tester[master]: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 ) Change subject: bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh ...................................................................... bts-trx: Improve logging and trap SIGTERM in ssh_sigkiller.sh Trapping SIGTERM is done in order to get extra logging about that event. Related: OS#4151 Change-Id: I2c7649dee8f5ecdaa08274806ccd8948d197ffdb --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 2 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/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 93e3c62..b3738d2 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -224,12 +224,14 @@ echo "received signal handler $sig, killing $mypid" kill $mypid } + trap 'sign_handler SIGTERM' SIGTERM trap 'sign_handler SIGINT' SIGINT trap 'sign_handler SIGHUP' SIGHUP "$@" & mypid=$! echo "waiting for $mypid" wait $mypid + echo "process $mypid finished" """ f.write(r) st = os.stat(wrapper_script) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I2c7649dee8f5ecdaa08274806ccd8948d197ffdb Gerrit-Change-Number: 15190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 17:25:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 17:25:52 +0000 Subject: Change in ...osmo-gsm-tester[master]: default-suites: Drop multi-trx osmo-trx-lms tests In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15191 ) Change subject: default-suites: Drop multi-trx osmo-trx-lms tests ...................................................................... default-suites: Drop multi-trx osmo-trx-lms tests The feature is not supported yet and it seems to be leaving osmo-trx-lms in a zombie state preventing it to exit and blocking other tests. Let's disable it until this feature is working properly under manual use. Related: OS#4151 Change-Id: Ic255481e6f1fbbf06c4576f924cf27ae80567801 --- M example/default-suites.conf 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index f93c933..27522bf 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -103,12 +103,10 @@ - voice:trx-lms+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-lms+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-lms+mod-bts0-dynts-osmo -- voice:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-lms - gprs:trx-lms+mod-bts0-egprs - gprs:trx-lms+mod-bts0-dynts-ipa - gprs:trx-lms+mod-bts0-dynts-osmo -- gprs:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:trx-lms+mod-bts0-dynts67-ipa+cfg-codec-fr-any - dynts:trx-lms+mod-bts0-dynts67-osmo -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic255481e6f1fbbf06c4576f924cf27ae80567801 Gerrit-Change-Number: 15191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 17:59:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 17:59:47 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Check timers can be set over VTY Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 Change subject: tests: Check timers can be set over VTY ...................................................................... tests: Check timers can be set over VTY Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 --- M tests/vty_test_runner.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/13/15213/1 diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 73dd399..19eaf28 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -266,6 +266,15 @@ self.assert_(res.find(" cdr interval 900") > 0) self.assertEquals(res.find(" cdr interval 600"), -1) + def testVtyTimers(self): + self.vty.enable() + self.assertTrue(self.vty.verify('configure terminal', [''])) + self.assertEquals(self.vty.node(), 'config') + self.assertTrue(self.vty.verify('sgsn', [''])) + self.assertEquals(self.vty.node(), 'config-sgsn') + + for t in [3312, 3322, 3350, 3360, 3370, 3313, 3314, 3316, 3385, 3395, 3397]: + self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) def add_gbproxy_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-gbproxy")): -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 17:59:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 17:59:48 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Replace own timer infra with libosmocore osmo_tdef Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c M src/gprs/sgsn_vty.c 4 files changed, 127 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/15214/1 diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 0a6ea29..6e4f5ca 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -86,20 +86,8 @@ /* CDR configuration */ struct sgsn_cdr cdr; - struct { - int T3312; - int T3322; - int T3350; - int T3360; - int T3370; - int T3313; - int T3314; - int T3316; - int T3385; - int T3386; - int T3395; - int T3397; - } timers; + /* Timer defintions */ + struct osmo_tdef *T_defs; int dynamic_lookup; diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 5d03923..c223f2a 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -231,12 +232,15 @@ static void mmctx_timer_cb(void *_mm); -static void mmctx_timer_start(struct sgsn_mm_ctx *mm, unsigned int T, - unsigned int seconds) +static void mmctx_timer_start(struct sgsn_mm_ctx *mm, unsigned int T) { + unsigned long seconds; if (osmo_timer_pending(&mm->timer)) LOGMMCTXP(LOGL_ERROR, mm, "Starting MM timer %u while old " "timer %u pending\n", T, mm->T); + + seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1); + mm->T = T; mm->num_T_exp = 0; @@ -255,7 +259,11 @@ time_t gprs_max_time_to_idle(void) { - return sgsn->cfg.timers.T3314 + (sgsn->cfg.timers.T3312 + 4 * 60); + unsigned long T3314, T3312; + + T3314 = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + T3312 = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); + return T3314 + (T3312 + 4 * 60); } /* Send a message through the underlying layer. @@ -447,6 +455,7 @@ struct gsm48_hdr *gh; struct gsm48_attach_ack *aa; uint8_t *mid; + unsigned long t; #if 0 uint8_t *ptsig; #endif @@ -463,7 +472,8 @@ aa = (struct gsm48_attach_ack *) msgb_put(msg, sizeof(*aa)); aa->force_stby = 0; /* not indicated */ aa->att_result = 1; /* GPRS only */ - aa->ra_upd_timer = gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3312); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); + aa->ra_upd_timer = gprs_secs_to_tmr_floor(t); aa->radio_prio = 4; /* lowest */ gsm48_encode_ra(&aa->ra_id, &mm->ra); @@ -480,8 +490,8 @@ * (fixed 44s, default value, GSM 04.08, table 11.4a) to safely limit * the inactivity time READY->STANDBY. */ - msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, - gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3314)); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, gprs_secs_to_tmr_floor(t)); #ifdef PTMSI_ALLOC /* Optional: Allocated P-TMSI */ @@ -1017,12 +1027,12 @@ /* Request IMSI and IMEI from the MS if they are unknown */ if (!strlen(ctx->imei)) { ctx->t3370_id_type = GSM_MI_TYPE_IMEI; - mmctx_timer_start(ctx, 3370, sgsn->cfg.timers.T3370); + mmctx_timer_start(ctx, 3370); return gsm48_tx_gmm_id_req(ctx, GSM_MI_TYPE_IMEI); } if (!strlen(ctx->imsi)) { ctx->t3370_id_type = GSM_MI_TYPE_IMSI; - mmctx_timer_start(ctx, 3370, sgsn->cfg.timers.T3370); + mmctx_timer_start(ctx, 3370); return gsm48_tx_gmm_id_req(ctx, GSM_MI_TYPE_IMSI); } @@ -1045,7 +1055,7 @@ && !sgsn_mm_ctx_is_authenticated(ctx)) { struct gsm_auth_tuple *at = &ctx->auth_triplet; - mmctx_timer_start(ctx, 3360, sgsn->cfg.timers.T3360); + mmctx_timer_start(ctx, 3360); return gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, false); } @@ -1084,7 +1094,7 @@ extract_subscr_hlr(ctx); #ifdef PTMSI_ALLOC /* Start T3350 and re-transmit up to 5 times until ATTACH COMPLETE */ - mmctx_timer_start(ctx, 3350, sgsn->cfg.timers.T3350); + mmctx_timer_start(ctx, 3350); ctx->t3350_mode = GMM_T3350_MODE_ATT; #else memset(&sig_data, 0, sizeof(sig_data)); @@ -1533,6 +1543,7 @@ struct gsm48_hdr *gh; struct gsm48_ra_upd_ack *rua; uint8_t *mid; + unsigned long t; rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_ACKED]); LOGMMCTXP(LOGL_INFO, mm, "<- ROUTING AREA UPDATE ACCEPT\n"); @@ -1546,7 +1557,8 @@ rua = (struct gsm48_ra_upd_ack *) msgb_put(msg, sizeof(*rua)); rua->force_stby = 0; /* not indicated */ rua->upd_result = 0; /* RA updated */ - rua->ra_upd_timer = gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3312); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); + rua->ra_upd_timer = gprs_secs_to_tmr_floor(t); gsm48_encode_ra(&rua->ra_id, &mm->ra); @@ -1567,8 +1579,8 @@ #endif /* Optional: Negotiated READY timer value */ - msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, - gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3314)); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, gprs_secs_to_tmr_floor(t)); /* Option: MS ID, ... */ return gsm48_gmm_sendmsg(msg, 0, mm, true); @@ -1791,7 +1803,7 @@ /* Start T3350 and re-transmit up to 5 times until ATTACH COMPLETE */ mmctx->t3350_mode = GMM_T3350_MODE_RAU; - mmctx_timer_start(mmctx, 3350, sgsn->cfg.timers.T3350); + mmctx_timer_start(mmctx, 3350); #else /* Make sure we are NORMAL (i.e. not SUSPENDED anymore) */ mmctx->gmm_state = GMM_REGISTERED_NORMAL; @@ -2185,6 +2197,7 @@ struct sgsn_mm_ctx *mm = _mm; struct gsm_auth_tuple *at; int rc; + unsigned long seconds; mm->num_T_exp++; @@ -2212,7 +2225,8 @@ "T3350 mode wasn't set, ignoring timeout\n"); break; } - osmo_timer_schedule(&mm->timer, sgsn->cfg.timers.T3350, 0); + seconds = osmo_tdef_get(sgsn->cfg.T_defs, 3350, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->timer, seconds, 0); break; case 3360: /* waiting for AUTH AND CIPH RESP */ if (mm->num_T_exp >= 5) { @@ -2230,10 +2244,12 @@ at = &mm->auth_triplet; rc = gsm48_tx_gmm_auth_ciph_req(mm, &at->vec, at->key_seq, false); - if (rc < 0) + if (rc < 0) { LOGMMCTXP(LOGL_ERROR, mm, "failed sending Auth. & Ciph. Request: %s \n", strerror(-rc)); - else - osmo_timer_schedule(&mm->timer, sgsn->cfg.timers.T3360, 0); + } else { + seconds = osmo_tdef_get(sgsn->cfg.T_defs, 3360, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->timer, seconds, 0); + } break; case 3370: /* waiting for IDENTITY RESPONSE */ if (mm->num_T_exp >= 5) { @@ -2244,7 +2260,8 @@ } /* re-tranmit IDENTITY REQUEST and re-start timer */ gsm48_tx_gmm_id_req(mm, mm->t3370_id_type); - osmo_timer_schedule(&mm->timer, sgsn->cfg.timers.T3370, 0); + seconds = osmo_tdef_get(sgsn->cfg.T_defs, 3370, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->timer, seconds, 0); break; default: LOGMMCTXP(LOGL_ERROR, mm, "timer expired in unknown mode %u\n", @@ -2257,25 +2274,28 @@ static void pdpctx_timer_cb(void *_mm); -static void pdpctx_timer_rearm(struct sgsn_pdp_ctx *pdp, unsigned int T, unsigned int seconds) +static void pdpctx_timer_rearm(struct sgsn_pdp_ctx *pdp, unsigned int T) { + unsigned long seconds; if (osmo_timer_pending(&pdp->timer)) LOGPDPCTXP(LOGL_ERROR, pdp, "Scheduling PDP timer %u while old " "timer %u pending\n", T, pdp->T); + seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1); osmo_timer_schedule(&pdp->timer, seconds, 0); } -static void pdpctx_timer_start(struct sgsn_pdp_ctx *pdp, unsigned int T, - unsigned int seconds) +static void pdpctx_timer_start(struct sgsn_pdp_ctx *pdp, unsigned int T) { + if (osmo_timer_pending(&pdp->timer)) LOGPDPCTXP(LOGL_ERROR, pdp, "Starting PDP timer %u while old " "timer %u pending\n", T, pdp->T); + pdp->T = T; pdp->num_T_exp = 0; osmo_timer_setup(&pdp->timer, pdpctx_timer_cb, pdp); - pdpctx_timer_rearm(pdp, pdp->T, seconds); + pdpctx_timer_rearm(pdp, pdp->T); } static void pdpctx_timer_stop(struct sgsn_pdp_ctx *pdp, unsigned int T) @@ -2412,7 +2432,7 @@ } int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause, bool teardown) { - pdpctx_timer_start(pdp, 3395, sgsn->cfg.timers.T3395); + pdpctx_timer_start(pdp, 3395); return _gsm48_tx_gsm_deact_pdp_req(pdp->mm, pdp->ti, sm_cause, teardown); } @@ -2828,7 +2848,7 @@ break; } _gsm48_tx_gsm_deact_pdp_req(pdp->mm, pdp->ti, GSM_CAUSE_NET_FAIL, true); - pdpctx_timer_rearm(pdp, 3395, sgsn->cfg.timers.T3395); + pdpctx_timer_rearm(pdp, 3395); break; default: LOGPDPCTXP(LOGL_ERROR, pdp, "timer expired in unknown mode %u\n", diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 84a2cf5..39efb0d 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -1,3 +1,5 @@ +#include + #include #include @@ -10,6 +12,18 @@ static int require_identity_imei = 1; static int require_auth = 1; +static const struct osmo_tdef_state_timeout gmm_attach_fsm_timeouts[] = { + [ST_IDENTIY] = { .T=3370 }, + [ST_AUTH] = { .T=3360 }, + [ST_ACCEPT] = { .T=3350 }, + [ST_ASK_VLR] = { .T=3350 }, + [ST_IU_SECURITY_CMD] = { .T=3350 }, +}; + +#define gmm_attach_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, gmm_attach_fsm_timeouts, sgsn->cfg.T_defs, -1) + + static void st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct sgsn_mm_ctx *ctx = fi->priv; @@ -33,14 +47,14 @@ if (require_identity_imei) { ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMEI; - osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + gmm_attach_fsm_state_chg(fi, ST_IDENTIY); } else if (!strlen(ctx->imsi)) { ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMSI; - osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + gmm_attach_fsm_state_chg(fi, ST_IDENTIY); } else if (require_auth) - osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + gmm_attach_fsm_state_chg(fi, ST_AUTH); else - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); } static void st_identity_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -94,11 +108,11 @@ if (type == GSM_MI_TYPE_IMEI && !strlen(ctx->imsi)) { ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMSI; - osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + gmm_attach_fsm_state_chg(fi, ST_IDENTIY); } else if (require_auth) - osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + gmm_attach_fsm_state_chg(fi, ST_AUTH); else - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); } static void st_auth_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -124,19 +138,19 @@ switch(auth_state) { case SGSN_AUTH_UMTS_RESYNC: /* ask the vlr for a new vector to match the simcards seq */ case SGSN_AUTH_UNKNOWN: /* the SGSN doesn know this MS */ - osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ASK_VLR); break; case SGSN_AUTH_REJECTED: /* TODO: correct GMM cause */ osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_GPRS_NOTALLOWED); break; case SGSN_AUTH_ACCEPTED: - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); break; case SGSN_AUTH_AUTHENTICATE: if (ctx->auth_triplet.key_seq == GSM_KEY_SEQ_INVAL) { /* invalid key material */ - osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ASK_VLR); } struct gsm_auth_tuple *at = &ctx->auth_triplet; @@ -159,14 +173,14 @@ sgsn_auth_request(ctx); #ifdef BUILD_IU if (ctx->ran_type == MM_CTX_T_UTRAN_Iu && !ctx->iu.ue_ctx->integrity_active) - osmo_fsm_inst_state_chg(fi, ST_IU_SECURITY_CMD, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_IU_SECURITY_CMD); else #endif /* BUILD_IU */ - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); break; case E_AUTH_RESP_RECV_RESYNC: if (ctx->gmm_att_req.auth_reattempt <= 1) - osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ASK_VLR); else osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_SYNC_FAIL); break; @@ -234,7 +248,7 @@ { switch(event) { case E_VLR_ANSWERED: - osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + gmm_attach_fsm_state_chg(fi, ST_AUTH); break; } } @@ -246,7 +260,7 @@ /* TODO: shouldn't this set always? not only when the integrity_active? */ if (ctx->iu.ue_ctx->integrity_active) { - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); return; } @@ -259,7 +273,7 @@ { switch(event) { case E_IU_SECURITY_CMD_COMPLETE: - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); break; } } @@ -373,6 +387,7 @@ { struct sgsn_mm_ctx *ctx = fi->priv; struct gsm_auth_tuple *at = &ctx->auth_triplet; + unsigned long t_secs; ctx->num_T_exp++; @@ -392,7 +407,9 @@ break; } gsm48_tx_gmm_id_req(ctx, ctx->gmm_att_req.id_type); - osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3370, 0); + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3370, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); + break; case ST_AUTH: /* T3360 */ @@ -401,7 +418,8 @@ break; } gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, false); - osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3360, 0); + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3360, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); break; case ST_ACCEPT: /* T3350 */ @@ -410,7 +428,8 @@ break; } gsm48_tx_gmm_att_ack(ctx); - osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3350, 0); + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3350, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); break; } diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index d1d53e6..ae26cbe 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -39,6 +40,7 @@ #include #include +#include #include #include #include @@ -88,39 +90,42 @@ #define GSM0408_T3395_SECS 8 /* wait for DEACT PDP CTX ACK */ #define GSM0408_T3397_SECS 8 /* wait for DEACT AA PDP CTX ACK */ -#define DECLARE_TIMER(number, doc) \ - DEFUN(cfg_sgsn_T##number, \ - cfg_sgsn_T##number##_cmd, \ - "timer t" #number " <0-65535>", \ - "Configure GPRS Timers\n" \ - doc "\nTimer Value in seconds\n") \ -{ \ - int value = atoi(argv[0]); \ - \ - if (value < 0 || value > 65535) { \ - vty_out(vty, "Timer value %s out of range.%s", \ - argv[0], VTY_NEWLINE); \ - return CMD_WARNING; \ - } \ - \ - g_cfg->timers.T##number = value; \ - return CMD_SUCCESS; \ + +static struct osmo_tdef sgsn_T_defs[] = { + { .T=3312, .default_val=GSM0408_T3312_SECS, .desc="Periodic RA Update timer (s)" }, + { .T=3313, .default_val=GSM0408_T3313_SECS, .desc="Waiting for paging response timer (s)" }, + { .T=3314, .default_val=GSM0408_T3314_SECS, .desc="Force to STANDBY on expiry timer (s)" }, + { .T=3316, .default_val=GSM0408_T3316_SECS, .desc="AA-Ready timer (s)" }, + { .T=3322, .default_val=GSM0408_T3322_SECS, .desc="Detach request -> accept timer (s)" }, + { .T=3350, .default_val=GSM0408_T3350_SECS, .desc="Waiting for ATT/RAU/TMSI_COMPL timer (s)" }, + { .T=3360, .default_val=GSM0408_T3360_SECS, .desc="Waiting for AUTH/CIPH response timer (s)" }, + { .T=3370, .default_val=GSM0408_T3370_SECS, .desc="Waiting for IDENTITY response timer (s)" }, + { .T=3385, .default_val=GSM0408_T3385_SECS, .desc="Wait for ACT PDP CTX REQ timer (s)" }, + { .T=3386, .default_val=GSM0408_T3386_SECS, .desc="Wait for MODIFY PDP CTX ACK timer (s)" }, + { .T=3395, .default_val=GSM0408_T3395_SECS, .desc="Wait for DEACT PDP CTX ACK timer (s)" }, + { .T=3397, .default_val=GSM0408_T3397_SECS, .desc="Wait for DEACT AA PDP CTX ACK timer (s)" }, + {} +}; + +DEFUN(show_timer, show_timer_cmd, + "show timer " OSMO_TDEF_VTY_ARG_T_OPTIONAL, + SHOW_STR "Show timers\n" + OSMO_TDEF_VTY_DOC_T) +{ + const char *T_arg = argc > 0 ? argv[0] : NULL; + return osmo_tdef_vty_show_cmd(vty, g_cfg->T_defs, T_arg, NULL); } -DECLARE_TIMER(3312, "Periodic RA Update timer (s)") -DECLARE_TIMER(3322, "Detach request -> accept timer (s)") -DECLARE_TIMER(3350, "Waiting for ATT/RAU/TMSI_COMPL timer (s)") -DECLARE_TIMER(3360, "Waiting for AUTH/CIPH response timer (s)") -DECLARE_TIMER(3370, "Waiting for IDENTITY response timer (s)") - -DECLARE_TIMER(3313, "Waiting for paging response timer (s)") -DECLARE_TIMER(3314, "Force to STANDBY on expiry timer (s)") -DECLARE_TIMER(3316, "AA-Ready timer (s)") - -DECLARE_TIMER(3385, "Wait for ACT PDP CTX REQ timer (s)") -DECLARE_TIMER(3386, "Wait for MODIFY PDP CTX ACK timer (s)") -DECLARE_TIMER(3395, "Wait for DEACT PDP CTX ACK timer (s)") -DECLARE_TIMER(3397, "Wait for DEACT AA PDP CTX ACK timer (s)") +DEFUN(cfg_sgsn_timer, cfg_sgsn_timer_cmd, + "timer " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, + "Configure or show timers\n" + OSMO_TDEF_VTY_DOC_SET) +{ + /* If any arguments are missing, redirect to 'show' */ + if (argc < 2) + return show_timer(self, vty, argc, argv); + return osmo_tdef_vty_set_cmd(vty, g_cfg->T_defs, argv); +} char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len) { @@ -253,18 +258,7 @@ vty_out(vty, " no cdr trap%s", VTY_NEWLINE); vty_out(vty, " cdr interval %d%s", g_cfg->cdr.interval, VTY_NEWLINE); - vty_out(vty, " timer t3312 %d%s", g_cfg->timers.T3312, VTY_NEWLINE); - vty_out(vty, " timer t3322 %d%s", g_cfg->timers.T3322, VTY_NEWLINE); - vty_out(vty, " timer t3350 %d%s", g_cfg->timers.T3350, VTY_NEWLINE); - vty_out(vty, " timer t3360 %d%s", g_cfg->timers.T3360, VTY_NEWLINE); - vty_out(vty, " timer t3370 %d%s", g_cfg->timers.T3370, VTY_NEWLINE); - vty_out(vty, " timer t3313 %d%s", g_cfg->timers.T3313, VTY_NEWLINE); - vty_out(vty, " timer t3314 %d%s", g_cfg->timers.T3314, VTY_NEWLINE); - vty_out(vty, " timer t3316 %d%s", g_cfg->timers.T3316, VTY_NEWLINE); - vty_out(vty, " timer t3385 %d%s", g_cfg->timers.T3385, VTY_NEWLINE); - vty_out(vty, " timer t3386 %d%s", g_cfg->timers.T3386, VTY_NEWLINE); - vty_out(vty, " timer t3395 %d%s", g_cfg->timers.T3395, VTY_NEWLINE); - vty_out(vty, " timer t3397 %d%s", g_cfg->timers.T3397, VTY_NEWLINE); + osmo_tdef_vty_write(vty, g_cfg->T_defs, " timer "); if (g_cfg->pcomp_rfc1144.active) { vty_out(vty, " compression rfc1144 active slots %d%s", @@ -1388,12 +1382,16 @@ { g_cfg = cfg; + g_cfg->T_defs = sgsn_T_defs; + osmo_tdefs_reset(g_cfg->T_defs); + install_element_ve(&show_sgsn_cmd); //install_element_ve(&show_mmctx_tlli_cmd); install_element_ve(&show_mmctx_imsi_cmd); install_element_ve(&show_mmctx_all_cmd); install_element_ve(&show_pdpctx_all_cmd); install_element_ve(&show_subscr_cache_cmd); + install_element_ve(&show_timer_cmd); install_element(ENABLE_NODE, &update_subscr_insert_auth_triplet_cmd); install_element(ENABLE_NODE, &update_subscr_create_cmd); @@ -1433,18 +1431,7 @@ install_element(SGSN_NODE, &cfg_ggsn_dynamic_lookup_cmd); install_element(SGSN_NODE, &cfg_grx_ggsn_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3312_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3322_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3350_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3360_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3370_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3313_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3314_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3316_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3385_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3386_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3395_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3397_cmd); + install_element(SGSN_NODE, &cfg_sgsn_timer_cmd); install_element(SGSN_NODE, &cfg_no_comp_rfc1144_cmd); install_element(SGSN_NODE, &cfg_comp_rfc1144_cmd); @@ -1466,19 +1453,6 @@ /* make sure sgsn_vty_init() was called before this */ OSMO_ASSERT(g_cfg); - g_cfg->timers.T3312 = GSM0408_T3312_SECS; - g_cfg->timers.T3322 = GSM0408_T3322_SECS; - g_cfg->timers.T3350 = GSM0408_T3350_SECS; - g_cfg->timers.T3360 = GSM0408_T3360_SECS; - g_cfg->timers.T3370 = GSM0408_T3370_SECS; - g_cfg->timers.T3313 = GSM0408_T3313_SECS; - g_cfg->timers.T3314 = GSM0408_T3314_SECS; - g_cfg->timers.T3316 = GSM0408_T3316_SECS; - g_cfg->timers.T3385 = GSM0408_T3385_SECS; - g_cfg->timers.T3386 = GSM0408_T3386_SECS; - g_cfg->timers.T3395 = GSM0408_T3395_SECS; - g_cfg->timers.T3397 = GSM0408_T3397_SECS; - rc = vty_read_config_file(config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 18:24:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 18:24:41 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 Change subject: tests: Introduce vty-transcript-test tests ...................................................................... tests: Introduce vty-transcript-test tests Add a few commands to make sure it's working fine, and print all available timers with default values. Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 91 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/15/15215/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 035cfb0..93412ac 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,16 +43,38 @@ if ENABLE_EXT_TESTS python-tests: $(BUILT_SOURCES) - osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v - rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + $(MAKE) vty-test + $(MAKE) ctrl-python-test else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" endif +vty-python-test: $(BUILT_SOURCES) + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-transcript-test U=-u +vty-transcript-test: + osmo_verify_transcript_vty.py -v \ + -n OsmoSGSN -p 4245 \ + -r "$(top_builddir)/src/gprs/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ + $(U) $${T:-$(srcdir)/*.vty} + rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + +# don't run multiple tests concurrently so that the ports don't conflict +vty-test: + $(MAKE) vty-python-test + $(MAKE) vty-transcript-test + +ctrl-python-test: $(BUILT_SOURCES) + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty new file mode 100644 index 0000000..ab8b7fd --- /dev/null +++ b/tests/test_nodes.vty @@ -0,0 +1,64 @@ +OsmoSGSN> enable +OsmoSGSN# show timer +T3312 = 600 s Periodic RA Update timer (s) (default: 600 s) +T3313 = 30 s Waiting for paging response timer (s) (default: 30 s) +T3314 = 44 s Force to STANDBY on expiry timer (s) (default: 44 s) +T3316 = 44 s AA-Ready timer (s) (default: 44 s) +T3322 = 6 s Detach request -> accept timer (s) (default: 6 s) +T3350 = 6 s Waiting for ATT/RAU/TMSI_COMPL timer (s) (default: 6 s) +T3360 = 6 s Waiting for AUTH/CIPH response timer (s) (default: 6 s) +T3370 = 6 s Waiting for IDENTITY response timer (s) (default: 6 s) +T3385 = 8 s Wait for ACT PDP CTX REQ timer (s) (default: 8 s) +T3386 = 8 s Wait for MODIFY PDP CTX ACK timer (s) (default: 8 s) +T3395 = 8 s Wait for DEACT PDP CTX ACK timer (s) (default: 8 s) +T3397 = 8 s Wait for DEACT AA PDP CTX ACK timer (s) (default: 8 s) +OsmoSGSN# configure terminal +OsmoSGSN(config)# list +... + sgsn + ctrl + cs7 instance <0-15> + ns + bssgp +... + +OsmoSGSN(config)# sgsn +OsmoSGSN(config-sgsn)# list +... + gtp local-ip A.B.C.D + ggsn <0-255> remote-ip A.B.C.D + ggsn <0-255> gtp-version (0|1) + ggsn <0-255> echo-interval <1-36000> + ggsn <0-255> no echo-interval + imsi-acl (add|del) IMSI + auth-policy (accept-all|closed|acl-only|remote) + authentication (optional|required) + encryption (GEA0|GEA1|GEA2|GEA3|GEA4) + gsup ipa-name NAME + gsup remote-ip A.B.C.D + gsup remote-port <0-65535> + gsup oap-id <0-65535> + gsup oap-k K + gsup oap-opc OPC + apn APNAME ggsn <0-255> + apn APNAME imsi-prefix IMSIPRE ggsn <0-255> + access-point-name NAME + no access-point-name NAME + cdr filename NAME + no cdr filename + cdr trap + no cdr trap + cdr interval <1-2147483647> + ggsn dynamic + grx-dns-add A.B.C.D + timer [TNNNN] [(<0-2147483647>|default)] + no compression rfc1144 + compression rfc1144 active slots <1-256> + compression rfc1144 passive + no compression v42bis + compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250> + compression v42bis passive + iu rab-assign-addr-enc (x213|v4raw) + asn1 debug (1|0) + asn1 xer-print (1|0) +... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 18:36:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 18:36:12 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 to look at the new patch set (#2). Change subject: tests: Introduce vty-transcript-test tests ...................................................................... tests: Introduce vty-transcript-test tests Add a few commands to make sure it's working fine, and print all available timers with default values. Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 92 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/15/15215/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 18:52:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 18:52:30 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 to look at the new patch set (#3). Change subject: tests: Introduce vty-transcript-test tests ...................................................................... tests: Introduce vty-transcript-test tests Add a few commands to make sure it's working fine, and print all available timers with default values. Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 89 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/15/15215/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 19:00:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 19:00:47 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 to look at the new patch set (#4). Change subject: tests: Introduce vty-transcript-test tests ...................................................................... tests: Introduce vty-transcript-test tests Add a few commands to make sure it's working fine, and print all available timers with default values. Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 89 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/15/15215/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 19:07:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 14 Aug 2019 19:07:25 +0000 Subject: Change in ...libosmocore[master]: fsm: Quote received event token in logging line In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15154 ) Change subject: fsm: Quote received event token in logging line ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibeaeb046058777c2367e3cbfff0e00fc7e3a1640 Gerrit-Change-Number: 15154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 22:49:37 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 22:49:37 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c at 1747 PS2, Line 1747: mmctx->ran_type == MM_CTX_T_GERAN_Gb So OsmoSGSN would crash if mmctx->ran_type != MM_CTX_T_GERAN_Gb? Is it expected? The whole condition evaluates to (mmctx->ran_type != MM_CTX_T_GERAN_Gb || mmctx->gb.llme != NULL). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 22:49:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 22:53:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 22:53:54 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c at 1747 PS2, Line 1747: mmctx->ran_type == MM_CTX_T_GERAN_Gb > So OsmoSGSN would crash if mmctx->ran_type != MM_CTX_T_GERAN_Gb? Is it expected? [?] Oh, sorry, I was confused. Can we simplify the code a bit? if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) OSMO_ASSERT(mmctx->gb.llme == NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 22:53:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 22:55:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 22:55:10 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 ) Change subject: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f Gerrit-Change-Number: 15183 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 14 Aug 2019 22:55:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 22:56:16 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 22:56:16 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 22:56:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 22:56:56 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 22:56:56 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 ) Change subject: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d Gerrit-Change-Number: 15185 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 22:56:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:05:16 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 Change subject: fix TC_ho_int; make neighbor config more robust ...................................................................... fix TC_ho_int; make neighbor config more robust Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs" (I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those cells as neighbors that are explicitly listed, or all local cells if none are listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now regarded as invalid. The remote-cell neighbor is needed for inter-BSC handover tests; also consider that the TC_ho_neighbor_config_* tests each place individual neighbor configuration by live VTY interaction. Hence make all of these tests more robust: remove the neighbor config from the osmo-bsc.cfg file, and instead include VTY interaction for each test case that sets the particularly needed neighbor configuration at runtime. An analogous osmo-bsc.cfg change in docker-playground is in change If44dd6b578cdc55076c8180707d1c2d69fe5f2a8. (It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but remove that since it is also not needed anymore.) Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_LCLS.ttcn M bsc/osmo-bsc.cfg 3 files changed, 5 insertions(+), 157 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/15216/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4497a2e..e286905 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2863,6 +2863,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); + f_bts_0_cfg({"neighbor bts 1"}); var HandoverState hs := { rr_ho_cmpl_seen := false, @@ -2944,6 +2945,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3010,6 +3012,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3056,6 +3059,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3140,6 +3144,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -4357,131 +4362,6 @@ */ control { - /* CTRL interface testing */ - execute( TC_ctrl_msc_connection_status() ); - execute( TC_ctrl_msc0_connection_status() ); - execute( TC_ctrl() ); - if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER) { - execute( TC_ctrl_location() ); - } - - /* RSL DCHAN Channel ACtivation / Deactivation */ - execute( TC_chan_act_noreply() ); - execute( TC_chan_act_counter() ); - execute( TC_chan_act_ack_noest() ); - execute( TC_chan_act_ack_est_ind_noreply() ); - execute( TC_chan_act_ack_est_ind_refused() ); - execute( TC_chan_act_nack() ); - execute( TC_chan_exhaustion() ); - execute( TC_chan_deact_silence() ); - execute( TC_chan_rel_rll_rel_ind() ); - execute( TC_chan_rel_conn_fail() ); - execute( TC_chan_rel_hard_clear() ); - execute( TC_chan_rel_hard_clear_csfb() ); - execute( TC_chan_rel_hard_rlsd() ); - execute( TC_chan_rel_hard_rlsd_ms_dead() ); - execute( TC_chan_rel_a_reset() ); - - execute( TC_outbound_connect() ); - - /* Assignment related */ - execute( TC_assignment_cic_only() ); - execute( TC_assignment_csd() ); - execute( TC_assignment_ctm() ); - execute( TC_assignment_sign() ); - execute( TC_assignment_fr_a5_0() ); - execute( TC_assignment_fr_a5_1() ); - if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { - execute( TC_assignment_fr_a5_1_codec_missing() ); - } - execute( TC_assignment_fr_a5_3() ); - execute( TC_assignment_fr_a5_4() ); - execute( TC_ciph_mode_a5_0() ); - execute( TC_ciph_mode_a5_1() ); - execute( TC_ciph_mode_a5_3() ); - - execute( TC_assignment_codec_fr() ); - execute( TC_assignment_codec_hr() ); - execute( TC_assignment_codec_efr() ); - execute( TC_assignment_codec_amr_f() ); - execute( TC_assignment_codec_amr_h() ); - - if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { - execute( TC_assignment_codec_amr_f_S1() ); - execute( TC_assignment_codec_amr_h_S1() ); - execute( TC_assignment_codec_amr_f_S124() ); - execute( TC_assignment_codec_amr_h_S124() ); - execute( TC_assignment_codec_amr_f_S0() ); - execute( TC_assignment_codec_amr_f_S02() ); - execute( TC_assignment_codec_amr_f_S024() ); - execute( TC_assignment_codec_amr_f_S0247() ); - execute( TC_assignment_codec_amr_h_S0() ); - execute( TC_assignment_codec_amr_h_S02() ); - execute( TC_assignment_codec_amr_h_S024() ); - execute( TC_assignment_codec_amr_h_S0247() ); - execute( TC_assignment_codec_amr_f_S01234567() ); - execute( TC_assignment_codec_amr_f_S0234567() ); - execute( TC_assignment_codec_amr_f_zero() ); - execute( TC_assignment_codec_amr_f_unsupp() ); - execute( TC_assignment_codec_amr_h_S7() ); - } - - execute( TC_assignment_codec_fr_exhausted_req_hr() ); - execute( TC_assignment_codec_fr_exhausted_req_fr() ); - execute( TC_assignment_codec_fr_exhausted_req_fr_hr() ); - execute( TC_assignment_codec_fr_exhausted_req_hr_fr() ); - execute( TC_assignment_codec_hr_exhausted_req_fr() ); - execute( TC_assignment_codec_hr_exhausted_req_hr() ); - execute( TC_assignment_codec_hr_exhausted_req_hr_fr() ); - execute( TC_assignment_codec_hr_exhausted_req_fr_hr() ); - execute( TC_assignment_codec_req_hr_fr() ); - execute( TC_assignment_codec_req_fr_hr() ); - - if (mp_enable_osmux_test) { - execute( TC_assignment_osmux() ); - } - - /* RLL Establish Indication on inactive DCHAN / SAPI */ - execute( TC_rll_est_ind_inact_lchan() ); - execute( TC_rll_est_ind_inval_sapi1() ); - execute( TC_rll_est_ind_inval_sapi3() ); - execute( TC_rll_est_ind_inval_sacch() ); - - /* Paging related tests */ - execute( TC_paging_imsi_nochan() ); - execute( TC_paging_tmsi_nochan() ); - execute( TC_paging_tmsi_any() ); - execute( TC_paging_tmsi_sdcch() ); - execute( TC_paging_tmsi_tch_f() ); - execute( TC_paging_tmsi_tch_hf() ); - execute( TC_paging_imsi_nochan_cgi() ); - execute( TC_paging_imsi_nochan_lac_ci() ); - execute( TC_paging_imsi_nochan_ci() ); - execute( TC_paging_imsi_nochan_lai() ); - execute( TC_paging_imsi_nochan_lac() ); - execute( TC_paging_imsi_nochan_all() ); - execute( TC_paging_imsi_nochan_plmn_lac_rnc() ); - execute( TC_paging_imsi_nochan_rnc() ); - execute( TC_paging_imsi_nochan_lac_rnc() ); - execute( TC_paging_imsi_nochan_lacs() ); - execute( TC_paging_imsi_nochan_lacs_empty() ); - execute( TC_paging_imsi_nochan_cgi_unknown_cid() ); - execute( TC_paging_imsi_a_reset() ); - execute( TC_paging_imsi_load() ); - execute( TC_paging_counter() ); - execute( TC_paging_resp_unsol() ); - - execute( TC_rsl_drop_counter() ); - execute( TC_rsl_unknown_unit_id() ); - - execute( TC_oml_unknown_unit_id() ); - - execute( TC_classmark() ); - execute( TC_unsol_ass_fail() ); - execute( TC_unsol_ass_compl() ); - execute( TC_unsol_ho_fail() ); - execute( TC_err_82_short_msg() ); - execute( TC_err_84_unknown_msg() ); execute( TC_ho_int() ); @@ -4504,21 +4384,6 @@ execute( TC_ho_neighbor_config_6() ); execute( TC_ho_neighbor_config_7() ); - execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); - execute( TC_bssmap_clear_does_not_cause_bssmap_reset() ); - execute( TC_ms_rel_ind_does_not_cause_bssmap_reset() ); - - execute( TC_dyn_pdch_ipa_act_deact() ); - execute( TC_dyn_pdch_ipa_act_nack() ); - execute( TC_dyn_pdch_osmo_act_deact() ); - execute( TC_dyn_pdch_osmo_act_nack() ); - - execute( TC_chopped_ipa_ping() ); - execute( TC_chopped_ipa_payload() ); - - /* at bottom as they might crash OsmoBSC before OS#3182 is fixed */ - execute( TC_early_conn_fail() ); - execute( TC_late_conn_fail() ); } diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 6087133..c57cbfa 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -739,21 +739,6 @@ control { - execute( TC_lcls_gcr_only() ); - execute( TC_lcls_gcr_bway_connect() ); - execute( TC_lcls_gcr_bway_connect_hr() ); - execute( TC_lcls_gcr_bway_codec_mismatch() ); - execute( TC_lcls_gcr_nomatch_bway_connect() ); - execute( TC_lcls_gcr_bway_dont_connect() ); - execute( TC_lcls_gcr_unsuppported_cfg() ); - execute( TC_lcls_gcr_unsuppported_csc() ); - execute( TC_lcls_gcr_bway_dont_connect_csc() ); - execute( TC_lcls_connect_break() ); - execute( TC_lcls_connect_clear() ); - - execute( TC_lcls_bts_gcr_bway_connect() ); - execute( TC_lcls_bts_gcr_bway_connect_hr() ); - execute( TC_lcls_bts_connect_break() ); } diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 9384491..74fe255 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -88,8 +88,6 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 - # remote-BSS neighbor: - neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 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: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:05:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 23:05:40 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 ) Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at a139 PS2, Line 139: Maybe we should rather keep only one function? The only difference between the both is that we call mmctx_change_gtpu_endpoints_to_sgsn() if (ctx->ran_type == MM_CTX_T_UTRAN_Iu && state == PMM_IDLE). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:05:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:05:43 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:05:43 +0000 Subject: Change in ...docker-playground[master]: apply osmo-bsc.cfg changes from osmo-ttcn3-hacks Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15217 Change subject: apply osmo-bsc.cfg changes from osmo-ttcn3-hacks ...................................................................... apply osmo-bsc.cfg changes from osmo-ttcn3-hacks Analogous to osmo-ttcn3-hacks patch If44dd6b578cdc55076c8180707d1c2d69fe5f2a8, also remove the neighbor config from osmo-bsc.cfg here. Change-Id: I23d9a2046709452f4d3904230871f7421c6987a9 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/17/15217/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 6cfaf7c..5bb1525 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -96,8 +96,6 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 - # remote-BSS neighbor: - neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I23d9a2046709452f4d3904230871f7421c6987a9 Gerrit-Change-Number: 15217 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:07:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:07:55 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 to look at the new patch set (#2). Change subject: fix TC_ho_int; make neighbor config more robust ...................................................................... fix TC_ho_int; make neighbor config more robust Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs" (I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those cells as neighbors that are explicitly listed, or all local cells if none are listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now regarded as invalid. The remote-cell neighbor is needed for inter-BSC handover tests; also consider that the TC_ho_neighbor_config_* tests each place individual neighbor configuration by live VTY interaction. Hence make all of these tests more robust: remove the neighbor config from the osmo-bsc.cfg file, and instead include VTY interaction for each test case that sets the particularly needed neighbor configuration at runtime. An analogous osmo-bsc.cfg change in docker-playground is in change If44dd6b578cdc55076c8180707d1c2d69fe5f2a8. (It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but remove that since it is also not needed anymore.) Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 --- M bsc/BSC_Tests.ttcn M bsc/osmo-bsc.cfg 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/15216/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 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: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:08:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:08:34 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 ) Change subject: fix TC_ho_int; make neighbor config more robust ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 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: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:08:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:09:09 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:09:09 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 ) Change subject: fix TC_ho_int; make neighbor config more robust ...................................................................... Patch Set 2: +2 to self to fix a ttcn3-bsc-test failure -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 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: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:09:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:10:03 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:10:03 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 ) Change subject: fix TC_ho_int; make neighbor config more robust ...................................................................... fix TC_ho_int; make neighbor config more robust Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs" (I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those cells as neighbors that are explicitly listed, or all local cells if none are listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now regarded as invalid. The remote-cell neighbor is needed for inter-BSC handover tests; also consider that the TC_ho_neighbor_config_* tests each place individual neighbor configuration by live VTY interaction. Hence make all of these tests more robust: remove the neighbor config from the osmo-bsc.cfg file, and instead include VTY interaction for each test case that sets the particularly needed neighbor configuration at runtime. An analogous osmo-bsc.cfg change in docker-playground is in change If44dd6b578cdc55076c8180707d1c2d69fe5f2a8. (It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but remove that since it is also not needed anymore.) Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 --- M bsc/BSC_Tests.ttcn M bsc/osmo-bsc.cfg 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4497a2e..09c5e5c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2863,6 +2863,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); + f_bts_0_cfg({"neighbor bts 1"}); var HandoverState hs := { rr_ho_cmpl_seen := false, @@ -2944,6 +2945,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3010,6 +3012,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3056,6 +3059,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3140,6 +3144,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); + f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 9384491..74fe255 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -88,8 +88,6 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 - # remote-BSS neighbor: - neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 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: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:10:35 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:10:35 +0000 Subject: Change in ...docker-playground[master]: apply osmo-bsc.cfg changes from osmo-ttcn3-hacks In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15217 ) Change subject: apply osmo-bsc.cfg changes from osmo-ttcn3-hacks ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I23d9a2046709452f4d3904230871f7421c6987a9 Gerrit-Change-Number: 15217 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:10:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:10:40 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:10:40 +0000 Subject: Change in ...docker-playground[master]: apply osmo-bsc.cfg changes from osmo-ttcn3-hacks In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15217 ) Change subject: apply osmo-bsc.cfg changes from osmo-ttcn3-hacks ...................................................................... apply osmo-bsc.cfg changes from osmo-ttcn3-hacks Analogous to osmo-ttcn3-hacks patch If44dd6b578cdc55076c8180707d1c2d69fe5f2a8, also remove the neighbor config from osmo-bsc.cfg here. Change-Id: I23d9a2046709452f4d3904230871f7421c6987a9 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 6cfaf7c..5bb1525 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -96,8 +96,6 @@ early-classmark-sending forbidden ip.access unit_id 1234 0 oml ip.access stream_id 255 line 0 - # remote-BSS neighbor: - neighbor lac 99 arfcn 123 bsic any neighbor-list mode manual-si5 neighbor-list add arfcn 100 neighbor-list add arfcn 200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I23d9a2046709452f4d3904230871f7421c6987a9 Gerrit-Change-Number: 15217 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:13:44 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 23:13:44 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 ) Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm.c at 109 PS1, Line 109: gprs_pmm_state_names You could just use OSMO_VALUE_STRING(x) here. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:13:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:14:15 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 23:14:15 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Check timers can be set over VTY In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 ) Change subject: tests: Check timers can be set over VTY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:14:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:18:07 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 23:18:07 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:18:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:19:33 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 23:19:33 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 ) Change subject: tests: Introduce vty-transcript-test tests ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:19:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:20:25 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:20:25 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c at 1747 PS2, Line 1747: mmctx->ran_type == MM_CTX_T_GERAN_Gb > Oh, sorry, I was confused. Can we simplify the code a bit? [?] I'm also confused. The condition matching the current patch would have to be if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) OSMO_ASSERT(mmctx->gb.llme); But it makes no sense when reading the comment above it. To make sure of no dangling pointers I also expected an 'gb.llme = NULL' assignment instead of an assert? Pau, can you explain better what the intention is and possibly fix the condition? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:20:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:21:38 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:21:38 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 2: Code-Review+2 why is that even in there... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:21:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:21:59 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:21:59 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 ) Change subject: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d Gerrit-Change-Number: 15185 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:21:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:31:57 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 14 Aug 2019 23:31:57 +0000 Subject: Change in ...osmo-trx[master]: osmo-trx: log to stderr on signal received In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15210 ) Change subject: osmo-trx: log to stderr on signal received ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c Gerrit-Change-Number: 15210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:31:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:39:43 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:39:43 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 ) Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... Patch Set 2: (7 comments) I'm advocating for OSMO_ASSERTS(); they would probably give us more SGSN crashes, but then we stand a chance of finding bugs related to a subscriber switching RAN types. The aim could also be to not crash and instead log errors and detach the subscriber, not so sure. https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 140 PS2, Line 140: { Vadim's idea seems very good, and I would add: Place an OSMO_ASSERT for matching RAN type to catch all bugs that mix and mess it up. (Am not aware of the callers but would assume no mismatching RAN type state should ever be passed to this.) https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 153 PS2, Line 153: case PMM_CONNECTED: (while at it we could lose this 'case', or even make the entire switch into an if()) https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 204 PS2, Line 204: mmctx_set_pmm_state(mm, PMM_IDLE); how could a RANAP_IU_EVENT come in on a ran_type != MM_CTX_T_UTRAN_Iu? I guess that should be an OSMO_ASSERT()? https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 1096 PS2, Line 1096: case GSM48_MT_GMM_SERVICE_REQ: again this looks like it is clearly related to Iu and ran_type should always be UTRAN_Iu? https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 2084 PS2, Line 2084: mmctx->gmm_state = GMM_REGISTERED_NORMAL; I know this was in the code before, but it seems to overwrite the previous state. Both RAN types set the state after this, so this is redundant and may confuse logging? (It says "Changing state from X to Y", where the X is here always GMM_REGISTERED_NORMAL, although the state would have been something else before overwriting?) https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 2097 PS2, Line 2097: case MM_CTX_T_GERAN_Iu: (instead of all of these dead switch cases, maybe we should rather "#if 0" away the unused enum member) https://gerrit.osmocom.org/#/c/15186/2/src/gprs/gprs_gmm.c at 2116 PS2, Line 2116: mmctx->gmm_state = GMM_REGISTERED_NORMAL; (again weird overwriting of the current state, like above) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:39:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:52:46 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:52:46 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 ) Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Patch Set 1: Code-Review+1 (4 comments) https://gerrit.osmocom.org/#/c/15211/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/15211/1/include/osmocom/sgsn/gprs_sgsn.h at 264 PS1, Line 264: #define LOGIUP(level, ue, fmt, args...) \ (cosmetic) hmm, I see that LOGMMCTXP() also has level as first arg, but AFAIK all the rest of the Osmocom code base uses this order: LOGFOO(object, level, fmt, args...) Probably not worth the effort, but I'd prefer new LOG macros to be consistent with that ordering, and maybe one day use sed to adjust LOGMMCTXP() to that order as well...? https://gerrit.osmocom.org/#/c/15211/1/include/osmocom/sgsn/gprs_sgsn.h at 284 PS1, Line 284: (in osmo-msc and -bsc I named the logging macros more like LOG_HO and LOG_MSC_A, for readability. Here that would be LOG_IU, LOG_GB... I'd prefer that but you decide.) https://gerrit.osmocom.org/#/c/15211/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15211/1/src/gprs/gprs_gmm.c at 185 PS1, Line 185: LOGIUP(LOGL_NOTICE, ctx, "Cannot find mm ctx for IU event %d\n", type); \ (we have a value string for those events, see ranap_iu_event_type_str() from iu_client.h) https://gerrit.osmocom.org/#/c/15211/1/src/gprs/gprs_gmm.c at 221 PS1, Line 221: LOGIUP(LOGL_NOTICE, ctx, "Unknown event received: %i\n", type); ranap_iu_event_type_str()? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:52:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 14 23:55:30 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 14 Aug 2019 23:55:30 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 ) Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm.c at 110 PS1, Line 110: { PMM_DETACHED, "PMM_DETACH" }, maybe while at it fix to "PMM_DETACHED" (or what Vadim said) https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm_attach.c at 328 PS1, Line 328: { E_VLR_ANSWERED, "VLR_ANSWERED"}, (this could also use OSMO_VALUE_STRING(); IMHO it's an advantage to print exactly the event names as found in the code) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 14 Aug 2019 23:55:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:00:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:00:02 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Check timers can be set over VTY In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 ) Change subject: tests: Check timers can be set over VTY ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/15213/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15213/1//COMMIT_MSG at 7 PS1, Line 7: tests: Check timers can be set over VTY you mean "add tests to verify that...", right? (I didn't understand when I read it) https://gerrit.osmocom.org/#/c/15213/1/tests/vty_test_runner.py File tests/vty_test_runner.py: https://gerrit.osmocom.org/#/c/15213/1/tests/vty_test_runner.py at 277 PS1, Line 277: self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) I would encourage to instead add vty transcript tests. They are far easier to maintain... You can easily copy-paste the Makefile.am bits from osmo-msc and add a timers.vty file. Or maybe next time. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 00:00:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:18:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:18:34 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 1: Code-Review-1 (2 comments) nice! https://gerrit.osmocom.org/#/c/15214/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15214/1/src/gprs/gprs_gmm.c at 475 PS1, Line 475: t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); Hmm, I just notice a flaw in the osmo_tdef() API. The val_if_not_present argument is an unsigned long, and I see -1 explicitly in the API docs, indicating that a negative value causes a program abort if no timer is found. That is in fact not possible with an unsigned long arg. I created https://osmocom.org/issues/4152 for this. https://gerrit.osmocom.org/#/c/15214/1/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/15214/1/src/gprs/gprs_gmm_attach.c at 15 PS1, Line 15: static const struct osmo_tdef_state_timeout gmm_attach_fsm_timeouts[] = { -1: you *have* to explicitly use an array size of [32] to be safe. See osmo_tdef_get_state_timeout() API doc. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 00:18:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:20:11 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:20:11 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Check timers can be set over VTY In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 ) Change subject: tests: Check timers can be set over VTY ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15213/1/tests/vty_test_runner.py File tests/vty_test_runner.py: https://gerrit.osmocom.org/#/c/15213/1/tests/vty_test_runner.py at 277 PS1, Line 277: self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) > I would encourage to instead add vty transcript tests. They are far easier to maintain... [?] Oh wait, you actually did add transcript tests in a later patch! :D -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 00:20:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:21:08 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:21:08 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 ) Change subject: tests: Introduce vty-transcript-test tests ...................................................................... Patch Set 4: Code-Review+2 excellent! -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 00:21:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:28:08 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:28:08 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 1: (2 comments) agree to fix the Change-Id duality, otherwise +1 from me https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c at 328 PS1, Line 328: LOGP(DMSC, LOGL_ERROR, "Got paged but no subscriber found, will now (blindly) deliver the paging response to the first configured MSC!\n"); s/Got paged/Got Paging Response ? https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c at 358 PS1, Line 358: * blindly. */ > As commented on other patch, shouldn't this be VTY configurable? (to which MSC send them). This entire code looks like weird legacy bsc-nat stuff, I've never used osmo-bsc with more than one MSC. I think it makes a lot of sense to send the CSFB Paging Response to The One MSC. The entire going through lists of MSCs is a legacy nonsense that we should probably remove anyway. Correct me if I'm wrong (laforge?) but I think we don't need more vty for multiple MSC scenarios. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 00:28:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:29:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:29:53 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: Change test-expectation of TC_paging_resp_unsol In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 ) Change subject: BSC_Tests: Change test-expectation of TC_paging_resp_unsol ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15208/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/15208/1/bsc/BSC_Tests.ttcn at 1631 PS1, Line 1631: /* Expevct a CR with a matching Paging response on the A-Interface */ (typo) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 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: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe Gerrit-Change-Number: 15208 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 00:29:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:32:41 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:32:41 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: SGSN: introduce f_send_l3() to allow one function for Gb & Iu In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15171 ) Change subject: SGSN: introduce f_send_l3() to allow one function for Gb & Iu ...................................................................... Patch Set 1: Code-Review+1 what's up with the [gb_idx >= NUM_GB] conditions? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15171 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: If47ad2be459ca7b87d9071d9ff020a51821e4433 Gerrit-Change-Number: 15171 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 00:32:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:40:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:40:02 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 12: Code-Review+1 (2 comments) non-mandatory stuff... https://gerrit.osmocom.org/#/c/15120/12/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/12/src/libmsc/msc_vty.c at 309 PS12, Line 309: "Disable Call Waiting on the Network\n") (could follow up with a longer description like "...: while a call is active, reject all other incoming calls") https://gerrit.osmocom.org/#/c/15120/12/tests/test_nodes.vty File tests/test_nodes.vty: https://gerrit.osmocom.org/#/c/15120/12/tests/test_nodes.vty at 30 PS12, Line 30: it would also be nice to add tests that ensure the write-back works: OsmoMSC(config-net)# show running-config ... call-waiting ... OsmoMSC(config-net)# no call-waiting OsmoMSC(config-net)# show running-config ... no call-waiting ... OsmoMSC(config-net)# call-waiting OsmoMSC(config-net)# show running-config ... call-waiting ... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 15 Aug 2019 00:40:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 00:43:27 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 00:43:27 +0000 Subject: Change in ...osmo-sgsn[master]: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 ) Change subject: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp ...................................................................... Patch Set 5: (1 comment) hmm, I can't vote here because... https://gerrit.osmocom.org/#/c/13929/5/src/gprs/sgsn_libgtp.c File src/gprs/sgsn_libgtp.c: https://gerrit.osmocom.org/#/c/13929/5/src/gprs/sgsn_libgtp.c at 543 PS5, Line 543: struct sgsn_pdp_ctx *pctx = cbp; I wish I knew why there's a pdp_t *and* a separate sgsn_pdp_ctx -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I184dcce27b26104c61d80b2d910388d5d3323def Gerrit-Change-Number: 13929 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 00:43:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 01:01:59 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 01:01:59 +0000 Subject: Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15218 Change subject: osmo_tdef_get(): allow passing -1 as default timeout ...................................................................... osmo_tdef_get(): allow passing -1 as default timeout The intention of osmo_tdef_get()'s val_if_not_present argument was to return a default timeout, or to optionally abort the program for missing timer definitions if the default timeout is < 0. This was the case in the original implementation of this API in osmo-bsc, but in the migration to libosmocore, the argument was by accident changed to an unsigned type. In consequence, the assertion in the implementation that was intended to abort the program seemed bogus to coverity, and was fixed by removal in I7a544d2d43b83135def296674f777e48fe5fd80a -- the wrong direction, as is obvious from the API doc for osmo_tdef_get(). Note that osmo-bsc master passes -1 in various places and expects the program-abort behavior that was missing from the libosmocore implementation. Change the val_if_not_present argument to a signed type, and revert removal of the assertion, so that passing -1 has the effect described in the API doc: program abort on missing timer definition. This bug was not detected because it is hard to write tests that expect a program abort to happen, hence no tests for this API feature exist. Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 --- M TODO-RELEASE M include/osmocom/core/tdef.h M src/tdef.c 3 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/15218/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..665ecf7 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +core osmo_tdef_get() change val_if_not_present arg from unsigned long to long to allow passing -1 diff --git a/include/osmocom/core/tdef.h b/include/osmocom/core/tdef.h index c8d9053..566f5dd 100644 --- a/include/osmocom/core/tdef.h +++ b/include/osmocom/core/tdef.h @@ -95,7 +95,7 @@ void osmo_tdefs_reset(struct osmo_tdef *tdefs); unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, - unsigned long val_if_not_present); + long val_if_not_present); struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T); /*! Using osmo_tdef for osmo_fsm_inst: array entry for a mapping of state numbers to timeout definitions. diff --git a/src/tdef.c b/src/tdef.c index 3cfb17c..40a9900 100644 --- a/src/tdef.c +++ b/src/tdef.c @@ -183,10 +183,11 @@ * \param[in] val_if_not_present Fallback value to return if no timeout is defined. * \return Timeout value in the unit given by as_unit, rounded up if necessary, or val_if_not_present. */ -unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, unsigned long val_if_not_present) +unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, long val_if_not_present) { const struct osmo_tdef *t = osmo_tdef_get_entry((struct osmo_tdef*)tdefs, T); if (!t) { + OSMO_ASSERT(val_if_not_present >= 0); return val_if_not_present; } return osmo_tdef_round(t->val, t->unit, as_unit); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 01:03:08 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 15 Aug 2019 01:03:08 +0000 Subject: Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/15218 ) Change subject: osmo_tdef_get(): allow passing -1 as default timeout ...................................................................... osmo_tdef_get(): allow passing -1 as default timeout The intention of osmo_tdef_get()'s val_if_not_present argument was to return a default timeout, or to optionally abort the program for missing timer definitions if the default timeout is < 0. This was the case in the original implementation of this API in osmo-bsc, but in the migration to libosmocore, the argument was by accident changed to an unsigned type. In consequence, the assertion in the implementation that was intended to abort the program seemed bogus to coverity, and was fixed by removal in I7a544d2d43b83135def296674f777e48fe5fd80a -- the wrong direction, as is obvious from the API doc for osmo_tdef_get(). Note that osmo-bsc master passes -1 in various places and expects the program-abort behavior that was missing from the libosmocore implementation. Change the val_if_not_present argument to a signed type, and revert removal of the assertion, so that passing -1 has the effect described in the API doc: program abort on missing timer definition. This bug was not detected because it is hard to write tests that expect a program abort to happen, hence no tests for this API feature exist. Related: OS#4152 Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 --- M TODO-RELEASE M include/osmocom/core/tdef.h M src/tdef.c 3 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/15218/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 07:00:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 15 Aug 2019 07:00:08 +0000 Subject: Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15218 ) Change subject: osmo_tdef_get(): allow passing -1 as default timeout ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15218/2/src/tdef.c File src/tdef.c: https://gerrit.osmocom.org/#/c/15218/2/src/tdef.c at 186 PS2, Line 186: osmo_tdef_get Alternatively, you could add another function without that optional parameter, so it would simply crash the process if (t == NULL), while this function would always return the val_if_not_present. Just an idea. The current approach also looks good. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 15 Aug 2019 07:00:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 07:03:58 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 15 Aug 2019 07:03:58 +0000 Subject: Change in ...libosmocore[master]: add vty logp command to echo on all log targets In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14986 ) Change subject: add vty logp command to echo on all log targets ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9 Gerrit-Change-Number: 14986 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 07:03:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 07:42:57 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 15 Aug 2019 07:42:57 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 12: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15120/12/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/12/src/libmsc/msc_vty.c at 296 PS12, Line 296: call-waiting BTW: if I am not mistaken, in commercial networks this parameter is stored in the HLR, for each subscriber individually. Subscribers can manage Call Waiting using special SS (Supplementary Services) commands: *#43# - check the service activation status, *43# - activate Call Waiting, #43# - deactivate. I am fine with having this parameter here, but some day we would need to have a proper SS support ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 15 Aug 2019 07:42:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 07:49:06 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 15 Aug 2019 07:49:06 +0000 Subject: Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. ...................................................................... Patch Set 12: (1 comment) https://gerrit.osmocom.org/#/c/15120/12/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/12/src/libmsc/msc_vty.c at 296 PS12, Line 296: call-waiting > BTW: if I am not mistaken, in commercial networks this parameter is stored in the HLR, for each subs [?] +1 :) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 15 Aug 2019 07:49:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:16:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 09:16:49 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15167/2/src/gprs/gprs_gmm.c at 1747 PS2, Line 1747: mmctx->ran_type == MM_CTX_T_GERAN_Gb > I'm also confused. [?] This is an assert I add to try to catch keith's osmo-sgsn isntance crashing (we started debugging it in OsmoDevCon). I don't want to directly workaround the issue, I really want osmo-sgsn to assert and exit in this situation, so we can make sure this is the condition he's hitting. Since lots of subscribers are using the sgsn at that time, it's impossible otherwise to find out. Killing osmo-sgsn here is not a big issue since anyway it would crash later on due to the bug we spotted. Regarding the assert condition: If ran_type is MM_CTX_T_UTRAN_Iu, it's perfectly fine to have a null llme, so I really want to check in the Gb case (because anyway that's what's deployed in the setup where we saw the crash). I want to make sure that "it doesn't happen that llme is NULL when on Gb", and the condition expresses so. The expression I'm using is exactly the same you are proposing. But Ok, I'll change it if you think it's simpler. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 15 Aug 2019 09:16:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:29:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 09:29:15 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 ) Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/15211/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/15211/1/include/osmocom/sgsn/gprs_sgsn.h at 264 PS1, Line 264: #define LOGIUP(level, ue, fmt, args...) \ > (cosmetic) [?] Yes I also noticed that. Fine, I'll try to change the order for new macros. https://gerrit.osmocom.org/#/c/15211/1/include/osmocom/sgsn/gprs_sgsn.h at 284 PS1, Line 284: > (in osmo-msc and -bsc I named the logging macros more like LOG_HO and LOG_MSC_A, for readability. [?] That depends on the project. I still to currently used one here, and it takes less space too. https://gerrit.osmocom.org/#/c/15211/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15211/1/src/gprs/gprs_gmm.c at 185 PS1, Line 185: LOGIUP(LOGL_NOTICE, ctx, "Cannot find mm ctx for IU event %d\n", type); \ > (we have a value string for those events, see ranap_iu_event_type_str() from iu_client. [?] Probably deserves a different patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 09:29:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:30:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 09:30:03 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 ) Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm.c at 110 PS1, Line 110: { PMM_DETACHED, "PMM_DETACH" }, > maybe while at it fix to "PMM_DETACHED" (or what Vadim said) I'll use OSMO_VALUE_STRING, thanks. https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/15212/1/src/gprs/gprs_gmm_attach.c at 328 PS1, Line 328: { E_VLR_ANSWERED, "VLR_ANSWERED"}, > (this could also use OSMO_VALUE_STRING(); IMHO it's an advantage to print exactly the event names as [?] ACK -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 15 Aug 2019 09:30:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:33:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 09:33:41 +0000 Subject: Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15218 ) Change subject: osmo_tdef_get(): allow passing -1 as default timeout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 09:33:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:35:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 09:35:01 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15214/1/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/15214/1/src/gprs/gprs_gmm_attach.c at 15 PS1, Line 15: static const struct osmo_tdef_state_timeout gmm_attach_fsm_timeouts[] = { > -1: you *have* to explicitly use an array size of [32] to be safe. [?] Would be great having a define for that ;) I actually looked in the doc while writing the patch because I saw some code with the 32 in there, but I didn't find it :( -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 09:35:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:47:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:47:31 +0000 Subject: Change in ...osmo-sgsn[master]: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 ) Change subject: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/13929/5/src/gprs/sgsn_libgtp.c File src/gprs/sgsn_libgtp.c: https://gerrit.osmocom.org/#/c/13929/5/src/gprs/sgsn_libgtp.c at 543 PS5, Line 543: struct sgsn_pdp_ctx *pctx = cbp; > I wish I knew why there's a pdp_t *and* a separate sgsn_pdp_ctx because the 'pdp_t' represents a libgtp library data structure and the sgsn_pdp_ctx is the data structure of the application. You cannot expect the library to contain all the application-layer context or vice-versa... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I184dcce27b26104c61d80b2d910388d5d3323def Gerrit-Change-Number: 13929 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 09:47:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:49:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:49:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: Add commented-out section for using custom TITAN In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 ) Change subject: start-testsuite.sh: Add commented-out section for using custom TITAN ...................................................................... start-testsuite.sh: Add commented-out section for using custom TITAN Sometimes it's useful to test with a non-installed locally-compiled version of Eclipse TITAN. This adds an example on how to do that. Change-Id: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a --- M start-testsuite.sh 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index 54332bb..e5bc756 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -36,8 +36,16 @@ TEST=$3 fi +# this is an example for using a non-installed custom (e.g. git master) TITAN +#TTCN3_DIR="/home/laforge/projects/git/titan/titan.core/Install" +#export TTCN3_DIR +#TITAN_LIBRARY_PATH="$TTCN3_DIR/lib" +#TTCN3_BIN_DIR="$TTCN3_DIR/bin" + +# below is for the debian packages +TTCN3_BIN_DIR="/usr/bin" TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" -LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" "$TTCN3_BIN_DIR/ttcn3_start" $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15192 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: I6a8c26becff868a3d2fcd3a01e2c03adfc748e0a Gerrit-Change-Number: 15192 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:49:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:49:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: initial skeleton for MME / SGsAP tetss In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15193 ) Change subject: mme: initial skeleton for MME / SGsAP tetss ...................................................................... mme: initial skeleton for MME / SGsAP tetss Change-Id: Idbd54838daaf12acccc3253dc4278de75eaaaf31 --- M library/SGsAP_Emulation.ttcn A mme/MME_Tests.ttcn A mme/MME_Tests_SGsAP.ttcn A mme/gen_links.sh A mme/regen_makefile.sh 5 files changed, 385 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn index f91e076..6cd1052 100644 --- a/library/SGsAP_Emulation.ttcn +++ b/library/SGsAP_Emulation.ttcn @@ -47,6 +47,12 @@ inout PDU_SGsAP, PDU_ML3_MS_NW, PDU_ML3_NW_MS; } with { extension "internal" }; +/* global test port e.g. for non-imsi/conn specific messages */ +type port SGsAP_PT message { + inout PDU_SGsAP; +} with { extension "internal" }; + + /* represents a single SGsAP Association */ type record AssociationData { SGsAP_ConnHdlr comp_ref, @@ -66,6 +72,8 @@ var ExpectData SgsapExpectTable[8]; /* procedure based port to register for incoming connections */ port SGsAPEM_PROC_PT SGsAP_PROC; + /* test port for unit data messages */ + port SGsAP_PT SGsAP_UNIT; var charstring g_sgsap_id; var integer g_sgsap_conn_id := -1; diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn new file mode 100644 index 0000000..3ba0677 --- /dev/null +++ b/mme/MME_Tests.ttcn @@ -0,0 +1,118 @@ +/* MME (Mobility Management Engine) test suite in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module MME_Tests { + +import from SGsAP_Types all; +import from SGsAP_Templates all; +import from SGsAP_Emulation all; + +import from L3_Templates all; +import from DNS_Helpers all; + +friend module MME_Tests_SGsAP; + +type component MTC_CT { + var SGsAP_Emulation_CT vc_SGsAP; + port SGsAP_PT SGsAP_UNIT; + port SGsAPEM_PROC_PT SGsAP_PROC; +} + +type component ConnHdlr extends SGsAP_ConnHdlr { + var ConnHdlrPars g_pars; + timer g_Tguard := 30.0; +} + +type record ConnHdlrPars { + hexstring imsi +} + +modulepar { + charstring mp_sgs_local_ip := "127.0.0.1"; + integer mp_sgs_local_port := 29118; + charstring mp_vlr_name := "vlr.example.net"; + charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; +} + +/* send incoming unit data messages (like reset) to global SGsAP_UNIT port */ +friend function ForwardUnitdataCallback(PDU_SGsAP msg) +runs on SGsAP_Emulation_CT return template PDU_SGsAP { + SGsAP_UNIT.send(msg); + return omit; +} + +friend function f_init_sgsap(charstring id) runs on MTC_CT { + id := id & "-SGsAP"; + var SGsAPOps ops := { + create_cb := refers(SGsAP_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(ForwardUnitdataCallback) + } + var SGsAP_conn_parameters pars := { + remote_ip := "", + remote_sctp_port := -1, + local_ip := mp_sgs_local_ip, + local_sctp_port := mp_sgs_local_port + } + + vc_SGsAP := SGsAP_Emulation_CT.create(id); + map(vc_SGsAP:SGsAP, system:SGsAP_CODEC_PT); + connect(vc_SGsAP:SGsAP_PROC, self:SGsAP_PROC); + connect(vc_SGsAP:SGsAP_UNIT, self:SGsAP_UNIT); + vc_SGsAP.start(SGsAP_Emulation.main(ops, pars, id)); +} + +/* generate parameters for a connection handler */ +friend function f_init_pars(integer imsi_suffix) +runs on MTC_CT return ConnHdlrPars { + var ConnHdlrPars pars := { + imsi := f_gen_imsi(imsi_suffix) + }; + return pars; +} + +type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; + +/* start a connection handler with given parameters */ +friend function f_start_handler_with_pars(void_fn fn, ConnHdlrPars pars, integer s1ap_idx := 0) +runs on MTC_CT return ConnHdlr { + var ConnHdlr vc_conn; + var charstring id := testcasename() & int2str(s1ap_idx); + + vc_conn := ConnHdlr.create(id); + /* SGsAP part */ + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + + /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have + * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ + vc_conn.start(derefers(fn)(pars)); + return vc_conn; +} + +/* altstep for the global guard timer */ +private altstep as_Tguard()runs on ConnHdlr { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +friend function f_init_handler(ConnHdlrPars pars, float t_guard := 30.0) runs on ConnHdlr { + /* make parameters available via component variable */ + g_pars := pars; + /* start guard timre and activate it as default */ + g_Tguard.start(t_guard); + activate(as_Tguard()); + /* Route all SGsAP mesages for our IMSIto us */ + f_create_sgsap_expect(pars.imsi); +} + + +} diff --git a/mme/MME_Tests_SGsAP.ttcn b/mme/MME_Tests_SGsAP.ttcn new file mode 100644 index 0000000..935a59e --- /dev/null +++ b/mme/MME_Tests_SGsAP.ttcn @@ -0,0 +1,210 @@ +module MME_Tests_SGsAP { + +/* Osmocom MME test suite in in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from SGsAP_Types all; +import from SGsAP_Templates all; +import from SGsAP_Emulation all; + +import from General_Types all; +import from Osmocom_Types all; +import from L3_Templates all; +import from DNS_Helpers all; +import from MME_Tests all; + +/* performa SGs reset procedure */ +function f_sgsap_vlr_reset() runs on ConnHdlr { + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); + + SGsAP.send(ts_SGsAP_RESET_IND_VLR(vlr_name)); + alt { + [] SGsAP.receive(tr_SGsAP_RESET_ACK(mme_name, vlr_name)) { + setverdict(pass); + } + [] SGsAP.receive(tr_SGsAP_RESET_ACK(?, ?)) { + setverdict(fail, "Received unexpected VLR/MME name in SGsAP RESET ACK"); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected response to SGsAP RESET"); + } + } +} + +/* perform a SGs paging procedure */ +function f_sgsap_page(Service_Indicator serv_ind, template (omit) OCT4 tmsi, + template (omit) SGs_Cause exp_cause) runs on ConnHdlr { + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var boolean exp_success := true; + var PDU_SGsAP rx; + if (not istemplatekind(exp_cause, "omit")) { + exp_success := false; + } + SGsAP.send(ts_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, serv_ind, tmsi)); + alt { + /* we expect success */ + [exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + setverdict(pass); + } + [exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + setverdict(fail, "Received unexpected PAGING REJECT"); + } + /* we expect failure */ + [not exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + setverdict(fail, "Received SERVICE REQ waiting for PAGING REJECT"); + } + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, exp_cause)) { + setverdict(pass); + } + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + setverdict(fail, "Received unexpected PAGING REJECT cause"); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected SgSAP"); + } + } +} + +/* perform a SGs alert procedure */ +function f_sgsap_alert(template (omit) SGs_Cause exp_cause) runs on ConnHdlr{ + var boolean exp_success := true; + var PDU_SGsAP rx; + if (not istemplatekind(exp_cause, "omit")) { + exp_success := false; + } + SGsAP.send(ts_SGsAP_ALERT_REQ(g_pars.imsi)); + alt { + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + setverdict(pass); + } + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + setverdict(fail, "Received unexpected ALERT REJECT ", rx); + } + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + setverdict(fail, "Received unexpected ALERT ACK"); + } + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, exp_cause)) { + setverdict(pass) + } + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + setverdict(fail, "Received ALERT REJECT with unexpected cause ", rx); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected SGsAP"); + } + } +} + +/* Test if MME responds to VLR-originated RESET procedure as expected */ +private function f_TC_sgsap_vlr_reset(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + f_sgsap_vlr_reset(); +} +testcase TC_sgsap_vlr_reset() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(1); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_vlr_reset), pars); + vc_conn.done; +} + +/* Page known subscriber for SMS */ +private function f_TC_sgsap_paging_sms(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* TODO: register subscriber on S1 */ + f_sgsap_page(SMS_indicator, omit, omit); +} +testcase TC_sgsap_paging_sms() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(2); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_paging_sms), pars); + vc_conn.done; +} + +/* Page known subscriber for CS call */ +private function f_TC_sgsap_paging_cs(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* TODO: register subscriber on S1 */ + f_sgsap_page(CS_call_indicator, omit, omit); +} +testcase TC_sgsap_paging_cs() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(3); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_paging_cs), pars); + vc_conn.done; +} + + +/* Page unknown subscriber; expect PAGING REJECT from MME */ +private function f_TC_sgsap_paging_reject(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + f_sgsap_page(SMS_indicator, omit, IMSI_unknown); +} +testcase TC_sgsap_paging_reject() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(4); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_paging_reject), pars); + vc_conn.done; +} + +/* Send ALERT-REQ to MME; perform S1AP activity; expect ALERT-ACK on SGs */ +private function f_TC_sgsap_alert(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* TODO: register subscriber on S1 */ + f_sgsap_alert(omit); + /* TOOD: do something on S1 triggering UE ACT IND */ + SGsAP.receive(tr_SGsAP_UE_ACT_IND(g_pars.imsi)); +} +testcase TC_sgsap_alert() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(5); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_alert), pars); + vc_conn.done; +} + +/* Send ALERT-REQ to MME for unidentified IMSI; expect ALERT-REJ on SGs */ +private function f_TC_sgsap_alert_rej(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + /* IMSI doesn't register and is hence unknown */ + f_sgsap_alert(IMSI_unknown); +} +testcase TC_sgsap_alert_rej() runs on MTC_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init_sgsap(testcasename()); + pars := f_init_pars(6); + vc_conn := f_start_handler_with_pars(refers(f_TC_sgsap_alert_rej), pars); + vc_conn.done; +} + + +/* Test SGsAP-DOWNLINK-UNITDATA (SGs -> S1) */ +/* Test SGsAP-UPLINK-UNITDATA (S1 -> SGs)*/ +/* Test SGSAP-DETACH-IND; detach on S1; expect DETACH-IND on SGs; send DETACH-ACK */ +/* Test SGsAP-LU-REQ; perform combined attach on S1; expect LU-REQ; acknowlege it */ +/* Test SGsAP-LU-REQ; perform combined attach on S1; expect LU-REQ; reject it */ +/* Test SGsAP-MMINFO-REQ; establish SGs association; send it on SGs; expect on S1 */ + +/* Test MT SERVICE ABORT; send PAGING; expect SERVICE REQ; send SERVICE ABORT */ + +/* Test EPS DETACH */ +/* Test IMSI DETACH */ + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh new file mode 100755 index 0000000..2a98c70 --- /dev/null +++ b/mme/gen_links.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +# Required by MGCP and IPA +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +#FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.SGsAP_13.2.0/src +FILES="SGsAP_Types.ttcn" +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " +FILES+="L3_Templates.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh new file mode 100755 index 0000000..4d6d7c6 --- /dev/null +++ b/mme/regen_makefile.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc " + +export CPPFLAGS_TTCN3="" + +../regen-makefile.sh MME_Tests.ttcn $FILES + +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15193 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: Idbd54838daaf12acccc3253dc4278de75eaaaf31 Gerrit-Change-Number: 15193 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:49:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:49:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP Templates In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15195 ) Change subject: library: Add S1AP Templates ...................................................................... library: Add S1AP Templates Change-Id: I148b33eb5074d3549e7cd533af2cbf90f1c6d23f --- A library/s1ap/S1AP_Templates.ttcn 1 file changed, 907 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn new file mode 100644 index 0000000..6c5dbce --- /dev/null +++ b/library/s1ap/S1AP_Templates.ttcn @@ -0,0 +1,907 @@ +/* S1AP Templates in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module S1AP_Templates { + +import from S1AP_IEs all; +import from S1AP_CommonDataTypes all; +import from S1AP_Constants all; +import from S1AP_Containers all; +import from S1AP_PDU_Contents all; +import from S1AP_PDU_Descriptions all; + +/********************************************************************************* + * non-UE related + *********************************************************************************/ + +/********************************************************************************* + * 9.1.8 Management Messages + *********************************************************************************/ + +/* 9.1.8.4 S1 SETUP REQUEST */ +template (value) S1AP_PDU +ts_S1AP_SetupReq(template (value) Global_ENB_ID p_global_ENB_ID, + template (value) SupportedTAs p_supportedTAs, + template (value) PagingDRX p_pagingDRXs) := { + initiatingMessage := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_Global_ENB_ID, + criticality := ignore, + value_ := { Global_ENB_ID := p_global_ENB_ID } + }, { + id := S1AP_Constants.id_SupportedTAs, + criticality := reject, + value_ := {SupportedTAs := p_supportedTAs} + } /* HACK: work around nextepc bug + , { + id := S1AP_Constants.id_pagingDRX, + criticality := ignore, + value_ := {PagingDRX := p_pagingDRXs} + } */ + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_SetupReq(template (present) Global_ENB_ID p_global_ENB_ID := ?, + template (present) SupportedTAs p_supportedTAs := ?, + template (present) PagingDRX p_pagingDRXs := ?) := { + initiatingMessage := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_Global_ENB_ID, + criticality := ignore, + value_ := { Global_ENB_ID := p_global_ENB_ID } + }, { + id := S1AP_Constants.id_SupportedTAs, + criticality := reject, + value_ := {SupportedTAs := p_supportedTAs} + }, * + } + } + } + } +} + +/* 9.1.8.5 S1 SETUP RESPONSE */ +template (value) S1AP_PDU +ts_S1AP_SetupResp(template (value) ServedGUMMEIs served_gummeis, + template (value) RelativeMMECapacity rel_mme_capacity) := { + successfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_ServedGUMMEIs, + criticality := reject, + value_ := { ServedGUMMEIs := served_gummeis } + }, { + id := S1AP_Constants.id_RelativeMMECapacity, + criticality := ignore, + value_ := { RelativeMMECapacity := rel_mme_capacity } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_SetupResp(template (present) ServedGUMMEIs served_gummeis := ?, + template (present) RelativeMMECapacity rel_mme_capacity := ?) := { + successfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_ServedGUMMEIs, + criticality := reject, + value_ := { ServedGUMMEIs := served_gummeis } + }, { + id := S1AP_Constants.id_RelativeMMECapacity, + criticality := ignore, + value_ := { RelativeMMECapacity := rel_mme_capacity } + }, * + } + } + } + } +} + +/* 9.1.8.6 S1 SETUP FAILURE */ +template (value) S1AP_PDU +ts_S1AP_SetupFail(template (value) Cause cause) := { + unsuccessfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_SetupFail(template (present) Cause cause := ?) := { + unsuccessfulOutcome := { + procedureCode := id_S1Setup, + criticality := reject, + value_ := { + S1SetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + }, * + } + } + } + } +} + +/* 9.1.8.1 RESET */ +template (value) S1AP_PDU +ts_S1AP_Reset(template (value) Cause cause, + template (value) ResetType reset_type) := { + initiatingMessage := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + Reset := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } , { + id := S1AP_Constants.id_ResetType, + criticality := reject, + value_ := { resetType := reset_type } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_Reset(template (present) Cause cause := ?, + template (present) ResetType reset_type := ?) := { + initiatingMessage := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + Reset := { + protocolIEs := { + { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } , { + id := S1AP_Constants.id_ResetType, + criticality := reject, + value_ := { resetType := reset_type } + }, * + } + } + } + } +} + +/* 9.1.8.2 RESET ACKNOWLEDGE */ +template (value) S1AP_PDU +ts_S1AP_ResetAck(template (value) UE_associatedLogicalS1_ConnectionListResAck val) := { + successfulOutcome := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + ResetAcknowledge := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_associatedLogicalS1_ConnectionListResAck, + criticality := ignore, + value_ := { UE_associatedLogicalS1_ConnectionListResAck := val } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_ResetAck(template (present) UE_associatedLogicalS1_ConnectionListResAck val := ?) := { + successfulOutcome := { + procedureCode := id_Reset, + criticality := reject, + value_ := { + ResetAcknowledge := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_associatedLogicalS1_ConnectionListResAck, + criticality := ignore, + value_ := { UE_associatedLogicalS1_ConnectionListResAck := val } + }, * + } + } + } + } +} + + + + +/********************************************************************************* + * 9.1.7 NAS Transport + *********************************************************************************/ + +/* 9.1.7.1 INITIAL UE MESSAGE */ +template (value) S1AP_PDU +ts_S1AP_InitialUE(template (value) ENB_UE_S1AP_ID p_eNB_value, + template (value) NAS_PDU p_nasPdu, + template (value) TAI p_tAI, + template (value) EUTRAN_CGI p_eUTRAN_CGI, + template (value) RRC_Establishment_Cause p_rrcCause) := { + initiatingMessage := { + procedureCode := id_initialUEMessage, + criticality := ignore, + value_ := { + InitialUEMessage := { + protocolIEs := { + { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := p_eNB_value} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_RRC_Establishment_Cause, + criticality := ignore, + value_ := {RRC_Establishment_Cause := p_rrcCause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_InitialUE(template (present) ENB_UE_S1AP_ID p_eNB_value := ?, + template (present) NAS_PDU p_nasPdu := ?, + template (present) TAI p_tAI := ?, + template (present) EUTRAN_CGI p_eUTRAN_CGI := ?, + template (present) RRC_Establishment_Cause p_rrcCause := ?) := { + initiatingMessage := { + procedureCode := id_initialUEMessage, + criticality := ignore, + value_ := { + InitialUEMessage := { + protocolIEs := { + { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := p_eNB_value} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_RRC_Establishment_Cause, + criticality := ignore, + value_ := {RRC_Establishment_Cause := p_rrcCause} + }, * + } + } + } + } +} + + +/* 9.1.7.2 DOWNLINK NAS TRANSPORT */ +template (value) S1AP_PDU +ts_S1AP_DlNasTransport(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) octetstring p_nasPdu) := { + initiatingMessage := { + procedureCode := id_downlinkNASTransport, + criticality := ignore, + value_ := { + DownlinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_DlNasTransport(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) octetstring p_nasPdu := ?) := { + initiatingMessage := { + procedureCode := id_downlinkNASTransport, + criticality := ignore, + value_ := { + DownlinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, * + } + } + } + } +} + + +/* 9.1.7.3 UPNLINK NAS TRANSPORT */ +template (value) S1AP_PDU +ts_S1AP_UlNasTransport(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) octetstring p_nasPdu, + template (value) EUTRAN_CGI p_eUTRAN_CGI, + template (value) TAI p_tAI) := { + initiatingMessage := { + procedureCode := id_uplinkNASTransport, + criticality := ignore, + value_ := { + UplinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UlNasTransport(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) octetstring p_nasPdu := ?, + template (present) EUTRAN_CGI p_eUTRAN_CGI := ?, + template (present) TAI p_tAI := ?) := { + initiatingMessage := { + procedureCode := id_uplinkNASTransport, + criticality := ignore, + value_ := { + UplinkNASTransport := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_NAS_PDU, + criticality := reject, + value_ := {nAS_PDU := p_nasPdu} + }, { + id := S1AP_Constants.id_EUTRAN_CGI, + criticality := ignore, + value_ := {EUTRAN_CGI := p_eUTRAN_CGI} + }, { + id := S1AP_Constants.id_TAI, + criticality := ignore, + value_ := {TAI := p_tAI} + }, * + } + } + } + } +} + +/********************************************************************************* + * 9.1.4 Context Management + *********************************************************************************/ + +/* 9.1.4.1 INITIAL CONTEXT SETUP REQ */ +template (value) S1AP_PDU +ts_S1AP_IntialCtxSetupReq(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) UEAggregateMaximumBitrate max_br, + template (value) E_RABToBeSetupListCtxtSUReq rab_setup_items, + template (value) UESecurityCapabilities ue_sec_par, + template (value) SecurityKey sec_key) := { + initiatingMessage := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + initialContextSetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_uEaggregateMaximumBitrate, + criticality := reject, + value_ := {UEAggregateMaximumBitrate := max_br} + }, { + id := S1AP_Constants.id_E_RABToBeSetupListCtxtSUReq, + criticality := reject, + value_ := {E_RABToBeSetupListCtxtSUReq := rab_setup_items} + }, { + id := S1AP_Constants.id_UESecurityCapabilities, + criticality := reject, + value_ := {UESecurityCapabilities := ue_sec_par} + }, { + id := S1AP_Constants.id_SecurityKey, + criticality := reject, + value_ := {SecurityKey := sec_key} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_IntialCtxSetupReq(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) UEAggregateMaximumBitrate max_br := ?, + template (present) E_RABToBeSetupListCtxtSUReq rab_setup_items := ?, + template (present) UESecurityCapabilities ue_sec_par := ?, + template (present) SecurityKey sec_key := ?) := { + initiatingMessage := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + initialContextSetupRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_uEaggregateMaximumBitrate, + criticality := reject, + value_ := {UEAggregateMaximumBitrate := max_br} + }, { + id := S1AP_Constants.id_E_RABToBeSetupListCtxtSUReq, + criticality := reject, + value_ := {E_RABToBeSetupListCtxtSUReq := rab_setup_items} + }, { + id := S1AP_Constants.id_UESecurityCapabilities, + criticality := reject, + value_ := {UESecurityCapabilities := ue_sec_par} + }, { + id := S1AP_Constants.id_SecurityKey, + criticality := reject, + value_ := {SecurityKey := sec_key} + }, * + } + } + } + } +} + +/* 9.1.4.3 INITIAL CONTEXT SETUP RESPONSE */ +template (value) S1AP_PDU +ts_S1AP_InitialCtxSetupResp(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABSetupListCtxtSURes rab_setup_items, + template (value) E_RABList rab_items) := { + successfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_E_RABSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABSetupListCtxtSURes := rab_setup_items} + }, { + id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABList := rab_items} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_InitialCtxSetupResp(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABSetupListCtxtSURes rab_setup_items := ?, + template (present) E_RABList rab_items := ?) := { + successfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_E_RABSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABSetupListCtxtSURes := rab_setup_items} + }, { + id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes, + criticality := ignore, + value_ := {E_RABList := rab_items} + } + } + } + } + } +} + +/* 9.1.4.4 INITIAL CONTEXT SETUP FAILURE */ +template (value) S1AP_PDU +ts_S1AP_InitialCtxSetupFail(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) Cause cause) := { + unsuccessfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_InitialCtxSetupFail(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) Cause cause := ?) := { + unsuccessfulOutcome := { + procedureCode := id_InitialContextSetup, + criticality := reject, + value_ := { + InitialContextSetupFailure := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + }, * + } + } + } + } +} + +/* 9.1.4.5 UE CONTEXT RELEASE REQUEST */ +template (value) S1AP_PDU +ts_S1AP_UeContextReleaseReq(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) Cause cause) := { + initiatingMessage := { + procedureCode := id_UEContextReleaseRequest, + criticality := reject, + value_ := { + UEContextReleaseRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UeContextReleaseReq(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) Cause cause := ?) := { + initiatingMessage := { + procedureCode := id_UEContextReleaseRequest, + criticality := reject, + value_ := { + UEContextReleaseRequest := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + }, * + } + } + } + } +} + +/* 9.1.4.6 UE CONTEXT RELEASE COMMAND */ +template (value) S1AP_PDU +ts_S1AP_UeContextReleaseCmd(template (value) UE_S1AP_IDs mme_ids, + template (value) Cause cause) := { + initiatingMessage := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_S1AP_IDs, + criticality := ignore, + value_ := {UE_S1AP_IDs := mme_ids} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UeContextReleaseCmd(template (present) UE_S1AP_IDs ue_ids := ?, + template (present) Cause cause := ?) := { + initiatingMessage := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_UE_S1AP_IDs, + criticality := reject, + value_ := {UE_S1AP_IDs := ue_ids} + }, { + id := S1AP_Constants.id_Cause, + criticality := ignore, + value_ := {Cause := cause} + }, * + } + } + } + } +} + +/* 9.1.4.7 UE CONTEXT RELEASE COMPLETE */ +template (value) S1AP_PDU +ts_S1AP_UeContextReleaseCompl(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id) := { + successfulOutcome := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseComplete := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_UeContextReleaseCompl(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?) := { + successfulOutcome := { + procedureCode := id_UEContextRelease, + criticality := reject, + value_ := { + UEContextReleaseComplete := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, * + } + } + } + } +} + +/* 9.1.4.20 CONNECTION ESTABLISHMENT INDICATION */ +template (value) S1AP_PDU +ts_S1AP_ConnEstInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id) := { + initiatingMessage := { + procedureCode := id_ConnectionEstablishmentIndication, + criticality := reject, + value_ := { + ConnectionEstablishmentIndication := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_ConnEstInd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?) := { + initiatingMessage := { + procedureCode := id_ConnectionEstablishmentIndication, + criticality := reject, + value_ := { + ConnectionEstablishmentIndication := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := {MME_UE_S1AP_ID := mme_id} + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := {ENB_UE_S1AP_ID := enb_id} + }, * + } + } + } + } +} + + + +/* all non-UE-related S1AP messages */ +template (present) S1AP_PDU +tr_S1AP_nonUErelated := (tr_S1AP_SetupReq, tr_S1AP_SetupResp, tr_S1AP_SetupFail, + tr_S1AP_Reset, tr_S1AP_ResetAck + ); + + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15195 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: I148b33eb5074d3549e7cd533af2cbf90f1c6d23f Gerrit-Change-Number: 15195 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:56:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:56:21 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 ) Change subject: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f Gerrit-Change-Number: 15183 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 15 Aug 2019 09:56:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:56:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:56:34 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 09:56:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:56:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:56:50 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 ) Change subject: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d Gerrit-Change-Number: 15185 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 09:56:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 09:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 09:59:58 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 ) Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 09:59:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 10:11:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 10:11:49 +0000 Subject: Change in ...osmo-sgsn[master]: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 ) Change subject: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp ...................................................................... Patch Set 5: Code-Review-2 (1 comment) https://gerrit.osmocom.org/#/c/13929/5/src/gprs/sgsn_libgtp.c File src/gprs/sgsn_libgtp.c: https://gerrit.osmocom.org/#/c/13929/5/src/gprs/sgsn_libgtp.c at 549 PS5, Line 549: if (!pdp) { That's for sure not the correct fix. It's fine receiving a null pdp, because we anyway need to free the cbp stuff. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I184dcce27b26104c61d80b2d910388d5d3323def Gerrit-Change-Number: 13929 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 10:11:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 10:56:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 10:56:34 +0000 Subject: Change in ...osmo-sgsn[master]: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 ) Change subject: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp ...................................................................... Patch Set 5: See last comment: https://osmocom.org/issues/3956#note-12 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I184dcce27b26104c61d80b2d910388d5d3323def Gerrit-Change-Number: 13929 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 15 Aug 2019 10:56:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: Hello lynxis lazus, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 to look at the new patch set (#3). Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... gprs_gmm: Introduce assert to guard against unexpected condition This may well be the culprit of OS#3957, were already freed llme is accessed from mmctx context later on, upon some timer is triggered in mmctx. Related: OS#3957 Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 --- M src/gprs/gprs_gmm.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/67/15167/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: Hello fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 to look at the new patch set (#3). Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_libgtp.c 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/15184/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 to look at the new patch set (#3). Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type For new readers it's very confusing why PMM states and MM states are in the same enum, but handled with different functions, and sometimes called one right after the other with different enums. Calling them when on a different ran_type makes the function early return, so let's better conditionally call the function to make it clear in the flow when the function is expected to do something. Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 --- M src/gprs/gprs_gmm.c 1 file changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/15186/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 to look at the new patch set (#2). Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Introduce and use log macros when no mm ctx available Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 --- M include/osmocom/sgsn/gprs_llc.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_llc.c 4 files changed, 46 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/11/15211/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 to look at the new patch set (#2). Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... gprs_gmm: Avoid spaces in fsm events and enum strings FSM doesn't expect receiving event names containing spaces (log lines generated are confusing). Similar for enums, it's better using code names to match easily and make log lines more clear. Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 --- M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c 2 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/12/15212/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Verify that timers can be set over VTY In-Reply-To: References: Message-ID: Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 to look at the new patch set (#2). Change subject: tests: Verify that timers can be set over VTY ...................................................................... tests: Verify that timers can be set over VTY Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 --- M tests/vty_test_runner.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/13/15213/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 to look at the new patch set (#2). Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Replace own timer infra with libosmocore osmo_tdef Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c M src/gprs/sgsn_vty.c 4 files changed, 127 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/15214/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 12:12:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 12:12:06 +0000 Subject: Change in ...osmo-ggsn[master]: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 Change subject: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST ...................................................................... build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST $target/$target_os is never used, so AC_CANONICAL_TARGET is useless. $host is, so employ AC_CANONICAL_HOST. Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/19/15219/1 diff --git a/configure.ac b/configure.ac index 4c39681..c8bfae9 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR([.]) AC_CONFIG_TESTDIR(tests) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 Gerrit-Change-Number: 15219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 12:18:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 12:18:22 +0000 Subject: Change in ...osmo-ggsn[master]: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 ) Change subject: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 Gerrit-Change-Number: 15219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 12:18:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 12:30:38 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 15 Aug 2019 12:30:38 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15182 ) Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication ...................................................................... Patch Set 5: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 12:30:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 12:41:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 12:41:35 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY When a MS MM state is READY its exact location is known (PCU). On Gb, T3314 (aka TS 23.060 "READY timer") sets the MM state from READY to STANDBY, where only the RA is known. Introduce a second set of timer variables, because state timer can run while another packet state timer is timing out. Related: OS#1941 Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c M tests/test_nodes.vty 5 files changed, 96 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/09/12009/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 12:49:57 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 15 Aug 2019 12:49:57 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 Change subject: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call ...................................................................... MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call The TTCN3 tests MSC_Tests.TC_bssap_lu_sgsap_lu_and_mt_call and MSC_Tests.TC_sgsap_lu_and_mt_call initate an MT-CSFB call for testing purposes, but they also send an SGsAP-MO-CSFB-INDICATION to make the MS come back to LTE. This is wrong. SGsAP-MO-CSFB-INDICATION just informs the VLR that the UE has initiated a MO CSFB call on the LTE side. On MT CSFB calls this message should not appear. Lets remove it. Related: SYS#4624 Change-Id: I2e9fda4fe97866c4cbc77224ba1930ca81411fd6 --- M msc/MSC_Tests.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/15220/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c463dd5..7499456 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -4980,9 +4980,6 @@ /* Make sure that subscriber is still present and the SGs association is in tact (ref-counting) */ f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); - /* Finally simulate the return of the UE to the 4G network */ - SGsAP.send(ts_SGsAP_MO_CSFB_IND(pars.imsi)); - /* Test for successful return by triggering a paging, when the paging * request is received via SGs, we can be sure that the MSC/VLR has * recognized that the UE is now back on 4G */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 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: I2e9fda4fe97866c4cbc77224ba1930ca81411fd6 Gerrit-Change-Number: 15220 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:03:42 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 15 Aug 2019 13:03:42 +0000 Subject: Change in ...osmo-msc[master]: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15221 Change subject: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return ...................................................................... sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return When the VLR/MSC receives an SGsAP-MO-CSFB-INDICATION message it sets the RAN type back to SGs. This is wrong, the message SGsAP-MO-CSFB-INDICATION has just an informative character. It informs the VLR that the UE has initiated an MO CSFB call (service request). Change-Id: I625574fc42fc915ba483db3bb406922ad6df370d Related: SYS#4624 --- M src/libmsc/sgs_iface.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/15221/1 diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index 53ab853..b12991c 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -886,9 +886,10 @@ { struct vlr_subscr *vsub; - /* The MME informs us with this message that the UE has returned back - * to the 4G network, so we use the SGs interface again for further - * communication with the UE. */ + /* The MME informs us with this message that the UE has initiated a + * service request for MO CS fallback. There is not much we can do with + * this information, however, we can check if the subscriber actually + * exists in the VLR and if there are any lingering connections open.*/ vsub = vlr_subscr_find_by_imsi(gsm_network->vlr, imsi, __func__); if (!vsub) @@ -897,7 +898,6 @@ /* Check for lingering connections */ subscr_conn_toss(vsub); - vsub->cs.attached_via_ran = OSMO_RAT_EUTRAN_SGS; vlr_subscr_put(vsub, __func__); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I625574fc42fc915ba483db3bb406922ad6df370d Gerrit-Change-Number: 15221 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:03:42 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 15 Aug 2019 13:03:42 +0000 Subject: Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15222 Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared ...................................................................... msc_a: switch RAN type back to SGs when a CSFB-Call is cleared When a CSFB call is over the MS changes back to LTE after the call is cleared. However, at the moment the MSC will not change the cs.attached_via_ran flag. This may cause problems with the next call. Lets make sure that if there is an SGs association present, the ran type is set back to SGs when the call is cleared. Related: SYS#4624 Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 --- M src/libmsc/msc_a.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/15222/1 diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index bd69eed..553761f 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -754,6 +754,11 @@ }; msc_a_get(msc_a, MSC_A_USE_WAIT_CLEAR_COMPLETE); msc_a_ran_down(msc_a, MSC_ROLE_I, &msg); + + /* The connection is cleared. The MS will now go back to 4G, + Switch the RAN type back to SGS. */ + if (vsub && vsub->sgs_fsm->state == SGS_UE_ST_ASSOCIATED) + vsub->cs.attached_via_ran = OSMO_RAT_EUTRAN_SGS; } if (vsub) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:22:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 13:22:05 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 ) Change subject: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 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: I2e9fda4fe97866c4cbc77224ba1930ca81411fd6 Gerrit-Change-Number: 15220 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 13:22:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:23:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 13:23:20 +0000 Subject: Change in ...osmo-msc[master]: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15221 ) Change subject: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I625574fc42fc915ba483db3bb406922ad6df370d Gerrit-Change-Number: 15221 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 13:23:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 13:24:51 +0000 Subject: Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15222 ) Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15222/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15222/1//COMMIT_MSG at 10 PS1, Line 10: cleared. However, at the moment the MSC will not change the "does not change" seems more clear, as in "prior to this patch". -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 13:24:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:28:22 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 15 Aug 2019 13:28:22 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Package osmo-config-merge Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/15223 Change subject: libosmocore: Package osmo-config-merge ...................................................................... libosmocore: Package osmo-config-merge Related: rt#27399 Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/23/15223/1 diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 3a417f0..f43f296 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -4,9 +4,9 @@ SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" PV = "1.2.0+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" +PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}" FILES_libosmogb = "${libdir}/libosmogb${SOLIBS}" @@ -14,6 +14,7 @@ FILES_libosmovty = "${libdir}/libosmovty${SOLIBS}" FILES_osmo-arfcn = "${bindir}/osmo-arfcn" FILES_osmo-auc-gen = "${bindir}/osmo-auc-gen" +FILES_osmo-config-merge = "${bindir}/osmo-config-merge" # Requires fix for upgrades RREPLACES_libosmocore = "DONOTREPLACElibosmocore" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 Gerrit-Change-Number: 15223 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:29:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 13:29:34 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use osmo_rai_name() in log line Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 Change subject: gprs_gmm.c: Use osmo_rai_name() in log line ...................................................................... gprs_gmm.c: Use osmo_rai_name() in log line Change-Id: Ieab9b7696c93de9a5d3d42f614072a6f2181e37d --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/24/15224/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index dd19ce8..e906814 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1825,9 +1825,8 @@ { /* We cannot use the mmctx */ LOGMMCTXP(LOGL_INFO, mmctx, - "The MM context cannot be used, RA: %03d-%0*d-%d-%d\n", - mmctx->ra.mcc, mmctx->ra.mnc_3_digits, mmctx->ra.mnc, - mmctx->ra.lac, mmctx->ra.rac); + "The MM context cannot be used, RA: %s\n", + osmo_rai_name(&mmctx->ra)); /* mmctx is set to NULL and gprs_llgmm_unassign(llme) will be called below, let's make sure we don't keep dangling llme pointers in mmctx (OS#3957). */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ieab9b7696c93de9a5d3d42f614072a6f2181e37d Gerrit-Change-Number: 15224 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 13:31:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 13:31:40 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Package osmo-config-merge In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15223 ) Change subject: libosmocore: Package osmo-config-merge ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 Gerrit-Change-Number: 15223 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 13:31:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 14:37:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 15 Aug 2019 14:37:10 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use osmo_rai_name() in log line In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 ) Change subject: gprs_gmm.c: Use osmo_rai_name() in log line ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ieab9b7696c93de9a5d3d42f614072a6f2181e37d Gerrit-Change-Number: 15224 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 15 Aug 2019 14:37:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 15:55:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 15:55:11 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c at 328 PS1, Line 328: LOGP(DMSC, LOGL_ERROR, "Got paged but no subscriber found, will now (blindly) deliver the paging response to the first configured MSC!\n"); > s/Got paged/Got Paging Response ? ACK https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c at 349 PS1, Line 349: LOGL_ERROR this is not an error condition, but a perfectly normal situation in the context of CSFB. It should be INFO, maximum. https://gerrit.osmocom.org/#/c/15209/1/src/osmo-bsc/gsm_08_08.c at 358 PS1, Line 358: * blindly. */ > This entire code looks like weird legacy bsc-nat stuff, I've never used osmo-bsc with more than one [?] the code is unrelated to bsc-nat. OsmoBSC once was extended to talk to multiple MSC so you can have a "remote" normal BSC and a local one in case your backhaul fails, or in case you want to route some subscribers locally onboard a vessel. That use case has disappeared now, we could remove it. But we must not change the VTY syntax while doing it. In any case that's unrelated to the current patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 15:55:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 15:55:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 15:55:48 +0000 Subject: Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15222 ) Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 15:55:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 15:56:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 15:56:20 +0000 Subject: Change in ...osmo-msc[master]: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15221 ) Change subject: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I625574fc42fc915ba483db3bb406922ad6df370d Gerrit-Change-Number: 15221 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 15:56:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 15:56:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 15 Aug 2019 15:56:41 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: Change test-expectation of TC_paging_resp_unsol In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 ) Change subject: BSC_Tests: Change test-expectation of TC_paging_resp_unsol ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 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: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe Gerrit-Change-Number: 15208 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 15 Aug 2019 15:56:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 16:12:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 16:12:09 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 Change subject: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn ...................................................................... sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn osmo-sgsn sends 2 DeletePdpCtxReq on gtp, Confirmation received on first one frees cbp associatd to pdp and the second one accesses the already freed cbp. Related: OS#3956 Change-Id: Ie1cc9fdf91b18b0b7fb3d5fb33b6dcf6f46a393f --- M sgsn/SGSN_Tests.ttcn 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/15225/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 03c9d05..581d838 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1126,6 +1126,44 @@ } } +/* Test MS sending a duplicate Deact PDP Ctx (OS#3956). */ +private function f_TC_attach_pdp_act_deact_dup(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var Gtp1cUnitdata g_ud; + var integer i; + var OCT1 cause_regular_deact := '24'O; + + /* first perform regular attach + PDP context act */ + f_TC_attach(id); + f_pdp_ctx_act(apars); + + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause_regular_deact, false, omit), 0); + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause_regular_deact, false, omit), 0); + + for (i := 0; i < 2; i := i+1) { + GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + log("Received deletePDPContextResponse " & int2str(i) & ", seq_nr=" & int2str(seq_nr)); + GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + } + } + + alt { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { + setverdict(pass); + } + [] as_xid(apars, 0); + } + + setverdict(pass); +} +testcase TC_attach_pdp_act_deact_dup() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_dup), testcasename(), g_gb, 46); + vc_conn.done; +} + /* Table 10.5.156/3GPP TS 24.008 */ template (value) QoSV t_QosDefault := { @@ -2486,6 +2524,7 @@ execute( TC_attach_pdp_act_ggsn_reject() ); execute( TC_attach_pdp_act_user_deact_mo() ); execute( TC_attach_pdp_act_user_deact_mt() ); + execute( TC_attach_pdp_act_deact_dup() ); execute( TC_attach_second_attempt() ); execute( TC_attach_restart_ctr_echo() ); execute( TC_attach_restart_ctr_create() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 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: Ie1cc9fdf91b18b0b7fb3d5fb33b6dcf6f46a393f Gerrit-Change-Number: 15225 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 16:14:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 15 Aug 2019 16:14:04 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 ) Change subject: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn ...................................................................... Patch Set 1: Don't merge yet, it will make osmo-sgsn crash. Proper solution to this bug still WIP. I want to add an extra test too proving it can be done with 1 DeleteCtxReq + any other message by swapping the order they are answered. More information: https://osmocom.org/issues/3956?issue_count=137#note-13 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 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: Ie1cc9fdf91b18b0b7fb3d5fb33b6dcf6f46a393f Gerrit-Change-Number: 15225 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 15 Aug 2019 16:14:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 15 20:57:11 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 15 Aug 2019 20:57:11 +0000 Subject: Change in ...osmo-msc[master]: libvlr/vlr.c: cosmetic: move message_type assignment Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15226 Change subject: libvlr/vlr.c: cosmetic: move message_type assignment ...................................................................... libvlr/vlr.c: cosmetic: move message_type assignment Change-Id: Ice7f98597b54f03069375fac56fb162f2669e7f0 --- M src/libvlr/vlr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/15226/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 625b699..de61ba5 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -680,6 +680,7 @@ { struct osmo_gsup_message gsup_msg = { .message_class = OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT, + .message_type = OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST, }; uint8_t imei_enc[GSM23003_IMEI_NUM_DIGITS+2]; /* +2: IE header */ int len; @@ -694,7 +695,6 @@ gsup_msg.imei_enc_len = len; /* Send CHECK_IMEI_REQUEST */ - gsup_msg.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST; OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi); return gsup_client_mux_tx(vsub->vlr->gcm, &gsup_msg); } @@ -704,9 +704,9 @@ { struct osmo_gsup_message gsup_msg = { .message_class = OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT, + .message_type = OSMO_GSUP_MSGT_AUTH_FAIL_REPORT, }; - gsup_msg.message_type = OSMO_GSUP_MSGT_AUTH_FAIL_REPORT; OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi); return gsup_client_mux_tx(vsub->vlr->gcm, &gsup_msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice7f98597b54f03069375fac56fb162f2669e7f0 Gerrit-Change-Number: 15226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:00:37 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:00:37 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15179 ) Change subject: iu_client: sccp_sap_up: set rc early ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15179/1/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15179/1/src/iu_client.c at 768 PS1, Line 768: int rc = -1; > Ok, then better rebse and put this patch before the other one, or merge them. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idd803774612719df144bef569fb734289aa31282 Gerrit-Change-Number: 15179 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 00:00:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:01:15 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:01:15 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15178 ) Change subject: iu_client: ensure UE is not NULL on CO primitives ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15178/1/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15178/1/src/iu_client.c at 801 PS1, Line 801: if (!ue) > right. this patch is in the wrong order. there is a commit for that. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 Gerrit-Change-Number: 15178 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 00:01:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:03:38 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:03:38 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in... In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 to look at the new patch set (#6). Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication ...................................................................... iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 --- M src/iu_client.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/82/15182/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:05:57 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:05:57 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in... In-Reply-To: References: Message-ID: lynxis lazus has removed a vote on this change. Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication ...................................................................... Removed Code-Review-2 by lynxis lazus -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:06:21 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:06:21 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 to look at the new patch set (#4). Change subject: iu_client: introduce a connection state ...................................................................... iu_client: introduce a connection state When the SCCP stack indicate a disconnect, save this in the UE connection to allow the application to free() the instance later. Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/15181/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:09:30 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:09:30 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 3: IMHO: remove the case ..._Iu and add a comment to the enum _Iu it's unsupported. I don't like the ifdef0 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 16 Aug 2019 00:09:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:13:41 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:13:41 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 ) Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 16 Aug 2019 00:13:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:26:17 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:26:17 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Fix typo in log message In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 ) Change subject: gprs_gmm.c: Fix typo in log message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a Gerrit-Change-Number: 15189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 16 Aug 2019 00:26:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 00:47:23 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 00:47:23 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 to look at the new patch set (#5). Change subject: iu_client: introduce a connection state ...................................................................... iu_client: introduce a connection state When the SCCP stack indicate a disconnect, save this in the UE connection to allow the application to free() the instance later. Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/15181/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 01:01:59 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 16 Aug 2019 01:01:59 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Fix typo in log message In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 ) Change subject: gprs_gmm.c: Fix typo in log message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a Gerrit-Change-Number: 15189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 16 Aug 2019 01:01:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 16 04:52:24 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 16 Aug 2019 04:52:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d56369849084_5e142aed07c2e6003740fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 490s] ar: `u' modifier ignored since `D' is the default (see `U') [ 490s] libtool: link: ranlib .libs/libtransceiver_common.a [ 490s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 490s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 491s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 491s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 491s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 491s] collect2: error: ld returned 1 exit status [ 491s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 491s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 491s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 491s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 491s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 491s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 491s] make[1]: *** [Makefile:444: all] Error 2 [ 491s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 491s] dh_auto_build: make -j1 returned exit code 2 [ 491s] make: *** [debian/rules:6: build] Error 255 [ 491s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 491s] [ 491s] lamb56 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 04:52:06 UTC 2019. [ 491s] [ 491s] ### VM INTERACTION START ### [ 494s] [ 475.018740] sysrq: SysRq : Power Off [ 494s] [ 475.025302] reboot: Power down [ 494s] ### VM INTERACTION END ### [ 494s] [ 494s] lamb56 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 04:52:10 UTC 2019. [ 494s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 16 04:53:32 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 16 Aug 2019 04:53:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5636d4c06e2_5e142aed07c2e6003743c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 410s] ar: `u' modifier ignored since `D' is the default (see `U') [ 410s] libtool: link: ranlib .libs/libtransceiver_common.a [ 410s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 410s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 411s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 411s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 411s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 411s] collect2: error: ld returned 1 exit status [ 411s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 411s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 411s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 411s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 411s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 411s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 411s] make[1]: *** [Makefile:444: all] Error 2 [ 411s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 411s] dh_auto_build: make -j1 returned exit code 2 [ 411s] make: *** [debian/rules:6: build] Error 255 [ 411s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 411s] [ 411s] lamb14 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 04:53:25 UTC 2019. [ 411s] [ 411s] ### VM INTERACTION START ### [ 414s] [ 395.438678] sysrq: SysRq : Power Off [ 414s] [ 395.450255] reboot: Power down [ 414s] ### VM INTERACTION END ### [ 414s] [ 414s] lamb14 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 04:53:29 UTC 2019. [ 414s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 16 08:48:16 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Aug 2019 08:48:16 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15227 Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... gsm_08_08.c: always pick first msc for unsolicit paging responses When osmo-bsc receives a paging response via the A-bis interface it tries to find the MSC which is in charge for the paging. This is due to the fact that osmo-bsc supports multiple msc connections, which is not specified by 3gpp specs. In an MT-CSFB call the MSC pages the UE via the SGs interface. Then the UE falls back to 2G. It then reports back as MS on the A-Bis interface with the paging response directly. In those cases osmo-bsc will not be able to determine an MSC in charge, so we will forward the paging response to the first configured MSC. Change-Id: I633870030fad35d0a29dfafd6d118e2caa4ec3c9 Related: SYS#4624 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/15227/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 4dc4883..43117a8 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -323,8 +323,8 @@ subscr = extract_sub(conn, msg); if (!subscr) { - LOGP(DMSC, LOGL_ERROR, "Got paged but no subscriber found.\n"); - return NULL; + LOGP(DMSC, LOGL_INFO, "Got paging response but no subscriber found, will now (blindly) deliver the paging response to the first configured MSC!\n"); + goto blind; } pag_msc = paging_get_msc(conn_get_bts(conn), subscr); @@ -344,7 +344,20 @@ return msc; } - LOGP(DMSC, LOGL_ERROR, "Got paged but no request found.\n"); + LOGP(DMSC, LOGL_INFO, "Got paging response but no request found, will now (blindly) deliver the paging response to the first configured MSC!\n"); + +blind: + /* In the case of an MT CSFB call we will get a paging response from + * the BTS without a preceding paging request via A-Interface. In those + * cases the MSC will page the subscriber via SGs interface, so the BSC + * can not know about the paging in advance. In those cases we can not + * know the MSC which is in charge. The only meaningful option we have + * is to deliver the paging response to the first configured MSC + * blindly. */ + msc = llist_first_entry_or_null(&bsc->mscs, struct bsc_msc_data, entry); + if (msc) + return msc; + LOGP(DMSC, LOGL_ERROR, "Unable to find any suitable MSC to deliver paging response!\n"); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I633870030fad35d0a29dfafd6d118e2caa4ec3c9 Gerrit-Change-Number: 15227 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 08:59:06 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Aug 2019 08:59:06 +0000 Subject: Change in ...osmo-msc[master]: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15221 ) Change subject: sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return ...................................................................... sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return When the VLR/MSC receives an SGsAP-MO-CSFB-INDICATION message it sets the RAN type back to SGs. This is wrong, the message SGsAP-MO-CSFB-INDICATION has just an informative character. It informs the VLR that the UE has initiated an MO CSFB call (service request). Change-Id: I625574fc42fc915ba483db3bb406922ad6df370d Related: SYS#4624 --- M src/libmsc/sgs_iface.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index 53ab853..b12991c 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -886,9 +886,10 @@ { struct vlr_subscr *vsub; - /* The MME informs us with this message that the UE has returned back - * to the 4G network, so we use the SGs interface again for further - * communication with the UE. */ + /* The MME informs us with this message that the UE has initiated a + * service request for MO CS fallback. There is not much we can do with + * this information, however, we can check if the subscriber actually + * exists in the VLR and if there are any lingering connections open.*/ vsub = vlr_subscr_find_by_imsi(gsm_network->vlr, imsi, __func__); if (!vsub) @@ -897,7 +898,6 @@ /* Check for lingering connections */ subscr_conn_toss(vsub); - vsub->cs.attached_via_ran = OSMO_RAT_EUTRAN_SGS; vlr_subscr_put(vsub, __func__); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I625574fc42fc915ba483db3bb406922ad6df370d Gerrit-Change-Number: 15221 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 09:04:56 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Aug 2019 09:04:56 +0000 Subject: Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 to look at the new patch set (#2). Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared ...................................................................... msc_a: switch RAN type back to SGs when a CSFB-Call is cleared When a CSFB call is over the MS changes back to LTE after the call is cleared. However, at the moment the MSC does not change the cs.attached_via_ran flag. This may cause problems with the next call. Lets make sure that if there is an SGs association present, the ran type is set back to SGs when the call is cleared. Related: SYS#4624 Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 --- M src/libmsc/msc_a.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/15222/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:12:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:12:15 +0000 Subject: Change in ...osmo-msc[master]: libvlr/vlr.c: cosmetic: move message_type assignment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15226 ) Change subject: libvlr/vlr.c: cosmetic: move message_type assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice7f98597b54f03069375fac56fb162f2669e7f0 Gerrit-Change-Number: 15226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:12:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:15:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:15:19 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 3: > Patch Set 3: > > IMHO: remove the case ..._Iu and add a comment to the enum _Iu it's unsupported. I don't like the ifdef0 I already changed it following some comments, and end result is the same you are expected, so if you don't mind I'm leaving it this way. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 16 Aug 2019 10:15:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:16:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:16:32 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15227 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I633870030fad35d0a29dfafd6d118e2caa4ec3c9 Gerrit-Change-Number: 15227 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:16:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:17:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:17:13 +0000 Subject: Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15222 ) Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:17:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:19:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:19:15 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15177 ) Change subject: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED ...................................................................... Patch Set 2: I still don't get why are you introducing this code which is used nowhere (afaict) in the patchset you are submitting. What's the point in adding it if no-one is sending it? Add it whenever someone uses it. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14bb9904728eddf7a5742df8382fb204ccda20dd Gerrit-Change-Number: 15177 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:19:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:20:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:20:08 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15179 ) Change subject: iu_client: sccp_sap_up: set rc early ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idd803774612719df144bef569fb734289aa31282 Gerrit-Change-Number: 15179 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:20:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:20:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:20:47 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15178 ) Change subject: iu_client: ensure UE is not NULL on CO primitives ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 Gerrit-Change-Number: 15178 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:20:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:21:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:21:29 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15180 ) Change subject: iu_client: sccp_sap_up: don't decode empty disconnect indications ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 Gerrit-Change-Number: 15180 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:22:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:22:12 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:22:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 10:24:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 10:24:54 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce a connection state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15181 ) Change subject: iu_client: introduce a connection state ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/15181/5/src/iu_client.c File src/iu_client.c: https://gerrit.osmocom.org/#/c/15181/5/src/iu_client.c at 119 PS5, Line 119: ctx->conn_state = RANAP_CONN_STATE_CONNECTED; How can it be connected here? because there's already a conn_id assigned which is expected to be an open connection? https://gerrit.osmocom.org/#/c/15181/5/src/iu_client.c at 792 PS5, Line 792: /* indication of new inbound connection request*/ Shouldn't _alloc be DISCONNECTED and then in here set it to RANAP_CONN_STATE_CONNECTED? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I77e01724be05ac488a4685ba367b7a71985b54e3 Gerrit-Change-Number: 15181 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 10:24:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 16 10:35:56 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 16 Aug 2019 10:35:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d568722c794_6b972b0f57a605f41243f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 602s] ar: `u' modifier ignored since `D' is the default (see `U') [ 602s] libtool: link: ranlib .libs/libtransceiver_common.a [ 603s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 603s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 603s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 603s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 603s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 603s] collect2: error: ld returned 1 exit status [ 603s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 603s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 603s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 603s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 603s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 603s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 603s] make[1]: *** [Makefile:444: all] Error 2 [ 603s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 603s] dh_auto_build: make -j1 returned exit code 2 [ 603s] make: *** [debian/rules:6: build] Error 255 [ 603s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 603s] [ 603s] lamb23 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 10:35:36 UTC 2019. [ 603s] [ 603s] ### VM INTERACTION START ### [ 606s] [ 582.345829] sysrq: SysRq : Power Off [ 606s] [ 582.355456] reboot: Power down [ 606s] ### VM INTERACTION END ### [ 606s] [ 606s] lamb23 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 10:35:39 UTC 2019. [ 606s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 16 10:37:22 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 16 Aug 2019 10:37:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5687798354_6b972b0f57a605f412876@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 432s] ar: `u' modifier ignored since `D' is the default (see `U') [ 432s] libtool: link: ranlib .libs/libtransceiver_common.a [ 432s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 432s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 432s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 433s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 433s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 433s] collect2: error: ld returned 1 exit status [ 433s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 433s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 433s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 433s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 433s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 433s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 433s] make[1]: *** [Makefile:444: all] Error 2 [ 433s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 433s] dh_auto_build: make -j1 returned exit code 2 [ 433s] make: *** [debian/rules:6: build] Error 255 [ 433s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 433s] [ 433s] lamb20 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 10:37:04 UTC 2019. [ 433s] [ 433s] ### VM INTERACTION START ### [ 436s] [ 416.022520] sysrq: SysRq : Power Off [ 436s] [ 416.028470] reboot: Power down [ 436s] ### VM INTERACTION END ### [ 436s] [ 436s] lamb20 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 16 10:37:08 UTC 2019. [ 436s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 16 12:02:03 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 16 Aug 2019 12:02:03 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use osmo_rai_name() in log line In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 ) Change subject: gprs_gmm.c: Use osmo_rai_name() in log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ieab9b7696c93de9a5d3d42f614072a6f2181e37d Gerrit-Change-Number: 15224 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 16 Aug 2019 12:02:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 12:54:40 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 16 Aug 2019 12:54:40 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Package osmo-config-merge In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/15223 ) Change subject: libosmocore: Package osmo-config-merge ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 Gerrit-Change-Number: 15223 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 16 Aug 2019 12:54:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 12:54:58 2019 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 16 Aug 2019 12:54:58 +0000 Subject: Change in ...meta-telephony[201705]: libosmocore: Package osmo-config-merge In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/meta-telephony/+/15223 ) Change subject: libosmocore: Package osmo-config-merge ...................................................................... libosmocore: Package osmo-config-merge Related: rt#27399 Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved daniel: Verified diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 3a417f0..f43f296 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -4,9 +4,9 @@ SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" PV = "1.2.0+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" +PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}" FILES_libosmogb = "${libdir}/libosmogb${SOLIBS}" @@ -14,6 +14,7 @@ FILES_libosmovty = "${libdir}/libosmovty${SOLIBS}" FILES_osmo-arfcn = "${bindir}/osmo-arfcn" FILES_osmo-auc-gen = "${bindir}/osmo-auc-gen" +FILES_osmo-config-merge = "${bindir}/osmo-config-merge" # Requires fix for upgrades RREPLACES_libosmocore = "DONOTREPLACElibosmocore" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/15223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 Gerrit-Change-Number: 15223 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 14:50:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 14:50:40 +0000 Subject: Change in ...osmo-ggsn[master]: Remove packets in tx queue belonging pdp being freed Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 Change subject: Remove packets in tx queue belonging pdp being freed ...................................................................... Remove packets in tx queue belonging pdp being freed Doing so should avoid the crash seen in OS#3956, where a message is received in osmo-sgsn gtp iface after having received a DeleteCtxAccept message where pdp and associated cbp is freed. As a result, when new confirmation arrives, it can still be matched against an old request and be sent to upper layers providing an already freed cbp. With this patch, since all queued messages belonging to that pdp are dropped, confirmation won't find a match and be discarded in libgtp. In order to be able to drop all req messages belonging to a pdp, a new list is added to pdp_t and qmsg_t are added to that list when inserted into the per-gsn req transmit queue. This way upon pdp free time it's simply a matter of iterating over that list to remove all messages. There's no need to do same for resp queue, and it'd be actually counter-productive, because it wouldn't be possible to detect and discard duplicates anymore after pdp ctx has been freed. Related: OS#3956 Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a --- M TODO-RELEASE M gtp/gtp.c M gtp/pdp.c M gtp/pdp.h M gtp/queue.c M gtp/queue.h 6 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/28/15228/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..73e3189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libgtp queue.h struct qmsg_t got a new field: entry +libgtp pdp.h struct pdp_t got a new field: qmsg_list_req diff --git a/gtp/gtp.c b/gtp/gtp.c index 94c3245..23ce045 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -513,6 +513,7 @@ qmsg->cbp = cbp; qmsg->type = ntoh8(packet->gtp0.h.type); qmsg->fd = fd; + llist_add(&qmsg->entry, &pdp->qmsg_list_req); } gsn->seq_next++; /* Count up this time */ return 0; @@ -697,6 +698,9 @@ qmsg->cbp = NULL; qmsg->type = 0; qmsg->fd = fd; + /* No need to add to pdp list here, because even on pdp ctx free + we want to leave messages in queue_resp until timeout to + detect duplicates */ } return 0; } diff --git a/gtp/pdp.c b/gtp/pdp.c index d745916..eaef545 100644 --- a/gtp/pdp.c +++ b/gtp/pdp.c @@ -31,6 +31,7 @@ #include "pdp.h" #include "gtp.h" #include "lookupa.h" +#include "queue.h" /* *********************************************************** * Functions related to PDP storage @@ -156,7 +157,7 @@ } /* Default: Generate G-PDU sequence numbers on Tx */ (*pdp)->tx_gpdu_seq = true; - + INIT_LLIST_HEAD(&(*pdp)->qmsg_list_req); return 0; } } @@ -165,7 +166,17 @@ int pdp_freepdp(struct pdp_t *pdp) { + struct qmsg_t *qmsg, *qmsg2; struct pdp_t *pdpa = pdp->gsn->pdpa; + int rc; + + /* Remove all enqueued messages belonging to this pdp from req tx transmit + queue. queue_freemsg will call llist_del(). */ + llist_for_each_entry_safe(qmsg, qmsg2, &pdp->qmsg_list_req, entry) { + if ((rc = queue_freemsg(pdp->gsn->queue_req, qmsg))) + LOGP(DLGTP, LOGL_ERROR, + "Failed freeing qmsg from qmsg_list_req during pdp_freepdp()! %d\n", rc); + } pdp_tiddel(pdp); diff --git a/gtp/pdp.h b/gtp/pdp.h index d64d394..fdfa824 100644 --- a/gtp/pdp.h +++ b/gtp/pdp.h @@ -17,6 +17,7 @@ #include #include +#include struct gsn_t; @@ -241,6 +242,8 @@ struct gsn_t *gsn; /* Back pointer to GSN where this pdp ctx belongs to */ bool tx_gpdu_seq; /* Transmit (true) or suppress G-PDU sequence numbers */ + + struct llist_head qmsg_list_req; /* list of req qmsg_t in retrans queue belonging this pdp ctx */ }; /* functions related to pdp_t management */ diff --git a/gtp/queue.c b/gtp/queue.c index ce4713e..4c25913 100644 --- a/gtp/queue.c +++ b/gtp/queue.c @@ -172,6 +172,7 @@ } else { *qmsg = &queue->qmsga[queue->next]; queue_seqset(queue, *qmsg, peer, seq); + INIT_LLIST_HEAD(&(*qmsg)->entry); (*qmsg)->state = 1; /* Space taken */ (*qmsg)->this = queue->next; (*qmsg)->next = -1; /* End of the queue */ @@ -206,6 +207,8 @@ return EOF; /* Not in queue */ } + llist_del(&qmsg->entry); + queue_seqdel(queue, qmsg); if (qmsg->next == -1) /* Are we the last in queue? */ diff --git a/gtp/queue.h b/gtp/queue.h index 76cb7be..c43c704 100644 --- a/gtp/queue.h +++ b/gtp/queue.h @@ -17,6 +17,8 @@ #ifndef _QUEUE_H #define _QUEUE_H +#include + #include "gtp.h" #define QUEUE_DEBUG 0 /* Print debug information */ @@ -39,6 +41,7 @@ int this; /* Pointer to myself */ time_t timeout; /* When do we retransmit this packet? */ int retrans; /* How many times did we retransmit this? */ + struct llist_head entry; /* Listed with other qmsg_t belonging to a pdp_t->qmsg_list_{req,resp} */ }; struct queue_t { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 14:56:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 14:56:23 +0000 Subject: Change in ...osmo-ggsn[master]: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: Hello lynxis lazus, keith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 to look at the new patch set (#2). Change subject: Remove packets in tx queue belonging pdp being freed ...................................................................... Remove packets in tx queue belonging pdp being freed Doing so should avoid the crash seen in OS#3956, where a message is received in osmo-sgsn gtp iface after having received a DeleteCtxAccept message where pdp and associated cbp is freed. As a result, when new confirmation arrives, it can still be matched against an old request and be sent to upper layers providing an already freed cbp. With this patch, since all queued messages belonging to that pdp are dropped, confirmation won't find a match and be discarded in libgtp. In order to be able to drop all req messages belonging to a pdp, a new list is added to pdp_t and qmsg_t are added to that list when inserted into the per-gsn req transmit queue. This way upon pdp free time it's simply a matter of iterating over that list to remove all messages. There's no need to do same for resp queue, and it'd be actually counter-productive, because it wouldn't be possible to detect and discard duplicates anymore after pdp ctx has been freed. Related: OS#3956 Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a --- M TODO-RELEASE M gtp/gtp.c M gtp/pdp.c M gtp/pdp.h M gtp/queue.c M gtp/queue.h 6 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/28/15228/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 15:27:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 15:27:44 +0000 Subject: Change in ...osmo-ggsn[master]: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: Hello lynxis lazus, keith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 to look at the new patch set (#3). Change subject: Remove packets in tx queue belonging pdp being freed ...................................................................... Remove packets in tx queue belonging pdp being freed Doing so should avoid the crash seen in OS#3956, where a message is received in osmo-sgsn gtp iface after having received a DeleteCtxAccept message where pdp and associated cbp is freed. As a result, when new confirmation arrives, it can still be matched against an old request and be sent to upper layers providing an already freed cbp. With this patch, since all queued messages belonging to that pdp are dropped, confirmation won't find a match and be discarded in libgtp. In order to be able to drop all req messages belonging to a pdp, a new list is added to pdp_t and qmsg_t are added to that list when inserted into the per-gsn req transmit queue. This way upon pdp free time it's simply a matter of iterating over that list to remove all messages. There's no need to do same for resp queue, and it'd be actually counter-productive, because it wouldn't be possible to detect and discard duplicates anymore after pdp ctx has been freed. Related: OS#3956 Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a --- M TODO-RELEASE M gtp/gtp.c M gtp/pdp.c M gtp/pdp.h M gtp/queue.c M gtp/queue.h 6 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/28/15228/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 16 15:28:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 16 Aug 2019 15:28:27 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: Hello lynxis lazus, keith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 to look at the new patch set (#4). Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... libgtp: Remove packets in tx queue belonging pdp being freed Doing so should avoid the crash seen in OS#3956, where a message is received in osmo-sgsn gtp iface after having received a DeleteCtxAccept message where pdp and associated cbp is freed. As a result, when new confirmation arrives, it can still be matched against an old request and be sent to upper layers providing an already freed cbp. With this patch, since all queued messages belonging to that pdp are dropped, confirmation won't find a match and be discarded in libgtp. In order to be able to drop all req messages belonging to a pdp, a new list is added to pdp_t and qmsg_t are added to that list when inserted into the per-gsn req transmit queue. This way upon pdp free time it's simply a matter of iterating over that list to remove all messages. There's no need to do same for resp queue, and it'd be actually counter-productive, because it wouldn't be possible to detect and discard duplicates anymore after pdp ctx has been freed. Related: OS#3956 Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a --- M TODO-RELEASE M gtp/gtp.c M gtp/pdp.c M gtp/pdp.h M gtp/queue.c M gtp/queue.h 6 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/28/15228/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:16:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:16:21 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 ) Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... Patch Set 4: so far I don't think that libgtp depends on libosmocore. You are introducing linuxlist related bits to it. I'm not entirely sure if that's a good idea, or if we should rather keep it separate. However, we may need to check if a new library dependency needs to be handled in autoconf, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 17 Aug 2019 01:16:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:18:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:18:02 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15179 ) Change subject: iu_client: sccp_sap_up: set rc early ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idd803774612719df144bef569fb734289aa31282 Gerrit-Change-Number: 15179 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 01:18:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:18:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:18:17 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15178 ) Change subject: iu_client: ensure UE is not NULL on CO primitives ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I63222fda6778417b1c986cb05772fecc51c43bb5 Gerrit-Change-Number: 15178 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 01:18:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:18:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:18:36 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15180 ) Change subject: iu_client: sccp_sap_up: don't decode empty disconnect indications ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 Gerrit-Change-Number: 15180 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 01:18:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:19:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:19:24 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 6: Code-Review-1 (2 comments) let's fix the naming, please. https://gerrit.osmocom.org/#/c/15161/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15161/6//COMMIT_MSG at 9 PS6, Line 9: SCTP SCCP https://gerrit.osmocom.org/#/c/15161/6/include/osmocom/ranap/iu_client.h File include/osmocom/ranap/iu_client.h: https://gerrit.osmocom.org/#/c/15161/6/include/osmocom/ranap/iu_client.h at 75 PS6, Line 75: SCTP SCCP -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 01:19:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:22:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:22:28 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Sat, 17 Aug 2019 01:22:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:22:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:22:50 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 17 Aug 2019 01:22:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:23:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:23:32 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 ) Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-Comment-Date: Sat, 17 Aug 2019 01:23:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:23:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:23:53 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 ) Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 01:23:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:24:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:24:34 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 ) Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 17 Aug 2019 01:24:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:24:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:24:52 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Verify that timers can be set over VTY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 ) Change subject: tests: Verify that timers can be set over VTY ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Sat, 17 Aug 2019 01:24:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 01:26:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 17 Aug 2019 01:26:10 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 01:26:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 17 01:35:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 01:35:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5d5759eeb7bfb_6b972b0f57a605f427879b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_10/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 213s] asciidoc: control_if.adoc: line 104: evaluating: {counter2:target-number} [ 213s] asciidoc: control_if.adoc: line 104: evaluating: {set2:target:test-usermanual__52.png} [ 213s] asciidoc: control_if.adoc: line 110: filtering: "/usr/bin/python2" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__52.png" -Tpng - [ 213s] asciidoc: control_if.adoc: line 115: evaluating: {counter2:target-number} [ 213s] asciidoc: control_if.adoc: line 115: evaluating: {set2:target:test-usermanual__53.png} [ 213s] asciidoc: control_if.adoc: line 121: filtering: "/usr/bin/python2" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__53.png" -Tpng - [ 213s] asciidoc: control_if.adoc: line 131: evaluating: {counter2:target-number} [ 213s] asciidoc: control_if.adoc: line 131: evaluating: {set2:target:test-usermanual__54.png} [ 213s] asciidoc: control_if.adoc: line 136: filtering: "/usr/bin/python2" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__54.png" -Tpng - [ 213s] [ 213s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 213s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 213s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 213s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 213s] make[1]: *** [Makefile:362: all] Error 2 [ 213s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 213s] dh_auto_build: make -j1 returned exit code 2 [ 213s] make: *** [debian/rules:5: binary] Error 2 [ 213s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 213s] [ 213s] sheep81 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Sat Aug 17 01:35:22 UTC 2019. [ 213s] [ 213s] ### VM INTERACTION START ### [ 216s] [ 205.073157] sysrq: SysRq : Power Off [ 216s] [ 205.079857] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] sheep81 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Sat Aug 17 01:35:26 UTC 2019. [ 217s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 17 01:45:17 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 01:45:17 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5d575c46a0be1_6b972b0f57a605f42805a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 113s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stdout 2019-08-17 01:45:09.592000000 +0000 [ 113s] @@ -40,12 +40,6 @@ [ 113s] [NA] Client's read_cb_cli(): received 11(11) bytes: 72 65 61 64 5f 63 62 5f 73 72 76 [ 113s] [NA] Client's read_cb_cli(): initial read, contacting server [ 113s] [OK] Client's read_cb_cli(): sent 29 bytes message: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 113s] -[OK|OK] Server's read_cb_srv(): callback triggered [ 113s] -[OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 113s] -[OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 [ 113s] -[OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call [ 113s] -[OK] Client's read_cb_cli(): callback triggered [ 113s] -[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled [ 113s] non-reconnecting test complete. [ 113s] [ 113s] Stream tests completed [ 113s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 113s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] make: *** [debian/rules:13: build] Error 2 [ 113s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 114s] [ 114s] sheep82 failed "build libosmo-netif_0.6.0.dsc" at Sat Aug 17 01:45:11 UTC 2019. [ 114s] [ 114s] ### VM INTERACTION START ### [ 117s] [ 107.501145] sysrq: SysRq : Power Off [ 117s] [ 107.506019] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] sheep82 failed "build libosmo-netif_0.6.0.dsc" at Sat Aug 17 01:45:14 UTC 2019. [ 117s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 17 01:48:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 01:48:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d575d15c347b_6b972b0f57a605f42816e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 486s] ar: `u' modifier ignored since `D' is the default (see `U') [ 486s] libtool: link: ranlib .libs/libtransceiver_common.a [ 486s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 486s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 487s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 487s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 487s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 487s] collect2: error: ld returned 1 exit status [ 487s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 487s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 487s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 487s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 487s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 487s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 487s] make[1]: *** [Makefile:444: all] Error 2 [ 487s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 487s] dh_auto_build: make -j1 returned exit code 2 [ 487s] make: *** [debian/rules:6: build] Error 255 [ 487s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 487s] [ 487s] lamb57 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 01:48:25 UTC 2019. [ 487s] [ 487s] ### VM INTERACTION START ### [ 490s] [ 470.828951] sysrq: SysRq : Power Off [ 490s] [ 470.839786] reboot: Power down [ 490s] ### VM INTERACTION END ### [ 490s] [ 490s] lamb57 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 01:48:28 UTC 2019. [ 490s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Aug 17 08:46:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 17 Aug 2019 08:46:54 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 3: Code-Review+1 Much cleaner now. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 08:46:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 08:50:06 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 17 Aug 2019 08:50:06 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Sat, 17 Aug 2019 08:50:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:06:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:06:38 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 6: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 14:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:10:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:10:17 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 3: +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 14:10:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:10:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:10:23 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 17 Aug 2019 14:10:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:11:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:11:08 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 ) Change subject: gprs_gmm: Introduce assert to guard against unexpected condition ...................................................................... gprs_gmm: Introduce assert to guard against unexpected condition This may well be the culprit of OS#3957, were already freed llme is accessed from mmctx context later on, upon some timer is triggered in mmctx. Related: OS#3957 Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 --- M src/gprs/gprs_gmm.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 0fcf1bb..718fc97 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1741,6 +1741,11 @@ "The MM context cannot be used, RA: %03d-%0*d-%d-%d\n", mmctx->ra.mcc, mmctx->ra.mnc_3_digits, mmctx->ra.mnc, mmctx->ra.lac, mmctx->ra.rac); + /* mmctx is set to NULL and gprs_llgmm_unassign(llme) will be + called below, let's make sure we don't keep dangling llme + pointers in mmctx (OS#3957). */ + if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) + OSMO_ASSERT(mmctx->gb.llme == NULL); mmctx = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8e1eaeb9b3ebee8e45704b4fe007190c7db609e4 Gerrit-Change-Number: 15167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:11:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:11:08 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 ) Change subject: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup ...................................................................... gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 718fc97..bb0e002 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -327,7 +327,7 @@ /* Mark MM state as deregistered */ ctx->gmm_state = GMM_DEREGISTERED; mmctx_set_pmm_state(ctx, PMM_DETACHED); - mmctx_set_pmm_state(ctx, MM_IDLE); + mmctx_set_mm_state(ctx, MM_IDLE); sgsn_mm_ctx_cleanup_free(ctx); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic6912269d0d69c86f19e57f3271ebda1328e968f Gerrit-Change-Number: 15183 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:11:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:11:09 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 ) Change subject: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported ...................................................................... gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_libgtp.c 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index a0a056f..10455d6 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -108,8 +108,10 @@ MM_CTX_T_GERAN_Gb, /* UMTS via Iu */ MM_CTX_T_UTRAN_Iu, - /* GPRS/EDGE via Iu */ +#if 0 + /* GPRS/EDGE via Iu, not supported */ MM_CTX_T_GERAN_Iu, +#endif }; struct service_info { diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index e9fffd8..88b8d04 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -279,7 +279,9 @@ pdp->userloc.l = 8; switch (mmctx->ran_type) { case MM_CTX_T_GERAN_Gb: +#if 0 case MM_CTX_T_GERAN_Iu: +#endif pdp->rattype.v[0] = 2; /* User Location Information */ pdp->userloc_given = 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3b53a530ab25434e2b2f4d80ad70a8a5f22bfcac Gerrit-Change-Number: 15184 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:11:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:11:09 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 ) Change subject: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static ...................................................................... gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index bb0e002..e1bed0d 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -136,7 +136,7 @@ } } -void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) return; @@ -162,7 +162,7 @@ ctx->pmm_state = state; } -void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { if (ctx->ran_type != MM_CTX_T_GERAN_Gb) return; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I061144b6994ee40d5b32eb321dd4f3d3786d028d Gerrit-Change-Number: 15185 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 14:20:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 14:20:15 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 ) Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... Patch Set 4: libgtp already depends on libosmocore * It's already in osmo-ggsn.git's configure.ac as a PKG_CHECK_MODULES, so it depends on it at compile time. * only known users to us (osmo-ggsn, osmo-sgsn, sgsnemu?) already depend on libosmocore both compile time and runtime. * libgtp uses OSMO_DEPRECATED(), wich means again libosmocore is needed at compile time. * libgtp uses OSMO_ASSERT(), so again needed at compile time. * libgtp uses osmo_bcd2char(), so it requires libosmocore at runtime * in Makefile.am, libgtp already links against libosmocore: "libgtp_la_LIBADD = $(LIBOSMOCORE_LIBS)" So i'm in favour of actually moving libgtp to be more "osmocom" rather than trying to keep it away from it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 17 Aug 2019 14:20:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 17 16:15:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 17 Aug 2019 16:15:26 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 ) Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... Patch Set 4: Forgot an extra point: * libgtp already uses LOGP() -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 17 Aug 2019 16:15:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 17 16:44:13 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 16:44:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d582ef7bdaca_6b972b0f57a605f43822a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 399s] ar: `u' modifier ignored since `D' is the default (see `U') [ 399s] libtool: link: ranlib .libs/libtransceiver_common.a [ 399s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 399s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 399s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 399s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 399s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 399s] collect2: error: ld returned 1 exit status [ 399s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 399s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 399s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 399s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 399s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 399s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 399s] make[1]: *** [Makefile:444: all] Error 2 [ 399s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 399s] dh_auto_build: make -j1 returned exit code 2 [ 399s] make: *** [debian/rules:6: build] Error 255 [ 399s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 399s] [ 399s] lamb68 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 16:44:05 UTC 2019. [ 399s] [ 399s] ### VM INTERACTION START ### [ 402s] [ 384.271135] sysrq: SysRq : Power Off [ 402s] [ 384.280272] reboot: Power down [ 402s] ### VM INTERACTION END ### [ 403s] [ 403s] lamb68 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 16:44:09 UTC 2019. [ 403s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 17 16:48:13 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 16:48:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d582fe9737c4_6b972b0f57a605f438255a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 488s] ar: `u' modifier ignored since `D' is the default (see `U') [ 488s] libtool: link: ranlib .libs/libtransceiver_common.a [ 488s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 488s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 489s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 489s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 489s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 489s] collect2: error: ld returned 1 exit status [ 489s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 489s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 489s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 489s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 489s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 489s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 489s] make[1]: *** [Makefile:444: all] Error 2 [ 489s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 489s] dh_auto_build: make -j1 returned exit code 2 [ 489s] make: *** [debian/rules:6: build] Error 255 [ 489s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 489s] [ 489s] cloud131 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 16:47:54 UTC 2019. [ 489s] [ 489s] ### VM INTERACTION START ### [ 492s] [ 449.334574] sysrq: SysRq : Power Off [ 492s] [ 449.340962] reboot: Power down [ 494s] ### VM INTERACTION END ### [ 494s] [ 494s] cloud131 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 16:48:00 UTC 2019. [ 494s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 17 21:44:59 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 21:44:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d587565c8766_6b972b0f57a605f44128a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 407s] ar: `u' modifier ignored since `D' is the default (see `U') [ 407s] libtool: link: ranlib .libs/libtransceiver_common.a [ 407s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 407s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 408s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 408s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 408s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 408s] collect2: error: ld returned 1 exit status [ 408s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 408s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 408s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 408s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 408s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 408s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 408s] make[1]: *** [Makefile:444: all] Error 2 [ 408s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 408s] dh_auto_build: make -j1 returned exit code 2 [ 408s] make: *** [debian/rules:6: build] Error 255 [ 408s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 408s] [ 408s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 21:44:44 UTC 2019. [ 408s] [ 408s] ### VM INTERACTION START ### [ 411s] [ 391.626558] sysrq: SysRq : Power Off [ 411s] [ 391.634732] reboot: Power down [ 411s] ### VM INTERACTION END ### [ 411s] [ 411s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 21:44:47 UTC 2019. [ 411s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 17 21:47:50 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 17 Aug 2019 21:47:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d58761c6828d_6b972b0f57a605f441290@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 426s] ar: `u' modifier ignored since `D' is the default (see `U') [ 426s] libtool: link: ranlib .libs/libtransceiver_common.a [ 426s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 426s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 426s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 426s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 426s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 426s] collect2: error: ld returned 1 exit status [ 426s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 426s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 426s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 426s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 426s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 426s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 426s] make[1]: *** [Makefile:444: all] Error 2 [ 426s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 426s] dh_auto_build: make -j1 returned exit code 2 [ 426s] make: *** [debian/rules:6: build] Error 255 [ 426s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 426s] [ 426s] lamb57 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 21:47:35 UTC 2019. [ 426s] [ 426s] ### VM INTERACTION START ### [ 429s] [ 411.336469] sysrq: SysRq : Power Off [ 429s] [ 411.343556] reboot: Power down [ 429s] ### VM INTERACTION END ### [ 429s] [ 429s] lamb57 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 17 21:47:38 UTC 2019. [ 429s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 18 01:44:08 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 18 Aug 2019 01:44:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d58ad6c15397_6b972b0f57a605f442044c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 397s] ar: `u' modifier ignored since `D' is the default (see `U') [ 397s] libtool: link: ranlib .libs/libtransceiver_common.a [ 397s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 397s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 398s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 398s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 398s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 398s] collect2: error: ld returned 1 exit status [ 398s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 398s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 398s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 398s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 398s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 398s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 398s] make[1]: *** [Makefile:444: all] Error 2 [ 398s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 398s] dh_auto_build: make -j1 returned exit code 2 [ 398s] make: *** [debian/rules:6: build] Error 255 [ 398s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 398s] [ 398s] lamb12 failed "build osmo-trx_1.1.1.dsc" at Sun Aug 18 01:43:55 UTC 2019. [ 398s] [ 398s] ### VM INTERACTION START ### [ 401s] [ 382.620194] sysrq: SysRq : Power Off [ 401s] [ 382.629657] reboot: Power down [ 401s] ### VM INTERACTION END ### [ 401s] [ 401s] lamb12 failed "build osmo-trx_1.1.1.dsc" at Sun Aug 18 01:43:58 UTC 2019. [ 401s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Aug 18 11:11:35 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 18 Aug 2019 11:11:35 +0000 Subject: Change in ...osmo-msc[master]: libvlr/vlr.c: cosmetic: move message_type assignment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15226 ) Change subject: libvlr/vlr.c: cosmetic: move message_type assignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice7f98597b54f03069375fac56fb162f2669e7f0 Gerrit-Change-Number: 15226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 18 Aug 2019 11:11:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 11:11:44 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 18 Aug 2019 11:11:44 +0000 Subject: Change in ...osmo-msc[master]: libvlr/vlr.c: cosmetic: move message_type assignment In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15226 ) Change subject: libvlr/vlr.c: cosmetic: move message_type assignment ...................................................................... libvlr/vlr.c: cosmetic: move message_type assignment Change-Id: Ice7f98597b54f03069375fac56fb162f2669e7f0 --- M src/libvlr/vlr.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 625b699..de61ba5 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -680,6 +680,7 @@ { struct osmo_gsup_message gsup_msg = { .message_class = OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT, + .message_type = OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST, }; uint8_t imei_enc[GSM23003_IMEI_NUM_DIGITS+2]; /* +2: IE header */ int len; @@ -694,7 +695,6 @@ gsup_msg.imei_enc_len = len; /* Send CHECK_IMEI_REQUEST */ - gsup_msg.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST; OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi); return gsup_client_mux_tx(vsub->vlr->gcm, &gsup_msg); } @@ -704,9 +704,9 @@ { struct osmo_gsup_message gsup_msg = { .message_class = OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT, + .message_type = OSMO_GSUP_MSGT_AUTH_FAIL_REPORT, }; - gsup_msg.message_type = OSMO_GSUP_MSGT_AUTH_FAIL_REPORT; OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi); return gsup_client_mux_tx(vsub->vlr->gcm, &gsup_msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice7f98597b54f03069375fac56fb162f2669e7f0 Gerrit-Change-Number: 15226 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:07:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:07:44 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 ) Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 18 Aug 2019 17:07:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:11:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:11:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add GTPv2 support In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 to look at the new patch set (#2). Change subject: mme: Add GTPv2 support ...................................................................... mme: Add GTPv2 support this includes a GTPv2_CodecPort (for the usual transcoding) as wella as an empty GTPv2_PrivateExtensions.ttcn without which the TITAN GTPv2 ProtocolModule won't compile. Change-Id: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 --- A library/GTPv2_CodecPort.ttcn A library/GTPv2_PrivateExtensions.ttcn A library/GTPv2_Templates.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 5 files changed, 411 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/15204/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 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: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 Gerrit-Change-Number: 15204 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:12:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:12:47 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 ) Change subject: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure ...................................................................... BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure It originally seemed like a great idea to define a custom record which aggregates the decoded BSSGP, LLC, L3 and/or SNDCP and passes it to the individual ConnHdlr. However, particularly with testcase interoperability for IuPS in mind, this seems bogus. Also, we never really took advantage of this. Let's now decode as far as we can decode any PDU, and then send the decoded version of that PDU via the ports between the BSSGP_Emulation and the ConnHdlr component. Change-Id: I8c1082880902dd9a04935945f0293895f4d0c53a --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_RAW.ttcn M sgsn/SGSN_Tests.ttcn 4 files changed, 112 insertions(+), 165 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index 5b5628e..f8b9f06 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -53,7 +53,9 @@ PDU_LLC, PDU_L3_MS_SGSN, PDU_L3_SGSN_MS; - out BssgpDecoded, + out PDU_BSSGP, + PDU_LLC, + PDU_SN, NsStatusIndication, BssgpStatusIndication, ASP_Event, @@ -66,7 +68,9 @@ in ASP_Event, NsStatusIndication, BssgpStatusIndication, - BssgpDecoded, + PDU_BSSGP, + PDU_LLC, + PDU_SN, PDU_L3_MS_SGSN, PDU_L3_SGSN_MS; out PDU_BSSGP, @@ -492,6 +496,21 @@ } } +private function f_send_bssgp_dec(BssgpDecoded dec, BSSGP_Client_CT vc_conn, BSSGP_SP_PT pt := BSSGP_SP) runs on BSSGP_CT { + if (ispresent(dec.l3_mt)) { + pt.send(dec.l3_mt) to vc_conn; + } else if (ispresent(dec.l3_mo)) { + pt.send(dec.l3_mo) to vc_conn; + } else if (ispresent(dec.sndcp)) { + pt.send(dec.sndcp) to vc_conn; + } else if (ispresent(dec.llc)) { + pt.send(dec.llc) to vc_conn; + } else { + pt.send(dec.bssgp) to vc_conn; + } +} + + altstep as_unblocked() runs on BSSGP_CT { var BSSGP_Client_CT vc_conn; var NsUnitdataIndication udi; @@ -539,7 +558,7 @@ [] BSCP.receive(f_BnsUdInd(tr_BSSGP_PS_PAGING(g_cfg.bvci), g_cfg.bvci)) -> value udi { var hexstring imsi := udi.bssgp.pDU_BSSGP_PAGING_PS.iMSI.digits vc_conn := f_tbl_comp_by_imsi(imsi); - BSSGP_SP.send(f_dec_bssgp(udi.bssgp)) to vc_conn; + f_send_bssgp_dec(f_dec_bssgp(udi.bssgp), vc_conn); } /* Any other PTP BSSGP message: If it has TLLi, route to component; otherwise broadcast */ @@ -548,14 +567,14 @@ var template OCT4 tlli := f_bssgp_get_tlli(udi.bssgp); if (isvalue(tlli)) { vc_conn := f_tbl_comp_by_tlli(valueof(tlli)); - BSSGP_SP.send(dec) to vc_conn; + f_send_bssgp_dec(dec, vc_conn); } else { log("No TLLI: Broadcasting ", dec); /* broadcast this message to all components */ // TITAN DOESN'T DO THIS, *SIGH*: "BSSGP_SP.send(dec) to all component;" for (var integer i := 0; i < sizeof(ClientTable); i := i+1) { if (isbound(ClientTable[i].comp_ref)) { - BSSGP_SP.send(dec) to ClientTable[i].comp_ref; + f_send_bssgp_dec(dec, ClientTable[i].comp_ref); } } } @@ -567,14 +586,14 @@ var template OCT4 tlli := f_bssgp_get_tlli(udi.bssgp); if (isvalue(tlli)) { vc_conn := f_tbl_comp_by_tlli(valueof(tlli)); - BSSGP_SP_SIG.send(dec) to vc_conn; + f_send_bssgp_dec(dec, vc_conn, BSSGP_SP_SIG); } else { log("No TLLI: Broadcasting ", dec); /* broadcast this message to all components */ // TITAN DOESN'T DO THIS, *SIGH*: "BSSGP_SP.send(dec) to all component;" for (var integer i := 0; i < sizeof(ClientTable); i := i+1) { if (isbound(ClientTable[i].comp_ref)) { - BSSGP_SP_SIG.send(dec) to ClientTable[i].comp_ref; + f_send_bssgp_dec(dec, vc_conn, BSSGP_SP_SIG); } } } @@ -731,47 +750,5 @@ } } -template BssgpDecoded tr_BD_BSSGP(template PDU_BSSGP bg) := { - bssgp := bg, - llc := *, - l3_mo := *, - l3_mt := *, - sndcp := * -} - -template BssgpDecoded tr_BD_LLC(template PDU_LLC llc) := { - bssgp := ?, - llc := llc, - l3_mo := *, - l3_mt := *, - sndcp := * -} - -template BssgpDecoded tr_BD_L3_MT(template PDU_L3_SGSN_MS mt) := { - bssgp := ?, - llc := ?, - l3_mo := omit, - l3_mt := mt, - sndcp := omit -} - -template BssgpDecoded tr_BD_L3_MO(template PDU_L3_MS_SGSN mo) := { - bssgp := ?, - llc := ?, - l3_mo := mo, - l3_mt := omit, - sndcp := omit -} - -template BssgpDecoded tr_BD_SNDCP(template BIT4 sapi, template PDU_SN sn) := { - bssgp := ?, - llc := tr_LLC_UI(?, sapi), - l3_mo := omit, - l3_mt := omit, - sndcp := sn -} - - - } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index e00f92b..a88dfed 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -324,15 +324,15 @@ } -function f_bssgp_wait_ul_ud(template BssgpDecoded bd_exp) runs on dummy_CT { +function f_bssgp_wait_ul_ud(template PDU_BSSGP exp) runs on dummy_CT { timer T := 5.0; T.start; alt { - [] BSSGP[0].receive(bd_exp) { + [] BSSGP[0].receive(exp) { log("found matching BSSGP UL-UNITDATA PDU"); } [] T.timeout { - setverdict(fail, "Timeout waiting for ", bd_exp); + setverdict(fail, "Timeout waiting for ", exp); mtc.stop; } } @@ -373,7 +373,7 @@ } for (var integer i := 0; i < sizeof(us.tbf.llc_pdus_enc); i := i+1) { - f_bssgp_wait_ul_ud(tr_BD_BSSGP(tr_BSSGP_UL_UD(g_mmctx.tlli, ?, us.tbf.llc_pdus_enc[i]))); + f_bssgp_wait_ul_ud(tr_BSSGP_UL_UD(g_mmctx.tlli, ?, us.tbf.llc_pdus_enc[i])); } setverdict(pass); @@ -393,26 +393,6 @@ } -testcase TC_nsem() runs on dummy_CT { - - f_init(); - f_bssgp_establish(); - - while (true) { - var BssgpDecoded bd; - alt { - [] BSSGP[0].receive(tr_BD_BSSGP(?)) -> value bd { - log("BSSGP Rx: ", bd); - //log("GMM Rx: ", dec_PDU_L3_MS_SGSN(pdu.payload)); - g_mmctx.tlli := bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI; - tx_gmm(LLC_CR_DL_CMD, gmm_auth_req); - } - [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP[0].receive { repeat; } - } - } -} - function f_llc_dec_and_log(in octetstring inp) { log("LLC Input: ", inp); diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 36db225..4732da6 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -433,7 +433,7 @@ f_sleep(1.0); f_pcuif_tx(ts_PCUIF_SUSP_REQ(0, tlli, ra_id, 0)); - BSSGP_SIG[0].receive(tr_BD_BSSGP(tr_BSSGP_SUSPEND(tlli, mp_gb_cfg.cell_id.ra_id))); + BSSGP_SIG[0].receive(tr_BSSGP_SUSPEND(tlli, mp_gb_cfg.cell_id.ra_id)); setverdict(pass); } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 03c9d05..e349719 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -401,12 +401,12 @@ altstep as_mm_identity(integer gb_idx := 0) runs on BSSGP_ConnHdlr { var MobileL3_CommonIE_Types.MobileIdentityLV mi; - [] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[gb_idx].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi), gb_idx); repeat; } - [] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[gb_idx].receive(tr_GMM_ID_REQ('010'B)) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi), gb_idx); repeat; @@ -416,12 +416,9 @@ /* receive a L3 (GMM/SM) message over whatever is the appropriate lower-layer bearer */ function f_receive_l3(template PDU_L3_SGSN_MS rx_tpl := ?, integer gb_idx := 0) runs on BSSGP_ConnHdlr return PDU_L3_SGSN_MS { - var BssgpDecoded bd; var PDU_L3_SGSN_MS l3_mt; alt { - [] BSSGP[gb_idx].receive(tr_BD_L3_MT(rx_tpl)) -> value bd { - l3_mt := bd.l3_mt; - } + [] BSSGP[gb_idx].receive(rx_tpl) -> value l3_mt { } } return l3_mt; } @@ -658,14 +655,14 @@ f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ(?)) { /* don't send ID Response */ repeat; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('09'O))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT('09'O)) { setverdict(pass); } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(fail, "Wrong Attach Reject Cause"); mtc.stop; } @@ -688,7 +685,7 @@ [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { } } /* don't send SAI-response from HLR */ - BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); + BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)); setverdict(pass); } testcase TC_attach_auth_sai_timeout() runs on test_CT { @@ -709,7 +706,7 @@ GSUP.send(ts_GSUP_SAI_ERR(g_pars.imsi, 23)); } } - BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); + BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)); setverdict(pass); } testcase TC_attach_auth_sai_reject() runs on test_CT { @@ -721,7 +718,7 @@ /* HLR never responds to UL REQ, expect ATTACH REJECT */ private function f_TC_attach_gsup_lu_timeout(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); @@ -730,11 +727,11 @@ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); /* Never follow-up with ISD_REQ or UL_RES */ alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(pass); } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); setverdict(fail); mtc.stop; } @@ -750,7 +747,7 @@ /* HLR rejects UL REQ, expect ATTACH REJECT */ private function f_TC_attach_gsup_lu_reject(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); @@ -760,11 +757,11 @@ GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 0)); } alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(pass); } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); setverdict(fail); mtc.stop; } @@ -781,7 +778,7 @@ /* Attempt of combined GPRS + IMSI attach: network should ACK only GPRS attach */ private function f_TC_attach_combined(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); @@ -789,8 +786,8 @@ /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); - BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); } f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); @@ -805,15 +802,15 @@ /* Attempt of GPRS ATTACH in 'accept all' mode */ private function f_TC_attach_accept_all(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; var RoutingAreaIdentificationV old_ra := f_random_RAI(); g_pars.net.expect_auth := false; f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); - BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); } f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); @@ -840,13 +837,13 @@ f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT('07'O)) { setverdict(pass); } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(pass); } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT(*, *, *)) { setverdict(fail); mtc.stop; } @@ -871,7 +868,7 @@ f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { + [] BSSGP[0].receive(tr_GMM_RAU_REJECT('0a'O)) { setverdict(pass); } /* FIXME: Expect XID RESET? */ @@ -887,8 +884,6 @@ } private function f_TC_attach_rau(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; - /* first perform regular attach */ f_TC_attach(id); @@ -905,7 +900,7 @@ /* general GPRS DETACH helper */ function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge, integer bssgp_index := 0) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; timer T := 5.0; f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp_index); if (expect_purge) { @@ -918,7 +913,7 @@ setverdict(fail, "Unexpected GSUP PURGE MS for unregistered TLLI"); mtc.stop; } - [power_off] BSSGP[bssgp_index].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [power_off] BSSGP[bssgp_index].receive(tr_GMM_DET_ACCEPT_MT) -> value l3_mt { g_pars.ra := omit; setverdict(fail, "Unexpected DETACH ACCEPT in power-off DETACH"); mtc.stop; @@ -927,12 +922,12 @@ [power_off] T.timeout { setverdict(pass); } - [not power_off] BSSGP[bssgp_index].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [not power_off] BSSGP[bssgp_index].receive(tr_GMM_DET_ACCEPT_MT) -> value l3_mt { g_pars.ra := omit; setverdict(pass); /* TODO: check if any PDP contexts are deactivated on network side? */ } - [] BSSGP[bssgp_index].receive(tr_BD_L3_MT(?)) -> value bd { + [] BSSGP[bssgp_index].receive(PDU_L3_SGSN_MS:?) -> value l3_mt { if (power_off) { setverdict(fail, "Unexpected Layer 3 package received in power-off DETACH"); } else { @@ -1056,22 +1051,22 @@ omit, recovery)); } alt { - [exp_rej] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause))) { + [exp_rej] BSSGP[gb_idx].receive(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause)) { setverdict(pass); } - [exp_rej] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT)) { + [exp_rej] BSSGP[gb_idx].receive(tr_SM_ACT_PDP_ACCEPT) { setverdict(fail, "Unexpected PDP CTX ACT ACC"); mtc.stop; } - [not exp_rej] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { + [not exp_rej] BSSGP[gb_idx].receive(tr_SM_ACT_PDP_REJ(apars.tid, ?)) { setverdict(fail, "Unexpected PDP CTX ACT FAIL"); mtc.stop; } - [not exp_rej] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { + [not exp_rej] BSSGP[gb_idx].receive(tr_SM_ACT_PDP_REJ(apars.tid, ?)) { setverdict(fail, "Unexpected PDP CTX ACT FAIL"); mtc.stop; } - [not exp_rej] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi))) { + [not exp_rej] BSSGP[gb_idx].receive(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi)) { setverdict(pass); } [] as_xid(apars, gb_idx); @@ -1090,7 +1085,7 @@ GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { - [] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { + [] BSSGP[gb_idx].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { setverdict(pass); } [] as_xid(apars, gb_idx); @@ -1114,7 +1109,7 @@ T.start; alt { - [] BSSGP[gb_idx].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { + [] BSSGP[gb_idx].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), gb_idx); } [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { @@ -1219,7 +1214,7 @@ } private altstep as_xid(PdpActPars apars, integer gb_idx := 0) runs on BSSGP_ConnHdlr { - [] BSSGP[gb_idx].receive(tr_BD_LLC(tr_LLC_XID_MT_CMD(?, apars.sapi))) { + [] BSSGP[gb_idx].receive(tr_LLC_XID_MT_CMD(?, apars.sapi)) { repeat; } } @@ -1265,7 +1260,8 @@ /* Expect PDU via BSSGP/LLC on simulated PCU from SGSN */ alt { [] as_xid(apars, gb_idx); - [] BSSGP[gb_idx].receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); + //[] BSSGP[gb_idx].receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); + [] BSSGP[gb_idx].receive(tr_SN_UD(apars.nsapi, payload)); } } @@ -1304,14 +1300,14 @@ apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(?, ?))) { + [] BSSGP[0].receive(tr_GMM_DET_REQ_MT(?, ?)) { setverdict(pass); } [] GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) { setverdict(fail, "Unexpected GTP PDP CTX ACT"); mtc.stop; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(?, ?))) { + [] BSSGP[0].receive(tr_SM_ACT_PDP_ACCEPT(?, ?)) { setverdict(fail, "Unexpected SM PDP CTX ACT ACK"); mtc.stop; } @@ -1447,7 +1443,7 @@ } var OCT1 cause_network_failure := int2oct(38, 1) alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true)) { f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } @@ -1522,7 +1518,7 @@ for (i := 0; i < 5; i := i+1) { alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) {} + [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) {} [] as_xid(apars); } } @@ -1567,7 +1563,7 @@ apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, omit, omit)); } - BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT)) {} + BSSGP[0].receive(tr_SM_ACT_PDP_ACCEPT) {} /* Now the same with Deact */ f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, '00'O, false, omit), 0); @@ -1583,7 +1579,7 @@ GTP.send(ts_GTPC_DeletePdpResp(g_ud_second.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { setverdict(pass); } [] as_xid(apars, 0); @@ -1614,7 +1610,7 @@ g_delete_req := ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B); GTP.send(g_delete_req); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), 0); } [] as_xid(apars, 0); @@ -1669,7 +1665,7 @@ timer T := 5.0; T.start; alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(*, *, *))) { + [] BSSGP[0].receive(tr_GMM_DET_REQ_MT(*, *, *)) { T.stop; setverdict(fail, "Unexpected GMM Detach Request"); mtc.stop; @@ -1728,7 +1724,7 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); /* MS: receive a Detach Request */ - BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); + BSSGP[0].receive(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?)); f_send_l3_gmm_llc(ts_GMM_DET_ACCEPT_MO); setverdict(pass); @@ -1823,15 +1819,15 @@ f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { /* break */ } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { /* ignore ID REQ IMEI */ count_req := count_req + 1; repeat; @@ -1871,15 +1867,15 @@ f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { /* break */ } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { /* ignore ID REQ IMSI */ count_req := count_req + 1; repeat; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; @@ -1931,7 +1927,7 @@ private function f_TC_attach_closed_imsi_added(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; /* unregister the old IMSI */ f_bssgp_client_unregister(g_pars.imsi); @@ -1945,12 +1941,12 @@ f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(fail, "Received unexpected GMM Attach REJECT"); mtc.stop; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT(*, *, *)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } @@ -2004,7 +2000,7 @@ [] T.timeout { /* break */ } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT(*, *, *)) { /* ignore */ count_req := count_req + 1; T.start; @@ -2032,17 +2028,17 @@ } private function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; /* then send RAU */ f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp); alt { - [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { - f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp); + [] BSSGP[bssgp].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt { + f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp); f_send_l3_gmm_llc(ts_GMM_RAU_COMPL, bssgp); setverdict(pass); } - [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { + [] BSSGP[bssgp].receive(tr_GMM_RAU_REJECT) { setverdict(fail, "Unexpected RAU Reject"); mtc.stop; } @@ -2051,8 +2047,6 @@ } private function f_TC_attach_rau_a_a(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; - /* first perform regular attach */ f_TC_attach(id); @@ -2081,8 +2075,6 @@ } private function f_TC_attach_rau_a_b(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; - f_TC_attach(id); log("attach complete sending rau"); @@ -2117,21 +2109,21 @@ var integer count_req := 0; var MobileL3_CommonIE_Types.MobileIdentityLV mi; var RoutingAreaIdentificationV rand_rai := f_random_RAI(); - var BssgpDecoded bd; + var PDU_L3_SGSN_MS l3_mt; f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(fail, "Unexpected GMM ATTACH REJECT"); mtc.stop; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { /* send out a second GMM_Attach Request. * If the SGSN follows the rules, this 2nd ATTACH REQ should be ignored, because * of the same content */ @@ -2144,21 +2136,21 @@ /* we've sent already a IMEI answer, we should NOT asked again for IMEI */ alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) { setverdict(fail, "Unexpected GMM ID REQ (IMEI)."); mtc.stop; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) { setverdict(fail, "Unexpected GMM ATTACH REJECT"); mtc.stop; } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ @@ -2186,7 +2178,6 @@ } private function f_TC_attach_usim_resync(charstring id) runs on BSSGP_ConnHdlr { - var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); @@ -2227,7 +2218,7 @@ var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; - BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + BSSGP[0].receive(auth_ciph_req) -> value l3_mt; /* send the gmm auth failure with resync IE */ f_send_l3_gmm_llc(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts)); @@ -2259,8 +2250,7 @@ /* wait for the new Auth Request */ auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; - BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; - l3_mt := bd.l3_mt; + BSSGP[0].receive(auth_ciph_req) -> value l3_mt; var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); @@ -2284,8 +2274,8 @@ /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); - BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { - f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt { + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); } f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); @@ -2337,7 +2327,7 @@ f_gmm_attach(false, false); f_sleep(1.0); f_send_llc(ts_LLC_SABM({}, '1'B, c_LLC_SAPI_LLGMM, LLC_CR_UL_CMD)); - BSSGP[0].receive(tr_BD_LLC(tr_LLC_DM(?, c_LLC_SAPI_LLGMM, LLC_CR_DL_RSP))); + BSSGP[0].receive(tr_LLC_DM(?, c_LLC_SAPI_LLGMM, LLC_CR_DL_RSP)); setverdict(pass); } testcase TC_llc_sabm_dm_llgmm() runs on test_CT { @@ -2353,7 +2343,7 @@ f_gmm_attach(false, false); f_sleep(1.0); f_send_llc(ts_LLC_SABM({}, '1'B, c_LLC_SAPI_LL5, LLC_CR_UL_CMD)); - BSSGP[0].receive(tr_BD_LLC(tr_LLC_DM(?, c_LLC_SAPI_LL5, LLC_CR_DL_RSP))); + BSSGP[0].receive(tr_LLC_DM(?, c_LLC_SAPI_LL5, LLC_CR_DL_RSP)); setverdict(pass); } testcase TC_llc_sabm_dm_ll5() runs on test_CT { @@ -2380,7 +2370,7 @@ xid_rx := { tr_XID_L3(''O) }; f_send_llc(ts_LLC_XID_MO_CMD(xid, apars.sapi)); alt { - [] BSSGP[0].receive(tr_BD_LLC(tr_LLC_XID(xid_rx, apars.sapi))); + [] BSSGP[0].receive(tr_LLC_XID(xid_rx, apars.sapi)); [] as_xid(apars); } setverdict(pass); @@ -2408,7 +2398,7 @@ xid_rx := { tr_XID_N201U(1234) }; f_send_llc(ts_LLC_XID_MO_CMD(xid, apars.sapi)); alt { - [] BSSGP[0].receive(tr_BD_LLC(tr_LLC_XID_MT_RSP(xid_rx, apars.sapi))); + [] BSSGP[0].receive(tr_LLC_XID_MT_RSP(xid_rx, apars.sapi)); [] as_xid(apars); } setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13865 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: I8c1082880902dd9a04935945f0293895f4d0c53a Gerrit-Change-Number: 13865 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:12:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:12:47 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Emulation: Support for PS domain In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13854 ) Change subject: RAN_Emulation: Support for PS domain ...................................................................... RAN_Emulation: Support for PS domain So far, the RAN_Emulation only supported the CS domain, and not PS. Let's change that so we can start having IuPS related tests. Change-Id: I7ba4662e5a7ba31a2582b0c133b3140c8057678f --- M library/RAN_Emulation.ttcnpp 1 file changed, 92 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 207adcd..891de09 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -101,6 +101,17 @@ PDU_ML3_NW_MS dtap } +type record PDU_DTAP_PS_MO { + OCT1 dlci optional, + boolean skip_seq_patching optional, + PDU_L3_MS_SGSN dtap +} + +type record PDU_DTAP_PS_MT { + OCT1 dlci optional, + PDU_L3_SGSN_MS dtap +} + template PDU_DTAP_MT ts_PDU_DTAP_MT(template PDU_ML3_NW_MS dtap, template OCT1 dlci := omit) := { dlci := dlci, dtap := dtap @@ -123,6 +134,29 @@ dtap := dtap } +template (value) PDU_DTAP_PS_MT ts_PDU_DTAP_PS_MT(template (value) PDU_L3_SGSN_MS dtap, template (omit) OCT1 dlci := omit) := { + dlci := dlci, + dtap := dtap +} + +template (value) PDU_DTAP_PS_MO ts_PDU_DTAP_PS_MO(template (value) PDU_L3_MS_SGSN dtap, template (value) OCT1 dlci := '00'O, + boolean skip_seq_patching := false) := { + dlci := dlci, + skip_seq_patching := skip_seq_patching, + dtap := dtap +} + +template PDU_DTAP_PS_MT tr_PDU_DTAP_PS_MT(template PDU_L3_SGSN_MS dtap, template OCT1 dlci := *) := { + dlci := dlci, + dtap := dtap +} + +template PDU_DTAP_PS_MO tr_PDU_DTAP_PS_MO(template PDU_L3_MS_SGSN dtap, template OCT1 dlci := *) := { + dlci := dlci, + skip_seq_patching := ?, + dtap := dtap +} + /* port between individual per-connection components and this dispatcher */ type port RAN_Conn_PT message { inout @@ -142,6 +176,7 @@ #endif /* direct DTAP messages from/to clients */ PDU_DTAP_MO, PDU_DTAP_MT, + PDU_DTAP_PS_MO, PDU_DTAP_PS_MT, /* misc indications / requests between SCCP and client */ RAN_Conn_Prim; } with { extension "internal" }; @@ -562,24 +597,46 @@ var template (omit) OCT1 dlci := fake_dlci_from_sapi(sapi); if (g_ran_ops.role_ms) { /* we are the MS, so any message to us must be MT */ - var PDU_DTAP_MT mt := { - dlci := omit, - dtap := dec_PDU_ML3_NW_MS(valueof(l3)) - }; - if (isvalue(dlci)) { - mt.dlci := valueof(dlci) + if (g_ran_ops.ps_domain) { + var PDU_DTAP_PS_MT mt := { + dlci := omit, + dtap := dec_PDU_L3_SGSN_MS(valueof(l3)) + }; + if (isvalue(dlci)) { + mt.dlci := valueof(dlci); + } + CLIENT.send(mt) to client; + } else { + var PDU_DTAP_MT mt := { + dlci := omit, + dtap := dec_PDU_ML3_NW_MS(valueof(l3)) + }; + if (isvalue(dlci)) { + mt.dlci := valueof(dlci) + } + CLIENT.send(mt) to client; } - CLIENT.send(mt) to client; } else { /* we are the Network, so any message to us must be MO */ - var PDU_DTAP_MO mo := { - dlci := omit, - dtap := dec_PDU_ML3_MS_NW(valueof(l3)) - }; - if (isvalue(dlci)) { - mo.dlci := valueof(dlci) + if (g_ran_ops.ps_domain) { + var PDU_DTAP_PS_MO mo := { + dlci := omit, + dtap := dec_PDU_L3_MS_SGSN(valueof(l3)) + }; + if (isvalue(dlci)) { + mo.dlci := valueof(dlci); + } + CLIENT.send(mo) to client; + } else { + var PDU_DTAP_MO mo := { + dlci := omit, + dtap := dec_PDU_ML3_MS_NW(valueof(l3)) + }; + if (isvalue(dlci)) { + mo.dlci := valueof(dlci) + } + CLIENT.send(mo) to client; } - CLIENT.send(mo) to client; } } } @@ -904,6 +961,8 @@ var RANAP_Conn_Req creq; var RANAP_PDU ranap; var RAN_ConnHdlr vc_conn; + var PDU_DTAP_PS_MO ps_mo; + var PDU_DTAP_PS_MT ps_mt; /* SCCP -> Client: UNIT-DATA (connectionless SCCP) from a BSC */ [] RANAP.receive(RANAP_N_UNITDATA_ind:?) -> value rud_ind { @@ -998,6 +1057,25 @@ } } + [g_ran_ops.role_ms] CLIENT.receive(PDU_DTAP_PS_MO:?) -> value ps_mo sender vc_conn { + var integer idx := f_idx_by_comp(vc_conn); + /* convert from decoded DTAP to encoded DTAP */ + var octetstring l3_enc := enc_PDU_L3_MS_SGSN(ps_mo.dtap); + /* patch correct L3 send sequence number N(SD) into l3_enc */ + if (ps_mo.skip_seq_patching == false) { + //f_ML3_patch_seq(ConnectionTable[idx], ps_mo.dtap, l3_enc); + } + f_xmit_raw_l3(ConnectionTable[idx].sccp_conn_id, ps_mo.dlci, l3_enc); + } + + [not g_ran_ops.role_ms] CLIENT.receive(PDU_DTAP_PS_MT:?) -> value ps_mt sender vc_conn { + var integer idx := f_idx_by_comp(vc_conn); + /* convert from decoded DTAP to encoded DTAP */ + var octetstring l3_enc := enc_PDU_L3_SGSN_MS(ps_mt.dtap); + f_xmit_raw_l3(ConnectionTable[idx].sccp_conn_id, ps_mt.dlci, l3_enc); + } + + #else [false] CLIENT.receive {} #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13854 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: I7ba4662e5a7ba31a2582b0c133b3140c8057678f Gerrit-Change-Number: 13854 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:12:48 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 ) Change subject: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef ...................................................................... RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef Change-Id: I1ff98c933b00a90f54ceedf290121d61d35c6063 --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 40cf0fa..e995e8d 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -168,10 +168,12 @@ connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP); #endif #ifdef IPA_EMULATION_CTRL +#ifdef RAN_EMULATION_CTRL /* connect IPA CTRL port with BSSMAP CTRL port */ log("Connecting CTRL RAN Emulation to IPA CTRL PORT"); connect(ba.vc_IPA:IPA_CTRL_PORT, ba.vc_RAN:CTRL); #endif +#endif } log("Starting RAN_Emulation"); ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), "")); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15156 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: I1ff98c933b00a90f54ceedf290121d61d35c6063 Gerrit-Change-Number: 15156 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:12:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:12:49 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 ) Change subject: RAN_Adapter: invert check for RAN_ops == omit ...................................................................... RAN_Adapter: invert check for RAN_ops == omit The SGSN_Tests.ttcn run into bugs when doing the isvalue() check on a const object. Check explicit for "omit" to skip creation of the vc_RAN object Change-Id: I639ab6d0586174c0f20b93a53169f0aa254970fa --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index e995e8d..8e19241 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -90,7 +90,7 @@ /* create components */ ba.vc_SCCP := SCCP_CT.create(id & "-SCCP"); - if (isvalue(ops)) { + if (not istemplatekind(ops, "omit")) { ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN"); } select (cfg.transport) { @@ -142,7 +142,7 @@ } } - if (isvalue(ops)) { + if (not istemplatekind(ops, "omit")) { timer T := 5.0; T.start; //T.timeout; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 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: I639ab6d0586174c0f20b93a53169f0aa254970fa Gerrit-Change-Number: 15157 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:12:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:12:49 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Integrate RANAP In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 ) Change subject: sgsn: Integrate RANAP ...................................................................... sgsn: Integrate RANAP Integrate RANAP support to SGSN_Tests.ttcn. Related: OS#2857 Change-Id: Ib62fc4c6007f6f4c47db7ca096a8d629bc72bb22 --- M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 3 files changed, 106 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index e349719..a7cc57f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -19,6 +19,7 @@ import from BSSGP_Types all; import from BSSGP_Emulation all; import from Osmocom_Gb_Types all; +import from SCCPasp_Types all; import from MobileL3_CommonIE_Types all; import from MobileL3_GMM_SM_Types all; @@ -30,6 +31,12 @@ import from GSUP_Types all; import from IPA_Emulation all; +import from RAN_Adapter all; +import from RAN_Emulation all; +import from RANAP_Templates all; +import from RANAP_PDU_Descriptions all; +import from RANAP_IEs all; + import from GTP_Emulation all; import from GTP_Templates all; import from GTP_CodecPort all; @@ -87,6 +94,20 @@ handle_sns := false } }; + + RAN_Configurations mp_ranap_cfg := { + { + transport := RANAP_TRANSPORT_IuCS, + sccp_service_type := "mtp3_itu", + sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" }, + own_pc := 195, + own_ssn := 142, + peer_pc := 188, /* 0.23.4 */ + peer_ssn := 142, + sio := '83'O, + rctx := 2 + } + } }; type record GbInstance { @@ -100,8 +121,12 @@ type record length(NUM_GB) of NSConfiguration NSConfigurations; type record length(NUM_GB) of BssgpCellId BssgpCellIds; +const integer NUM_RNC := 1; +type record of RAN_Configuration RAN_Configurations; + type component test_CT { var GbInstances g_gb; + var RAN_Adapter g_ranap[NUM_RNC]; var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; @@ -116,7 +141,7 @@ var boolean g_use_echo := false; }; -type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr { +type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr, RAN_ConnHdlr { var BSSGP_ConnHdlrPars g_pars; timer g_Tguard; var LLC_Entities llc; @@ -145,7 +170,10 @@ BssgpCellIds bssgp_cell_id, AuthVector vec optional, SGSN_ConnHdlrNetworkPars net, - float t_guard + float t_guard, + /* only in IuPS / RANAP case */ + SCCP_PAR_Address sccp_addr_local, + SCCP_PAR_Address sccp_addr_peer }; private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV { @@ -240,6 +268,8 @@ /* mcc_mnc is 24.008 10.5.5.15 encoded. 262 42 */ function f_init(BcdMccMnc mcc_mnc := '262F42'H) runs on test_CT { + var integer i; + if (g_initialized == true) { return; } @@ -288,11 +318,44 @@ f_init_gb(g_gb[0], "SGSN_Test-Gb0", 0); f_init_gb(g_gb[1], "SGSN_Test-Gb1", 1); f_init_gb(g_gb[2], "SGSN_Test-Gb2", 2); + + for (i := 0; i < NUM_RNC; i := i+1) { + f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps); + f_ran_adapter_start(g_ranap[i]); + } f_init_gsup("SGSN_Test"); f_init_gtp("SGSN_Test"); f_vty_enable_echo_interval(g_use_echo); } +private function RncUnitdataCallback(RANAP_PDU ranap) +runs on RAN_Emulation_CT return template RANAP_PDU { + var template RANAP_PDU resp := omit; + + log ("RANAP_RncUnitDataCallback"); + /* answer all RESET with RESET ACK */ + if (match(ranap, tr_RANAP_Reset)) { + log("RANAP_RncUnitdataCallback: Responding to RESET with RESET-ACK"); + var CN_DomainIndicator dom; + dom := ranap.initiatingMessage.value_.Reset.protocolIEs[1].value_.cN_DomainIndicator; + resp := ts_RANAP_ResetAck(dom); + } + return resp; +} + +const RanOps RNC_RanOps := { + ranap_create_cb := refers(RAN_Emulation.RanapExpectedCreateCallback), + ranap_unitdata_cb := refers(RncUnitdataCallback), + ps_domain := true, + decode_dtap := true, + role_ms := true, + protocol := RAN_PROTOCOL_RANAP, + transport := RANAP_TRANSPORT_IuCS, + use_osmux := false, + sccp_addr_local := omit, + sccp_addr_peer := omit +}; + type function void_fn(charstring id) runs on BSSGP_ConnHdlr; /* helper function to create, connect and start a BSSGP_ConnHdlr component */ @@ -317,7 +380,9 @@ bssgp_cell_id := { gb[0].cfg.cell_id, gb[1].cfg.cell_id, gb[2].cfg.cell_id }, vec := omit, net := net_pars, - t_guard := t_guard + t_guard := t_guard, + sccp_addr_local := g_ranap[0].sccp_addr_own, + sccp_addr_peer := g_ranap[0].sccp_addr_peer }; vc_conn := BSSGP_ConnHdlr.create(id); @@ -328,6 +393,10 @@ connect(vc_conn:BSSGP[2], gb[2].vc_BSSGP:BSSGP_SP); connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP:BSSGP_PROC); + /* FIXME: support multiple RNCs */ + connect(vc_conn:BSSAP, g_ranap[0].vc_RAN:CLIENT); + connect(vc_conn:BSSAP_PROC, g_ranap[0].vc_RAN:PROC); + connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index fe09726..3552bc2 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -53,6 +53,35 @@ FILES="GTPC_EncDec.cc GTPC_Types.ttcn GTPU_EncDec.cc GTPU_Types.ttcn" gen_links $DIR $FILES +# required by M3UA_Emulation +DIR=$BASEDIR/titan.ProtocolModules.M3UA/src +FILES="M3UA_Types.ttcn" +gen_links $DIR $FILES + +# required by M3UA_Emulation +DIR=$BASEDIR/titan.TestPorts.SCTPasp/src +FILES="SCTPasp_PT.cc SCTPasp_PT.hh SCTPasp_PortType.ttcn SCTPasp_Types.ttcn" +gen_links $DIR $FILES + +# required by M3UA Emulation +DIR=$BASEDIR/titan.TestPorts.MTP3asp/src +FILES="MTP3asp_PortType.ttcn MTP3asp_Types.ttcn" +gen_links $DIR $FILES + +# required by SCCP Emulation +DIR=$BASEDIR/titan.ProtocolEmulations.M3UA/src +FILES="M3UA_Emulation.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src +FILES="SCCP_Emulation.ttcn SCCP_EncDec.cc SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" +gen_links $DIR $FILES + +DIR=../library/ranap +FILES="RANAP_CommonDataTypes.asn RANAP_Constants.asn RANAP_Containers.asn RANAP_IEs.asn RANAP_PDU_Contents.asn RANAP_PDU_Descriptions.asn " +FILES+="RANAP_Types.ttcn RANAP_Templates.ttcn RANAP_CodecPort.ttcn RANAP_EncDec.cc " +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " @@ -60,6 +89,7 @@ FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " +FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 0cf2e64..a239a3b 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -1,7 +1,9 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc" +FILES="*.ttcn *.ttcnpp *.asn BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc RANAP_EncDec.cc " -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DRAN_EMULATION_RANAP" ../regen-makefile.sh SGSN_Tests.ttcn $FILES + +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13754 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: Ib62fc4c6007f6f4c47db7ca096a8d629bc72bb22 Gerrit-Change-Number: 13754 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:13:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:13:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 ) Change subject: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 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: I2e9fda4fe97866c4cbc77224ba1930ca81411fd6 Gerrit-Change-Number: 15220 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 18 Aug 2019 17:13:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:13:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:13:20 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: Change test-expectation of TC_paging_resp_unsol In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 ) Change subject: BSC_Tests: Change test-expectation of TC_paging_resp_unsol ...................................................................... BSC_Tests: Change test-expectation of TC_paging_resp_unsol The testcase TC_paging_resp_unsol expects the BSC to close the channel when an unsolicit paging response is received. This expectation is due to the fact that osmo-bsc supports multiple MSC, which is not specified in 3gpp specs. Therefore the BSC needs to know which MSC is in charge. However, with MT-CSFB calls it is a normal situation that the BSC receives a paging response on abis without sending a paging first since the MSC has paged the UE via the SGs interface. In those cases we expect the BSC to forward the paging response to the first configured MSC. Related: SYS#4624 Change-Id: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe --- M bsc/BSC_Tests.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved neels: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 09c5e5c..327326d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1604,17 +1604,22 @@ f_shutdown_helper(); } -/* Verify how we handle unsolicited Paging Response, for instance because we - * receive a Paging Response after T3113 expired (and subscriber information was - * dropped). See OS#3680. +/* Verify how we handle unsolicited Paging Response. In case of an unsolicit + * paging response we can not know which MSC is in charge, so we will blindly + * pick the first configured MSC. This behavior is required in order to make + * MT-CSFB calls working because in those cases the BSC can not know that the + * MSC has already paged the subscriver via SGs. So any MT-CSFB call will look + * like an unsolicited Paging Response to the MSC. */ testcase TC_paging_resp_unsol() runs on test_CT { f_init(1); + timer T := 5.0; var BSSAP_N_CONNECT_ind rx_c_ind; var DchanTuple dt; var PDU_ML3_MS_NW l3 := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010008880018'H)))); + var octetstring rr_pag_resp := enc_PDU_ML3_MS_NW(l3); /* Send CHAN RQD and wait for allocation; acknowledge it */ dt.rsl_chan_nr := f_chreq_act_ack(); @@ -1622,10 +1627,22 @@ /* Send unsolicited Paging response (no matching Paging CMD stored in BSC) */ f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), enc_PDU_ML3_MS_NW(l3))); - /* expect BSC to disable the channel */ - f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + /* Expevct a CR with a matching Paging response on the A-Interface */ + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(rr_pag_resp))) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Received unexpected message on A-Interface!"); + } + [] T.timeout { + setverdict(fail, "Received nothing on A-Interface!"); + } + } + + setverdict(pass); } /* Test RSL link drop causes counter increment */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15208 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: I5562cbf61a2aa42e6950860bc0f9c6c20c61a9fe Gerrit-Change-Number: 15208 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:13:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:13:21 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 ) Change subject: MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call ...................................................................... MSC_Tests: do not send an SGsAP-MO-CSFB-INDICATION when testing MT-Call The TTCN3 tests MSC_Tests.TC_bssap_lu_sgsap_lu_and_mt_call and MSC_Tests.TC_sgsap_lu_and_mt_call initate an MT-CSFB call for testing purposes, but they also send an SGsAP-MO-CSFB-INDICATION to make the MS come back to LTE. This is wrong. SGsAP-MO-CSFB-INDICATION just informs the VLR that the UE has initiated a MO CSFB call on the LTE side. On MT CSFB calls this message should not appear. Lets remove it. Related: SYS#4624 Change-Id: I2e9fda4fe97866c4cbc77224ba1930ca81411fd6 --- M msc/MSC_Tests.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c463dd5..7499456 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -4980,9 +4980,6 @@ /* Make sure that subscriber is still present and the SGs association is in tact (ref-counting) */ f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED"); - /* Finally simulate the return of the UE to the 4G network */ - SGsAP.send(ts_SGsAP_MO_CSFB_IND(pars.imsi)); - /* Test for successful return by triggering a paging, when the paging * request is received via SGs, we can be sure that the MSC/VLR has * recognized that the UE is now back on 4G */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15220 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: I2e9fda4fe97866c4cbc77224ba1930ca81411fd6 Gerrit-Change-Number: 15220 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:13:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:13:53 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP CodecPort/Emulation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 ) Change subject: library: Add S1AP CodecPort/Emulation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 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: I9bfba3ab2a3830e590b203c44c03b9c9383fff99 Gerrit-Change-Number: 15196 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 18 Aug 2019 17:13:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:00 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Import snow-3g.[ch] from nextepc source code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 ) Change subject: Import snow-3g.[ch] from nextepc source code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 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: I938de2ad17210aa1561240c0a96d0df216243be1 Gerrit-Change-Number: 15198 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 18 Aug 2019 17:14:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:12 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add GTPv2 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 ) Change subject: mme: Add GTPv2 support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 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: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 Gerrit-Change-Number: 15204 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 18 Aug 2019 17:14:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:22 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: snow-3g.c: Mark all internal primitive functions as static In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15200 ) Change subject: snow-3g.c: Mark all internal primitive functions as static ...................................................................... snow-3g.c: Mark all internal primitive functions as static We don't need to pollute the public namespace Change-Id: I55347320383b173d1aca622997e7cfb98cd9caff --- M mme/snow-3g.c 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/snow-3g.c b/mme/snow-3g.c index 6d4fe2a..992b107 100644 --- a/mme/snow-3g.c +++ b/mme/snow-3g.c @@ -78,7 +78,7 @@ * See section 3.1.1 for details. */ -u8 MULx(u8 V, u8 c) +static u8 MULx(u8 V, u8 c) { if ( V & 0x80 ) return ( (V << 1) ^ c); @@ -94,7 +94,7 @@ * See section 3.1.2 for details. */ -u8 MULxPOW(u8 V, u8 i, u8 c) +static u8 MULxPOW(u8 V, u8 i, u8 c) { if ( i == 0) return V; @@ -108,7 +108,7 @@ * See section 3.4.2 for details. */ -u32 MULalpha(u8 c) +static u32 MULalpha(u8 c) { return ( ( ((u32)MULxPOW(c, 23, 0xa9)) << 24 ) | ( ((u32)MULxPOW(c, 245, 0xa9)) << 16 ) | @@ -122,7 +122,7 @@ * See section 3.4.3 for details. */ -u32 DIValpha(u8 c) +static u32 DIValpha(u8 c) { return ( ( ((u32)MULxPOW(c, 16, 0xa9)) << 24 ) | ( ((u32)MULxPOW(c, 39, 0xa9)) << 16 ) | @@ -136,7 +136,7 @@ * See section 3.3.1. */ -u32 S1(u32 w) +static u32 S1(u32 w) { u8 r0=0, r1=0, r2=0, r3=0; u8 srw0 = SR[ (u8)((w >> 24) & 0xff) ]; @@ -174,7 +174,7 @@ * See section 3.3.2. */ -u32 S2(u32 w) +static u32 S2(u32 w) { u8 r0=0, r1=0, r2=0, r3=0; u8 sqw0 = SQ[ (u8)((w >> 24) & 0xff) ]; @@ -211,7 +211,7 @@ * See section 3.4.4. */ -void ClockLFSRInitializationMode(u32 F) +static void ClockLFSRInitializationMode(u32 F) { u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ @@ -243,7 +243,7 @@ * See section 3.4.5. */ -void ClockLFSRKeyStreamMode() +static void ClockLFSRKeyStreamMode() { u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ @@ -275,7 +275,7 @@ * See Section 3.4.6. */ -u32 ClockFSM() +static u32 ClockFSM() { u32 F = ( ( LFSR_S15 + FSM_R1 ) & 0xffffffff ) ^ FSM_R2 ; u32 r = ( FSM_R2 + ( FSM_R3 ^ LFSR_S5 ) ) & 0xffffffff ; @@ -433,7 +433,7 @@ * function. * See section 4.3.2 for details. */ -u64 MUL64x(u64 V, u64 c) +static u64 MUL64x(u64 V, u64 c) { if ( V & 0x8000000000000000 ) return (V << 1) ^ c; @@ -449,7 +449,7 @@ * A 64-bit memory is allocated which is to be freed by the calling function. * See section 4.3.3 for details. */ -u64 MUL64xPOW(u64 V, u8 i, u64 c) +static u64 MUL64xPOW(u64 V, u8 i, u64 c) { if ( i == 0) return V; @@ -466,7 +466,7 @@ * function. * See section 4.3.4 for details. */ -u64 MUL64(u64 V, u64 P, u64 c) +static u64 MUL64(u64 V, u64 P, u64 c) { u64 result = 0; int i = 0; @@ -484,7 +484,7 @@ * Output : an 8 bit mask. * Prepares an 8 bit mask with required number of 1 bits on the MSB side. */ -u8 mask8bit(int n) +static u8 mask8bit(int n) { return 0xFF ^ ((1<<(8-n)) - 1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15200 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: I55347320383b173d1aca622997e7cfb98cd9caff Gerrit-Change-Number: 15200 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:21 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add S1AP CodecPort/Emulation In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 ) Change subject: library: Add S1AP CodecPort/Emulation ...................................................................... library: Add S1AP CodecPort/Emulation Change-Id: I9bfba3ab2a3830e590b203c44c03b9c9383fff99 --- A library/S1AP_CodecPort.ttcn A library/S1AP_CodecPort_CtrlFunct.ttcn A library/S1AP_CodecPort_CtrlFunctDef.cc A library/S1AP_Emulation.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 6 files changed, 871 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/S1AP_CodecPort.ttcn b/library/S1AP_CodecPort.ttcn new file mode 100644 index 0000000..59cef18 --- /dev/null +++ b/library/S1AP_CodecPort.ttcn @@ -0,0 +1,82 @@ +module S1AP_CodecPort { + +/* Simple S1AP Codec Port, translating between raw SCTP primitives with + * octetstring payload towards the IPL4asp provider, and S1AP primitives + * which carry the decoded S1AP data types as payload. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from S1AP_PDU_Descriptions all; + import from S1AP_Types all; + + type record S1AP_RecvFrom { + ConnectionId connId, + HostName remName, + PortNumber remPort, + HostName locName, + PortNumber locPort, + S1AP_PDU msg + }; + + template S1AP_RecvFrom t_S1AP_RecvFrom(template S1AP_PDU msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + + type record S1AP_Send { + ConnectionId connId, + S1AP_PDU msg + } + + template S1AP_Send t_S1AP_Send(template ConnectionId connId, template S1AP_PDU msg) := { + connId := connId, + msg := msg + } + + private function IPL4_to_S1AP_RecvFrom(in ASP_RecvFrom pin, out S1AP_RecvFrom pout) { + pout.connId := pin.connId; + pout.remName := pin.remName; + pout.remPort := pin.remPort; + pout.locName := pin.locName; + pout.locPort := pin.locPort; + pout.msg := dec_S1AP_PDU(pin.msg); + } with { extension "prototype(fast)" }; + + private function S1AP_to_IPL4_Send(in S1AP_Send pin, out ASP_Send pout) { + pout.connId := pin.connId; + pout.proto := { + sctp := { + sinfo_stream := omit, + sinfo_ppid := 18, + remSocks := omit, + assocId := omit + } + }; + pout.msg := enc_S1AP_PDU(pin.msg); + } with { extension "prototype(fast)" }; + + type port S1AP_CODEC_PT message { + out S1AP_Send; + in S1AP_RecvFrom, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(S1AP_Send -> ASP_Send:function(S1AP_to_IPL4_Send)) + in(ASP_RecvFrom -> S1AP_RecvFrom: function(IPL4_to_S1AP_RecvFrom); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" + } +} diff --git a/library/S1AP_CodecPort_CtrlFunct.ttcn b/library/S1AP_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..0399199 --- /dev/null +++ b/library/S1AP_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,44 @@ +module S1AP_CodecPort_CtrlFunct { + + import from S1AP_CodecPort all; + import from IPL4asp_Types all; + + external function f_IPL4_listen( + inout S1AP_CODEC_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_connect( + inout S1AP_CODEC_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_close( + inout S1AP_CODEC_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } + ) return Result; + + external function f_IPL4_setUserData( + inout S1AP_CODEC_PT portRef, + in ConnectionId id, + in UserData userData + ) return Result; + + external function f_IPL4_getUserData( + inout S1AP_CODEC_PT portRef, + in ConnectionId id, + out UserData userData + ) return Result; + +} + diff --git a/library/S1AP_CodecPort_CtrlFunctDef.cc b/library/S1AP_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..dc73046 --- /dev/null +++ b/library/S1AP_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,56 @@ +#include "IPL4asp_PortType.hh" +#include "S1AP_CodecPort.hh" +#include "IPL4asp_PT.hh" + +namespace S1AP__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + S1AP__CodecPort::S1AP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} + diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn new file mode 100644 index 0000000..d09b499 --- /dev/null +++ b/library/S1AP_Emulation.ttcn @@ -0,0 +1,681 @@ +module S1AP_Emulation { + +/* S1AP Emulation, runs on top of S1AP_CodecPort. It multiplexes/demultiplexes + * the individual IMSIs/subscribers, so there can be separate TTCN-3 components handling + * each of them. + * + * The S1AP_Emulation.main() function processes S1AP primitives from the S1AP + * socket via the S1AP_CodecPort, and dispatches them to the per-IMSI components. + * + * For each new IMSI, the S1apOps.create_cb() is called. It can create + * or resolve a TTCN-3 component, and returns a component reference to which that IMSI + * is routed/dispatched. + * + * If a pre-existing component wants to register to handle a future inbound IMSI, it can + * do so by registering an "expect" with the expected IMSI. + * + * Inbound non-UE related S1AP messages (such as RESET, SETUP, OVERLOAD) are dispatched to + * the S1apOps.unitdata_cb() callback, which is registered with an argument to the + * main() function below. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from S1AP_CodecPort all; +import from S1AP_CodecPort_CtrlFunct all; +import from S1AP_Types all; +import from S1AP_Constants all; +import from S1AP_PDU_Contents all; +import from S1AP_PDU_Descriptions all; +import from S1AP_IEs all; +import from S1AP_Templates all; + +import from NAS_EPS_Types all; +import from NAS_Templates all; + +import from LTE_CryptoFunctions all; + +import from General_Types all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from DNS_Helpers all; + + +type component S1AP_ConnHdlr { + port S1AP_Conn_PT S1AP; + /* procedure based port to register for incoming connections */ + port S1APEM_PROC_PT S1AP_PROC; +} + +/* port between individual per-connection components and this dispatcher */ +type port S1AP_Conn_PT message { + inout S1AP_PDU, PDU_NAS_EPS, S1APEM_Config; +} with { extension "internal" }; + +type record NAS_Keys { + octetstring k_nas_int, + octetstring k_nas_enc +}; +type union S1APEM_Config { + NAS_Keys set_nas_keys +}; + +type enumerated S1APEM_EventUpDown { + S1APEM_EVENT_DOWN, + S1APEM_EVENT_UP +} + +/* an event indicating us whether or not a connection is physically up or down, + * and whether we have received an ID_ACK */ +type union S1APEM_Event { + S1APEM_EventUpDown up_down +} + +/* global test port e.g. for non-imsi/conn specific messages */ +type port S1AP_PT message { + inout S1AP_PDU, S1APEM_Event; +} with { extension "internal" }; + + +/* represents a single S1AP Association */ +type record AssociationData { + S1AP_ConnHdlr comp_ref, /* component handling this UE connection */ + uint24_t enb_ue_s1ap_id optional, /* eNB side S1AP ID */ + uint32_t mme_ue_s1ap_id optional, /* MME side S1AP ID */ + EUTRAN_CGI cgi optional, + TAI tai optional, + NAS_UE_State nus + + //hexstring imsi optional +}; + +type component S1AP_Emulation_CT { + /* Port facing to the UDP SUT */ + port S1AP_CODEC_PT S1AP; + /* All S1AP_ConnHdlr S1AP ports connect here + * S1AP_Emulation_CT.main needs to figure out what messages + * to send where with CLIENT.send() to vc_conn */ + port S1AP_Conn_PT S1AP_CLIENT; + /* currently tracked connections */ + var AssociationData S1apAssociationTable[16]; + /* pending expected CRCX */ + var ExpectData S1apExpectTable[8]; + /* procedure based port to register for incoming connections */ + port S1APEM_PROC_PT S1AP_PROC; + /* test port for unit data messages */ + port S1AP_PT S1AP_UNIT; + + var S1AP_conn_parameters g_pars; + var charstring g_s1ap_id; + var integer g_s1ap_conn_id := -1; +} + +type function S1APCreateCallback(S1AP_PDU msg, template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id, charstring id) +runs on S1AP_Emulation_CT return S1AP_ConnHdlr; + +type function S1APUnitdataCallback(S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_PDU; + +type record S1APOps { + S1APCreateCallback create_cb, + S1APUnitdataCallback unitdata_cb +} + +type record S1AP_conn_parameters { + HostName remote_ip, + PortNumber remote_sctp_port, + HostName local_ip, + PortNumber local_sctp_port, + NAS_Role role +} + +function tr_S1AP_RecvFrom_R(template S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_RecvFrom { + var template S1AP_RecvFrom mrf := { + connId := g_s1ap_conn_id, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + return mrf; +} + +private function f_s1ap_ids_known(template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT return boolean { + var integer i; + log("f_s1ap_ids_known(",mme_id,", ",enb_id,")"); + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + log("tbl[",i,"]: mme=", S1apAssociationTable[i].mme_ue_s1ap_id, + ", enb=", S1apAssociationTable[i].enb_ue_s1ap_id); + /* skip empty records */ + if (S1apAssociationTable[i].mme_ue_s1ap_id == omit and + S1apAssociationTable[i].enb_ue_s1ap_id == omit) { + log("skipping empty ", i); + continue; + } + if (S1apAssociationTable[i].mme_ue_s1ap_id == omit) { + log("entry ", i, " has no MME ID yet (enb=", S1apAssociationTable[i].enb_ue_s1ap_id); + /* Table doesn't yet know the MME side ID, let's look-up only + * based on the eNB side ID */ + if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + /* update table with MME side ID */ + S1apAssociationTable[i].mme_ue_s1ap_id := valueof(mme_id); + return true; + } + } else if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id) and + match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { + return true; + } + } + return false; +} + +private function f_comp_known(S1AP_ConnHdlr client) +runs on S1AP_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (S1apAssociationTable[i].comp_ref == client) { + return true; + } + } + return false; +} + +private function f_assoc_id_by_s1ap_ids(template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + if (istemplatekind(mme_id, "omit")) { + return i; + } else { + if (match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { + return i; + } + } + } + } + setverdict(fail, "S1AP Association Table not found by ENB-ID=", enb_id, " MME-ID=", mme_id); + mtc.stop; +} + +private function f_assoc_id_by_comp(S1AP_ConnHdlr client) +runs on S1AP_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (S1apAssociationTable[i].comp_ref == client) { + return i; + } + } + setverdict(fail, "S1AP Association Table not found by component ", client); + mtc.stop; +} + +private function f_assoc_by_comp(S1AP_ConnHdlr client) +runs on S1AP_Emulation_CT return AssociationData { + var integer i := f_assoc_id_by_comp(client); + return S1apAssociationTable[i]; +} + +private function f_s1ap_id_table_add(S1AP_ConnHdlr comp_ref, + template (omit) MME_UE_S1AP_ID mme_id, ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (not isvalue(S1apAssociationTable[i].enb_ue_s1ap_id)) { + S1apAssociationTable[i].enb_ue_s1ap_id := enb_id; + if (istemplatekind(mme_id, "omit")) { + S1apAssociationTable[i].mme_ue_s1ap_id := omit; + } else { + S1apAssociationTable[i].mme_ue_s1ap_id := valueof(mme_id); + } + S1apAssociationTable[i].comp_ref := comp_ref; + return i; + } + } + testcase.stop("S1AP Association Table full!"); + return -1; +} + +private function f_s1ap_id_table_del(S1AP_ConnHdlr comp_ref, ENB_UE_S1AP_ID enb_id) +runs on S1AP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (S1apAssociationTable[i].comp_ref == comp_ref and + S1apAssociationTable[i].mme_ue_s1ap_id == enb_id) { + S1apAssociationTable[i].enb_ue_s1ap_id := omit; + S1apAssociationTable[i].mme_ue_s1ap_id := omit; + S1apAssociationTable[i].comp_ref := null; + return; + } + } + setverdict(fail, "S1AP Association Table: Couldn't find to-be-deleted entry!"); + mtc.stop; +} + + +private function f_s1ap_id_table_init() +runs on S1AP_Emulation_CT { + for (var integer i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + S1apAssociationTable[i].mme_ue_s1ap_id := omit; + S1apAssociationTable[i].enb_ue_s1ap_id := omit; + S1apAssociationTable[i].cgi := omit; + S1apAssociationTable[i].tai := omit; + S1apAssociationTable[i].nus := valueof(t_NAS_UE_State(g_pars.role)); + } +} + +private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := 18) := { + sinfo_stream := omit, + sinfo_ppid := ppid, + remSocks := omit, + assocId := omit +}; + +private template PortEvent tr_SctpAssocChange := { + sctpEvent := { + sctpAssocChange := ? + } +} +private template PortEvent tr_SctpPeerAddrChange := { + sctpEvent := { + sctpPeerAddrChange := ? + } +} + +private function f_s1ap_xceive(template (value) S1AP_PDU tx, + template S1AP_PDU rx_t := ?) +runs on S1AP_Emulation_CT return S1AP_PDU { + timer T := 10.0; + var S1AP_RecvFrom mrf; + + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, tx)); + alt { + [] S1AP.receive(tr_S1AP_RecvFrom_R(rx_t)) -> value mrf { } + [] S1AP.receive(tr_SctpAssocChange) { repeat; } + [] S1AP.receive(tr_SctpPeerAddrChange) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_t); + mtc.stop; + } + } + return mrf.msg; +} + +/* +private function f_nas_try_decaps(PDU_NAS_EPS nas) return PDU_NAS_EPS +{ + var PDU_NAS_EPS_SecurityProtectedNASMessage secp_nas; + if (not match(nas, tr_NAS_EMM_SecurityProtected)) { + return nas; + } + secp_nas := nas.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_SecurityProtectedNASMessage; + select (secp_nas.securityHeaderType) { + case ('0011'B) { + var octetstring knas_int := '530ce32318f26264eab26bc116870b86'O; + var octetstring data_with_seq := int2oct(secp_nas.sequenceNumber, 1) & secp_nas.nAS_Message; + var OCT4 exp_mac := f_snow_3g_f9(knas_int, secp_nas.sequenceNumber, 0, + is_downlink:=true, data:=data_with_seq); + if (exp_mac != secp_nas.messageAuthenticationCode) { + setverdict(fail, "Received NAS MAC ", secp_nas.messageAuthenticationCode, + " doesn't match expected MAC ", exp_mac, ": ", nas); + mtc.stop; + } + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case else { + setverdict(fail, "Implement SecHdrType for ", secp_nas); + mtc.stop; + } + } +} +*/ + +function main(S1APOps ops, S1AP_conn_parameters p, charstring id) runs on S1AP_Emulation_CT { + var Result res; + g_pars := p; + g_s1ap_id := id; + f_s1ap_id_table_init(); + f_expect_table_init(); + + map(self:S1AP, system:S1AP_CODEC_PT); + if (p.remote_sctp_port == -1) { + res := S1AP_CodecPort_CtrlFunct.f_IPL4_listen(S1AP, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + } else { + res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP, p.remote_ip, p.remote_sctp_port, + p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + } + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect S1AP socket, check your configuration"); + mtc.stop; + } + g_s1ap_conn_id := res.connId; + + /* notify user about SCTP establishment */ + if (p.remote_sctp_port != -1) { + S1AP_UNIT.send(S1APEM_Event:{up_down:=S1APEM_EVENT_UP}) + } + + while (true) { + var S1AP_ConnHdlr vc_conn; + var PDU_NAS_EPS nas; + var hexstring imsi; + var S1AP_RecvFrom mrf; + var S1AP_PDU msg; + var S1APEM_Config s1cfg; + var charstring vlr_name, mme_name; + var integer ai; + + alt { + /* Configuration primitive from client */ + [] S1AP_CLIENT.receive(S1APEM_Config:{set_nas_keys:=?}) -> value s1cfg sender vc_conn { + var integer assoc_id := f_assoc_id_by_comp(vc_conn); + S1apAssociationTable[assoc_id].nus.k_nas_int := s1cfg.set_nas_keys.k_nas_int; + S1apAssociationTable[assoc_id].nus.k_nas_enc := s1cfg.set_nas_keys.k_nas_enc; + } + /* S1AP from client: InitialUE */ + [] S1AP_CLIENT.receive(tr_S1AP_InitialUE) -> value msg sender vc_conn { + /* create a table entry about this connection */ + ai := f_s1ap_id_table_add(vc_conn, omit, valueof(f_S1AP_get_ENB_UE_S1AP_ID(msg))); + /* Store CGI + TAI so we can use it for generating UlNasTransport from NAS */ + S1apAssociationTable[ai].tai := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[2].value_.TAI; + S1apAssociationTable[ai].cgi := msg.initiatingMessage.value_.InitialUEMessage.protocolIEs[3].value_.EUTRAN_CGI; + /* Pass message through */ + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); + } + /* NAS from client: Wrap in S1AP Uplink NAS Transport */ + [] S1AP_CLIENT.receive(PDU_NAS_EPS:?) -> value nas sender vc_conn { + var integer assoc_id := f_assoc_id_by_comp(vc_conn); + var AssociationData ad := S1apAssociationTable[assoc_id]; + nas := f_nas_encaps(S1apAssociationTable[assoc_id].nus, nas, new_ctx := false); + var octetstring nas_enc := enc_PDU_NAS_EPS(nas); + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, + ts_S1AP_UlNasTransport(ad.mme_ue_s1ap_id, + ad.enb_ue_s1ap_id, + nas_enc, ad.cgi, ad.tai))); + } + /* S1AP from client: pass on transparently */ + [] S1AP_CLIENT.receive(S1AP_PDU:?) -> value msg sender vc_conn { + /* Pass message through */ + /* FIXME: validate S1AP_IDs ? */ + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); + } + + /* non-UE related S1AP: pass through unmodified/unverified */ + [] S1AP_UNIT.receive(S1AP_PDU:?) -> value msg sender vc_conn { + /* Pass message through */ + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); + } + + /* S1AP received from peer (MME) */ + [] S1AP.receive(tr_S1AP_RecvFrom_R(?)) -> value mrf { + if (match(mrf.msg, tr_S1AP_nonUErelated)) { + /* non-UE-related S1AP message */ + var template S1AP_PDU resp := ops.unitdata_cb.apply(mrf.msg); + if (isvalue(resp)) { + S1AP.send(t_S1AP_Send(g_s1ap_conn_id, valueof(resp))); + } + } else if (match(mrf.msg, tr_S1AP_UeContextReleaseCmd)) { + /* TODO: special handling, as it contains multiple eNB or MME IDs */ + setverdict(fail, "implement UeContextReleaseCmd handling"); + mtc.stop; + } else { + /* Ue-related S1AP message */ + /* obtain MME + ENB UE S1AP ID */ + var template (omit) MME_UE_S1AP_ID mme_ue_id := f_S1AP_get_MME_UE_S1AP_ID(mrf.msg); + var template (omit) ENB_UE_S1AP_ID enb_ue_id := f_S1AP_get_ENB_UE_S1AP_ID(mrf.msg); + /* check if those IDs are known in our table */ + if (f_s1ap_ids_known(mme_ue_id, enb_ue_id)) { + /* if yes, dispatch to the ConnHdlr for this Ue-Connection */ + var template (omit) octetstring nas_enc; + var integer assoc_id := f_assoc_id_by_s1ap_ids(mme_ue_id, enb_ue_id); + vc_conn := S1apAssociationTable[assoc_id].comp_ref; + nas_enc := f_S1AP_get_NAS_PDU(mrf.msg); + if (isvalue(nas_enc)) { + nas := dec_PDU_NAS_EPS(valueof(nas_enc)); + if (match(nas, tr_NAS_EMM_SecurityProtected)) { + nas := f_nas_try_decaps(S1apAssociationTable[assoc_id].nus, nas); + } + /* send decoded NAS */ + S1AP_CLIENT.send(nas) to vc_conn; + } else { + /* send raw S1AP */ + S1AP_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* if not, call create_cb so it can create new ConnHdlr */ + vc_conn := ops.create_cb.apply(mrf.msg, mme_ue_id, enb_ue_id, id); + f_s1ap_id_table_add(vc_conn, mme_ue_id, valueof(enb_ue_id)); + S1AP_CLIENT.send(mrf.msg) to vc_conn; + } + } + } + [] S1AP.receive(tr_SctpAssocChange) { } + [] S1AP.receive(tr_SctpPeerAddrChange) { } + [] S1AP_PROC.getcall(S1APEM_register:{?,?}) -> param(imsi, vc_conn) { + f_create_expect(imsi, vc_conn); + S1AP_PROC.reply(S1APEM_register:{imsi, vc_conn}) to vc_conn; + } + } + + } +} + +/* "Expect" Handling */ + +type record ExpectData { + hexstring imsi optional, + S1AP_ConnHdlr vc_conn +} + +signature S1APEM_register(in hexstring imsi, in S1AP_ConnHdlr hdlr); + +type port S1APEM_PROC_PT procedure { + inout S1APEM_register; +} with { extension "internal" }; + +/* Function that can be used as create_cb and will usse the expect table */ +function ExpectedCreateCallback(S1AP_PDU msg, hexstring imsi, charstring id) +runs on S1AP_Emulation_CT return S1AP_ConnHdlr { + var S1AP_ConnHdlr ret := null; + var integer i; + + for (i := 0; i < sizeof(S1apExpectTable); i := i+1) { + if (not ispresent(S1apExpectTable[i].imsi)) { + continue; + } + if (imsi == S1apExpectTable[i].imsi) { + ret := S1apExpectTable[i].vc_conn; + /* Release this entry */ + S1apExpectTable[i].imsi := omit; + S1apExpectTable[i].vc_conn := null; + log("Found Expect[", i, "] for ", msg, " handled at ", ret); + return ret; + } + } + setverdict(fail, "Couldn't find Expect for ", msg); + mtc.stop; +} + +private function f_create_expect(hexstring imsi, S1AP_ConnHdlr hdlr) +runs on S1AP_Emulation_CT { + var integer i; + + /* Check an entry like this is not already presnt */ + for (i := 0; i < sizeof(S1apExpectTable); i := i+1) { + if (imsi == S1apExpectTable[i].imsi) { + setverdict(fail, "IMSI already present", imsi); + mtc.stop; + } + } + for (i := 0; i < sizeof(S1apExpectTable); i := i+1) { + if (not ispresent(S1apExpectTable[i].imsi)) { + S1apExpectTable[i].imsi := imsi; + S1apExpectTable[i].vc_conn := hdlr; + log("Created Expect[", i, "] for ", imsi, " to be handled at ", hdlr); + return; + } + } + testcase.stop("No space left in S1apExpectTable") +} + +/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +function f_create_s1ap_expect(hexstring imsi) runs on S1AP_ConnHdlr { + S1AP_PROC.call(S1APEM_register:{imsi, self}) { + [] S1AP_PROC.getreply(S1APEM_register:{?,?}) {}; + } +} + + +private function f_expect_table_init() +runs on S1AP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(S1apExpectTable); i := i + 1) { + S1apExpectTable[i].imsi := omit; + } +} + +function DummyUnitdataCallback(S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_PDU { + log("Ignoring S1AP ", msg); + return omit; +} + + +function f_S1AP_get_ENB_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) ENB_UE_S1AP_ID +{ + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_InitialUE) { + return im.value_.InitialUEMessage.protocolIEs[0].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_DlNasTransport) { + return im.value_.DownlinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UlNasTransport) { + return im.value_.UplinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_IntialCtxSetupReq) { + return im.value_.initialContextSetupRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseReq) { + return im.value_.UEContextReleaseRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* UeContextReleaseCmd needs special handling; it can contain any number of MME/UE IDs */ + case (tr_S1AP_ConnEstInd) { + return im.value_.ConnectionEstablishmentIndication.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.successfulOutcome)) { + var SuccessfulOutcome so := s1ap.successfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupResp) { + return so.value_.initialContextSetupResponse.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCompl) { + return so.value_.UEContextReleaseComplete.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.unsuccessfulOutcome)) { + var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupFail) { + return uo.value_.initialContextSetupFailure.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } + return omit; +} + +function f_S1AP_get_MME_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) MME_UE_S1AP_ID +{ + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_DlNasTransport) { + return im.value_.DownlinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UlNasTransport) { + return im.value_.UplinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_IntialCtxSetupReq) { + return im.value_.initialContextSetupRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseReq) { + return im.value_.UEContextReleaseRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* UeContextReleaseCmd needs special handling; it can contain any number of MME/UE IDs */ + case (tr_S1AP_ConnEstInd) { + return im.value_.ConnectionEstablishmentIndication.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.successfulOutcome)) { + var SuccessfulOutcome so := s1ap.successfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupResp) { + return so.value_.initialContextSetupResponse.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCompl) { + return so.value_.UEContextReleaseComplete.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.unsuccessfulOutcome)) { + var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupFail) { + return uo.value_.initialContextSetupFailure.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } + return omit; +} + +function f_S1AP_get_NAS_PDU(S1AP_PDU s1ap) return template (omit) NAS_PDU +{ + var integer i; + + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_DlNasTransport) { + var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (tr_S1AP_UlNasTransport) { + var UplinkNASTransport msg := im.value_.UplinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + } + } + return omit; +} + + + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 2a98c70..1f2d85b 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -31,10 +31,17 @@ FILES="SGsAP_Types.ttcn" gen_links $DIR $FILES +DIR=../library/s1ap +FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn +S1AP_PDU_Descriptions.asn " +FILES+="S1AP_EncDec.cc S1AP_Types.ttcn " +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " +FILES+="S1AP_CodecPort.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 4d6d7c6..ee73658 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc " +FILES="*.ttcn *.asn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15196 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: I9bfba3ab2a3830e590b203c44c03b9c9383fff99 Gerrit-Change-Number: 15196 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:21 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Import snow-3g.[ch] from nextepc source code In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 ) Change subject: Import snow-3g.[ch] from nextepc source code ...................................................................... Import snow-3g.[ch] from nextepc source code Change-Id: I938de2ad17210aa1561240c0a96d0df216243be1 --- A mme/snow-3g.c A mme/snow-3g.h 2 files changed, 660 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/mme/snow-3g.c b/mme/snow-3g.c new file mode 100644 index 0000000..4c728fe --- /dev/null +++ b/mme/snow-3g.c @@ -0,0 +1,592 @@ +/*------------------------------------------------------------------------ +* SNOW_3G.c +*------------------------------------------------------------------------*/ + +#include "snow-3g.h" + +/* LFSR */ + +static u32 LFSR_S0 = 0x00; +static u32 LFSR_S1 = 0x00; +static u32 LFSR_S2 = 0x00; +static u32 LFSR_S3 = 0x00; +static u32 LFSR_S4 = 0x00; +static u32 LFSR_S5 = 0x00; +static u32 LFSR_S6 = 0x00; +static u32 LFSR_S7 = 0x00; +static u32 LFSR_S8 = 0x00; +static u32 LFSR_S9 = 0x00; +static u32 LFSR_S10 = 0x00; +static u32 LFSR_S11 = 0x00; +static u32 LFSR_S12 = 0x00; +static u32 LFSR_S13 = 0x00; +static u32 LFSR_S14 = 0x00; +static u32 LFSR_S15 = 0x00; + +/* FSM */ + +static u32 FSM_R1 = 0x00; +static u32 FSM_R2 = 0x00; +static u32 FSM_R3 = 0x00; + +/* Rijndael S-box SR */ + +static u8 SR[256] = { +0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76, +0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0, +0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15, +0x04,0xC7,0x23,0xC3,0x18,0x96,0x05,0x9A,0x07,0x12,0x80,0xE2,0xEB,0x27,0xB2,0x75, +0x09,0x83,0x2C,0x1A,0x1B,0x6E,0x5A,0xA0,0x52,0x3B,0xD6,0xB3,0x29,0xE3,0x2F,0x84, +0x53,0xD1,0x00,0xED,0x20,0xFC,0xB1,0x5B,0x6A,0xCB,0xBE,0x39,0x4A,0x4C,0x58,0xCF, +0xD0,0xEF,0xAA,0xFB,0x43,0x4D,0x33,0x85,0x45,0xF9,0x02,0x7F,0x50,0x3C,0x9F,0xA8, +0x51,0xA3,0x40,0x8F,0x92,0x9D,0x38,0xF5,0xBC,0xB6,0xDA,0x21,0x10,0xFF,0xF3,0xD2, +0xCD,0x0C,0x13,0xEC,0x5F,0x97,0x44,0x17,0xC4,0xA7,0x7E,0x3D,0x64,0x5D,0x19,0x73, +0x60,0x81,0x4F,0xDC,0x22,0x2A,0x90,0x88,0x46,0xEE,0xB8,0x14,0xDE,0x5E,0x0B,0xDB, +0xE0,0x32,0x3A,0x0A,0x49,0x06,0x24,0x5C,0xC2,0xD3,0xAC,0x62,0x91,0x95,0xE4,0x79, +0xE7,0xC8,0x37,0x6D,0x8D,0xD5,0x4E,0xA9,0x6C,0x56,0xF4,0xEA,0x65,0x7A,0xAE,0x08, +0xBA,0x78,0x25,0x2E,0x1C,0xA6,0xB4,0xC6,0xE8,0xDD,0x74,0x1F,0x4B,0xBD,0x8B,0x8A, +0x70,0x3E,0xB5,0x66,0x48,0x03,0xF6,0x0E,0x61,0x35,0x57,0xB9,0x86,0xC1,0x1D,0x9E, +0xE1,0xF8,0x98,0x11,0x69,0xD9,0x8E,0x94,0x9B,0x1E,0x87,0xE9,0xCE,0x55,0x28,0xDF, +0x8C,0xA1,0x89,0x0D,0xBF,0xE6,0x42,0x68,0x41,0x99,0x2D,0x0F,0xB0,0x54,0xBB,0x16 +}; + +/* S-box SQ */ + +static u8 SQ[256] = { +0x25,0x24,0x73,0x67,0xD7,0xAE,0x5C,0x30,0xA4,0xEE,0x6E,0xCB,0x7D,0xB5,0x82,0xDB, +0xE4,0x8E,0x48,0x49,0x4F,0x5D,0x6A,0x78,0x70,0x88,0xE8,0x5F,0x5E,0x84,0x65,0xE2, +0xD8,0xE9,0xCC,0xED,0x40,0x2F,0x11,0x28,0x57,0xD2,0xAC,0xE3,0x4A,0x15,0x1B,0xB9, +0xB2,0x80,0x85,0xA6,0x2E,0x02,0x47,0x29,0x07,0x4B,0x0E,0xC1,0x51,0xAA,0x89,0xD4, +0xCA,0x01,0x46,0xB3,0xEF,0xDD,0x44,0x7B,0xC2,0x7F,0xBE,0xC3,0x9F,0x20,0x4C,0x64, +0x83,0xA2,0x68,0x42,0x13,0xB4,0x41,0xCD,0xBA,0xC6,0xBB,0x6D,0x4D,0x71,0x21,0xF4, +0x8D,0xB0,0xE5,0x93,0xFE,0x8F,0xE6,0xCF,0x43,0x45,0x31,0x22,0x37,0x36,0x96,0xFA, +0xBC,0x0F,0x08,0x52,0x1D,0x55,0x1A,0xC5,0x4E,0x23,0x69,0x7A,0x92,0xFF,0x5B,0x5A, +0xEB,0x9A,0x1C,0xA9,0xD1,0x7E,0x0D,0xFC,0x50,0x8A,0xB6,0x62,0xF5,0x0A,0xF8,0xDC, +0x03,0x3C,0x0C,0x39,0xF1,0xB8,0xF3,0x3D,0xF2,0xD5,0x97,0x66,0x81,0x32,0xA0,0x00, +0x06,0xCE,0xF6,0xEA,0xB7,0x17,0xF7,0x8C,0x79,0xD6,0xA7,0xBF,0x8B,0x3F,0x1F,0x53, +0x63,0x75,0x35,0x2C,0x60,0xFD,0x27,0xD3,0x94,0xA5,0x7C,0xA1,0x05,0x58,0x2D,0xBD, +0xD9,0xC7,0xAF,0x6B,0x54,0x0B,0xE0,0x38,0x04,0xC8,0x9D,0xE7,0x14,0xB1,0x87,0x9C, +0xDF,0x6F,0xF9,0xDA,0x2A,0xC4,0x59,0x16,0x74,0x91,0xAB,0x26,0x61,0x76,0x34,0x2B, +0xAD,0x99,0xFB,0x72,0xEC,0x33,0x12,0xDE,0x98,0x3B,0xC0,0x9B,0x3E,0x18,0x10,0x3A, +0x56,0xE1,0x77,0xC9,0x1E,0x9E,0x95,0xA3,0x90,0x19,0xA8,0x6C,0x09,0xD0,0xF0,0x86 +}; + +/* MULx. +* Input V: an 8-bit input. +* Input c: an 8-bit input. +* Output : an 8-bit output. +* See section 3.1.1 for details. +*/ + +u8 MULx(u8 V, u8 c) +{ + if ( V & 0x80 ) + return ( (V << 1) ^ c); + else + return ( V << 1); +} + +/* MULxPOW. +* Input V: an 8-bit input. +* Input i: a positive integer. +* Input c: an 8-bit input. +* Output : an 8-bit output. +* See section 3.1.2 for details. +*/ + +u8 MULxPOW(u8 V, u8 i, u8 c) +{ + if ( i == 0) + return V; + else + return MULx( MULxPOW( V, i-1, c ), c); +} + +/* The function MUL alpha. +* Input c: 8-bit input. +* Output : 32-bit output. +* See section 3.4.2 for details. +*/ + +u32 MULalpha(u8 c) +{ + return ( ( ((u32)MULxPOW(c, 23, 0xa9)) << 24 ) | + ( ((u32)MULxPOW(c, 245, 0xa9)) << 16 ) | + ( ((u32)MULxPOW(c, 48, 0xa9)) << 8 ) | + ( ((u32)MULxPOW(c, 239, 0xa9)) ) ) ; +} + +/* The function DIV alpha. +* Input c: 8-bit input. +* Output : 32-bit output. +* See section 3.4.3 for details. +*/ + +u32 DIValpha(u8 c) +{ + return ( ( ((u32)MULxPOW(c, 16, 0xa9)) << 24 ) | + ( ((u32)MULxPOW(c, 39, 0xa9)) << 16 ) | + ( ((u32)MULxPOW(c, 6, 0xa9)) << 8 ) | + ( ((u32)MULxPOW(c, 64, 0xa9)) ) ) ; +} + +/* The 32x32-bit S-Box S1 +* Input: a 32-bit input. +* Output: a 32-bit output of S1 box. +* See section 3.3.1. +*/ + +u32 S1(u32 w) +{ + u8 r0=0, r1=0, r2=0, r3=0; + u8 srw0 = SR[ (u8)((w >> 24) & 0xff) ]; + u8 srw1 = SR[ (u8)((w >> 16) & 0xff) ]; + u8 srw2 = SR[ (u8)((w >> 8) & 0xff) ]; + u8 srw3 = SR[ (u8)((w) & 0xff) ]; + r0 = ( ( MULx( srw0 , 0x1b) ) ^ + ( srw1 ) ^ + ( srw2 ) ^ + ( (MULx( srw3, 0x1b)) ^ srw3 ) + ); + r1 = ( ( ( MULx( srw0 , 0x1b) ) ^ srw0 ) ^ + ( MULx(srw1, 0x1b) ) ^ + ( srw2 ) ^ + ( srw3 ) + ); + r2 = ( ( srw0 ) ^ + ( ( MULx( srw1 , 0x1b) ) ^ srw1 ) ^ + ( MULx(srw2, 0x1b) ) ^ + ( srw3 ) + ); + r3 = ( ( srw0 ) ^ + ( srw1 ) ^ + ( ( MULx( srw2 , 0x1b) ) ^ srw2 ) ^ + ( MULx( srw3, 0x1b) ) + ); + + return ( ( ((u32)r0) << 24 ) | ( ((u32)r1) << 16 ) | ( ((u32)r2) << 8 ) | + ( ((u32)r3) ) ); +} + +/* The 32x32-bit S-Box S2 +* Input: a 32-bit input. +* Output: a 32-bit output of S2 box. +* See section 3.3.2. +*/ + +u32 S2(u32 w) +{ + u8 r0=0, r1=0, r2=0, r3=0; + u8 sqw0 = SQ[ (u8)((w >> 24) & 0xff) ]; + u8 sqw1 = SQ[ (u8)((w >> 16) & 0xff) ]; + u8 sqw2 = SQ[ (u8)((w >> 8) & 0xff) ]; + u8 sqw3 = SQ[ (u8)((w) & 0xff) ]; + r0 = ( ( MULx( sqw0 , 0x69) ) ^ + ( sqw1 ) ^ + ( sqw2 ) ^ + ( (MULx( sqw3, 0x69)) ^ sqw3 ) + ); + r1 = ( ( ( MULx( sqw0 , 0x69) ) ^ sqw0 ) ^ + ( MULx(sqw1, 0x69) ) ^ + ( sqw2 ) ^ + ( sqw3 ) + ); + r2 = ( ( sqw0 ) ^ + ( ( MULx( sqw1 , 0x69) ) ^ sqw1 ) ^ + ( MULx(sqw2, 0x69) ) ^ + ( sqw3 ) + ); + r3 = ( ( sqw0 ) ^ + ( sqw1 ) ^ + ( ( MULx( sqw2 , 0x69) ) ^ sqw2 ) ^ + ( MULx( sqw3, 0x69) ) + ); + return ( ( ((u32)r0) << 24 ) | ( ((u32)r1) << 16 ) | ( ((u32)r2) << 8 ) | + ( ((u32)r3) ) ); +} + +/* Clocking LFSR in initialization mode. +* LFSR Registers S0 to S15 are updated as the LFSR receives a single clock. +* Input F: a 32-bit word comes from output of FSM. +* See section 3.4.4. +*/ + +void ClockLFSRInitializationMode(u32 F) +{ + u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ + ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ + ( LFSR_S2 ) ^ + ( (LFSR_S11 >> 8) & 0x00ffffff ) ^ + ( DIValpha( (u8)( ( LFSR_S11) & 0xff ) ) ) ^ + ( F ) + ); + LFSR_S0 = LFSR_S1; + LFSR_S1 = LFSR_S2; + LFSR_S2 = LFSR_S3; + LFSR_S3 = LFSR_S4; + LFSR_S4 = LFSR_S5; + LFSR_S5 = LFSR_S6; + LFSR_S6 = LFSR_S7; + LFSR_S7 = LFSR_S8; + LFSR_S8 = LFSR_S9; + LFSR_S9 = LFSR_S10; + LFSR_S10 = LFSR_S11; + LFSR_S11 = LFSR_S12; + LFSR_S12 = LFSR_S13; + LFSR_S13 = LFSR_S14; + LFSR_S14 = LFSR_S15; + LFSR_S15 = v; +} + +/* Clocking LFSR in keystream mode. +* LFSR Registers S0 to S15 are updated as the LFSR receives a single clock. +* See section 3.4.5. +*/ + +void ClockLFSRKeyStreamMode() +{ + u32 v = ( ( (LFSR_S0 << 8) & 0xffffff00 ) ^ + ( MULalpha( (u8)((LFSR_S0>>24) & 0xff) ) ) ^ + ( LFSR_S2 ) ^ + ( (LFSR_S11 >> 8) & 0x00ffffff ) ^ + ( DIValpha( (u8)( ( LFSR_S11) & 0xff ) ) ) + ); + LFSR_S0 = LFSR_S1; + LFSR_S1 = LFSR_S2; + LFSR_S2 = LFSR_S3; + LFSR_S3 = LFSR_S4; + LFSR_S4 = LFSR_S5; + LFSR_S5 = LFSR_S6; + LFSR_S6 = LFSR_S7; + LFSR_S7 = LFSR_S8; + LFSR_S8 = LFSR_S9; + LFSR_S9 = LFSR_S10; + LFSR_S10 = LFSR_S11; + LFSR_S11 = LFSR_S12; + LFSR_S12 = LFSR_S13; + LFSR_S13 = LFSR_S14; + LFSR_S14 = LFSR_S15; + LFSR_S15 = v; +} + +/* Clocking FSM. +* Produces a 32-bit word F. +* Updates FSM registers R1, R2, R3. +* See Section 3.4.6. +*/ + +u32 ClockFSM() +{ + u32 F = ( ( LFSR_S15 + FSM_R1 ) & 0xffffffff ) ^ FSM_R2 ; + u32 r = ( FSM_R2 + ( FSM_R3 ^ LFSR_S5 ) ) & 0xffffffff ; + FSM_R3 = S2(FSM_R2); + FSM_R2 = S1(FSM_R1); + FSM_R1 = r; + return F; +} + +/* Initialization. +* Input k[4]: Four 32-bit words making up 128-bit key. +* Input IV[4]: Four 32-bit words making 128-bit initialization variable. +* Output: All the LFSRs and FSM are initialized for key generation. +* See Section 4.1. +*/ + +void snow_3g_initialize(u32 k[4], u32 IV[4]) +{ + u8 i=0; + u32 F = 0x0; + LFSR_S15 = k[3] ^ IV[0]; + LFSR_S14 = k[2]; + LFSR_S13 = k[1]; + LFSR_S12 = k[0] ^ IV[1]; + LFSR_S11 = k[3] ^ 0xffffffff; + LFSR_S10 = k[2] ^ 0xffffffff ^ IV[2]; + LFSR_S9 = k[1] ^ 0xffffffff ^ IV[3]; + LFSR_S8 = k[0] ^ 0xffffffff; + LFSR_S7 = k[3]; + LFSR_S6 = k[2]; + LFSR_S5 = k[1]; + LFSR_S4 = k[0]; + LFSR_S3 = k[3] ^ 0xffffffff; + LFSR_S2 = k[2] ^ 0xffffffff; + LFSR_S1 = k[1] ^ 0xffffffff; + LFSR_S0 = k[0] ^ 0xffffffff; + FSM_R1 = 0x0; + FSM_R2 = 0x0; + FSM_R3 = 0x0; + for(i=0;i<32;i++) + { + F = ClockFSM(); + ClockLFSRInitializationMode(F); + } +} + +/* Generation of Keystream. +* input n: number of 32-bit words of keystream. +* input z: space for the generated keystream, assumes +* memory is allocated already. +* output: generated keystream which is filled in z +* See section 4.2. +*/ + +void snow_3g_generate_key_stream(u32 n, u32 *ks) +{ + u32 t = 0; + u32 F = 0x0; + ClockFSM(); /* Clock FSM once. Discard the output. */ + ClockLFSRKeyStreamMode(); /* Clock LFSR in keystream mode once. */ + for ( t=0; t +#include +#include +*/ + +/* f8. +* Input key: 128 bit Confidentiality Key. +* Input count:32-bit Count, Frame dependent input. +* Input bearer: 5-bit Bearer identity (in the LSB side). +* Input dir:1 bit, direction of transmission. +* Input data: length number of bits, input bit stream. +* Input length: 32 bit Length, i.e., the number of bits to be encrypted or +* decrypted. +* Output data: Output bit stream. Assumes data is suitably memory +* allocated. +* Encrypts/decrypts blocks of data between 1 and 2^32 bits in length as +* defined in Section 3. +*/ + +void snow_3g_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, u32 length) +{ + u32 K[4],IV[4]; + int n = ( length + 31 ) / 32; + int i=0; + int lastbits = (8-(length%8)) % 8; + u32 *KS; + + /*Initialisation*/ + /* Load the confidentiality key for SNOW 3G initialization as in section + 3.4. */ + for (i=0; i<4; i++) + K[3-i] = (key[4*i] << 24) ^ (key[4*i+1] << 16) + ^ (key[4*i+2] << 8) ^ (key[4*i+3]); + + /* Prepare the initialization vector (IV) for SNOW 3G initialization as in + section 3.4. */ + IV[3] = count; + IV[2] = (bearer << 27) | ((dir & 0x1) << 26); + IV[1] = IV[3]; + IV[0] = IV[2]; + + /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ + snow_3g_initialize(K,IV); + KS = (u32 *)ogs_malloc(4*n); + snow_3g_generate_key_stream(n,(u32*)KS); + + /* Exclusive-OR the input data with keystream to generate the output bit + stream */ + for (i=0; i> 24) & 0xff; + data[4*i+1] ^= (u8) (KS[i] >> 16) & 0xff; + data[4*i+2] ^= (u8) (KS[i] >> 8) & 0xff; + data[4*i+3] ^= (u8) (KS[i] ) & 0xff; + } + + ogs_free(KS); + + /* zero last bits of data in case its length is not byte-aligned + this is an addition to the C reference code, which did not handle it */ + if (lastbits) + data[length/8] &= 256 - (1<>i ) & 0x1 ) + result ^= MUL64xPOW(V,i,c); + } + return result; +} + +/* mask8bit. + * Input n: an integer in 1-7. + * Output : an 8 bit mask. + * Prepares an 8 bit mask with required number of 1 bits on the MSB side. + */ +u8 mask8bit(int n) +{ + return 0xFF ^ ((1<<(8-n)) - 1); +} + +/* f9. + * Input key: 128 bit Integrity Key. + * Input count:32-bit Count, Frame dependent input. + * Input fresh: 32-bit Random number. + * Input dir:1 bit, direction of transmission (in the LSB). + * Input data: length number of bits, input bit stream. + * Input length: 64 bit Length, i.e., the number of bits to be MAC'd. + * Output : 32 bit block used as MAC + * Generates 32-bit MAC using UIA2 algorithm as defined in Section 4. + */ +void snow_3g_f9(u8* key, u32 count, u32 fresh, u32 dir, u8 *data, u64 length, + u8 *out) +{ + u32 K[4],IV[4], z[5]; + u32 i=0, D; + u64 EVAL; + u64 V; + u64 P; + u64 Q; + u64 c; + + u64 M_D_2; + int rem_bits = 0; + + /* Load the Integrity Key for SNOW3G initialization as in section 4.4. */ + for (i=0; i<4; i++) + { + K[3-i] = (key[4*i] << 24) ^ (key[4*i+1] << 16) ^ + (key[4*i+2] << 8) ^ (key[4*i+3]); + } + + /* Prepare the Initialization Vector (IV) for SNOW3G initialization as + in section 4.4. */ + IV[3] = count; + IV[2] = fresh; + IV[1] = count ^ ( dir << 31 ) ; + IV[0] = fresh ^ (dir << 15); + + z[0] = z[1] = z[2] = z[3] = z[4] = 0; + + /* Run SNOW 3G to produce 5 keystream words z_1, z_2, z_3, z_4 and z_5. */ + snow_3g_initialize(K, IV); + snow_3g_generate_key_stream(5, z); + + P = (u64)z[0] << 32 | (u64)z[1]; + Q = (u64)z[2] << 32 | (u64)z[3]; + + /* Calculation */ + if ((length % 64) == 0) + D = (length>>6) + 1; + else + D = (length>>6) + 2; + EVAL = 0; + c = 0x1b; + + /* for 0 <= i <= D-3 */ + for (i=0; i 7) + { + M_D_2 |= (u64)data[8*(D-2)+i] << (8*(7-i)); + rem_bits -= 8; + i++; + } + if (rem_bits > 0) + M_D_2 |= (u64)(data[8*(D-2)+i] & mask8bit(rem_bits)) << (8*(7-i)); + + V = EVAL ^ M_D_2; + EVAL = MUL64(V,P,c); + + /* for D-1 */ + EVAL ^= length; + + /* Multiply by Q */ + EVAL = MUL64(EVAL,Q,c); + + /* XOR with z_5: this is a modification to the reference C code, + which forgot to XOR z[5] */ + for (i=0; i<4; i++) + /* + MAC_I[i] = (mac32 >> (8*(3-i))) & 0xff; + */ + out[i] = ((EVAL >> (56-(i*8))) ^ (z[4] >> (24-(i*8)))) & 0xff; +} + +/* End of f9.c */ +/*------------------------------------------------------------------------*/ diff --git a/mme/snow-3g.h b/mme/snow-3g.h new file mode 100644 index 0000000..a5320bb --- /dev/null +++ b/mme/snow-3g.h @@ -0,0 +1,68 @@ +#ifndef __SNOW_3G__ +#define __SNOW_3G__ + +#include "ogs-core.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef uint8_t u8; +typedef uint32_t u32; +typedef uint64_t u64; + +/* Initialization. +* Input k[4]: Four 32-bit words making up 128-bit key. +* Input IV[4]: Four 32-bit words making 128-bit initialization variable. +* Output: All the LFSRs and FSM are initialized for key generation. +* See Section 4.1. +*/ + +void snow_3g_initialize(u32 k[4], u32 IV[4]); + +/* Generation of Keystream. +* input n: number of 32-bit words of keystream. +* input z: space for the generated keystream, assumes +* memory is allocated already. +* output: generated keystream which is filled in z +* See section 4.2. +*/ + +void snow_3g_generate_key_stream(u32 n, u32 *z); + +/* f8. +* Input key: 128 bit Confidentiality Key. +* Input count:32-bit Count, Frame dependent input. +* Input bearer: 5-bit Bearer identity (in the LSB side). +* Input dir:1 bit, direction of transmission. +* Input data: length number of bits, input bit stream. +* Input length: 32 bit Length, i.e., the number of bits to be encrypted or +* decrypted. +* Output data: Output bit stream. Assumes data is suitably memory +* allocated. +* Encrypts/decrypts blocks of data between 1 and 2^32 bits in length as +* defined in Section 3. +*/ + +void snow_3g_f8( u8 *key, u32 count, u32 bearer, u32 dir, + u8 *data, u32 length ); + +/* f9. +* Input key: 128 bit Integrity Key. +* Input count:32-bit Count, Frame dependent input. +* Input fresh: 32-bit Random number. +* Input dir:1 bit, direction of transmission (in the LSB). +* Input data: length number of bits, input bit stream. +* Input length: 64 bit Length, i.e., the number of bits to be MAC'd. +* Output : 32 bit block used as MAC +* Generates 32-bit MAC using UIA2 algorithm as defined in Section 4. +*/ + +void snow_3g_f9( u8* key, u32 count, u32 fresh, u32 dir, + u8 *data, u64 length, u8 *out); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __SNOW_3G__ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15198 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: I938de2ad17210aa1561240c0a96d0df216243be1 Gerrit-Change-Number: 15198 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:22 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: snow-3g: const-ify S-boxes In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15199 ) Change subject: snow-3g: const-ify S-boxes ...................................................................... snow-3g: const-ify S-boxes Change-Id: I3a85120aad95011954f25bb42900133cb30cddb7 --- M mme/snow-3g.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/snow-3g.c b/mme/snow-3g.c index 4c728fe..6d4fe2a 100644 --- a/mme/snow-3g.c +++ b/mme/snow-3g.c @@ -31,7 +31,7 @@ /* Rijndael S-box SR */ -static u8 SR[256] = { +static const u8 SR[256] = { 0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76, 0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0, 0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15, @@ -52,7 +52,7 @@ /* S-box SQ */ -static u8 SQ[256] = { +static const u8 SQ[256] = { 0x25,0x24,0x73,0x67,0xD7,0xAE,0x5C,0x30,0xA4,0xEE,0x6E,0xCB,0x7D,0xB5,0x82,0xDB, 0xE4,0x8E,0x48,0x49,0x4F,0x5D,0x6A,0x78,0x70,0x88,0xE8,0x5F,0x5E,0x84,0x65,0xE2, 0xD8,0xE9,0xCC,0xED,0x40,0x2F,0x11,0x28,0x57,0xD2,0xAC,0xE3,0x4A,0x15,0x1B,0xB9, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15199 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: I3a85120aad95011954f25bb42900133cb30cddb7 Gerrit-Change-Number: 15199 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:21 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add initial set of LTE/EPC NAS templates In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15197 ) Change subject: library: Add initial set of LTE/EPC NAS templates ...................................................................... library: Add initial set of LTE/EPC NAS templates Change-Id: I53a598011041d642f03dcd9cca128f4e9da4adfd --- M deps/Makefile A library/NAS_Templates.ttcn M mme/gen_links.sh 3 files changed, 1,017 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index cdca8f1..61afb37 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -51,6 +51,7 @@ titan.ProtocolModules.GTPv2_v13.7.0 \ titan.ProtocolModules.ISUP_Q.762 \ titan.ProtocolModules.MobileL3_v13.4.0 \ + titan.ProtocolModules.NAS_EPS_15.2.0.1 \ titan.ProtocolModules.NS_v7.3.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ titan.ProtocolEmulations.SCCP diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn new file mode 100644 index 0000000..f819862 --- /dev/null +++ b/library/NAS_Templates.ttcn @@ -0,0 +1,1011 @@ +/* EPC (Evolved Packet Core) NAS (Non-Access Stratum) templates in TTCN-3 + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module NAS_Templates { + +import from General_Types all; +import from NAS_EPS_Types all; + +template (value) PDU_NAS_EPS +ts_NAS_SM(template (value) EPS_SessionManagement sm) := { + protocolDiscriminator := '0010'B, + ePS_messages := { + ePS_SessionManagement := sm + } +} +template (present) PDU_NAS_EPS +tr_NAS_SM(template (present) EPS_SessionManagement sm) := { + protocolDiscriminator := '0010'B, + ePS_messages := { + ePS_SessionManagement := sm + } +} + +template (value) PDU_NAS_EPS +ts_NAS_MM(template (value) EPS_MobilityManagement mm) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := mm + } +} +template (present) PDU_NAS_EPS +tr_NAS_MM(template (present) EPS_MobilityManagement mm) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := mm + } +} + +const BIT4 c_EPS_SEC_NONE := '0000'B; +const BIT4 c_EPS_NAS_PD_EMM := '0111'B; +const BIT4 c_EPS_NAS_PD_ESM := '0010'B; + +private template (value) ESM_MessageContainerLVE +ts_NAS_EsmMsgContLVE(template (value) octetstring inp) := { + lengthIndicator := 0, + content := inp +} +private template (present) ESM_MessageContainerLVE +tr_NAS_EsmMsgContLVE(template (present) octetstring inp) := { + lengthIndicator := ?, + content := inp +} + +private template (value) MobileIdentityLV +ts_NAS_MobileIdLV(template (value) MobileIdentityV mid) := { + lengthIndicator := 0, + mobileIdentityV := mid +} +private template (present) MobileIdentityLV +tr_NAS_MobileIdLV(template (present) MobileIdentityV mid) := { + lengthIndicator := ?, + mobileIdentityV := mid +} + +private function f_enc_IMSI_NAS(hexstring digits) return IMSI { + var IMSI l3; + var integer len := lengthof(digits); + if (len rem 2 == 1) { /* modulo remainder */ + l3.oddevenIndicator := '1'B; + l3.fillerDigit := omit; + } else { + l3.oddevenIndicator := '0'B; + l3.fillerDigit := '1111'B; + } + l3.digits := digits; + return l3; +} + +private function f_enc_IMEI_NAS(hexstring digits) return IMEI { + var IMEI l3; + var integer len := lengthof(digits); + if (len rem 2 == 1) { /* modulo remainder */ + l3.oddevenIndicator := '1'B; + } else { + l3.oddevenIndicator := '0'B; + } + l3.digits := digits; + return l3; +} + +private function f_enc_IMEI_SV(hexstring digits) return IMEI_SV { + var IMEI_SV l3; + var integer len := lengthof(digits); + if (len rem 2 == 1) { /* modulo remainder */ + l3.oddevenIndicator := '1'B; + } else { + l3.oddevenIndicator := '0'B; + } + l3.digits := digits; + l3.fillerDigit := '1111'B; + return l3; +} + +template (value) GUTI ts_NAS_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := { + oddevenIndicator := '0'B, + spare := '1111'B, + /* mcc_mnc specified in format 262f42 */ + mccDigit1 := mcc_mnc[0], + mccDigit2 := mcc_mnc[1], + mccDigit3 := mcc_mnc[2], + mncDigit3 := mcc_mnc[5], + mncDigit1 := mcc_mnc[3], + mncDigit2 := mcc_mnc[4], + mMEGI := mmegi, + mMEC := mmec, + mTMSI := tmsi +} + +template (value) EPS_MobileIdentityV +ts_NAS_MobileId_IMSI(hexstring imsi) := { + typeOfIdentity := '001'B, + oddEvenInd_identity := { + imsi := f_enc_IMSI_NAS(imsi) + } +} + +template (value) EPS_MobileIdentityV +ts_NAS_MobileId_IMEI(hexstring imei) := { + typeOfIdentity := '011'B, + oddEvenInd_identity := { + imei := f_enc_IMEI_NAS(imei) + } +} + +template (value) EPS_MobileIdentityV +ts_NAS_MobileId_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := { + typeOfIdentity := '110'B, + oddEvenInd_identity := { + guti := ts_NAS_GUTI(mcc_mnc, mmegi, mmec, tmsi) + } +} + +template (value) PDU_NAS_EPS +ts_NAS_EMM_SecurityProtected(BIT4 sec_hdr_t, integer seq_nr, octetstring inner_nas) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityProtectedNASMessage := { + securityHeaderType := sec_hdr_t, + messageAuthenticationCode := '00000000'O, + sequenceNumber := seq_nr, + nAS_Message := inner_nas + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_EMM_SecurityProtected := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityProtectedNASMessage := ? + } + } +} + +const BIT3 NAS_PDN_T_IPv4 := '001'B; +const BIT3 NAS_PDN_T_IPv6 := '010'B; +const BIT3 NAS_PDN_T_IPv4v6 := '011'B; +const BIT3 NAS_PDN_T_NonIP := '101'B; + + +/********************************************************************************* + * Mobility Management + *********************************************************************************/ + +/* 8.2.1 Attach Accept */ +template (value) PDU_NAS_EPS +ts_NAS_AttachAccept(template (value) EPS_AttachResultV result, + template (value) GPRSTimerV t3412, + template (value) TAI_Lists tai_lists, + template (value) octetstring esm_enc) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachAccept := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000010'B, + ePS_AttachResult := result, + spare := '0000'B, + t3412 := t3412, + tAI_List := { + lengthIndicator := 0, + trackingAreaIdentityLists := tai_lists + }, + eSM_MessageContainer := ts_NAS_EsmMsgContLVE(esm_enc), + gUTI := omit, + locationAreaIdentification := omit, + msIdentity := omit, + eMMCause := omit, + t3402 := omit, + t3423 := omit, + equivalentPLMNs := omit, + emergencyNumberList := omit, + ePS_NetworkFeatureSupport := omit, + additionalUpdateResult := omit, + t3412_Extended := omit, + t3324 := omit, + extendedDRXParameters := omit, + dNCID := omit, + sMS_ServiceStatus := omit, + non3GPP_NW_ProvidedPolicies := omit, + t3448 := omit, + networkPolicy := omit, + t3447 := omit, + extendedEmergencyNumberList := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachAccept(template (present) EPS_AttachResultV result := ?, + template (present) GPRSTimerV t3412 := ?, + template (present) TAI_Lists tai_lists := ?, + template (present) octetstring esm_enc := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachAccept := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000010'B, + ePS_AttachResult := result, + spare := ?, + t3412 := t3412, + tAI_List := { + lengthIndicator := ?, + trackingAreaIdentityLists := tai_lists + }, + eSM_MessageContainer := tr_NAS_EsmMsgContLVE(esm_enc), + gUTI := *, + locationAreaIdentification := *, + msIdentity := *, + eMMCause := *, + t3402 := *, + t3423 := *, + equivalentPLMNs := *, + emergencyNumberList := *, + ePS_NetworkFeatureSupport := *, + additionalUpdateResult := *, + t3412_Extended := *, + t3324 := *, + extendedDRXParameters := *, + dNCID := *, + sMS_ServiceStatus := *, + non3GPP_NW_ProvidedPolicies := *, + t3448 := *, + networkPolicy := *, + t3447 := *, + extendedEmergencyNumberList := * + } + } + } +} + + +/* 8.2.2 Attach Complete */ +template (value) PDU_NAS_EPS +ts_NAS_AttachComplete(template (value) octetstring esm_enc) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000011'B, + eSM_MessageContainer := ts_NAS_EsmMsgContLVE(esm_enc) + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachComplete(template (present) octetstring esm_enc := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000011'B, + eSM_MessageContainer := tr_NAS_EsmMsgContLVE(esm_enc) + } + } + } +} + + +/* 8.2.3 Attach Reject */ +template (value) PDU_NAS_EPS +ts_NAS_AttachReject(template (value) EMM_CauseV cause) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000100'B, + emmCause := cause, + eSM_MessageContainer := omit, + t3346 := omit, + t3402 := omit, + extendedEmmCause := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachReject(template (present) EMM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000100'B, + emmCause := cause, + eSM_MessageContainer := omit, + t3346 := omit, + t3402 := omit, + extendedEmmCause := omit + } + } + } +} + +/* 8.2.4 Attach Request */ +template (value) PDU_NAS_EPS +ts_NAS_AttachRequest(template (value) BIT3 att_type, + template (value) BIT3 kset_id, + template (value) EPS_MobileIdentityV mobile_id, + template (value) UENetworkCapabilityV ue_net_cap, + template (value) octetstring esm_enc) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01000001'B, + ePS_attachType := { + typeOfAttach := att_type, + spare := '0'B + }, + nasKeySetId := { + identifier := kset_id, + tSC := '1'B + }, + ePSMobileId := { + lengthIndicator := 0, + ePS_MobileIdentity := mobile_id + }, + uENetworkCapability := { + lengthIndicator := 0, + uENetworkCapabilityV := ue_net_cap + }, + eSM_MessageContainer := ts_NAS_EsmMsgContLVE(esm_enc), + old_P_TMSISignature := omit, + additionalGUTI := omit, + lastVisitedRegisteredTAI := omit, + dRXParameter := omit, + mSNetworkCapability := omit, + oldLocationAreaIdentification := omit, + tMSIStatusTV := omit, + mobileStationClassmark2 := omit, + mobileStationClassmark3 := omit, + supportedCodecList := omit, + additionalUpdateType := omit, + voiceDomainPrefandUEsettings := omit, + deviceProperties := omit, + oldGUTI_Type := omit, + mS_NetworkFeatureSupport := omit, + tMSIBasedNRIContainer := omit, + t3324 := omit, + t3412_Extended := omit, + extendedDRXParameters := omit, + uEAdditionalSecurityCapability := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AttachRequest(template (present) BIT3 att_type := ?, + template (present) BIT3 kset_id := ?, + template (present) EPS_MobileIdentityV mobile_id := ?, + template (present) UENetworkCapabilityV ue_net_cap := ?, + template (present) octetstring esm_enc := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AttachRequest := { + securityHeaderType := ?, + messageType := '01000001'B, + ePS_attachType := { + typeOfAttach := att_type, + spare := ? + }, + nasKeySetId := { + identifier := kset_id, + tSC := ? + }, + ePSMobileId := { + lengthIndicator := ?, + ePS_MobileIdentity := mobile_id + }, + uENetworkCapability := { + lengthIndicator := ?, + uENetworkCapabilityV := ue_net_cap + }, + eSM_MessageContainer := tr_NAS_EsmMsgContLVE(esm_enc), + old_P_TMSISignature := *, + additionalGUTI := *, + lastVisitedRegisteredTAI := *, + dRXParameter := *, + mSNetworkCapability := *, + oldLocationAreaIdentification := *, + tMSIStatusTV := *, + mobileStationClassmark2 := *, + mobileStationClassmark3 := *, + supportedCodecList := *, + additionalUpdateType := *, + voiceDomainPrefandUEsettings := *, + deviceProperties := *, + oldGUTI_Type := *, + mS_NetworkFeatureSupport := *, + tMSIBasedNRIContainer := *, + t3324 := *, + t3412_Extended := *, + extendedDRXParameters := *, + uEAdditionalSecurityCapability := * + } + } + } +} + + +/* 8.2.5 Authentication Failure */ +template (value) PDU_NAS_EPS +ts_NAS_AuthFail(template (value) EMM_CauseV cause /* template (omit) OCT14 auth_fail_par */) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationFailure := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011100'B, + emmCause := cause, + authenticationFailureParameter := omit + } + } + } +} +template (value) PDU_NAS_EPS +ts_NAS_AuthFail_par(template (value) EMM_CauseV cause, + template (value) OCT14 auth_fail_par) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationFailure := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011100'B, + emmCause := cause, + authenticationFailureParameter := { + elementIdentifier := '30'O, + lengthIndicator := lengthof(auth_fail_par), + authenticationFailureParameter := auth_fail_par + } + } + } + } +} + +/* 8.2.6 Authentication Reject */ +template (value) PDU_NAS_EPS +ts_NAS_AuthRej := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010100'B + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AuthRej := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationReject := { + securityHeaderType := ?, + messageType := '01010100'B + } + } + } +} + +/* 8.2.7 Authentication Request */ +template (value) PDU_NAS_EPS +ts_NAS_AuthReq(template (value) NAS_KeySetIdentifierV kset_id, + OCT16 rand, OCT16 autn) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010010'B, + nasKeySetId := kset_id, + spare := '0000'B, + authenticationParameterRAND := { + rAND := rand + }, + authenticationParameterAUTN := { + lengthIndicator := lengthof(autn), + aUTN := autn + } + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AuthReq(template (present) NAS_KeySetIdentifierV kset_id := ?, + template (present) OCT16 rand := ?, + template (present) OCT16 autn := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationRequest := { + securityHeaderType := ?, + messageType := '01010010'B, + nasKeySetId := kset_id, + spare := '0000'B, + authenticationParameterRAND := { + rAND := rand + }, + authenticationParameterAUTN := { + lengthIndicator := ?, + aUTN := autn + } + } + } + } +} + +/* 8.2.8 Authentication Response */ +template (value) PDU_NAS_EPS +ts_NAS_AuthResp(octetstring res) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationResponse := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010011'B, + authenticationResponseParameter := { + lengthIndicator := lengthof(res), + authenticationResponseParameter := { + rES := res + } + } + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_AuthResp(template OCT16 res := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_AuthenticationResponse := { + securityHeaderType := ?, + messageType := '01010011'B, + authenticationResponseParameter := { + lengthIndicator := ?, + authenticationResponseParameter := { + rES := res + } + } + } + } + } +} + +/* 8.2.18 Identity Request */ +template (value) PDU_NAS_EPS +ts_NAS_IdentityReq(template (value) IdentityType2V id_type) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010101'B, + identityType := id_type, + spareHalfOctet := '0000'B + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_IdentityReq(template (present) IdentityType2V id_type := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityRequest := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010101'B, + identityType := id_type, + spareHalfOctet := ? + } + } + } +} + +/* 8.2.19 Identity Response */ +template (value) PDU_NAS_EPS +ts_NAS_IdentityResp(template (value) MobileIdentityV mobile_id) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityResponse := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010110'B, + mobileIdentity := ts_NAS_MobileIdLV(mobile_id) + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_IdentityResp(template (present) MobileIdentityV mobile_id := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_IdentityResponse := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01010110'B, + mobileIdentity := tr_NAS_MobileIdLV(mobile_id) + } + } + } +} + + + + +/* 8.2.20 Security Mode Command */ +template (value) PDU_NAS_EPS +ts_NAS_SecModeCmd(template (value) NAS_SecurityAlgorithmsV alg, + template (value) NAS_KeySetIdentifierV kset_id, + template (value) UESecurityCapabilityLV ue_sec_cap) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeCommand := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011101'B, + selected_NAS_SecurityAlgorithms := alg, + nasKeySetId := kset_id, + spareHalfOctet := '0000'B, + replayed_UE_SecurityCapability := ue_sec_cap, + iMEISV_Request := omit, + replayedNonceUE := omit, + nonceMME := omit, + hashMME := omit, + uEAdditionalSecurityCapability := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_SecModeCmd(template (present) NAS_SecurityAlgorithmsV alg := ?, + template (present) NAS_KeySetIdentifierV kset_id := ?, + template (present) UESecurityCapabilityLV ue_sec_cap := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeCommand := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011101'B, + selected_NAS_SecurityAlgorithms := alg, + nasKeySetId := kset_id, + spareHalfOctet := ?, + replayed_UE_SecurityCapability := ue_sec_cap, + iMEISV_Request := *, + replayedNonceUE := *, + nonceMME := *, + hashMME := *, + uEAdditionalSecurityCapability := * + } + } + } +} + +/* 8.2.21 Security Mode Complete */ +template (value) PDU_NAS_EPS +ts_NAS_SecModeCmpl := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011110'B, + iMEISV := omit, + replayedNASMessageContainer := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_SecModeCmpl := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_SecurityModeComplete := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01011110'B, + iMEISV := *, + replayedNASMessageContainer := * + } + } + } +} + +/********************************************************************************* + * Session Management + *********************************************************************************/ + +/* 9.9.4.11 - 10.5.6.3/24.008 */ +private function ts_NAS_PCO_TLV(template (omit) ProtocolConfigOptionsV pco) +return template (omit) ProtocolConfigOptionsTLV { + var template (value) ProtocolConfigOptionsTLV ret; + if (istemplatekind(pco, "omit")) { + return omit; + } + ret := { + elementIdentifier := '27'O, + protocolConfigOptions := { + lengthIndicator := 0, + protocolConfigOptionsV := pco + } + } + return ret; +} +private function tr_NAS_PCO_TLV(template ProtocolConfigOptionsV pco := ?) +return template ProtocolConfigOptionsTLV { + var template ProtocolConfigOptionsTLV ret := { + elementIdentifier := '27'O, + protocolConfigOptions := { + lengthIndicator := ?, + protocolConfigOptionsV := pco + } + } + if (istemplatekind(pco, "omit")) { + return omit; + } else if (istemplatekind(pco, "*")) { + return *; + } else { + return ret; + } +} + + + +/* 8.3.20 PDN Connectivity Request */ +template (value) PDU_NAS_EPS +ts_NAS_PdnConnReq(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) BIT3 pdn_type, + template (value) BIT3 req_type) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010000'B, + requestType := { + requestTypeValue := req_type, + spare := '0'B + }, + pDN_Type := { + pDN_TypeValue := pdn_type, + spare := '0'B + }, + eSM_InformationTransferFlag := omit, + accessPointName := omit, + protocolConfigOptions := omit, + deviceProperties := omit, + nBIFOMContainer := omit, + headerCompressinConfiguration := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_PdnConnReq(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) BIT3 pdn_type := ?, + template (present) BIT3 req_type := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010000'B, + requestType := { + requestTypeValue := req_type, + spare := '0'B + }, + pDN_Type := { + pDN_TypeValue := pdn_type, + spare := '0'B + }, + eSM_InformationTransferFlag := omit, + accessPointName := omit, + protocolConfigOptions := omit, + deviceProperties := omit, + nBIFOMContainer := omit, + headerCompressinConfiguration := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} + +/* 8.3.19 PDN Connectivity Reject */ +template (value) PDU_NAS_EPS +ts_NAS_PdnConnRej(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) ESM_CauseV cause) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010001'B, + esmCause := cause, + protocolConfigOptions := omit, + backOffTimer := omit, + reAttemptIndicator := omit, + nBIFOMContainer := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_PdnConnRej(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) ESM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_PDN_ConnectivityReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11010001'B, + esmCause := cause, + protocolConfigOptions := *, + backOffTimer := *, + reAttemptIndicator := *, + nBIFOMContainer := *, + extendedProtocolConfigurationOptions := * + } + } + } +} + + +/* 8.3.6 Activate Default EPS Bearer Context Request */ +template (value) PDU_NAS_EPS +ts_NAS_ActDefEpsBearCtxReq(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) EPS_QualityOfServiceV qos, + template (value) octetstring apn, + template (value) BIT3 addr_type, + template (value) octetstring addr_info) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextRequest := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000001'B, + ePS_QoS := { + lengthIndicator := 0, + ePS_QualityOfServiceV := qos + }, + accessPointName := { + lengthIndicator := 0, + accessPointNameValue := apn + }, + pDN_Address := { + lengthIndicator := 0, + typeValue := addr_type, + spare := '00000'B, + addressInformation := addr_info + }, + transactionIdentifier := omit, + negotiatedQoS := omit, + negotiated_LLC_SAPI := omit, + radioPriority := omit, + packetFlowID := omit, + aPN_AMBR := omit, + esmCause := omit, + protocolConfigOptions := omit, + connectivityType := omit, + wLANOffloadIndication := omit, + nBIFOMContainer := omit, + headerCompressinConfiguration := omit, + controlPlaneOnlyIndication := omit, + extendedProtocolConfigurationOptions := omit, + servingPLMNRateControl := omit, + extended_APN_AMBR := omit, + extendedQoS := omit + } + } + } +} + +/* 8.3.4 Activate Default EPS Bearer Context Accept */ +template (value) PDU_NAS_EPS +ts_NAS_ActDefEpsBearCtxAck(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (omit) ProtocolConfigOptionsV pco) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextAccept := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000010'B, + protocolConfigOptions := ts_NAS_PCO_TLV(pco), + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_ActDefEpsBearCtxAck(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template ProtocolConfigOptionsV pco := *) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextAccept := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000010'B, + protocolConfigOptions := tr_NAS_PCO_TLV(pco), + extendedProtocolConfigurationOptions := * + } + } + } +} + + +/* 8.3.5 Activate Default EPS Bearer Context Reject */ +template (value) PDU_NAS_EPS +ts_NAS_ActDefEpsBearCtxRej(template (value) BIT4 bearer_id, + template (value) BIT8 proc_tid, + template (value) ESM_CauseV cause) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000011'B, + esmCause := cause, + protocolConfigOptions := omit, + extendedProtocolConfigurationOptions := omit + } + } + } +} +template (present) PDU_NAS_EPS +tr_NAS_ActDefEpsBearCtxRej(template (present) BIT4 bearer_id := ?, + template (present) BIT8 proc_tid := ?, + template (present) ESM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_ESM, + ePS_messages := { + ePS_SessionManagement := { + pDU_NAS_EPS_ActDefEPSBearerContextReject := { + ePSBearerIdentity := bearer_id, + procedureTransactionIdentifier := proc_tid, + messageType := '11000011'B, + esmCause := cause, + protocolConfigOptions := *, + extendedProtocolConfigurationOptions := * + } + } + } +} + + + + + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 1f2d85b..8c1da59 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -31,6 +31,10 @@ FILES="SGsAP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.NAS_EPS_15.2.0.1/src +FILES="NAS_EPS_Types.ttcn" +gen_links $DIR $FILES + DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " @@ -42,6 +46,7 @@ FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn " +FILES+="NAS_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15197 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: I53a598011041d642f03dcd9cca128f4e9da4adfd Gerrit-Change-Number: 15197 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:22 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: remove ogslib dependency from snow In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15201 ) Change subject: remove ogslib dependency from snow ...................................................................... remove ogslib dependency from snow * don't use ogslib specific header files * don't use ogs_{malloc,free} but simply use the stack Change-Id: I5604c594934b03d2fd83e1e465fc150fc542a475 --- M mme/snow-3g.c M mme/snow-3g.h 2 files changed, 2 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/snow-3g.c b/mme/snow-3g.c index 992b107..60bdffd 100644 --- a/mme/snow-3g.c +++ b/mme/snow-3g.c @@ -381,7 +381,7 @@ int n = ( length + 31 ) / 32; int i=0; int lastbits = (8-(length%8)) % 8; - u32 *KS; + u32 KS[n]; /*Initialisation*/ /* Load the confidentiality key for SNOW 3G initialization as in section @@ -399,7 +399,6 @@ /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ snow_3g_initialize(K,IV); - KS = (u32 *)ogs_malloc(4*n); snow_3g_generate_key_stream(n,(u32*)KS); /* Exclusive-OR the input data with keystream to generate the output bit @@ -412,8 +411,6 @@ data[4*i+3] ^= (u8) (KS[i] ) & 0xff; } - ogs_free(KS); - /* zero last bits of data in case its length is not byte-aligned this is an addition to the C reference code, which did not handle it */ if (lastbits) diff --git a/mme/snow-3g.h b/mme/snow-3g.h index a5320bb..0ba6a84 100644 --- a/mme/snow-3g.h +++ b/mme/snow-3g.h @@ -1,7 +1,7 @@ #ifndef __SNOW_3G__ #define __SNOW_3G__ -#include "ogs-core.h" +#include #ifdef __cplusplus extern "C" { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15201 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: I5604c594934b03d2fd83e1e465fc150fc542a475 Gerrit-Change-Number: 15201 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:23 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: TTCN-3 native function wrapper for SNOW-3G In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15202 ) Change subject: TTCN-3 native function wrapper for SNOW-3G ...................................................................... TTCN-3 native function wrapper for SNOW-3G Change-Id: I7fca69ea8b4aed48d5a64885b762ab85be71ef03 --- A mme/LTE_CryptoFunctionDefs.cc A mme/LTE_CryptoFunctions.ttcn A mme/key_derivation.c A mme/key_derivation.h M mme/regen_makefile.sh 5 files changed, 557 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/LTE_CryptoFunctionDefs.cc b/mme/LTE_CryptoFunctionDefs.cc new file mode 100644 index 0000000..da2d521 --- /dev/null +++ b/mme/LTE_CryptoFunctionDefs.cc @@ -0,0 +1,189 @@ +/* Utility functions from ogslib imported to TTCN-3 + * + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "snow-3g.h" +#include "key_derivation.h" + +//#define DEBUG + +#ifdef DEBUG +static __thread char hexd_buff[4096]; +static const char hex_chars[] = "0123456789abcdef"; + +static const char *_osmo_hexdump_buf(char *out_buf, size_t out_buf_size, const unsigned char *buf, int len, const char *delim, + bool delim_after_last) +{ + int i; + char *cur = out_buf; + size_t delim_len; + + if (!out_buf || !out_buf_size) + return ""; + + delim = delim ? : ""; + delim_len = strlen(delim); + + for (i = 0; i < len; i++) { + const char *delimp = delim; + int len_remain = out_buf_size - (cur - out_buf) - 1; + if (len_remain < (2 + delim_len) + && !(!delim_after_last && i == (len - 1) && len_remain >= 2)) + break; + + *cur++ = hex_chars[buf[i] >> 4]; + *cur++ = hex_chars[buf[i] & 0xf]; + + if (i == (len - 1) && !delim_after_last) + break; + + while (len_remain > 1 && *delimp) { + *cur++ = *delimp++; + len_remain--; + } + } + *cur = '\0'; + return out_buf; +} + +static char *_osmo_hexdump(const unsigned char *buf, int len) +{ + _osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true); + return hexd_buff; +} +#endif + +namespace LTE__CryptoFunctions { + + +/* f8. +* Input key: 128 bit Confidentiality Key as OCT16. +* Input count:32-bit Count, Frame dependent input as INTEGER. +* Input bearer: 5-bit Bearer identity (in the LSB side) as BIT5. +* Input is_dlwnlink: Direction of transmission. +* Input data: length number of bits, input bit stream as OCTETSTRING. +* Output data: Output bit stream. Assumes data is suitably memory +* allocated. +* Encrypts/decrypts blocks of data between 1 and 2^32 bits in length as +* defined in Section 3. +*/ +OCTETSTRING f__snow__3g__f8(const OCTETSTRING& key, const INTEGER& count, const INTEGER & bearer, + const BOOLEAN& is_downlink, const OCTETSTRING& data) +{ + TTCN_Buffer ttcn_buf_data(data); + TTCN_Buffer ttcn_buf_key(key); + uint32_t direction = (uint32_t)is_downlink; + + snow_3g_f8((u8 *)ttcn_buf_key.get_data(), (u32) count, (u32)bearer, direction, + (u8 *)ttcn_buf_data.get_data(), ttcn_buf_data.get_len()); + + return OCTETSTRING(ttcn_buf_data.get_len(), ttcn_buf_data.get_data()); +} + +/* f9. +* Input key: 128 bit Integrity Key as OCT16. +* Input count:32-bit Count, Frame dependent input as UINT32. +* Input fresh: 32-bit Random number as UINT32. +* Input is_downlink:1 Direction of transmission. +* Input data: input bit stream. +* Output : 32 bit block used as MAC +* Generates 32-bit MAC using UIA2 algorithm as defined in Section 4. +*/ + +OCTETSTRING f__snow__3g__f9(const OCTETSTRING& key, const INTEGER& count, const INTEGER& fresh, + const BOOLEAN& is_downlink, const OCTETSTRING& data) +{ + TTCN_Buffer ttcn_buf_data(data); + TTCN_Buffer ttcn_buf_key(key); + uint32_t direction = (uint32_t)is_downlink; + uint8_t tmp[4]; + TTCN_Buffer ttcn_buf_mac; + +#ifdef DEBUG + printf("F9: key=%s, count=%u, fresh=%u, direction=%u, ", + _osmo_hexdump((u8 *)ttcn_buf_key.get_data(), ttcn_buf_key.get_len()), (u32) count, + (u32) fresh, direction); + printf("data=%s -> ", _osmo_hexdump(ttcn_buf_data.get_data(), ttcn_buf_data.get_len())); +#endif + snow_3g_f9((u8 *)ttcn_buf_key.get_data(), (u32) count, (u32) fresh, direction, + (u8 *)ttcn_buf_data.get_data(), ttcn_buf_data.get_len()*8, tmp); +#ifdef DEBUG + printf("%s\n", _osmo_hexdump(tmp, sizeof(tmp))); +#endif + + return OCTETSTRING(4, tmp); +} + +OCTETSTRING f__kdf__kasme(const OCTETSTRING& ck, const OCTETSTRING& ik, const OCTETSTRING& plmn_id, + const OCTETSTRING& sqn, const OCTETSTRING& ak) +{ + TTCN_Buffer ttcn_buf_ck(ck); + TTCN_Buffer ttcn_buf_ik(ik); + TTCN_Buffer ttcn_buf_plmn_id(plmn_id); + TTCN_Buffer ttcn_buf_sqn(sqn); + TTCN_Buffer ttcn_buf_ak(ak); + uint8_t kasme[32]; + + hss_auc_kasme(ttcn_buf_ck.get_data(), ttcn_buf_ik.get_data(), ttcn_buf_plmn_id.get_data(), + ttcn_buf_sqn.get_data(), ttcn_buf_ak.get_data(), kasme); + return OCTETSTRING(sizeof(kasme), kasme); +} + +OCTETSTRING f__kdf__nas__int(const INTEGER& alg_id, const OCTETSTRING &kasme) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + uint8_t knas[16]; + + mme_kdf_nas(MME_KDF_NAS_INT_ALG, (int)alg_id, (const u8*) ttcn_buf_kasme.get_data(), knas); + return OCTETSTRING(sizeof(knas), knas); +} + +OCTETSTRING f__kdf__nas__enc(const INTEGER& alg_id, const OCTETSTRING &kasme) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + uint8_t knas[16]; + + mme_kdf_nas(MME_KDF_NAS_ENC_ALG, (int)alg_id, (const u8*) ttcn_buf_kasme.get_data(), knas); + return OCTETSTRING(sizeof(knas), knas); +} + + +OCTETSTRING f__kdf__enb(const OCTETSTRING &kasme, const INTEGER &ul_count) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + uint8_t kenb[32]; + + mme_kdf_enb(ttcn_buf_kasme.get_data(), (int)ul_count, kenb); + return OCTETSTRING(sizeof(kenb), kenb); +} + +OCTETSTRING f__kdf__nh(const OCTETSTRING &kasme, const OCTETSTRING &sync_inp) +{ + TTCN_Buffer ttcn_buf_kasme(kasme); + TTCN_Buffer ttcn_buf_sync_inp(sync_inp); + uint8_t kenb[32]; + + mme_kdf_nh(ttcn_buf_kasme.get_data(), ttcn_buf_sync_inp.get_data(), kenb); + return OCTETSTRING(sizeof(kenb), kenb); +} + + + +} // namespace diff --git a/mme/LTE_CryptoFunctions.ttcn b/mme/LTE_CryptoFunctions.ttcn new file mode 100644 index 0000000..687caab --- /dev/null +++ b/mme/LTE_CryptoFunctions.ttcn @@ -0,0 +1,263 @@ +/* Utility functions from ogslib imported to TTCN-3 + * + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module LTE_CryptoFunctions { + +import from General_Types all; + +import from S1AP_Types all; +import from S1AP_PDU_Descriptions all; + +import from NAS_EPS_Types all; +import from NAS_Templates all; + +/********************************************************************************* + * low-level API (external C/C++ code) + *********************************************************************************/ + +external function f_snow_3g_f8(in OCT16 key, in integer count, in integer bearer, + in boolean is_downlink, in octetstring data) return octetstring; + +external function f_snow_3g_f9(in OCT16 key, in integer count, in integer fresh, + in boolean is_downlink, in octetstring data) return OCT4; + +external function f_kdf_kasme(in OCT16 ck, in OCT16 ik, in OCT3 plmn_id, + in OCT6 sqn, in OCT6 ak) return OCT32; + +external function f_kdf_nas_int(in integer alg_id, in OCT32 kasme) return OCT32; +external function f_kdf_nas_enc(in integer alg_id, in OCT32 kasme) return OCT32; + +external function f_kdf_enb(in OCT16 kasme, in integer ul_count) return OCT32; + +external function f_kdf_nh(in OCT16 kasme, in OCT32 sync_inp) return OCT32; + +/********************************************************************************* + * mid-level API + *********************************************************************************/ + +function f_nas_mac_calc(NAS_ALG_INT alg, octetstring k_nas_int, integer seq_nr, + integer bearer, boolean is_downlink, octetstring data) return OCT4 { + select (alg) { + case (NAS_ALG_IP_EIA0) { + return '00000000'O; + } + case (NAS_ALG_IP_EIA1) { + return f_snow_3g_f9(k_nas_int, seq_nr, bearer, is_downlink, data); + } + case else { + setverdict(fail, "Unsupported EIA: ", alg); + mtc.stop; + } + } +} + +function f_nas_encrypt(NAS_ALG_ENC alg, octetstring k_nas_enc, integer count, + integer bearer, boolean is_downlink, inout octetstring data) { + select (alg) { + case (NAS_ALG_ENC_EEA0) { } + case (NAS_ALG_ENC_EEA1) { + f_snow_3g_f8(k_nas_enc, count, bearer, is_downlink, data); + } + case else { + setverdict(fail, "Unsupported EEA: ", alg); + mtc.stop; + } + } +} + + +/********************************************************************************* + * high-level API (full NAS encapsulation/decapsulation) + *********************************************************************************/ + +type record NAS_UE_State { + NAS_Role role, /* ATS implements UE or MME role? */ + + NAS_ALG_INT alg_int, /* NAS Integrity Protection Algorithm */ + octetstring k_nas_int, /* NAS Integrity Protection Key */ + NAS_ALG_ENC alg_enc, /* NAS Encryption Algorithm */ + octetstring k_nas_enc, /* NAS Encryption Key */ + integer rx_count, /* frame counter (ATS rx side) */ + integer tx_count /* frame counter (ATS tx side) */ +}; + +template (value) NAS_UE_State t_NAS_UE_State(NAS_Role role) := { + role := role, + alg_int := NAS_ALG_IP_EIA0, + k_nas_int := ''O, + alg_enc := NAS_ALG_ENC_EEA0, + k_nas_enc := ''O, + rx_count := 0, + tx_count := 0 +}; + +type enumerated NAS_Role { + NAS_ROLE_UE, /* ATS implements/emulates UE */ + NAS_ROLE_MME /* ATS implements/emulates MME */ +}; +type enumerated NAS_ALG_INT { + NAS_ALG_IP_EIA0, /* no integrity protection */ + NAS_ALG_IP_EIA1, /* SNOW-3G F9 based */ + NAS_ALG_IP_EIA2, /* AES based */ + NAS_ALG_IP_EIA3 /* ZUC */ +}; +type enumerated NAS_ALG_ENC { + NAS_ALG_ENC_EEA0, /* no encryption */ + NAS_ALG_ENC_EEA1, /* SNOW-3G F8 based */ + NAS_ALG_ENC_EEA2, /* AES based */ + NAS_ALG_ENC_EEA3 /* ZUC */ +}; + +/* port between individual per-connection components and this translator */ +type port S1AP_NAS_Conn_PT message { + inout S1AP_PDU, PDU_NAS_EPS; +} with { extension "internal" }; + +/* determine if a received (from the IUT) message is downlink or not */ +private function f_rx_is_downlink(in NAS_UE_State nus) return boolean +{ + if (nus.role == NAS_ROLE_UE) { + return true; + } else { + return false; + } +} + +/* determine if a message transmitted to the IUT message is downlink or not */ +private function f_tx_is_downlink(in NAS_UE_State nus) return boolean +{ + return not f_rx_is_downlink(nus); +} + +private function f_nas_check_ip(inout NAS_UE_State nus, + in PDU_NAS_EPS_SecurityProtectedNASMessage secp_nas) return boolean +{ + var octetstring data_with_seq := int2oct(secp_nas.sequenceNumber, 1) & secp_nas.nAS_Message; + var OCT4 exp_mac := f_nas_mac_calc(nus.alg_int, nus.k_nas_int, nus.rx_count, 0, + f_rx_is_downlink(nus), data_with_seq); + if (exp_mac != secp_nas.messageAuthenticationCode) { + setverdict(fail, "Received NAS MAC ", secp_nas.messageAuthenticationCode, + " doesn't match expected MAC ", exp_mac, ": ", secp_nas); + return false; + } + return true; +} + +/* try to decapsulate (MAC verify, decrypt) NAS message */ +function f_nas_try_decaps(inout NAS_UE_State nus, PDU_NAS_EPS nas) return PDU_NAS_EPS +{ + var PDU_NAS_EPS_SecurityProtectedNASMessage secp_nas; + + /* transparently pass through any non-protected NAS */ + if (not match(nas, tr_NAS_EMM_SecurityProtected)) { + return nas; + } + + /* process any security-protected NAS */ + secp_nas := nas.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_SecurityProtectedNASMessage; + select (secp_nas.securityHeaderType) { + case ('0011'B) { /* IP with new EPS security context */ + nus.rx_count := 0; + nus.alg_int := NAS_ALG_IP_EIA1; /* FIXME: from decoded inner message! */ + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case ('0001'B) { /* IP only */ + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case ('0010'B) { /* IP + ciphered */ + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.rx_count, 0, + f_rx_is_downlink(nus), secp_nas.nAS_Message); + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + case ('0100'B) { /* IP + ciphered; new EPS security context */ + nus.rx_count := 0; + if (not f_nas_check_ip(nus, secp_nas)) { + mtc.stop; + } + f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.rx_count, 0, + f_rx_is_downlink(nus), secp_nas.nAS_Message); + return dec_PDU_NAS_EPS(secp_nas.nAS_Message); + } + //case ('0101'B) { /* IP + partially ciphered */ } + //case ('1100'B) { /* Service Request Message */ } + case else { + setverdict(fail, "Implement SecHdrType for ", secp_nas); + mtc.stop; + } + } +} + +private function f_nas_determine_sec_hdr_t(boolean encrypt, boolean authenticate, boolean new_ctx) +return BIT4 +{ + if (encrypt == false and authenticate == false and new_ctx == false) { + return '0000'B; + } else if (encrypt == false and authenticate == true and new_ctx == false) { + return '0001'B; + } else if (encrypt == false and authenticate == true and new_ctx == true) { + return '0011'B; + } else if (encrypt == true and authenticate == true and new_ctx == true) { + return '0100'B; + } else if (encrypt == true and authenticate == true and new_ctx == false) { + return '0010'B; + } else { + setverdict(fail, "invalid sec_hdr conditions"); + mtc.stop; + } +} + +/* encapsulate a NAS message (encrypt, MAC) */ +function f_nas_encaps(inout NAS_UE_State nus, PDU_NAS_EPS nas_in, boolean new_ctx := false) +return PDU_NAS_EPS +{ + var boolean encrypt := false; + var boolean authenticate := false; + if (nus.alg_int != NAS_ALG_IP_EIA0) { + authenticate := true; + } + if (nus.alg_enc != NAS_ALG_ENC_EEA0) { + encrypt := true; + } + + if (encrypt == false and authenticate == false) { + return nas_in; + } + + if (new_ctx) { + nus.tx_count := 0; + } + + var BIT4 sec_hdr_t := f_nas_determine_sec_hdr_t(encrypt, authenticate, new_ctx); + var octetstring nas_enc := enc_PDU_NAS_EPS(nas_in); + if (encrypt) { + f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.tx_count, 0, + f_tx_is_downlink(nus), nas_enc); + } + var PDU_NAS_EPS nas_out; + nas_out := valueof(ts_NAS_EMM_SecurityProtected(sec_hdr_t, nus.tx_count, nas_enc)); + if (authenticate) { + var OCT4 mac := f_nas_mac_calc(nus.alg_int, nus.k_nas_int, nus.tx_count, 0, + f_tx_is_downlink(nus), '00'O & nas_enc); + nas_out.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_SecurityProtectedNASMessage.messageAuthenticationCode := mac; + } + return nas_out; +} + +} // namespace diff --git a/mme/key_derivation.c b/mme/key_derivation.c new file mode 100644 index 0000000..36e4c91 --- /dev/null +++ b/mme/key_derivation.c @@ -0,0 +1,82 @@ +#include +#include +#include +#include + +/* From nextepc/src/mme/mme-kdf.c under AGPLv3+ */ + +void mme_kdf_nas(uint8_t algorithm_type_distinguishers, + uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas) +{ + uint8_t s[7]; + uint8_t out[32]; + + s[0] = 0x15; /* FC Value */ + + s[1] = algorithm_type_distinguishers; + s[2] = 0x00; + s[3] = 0x01; + + s[4] = algorithm_identity; + s[5] = 0x00; + s[6] = 0x01; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, kasme, 32, s, 7, out); + memcpy(knas, out+16, 16); +} + +void mme_kdf_enb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb) +{ + uint8_t s[7]; + + s[0] = 0x11; /* FC Value */ + + ul_count = htonl(ul_count); + memcpy(s+1, &ul_count, 4); + + s[5] = 0x00; + s[6] = 0x04; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, kasme, 32, s, 7, kenb); +} + +void mme_kdf_nh(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb) +{ + uint8_t s[35]; + + s[0] = 0x12; /* FC Value */ + + memcpy(s+1, sync_input, 32); + + s[33] = 0x00; + s[34] = 0x20; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, kasme, 32, s, 35, kenb); +} + +/* From nextepc/src/hss/hss-auc.c under AGPLv3+ */ + +#define FC_VALUE 0x10 + +void hss_auc_kasme(const uint8_t *ck, const uint8_t *ik, const uint8_t plmn_id[3], + const uint8_t *sqn, const uint8_t *ak, uint8_t *kasme) +{ + uint8_t s[14]; + uint8_t k[32]; + int i; + + memcpy(&k[0], ck, 16); + memcpy(&k[16], ik, 16); + + s[0] = FC_VALUE; + memcpy(&s[1], plmn_id, 3); + s[4] = 0x00; + s[5] = 0x03; + + for (i = 0; i < 6; i++) + s[6+i] = sqn[i] ^ ak[i]; + s[12] = 0x00; + s[13] = 0x06; + + gnutls_hmac_fast(GNUTLS_MAC_SHA256, k, 32, s, 14, kasme); +} diff --git a/mme/key_derivation.h b/mme/key_derivation.h new file mode 100644 index 0000000..496f52b --- /dev/null +++ b/mme/key_derivation.h @@ -0,0 +1,21 @@ +#pragma once + +#include + +#define HSS_SQN_LEN 6 +#define HSS_AK_LEN 6 + +void hss_auc_kasme(const uint8_t *ck, const uint8_t *ik, + const uint8_t plmn_id[3], const uint8_t *sqn, const uint8_t *ak, + uint8_t *kasme); + +/* Algorithm Type Distinguishers */ +#define MME_KDF_NAS_ENC_ALG 0x01 +#define MME_KDF_NAS_INT_ALG 0x02 + +void mme_kdf_nas(uint8_t algorithm_type_distinguishers, + uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas); + +void mme_kdf_enb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb); + +void mme_kdf_nh(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb); diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index ee73658..4752302 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,9 +1,9 @@ #!/bin/sh -FILES="*.ttcn *.asn IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " export CPPFLAGS_TTCN3="" ../regen-makefile.sh MME_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode -lgnutls/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15202 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: I7fca69ea8b4aed48d5a64885b762ab85be71ef03 Gerrit-Change-Number: 15202 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:23 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Extend MME tests to also include S1AP interface testing In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15203 ) Change subject: mme: Extend MME tests to also include S1AP interface testing ...................................................................... mme: Extend MME tests to also include S1AP interface testing The tests so far only tested SGsAP alone, which doesn't get us very far. Let's add interfacing with the S1, too. Change-Id: Id54071b901db720a0f88b91cdc5a8e09bea0fb58 --- A mme/MME_Tests.cfg A mme/MME_Tests.default M mme/MME_Tests.ttcn M mme/MME_Tests_SGsAP.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 6 files changed, 399 insertions(+), 25 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/MME_Tests.cfg b/mme/MME_Tests.cfg new file mode 100644 index 0000000..3e478c3 --- /dev/null +++ b/mme/MME_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./MME_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +MME_Tests.control diff --git a/mme/MME_Tests.default b/mme/MME_Tests.default new file mode 100644 index 0000000..1c220d8 --- /dev/null +++ b/mme/MME_Tests.default @@ -0,0 +1,12 @@ +[LOGGING] +FileMask := LOG_ALL | TTCN_MATCHING; +mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; + +[TESTPORT_PARAMETERS] + + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 3ba0677..ae71173 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -10,31 +10,84 @@ module MME_Tests { +import from General_Types all; + +import from S1AP_Types all; +import from S1AP_Templates all; +import from S1AP_Emulation all; +import from S1AP_PDU_Descriptions all; +import from S1AP_IEs all; + +import from NAS_EPS_Types all; +import from NAS_Templates all; + import from SGsAP_Types all; import from SGsAP_Templates all; import from SGsAP_Emulation all; +import from LTE_CryptoFunctions all; + import from L3_Templates all; import from DNS_Helpers all; +import from Osmocom_Types all; friend module MME_Tests_SGsAP; +/* (maximum) number of emulated eNBs */ +const integer NUM_ENB := 3; + +/* (maximum) number of emulated UEs */ +const integer NUM_UE := 3; + +/* parameters of emulated ENB */ +type record EnbParams { + Global_ENB_ID global_enb_id, + integer cell_identity, + SupportedTAs supported_tas +} + +/* parameters of emulated UE */ +type record UeParams { + hexstring imsi +} + type component MTC_CT { + /* S1 intreface of emulated ENBs */ + var EnbParams g_enb_pars[NUM_ENB]; + var S1AP_Emulation_CT vc_S1AP[NUM_ENB]; + port S1AP_PT S1AP_UNIT[NUM_ENB]; + port S1APEM_PROC_PT S1AP_PROC[NUM_ENB]; + + /* SGs interface of emulated MSC/VLR */ var SGsAP_Emulation_CT vc_SGsAP; port SGsAP_PT SGsAP_UNIT; port SGsAPEM_PROC_PT SGsAP_PROC; + + var UeParams g_ue_pars[NUM_UE]; } -type component ConnHdlr extends SGsAP_ConnHdlr { +type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; } type record ConnHdlrPars { - hexstring imsi + /* copied over from MTC_CT on start of component */ + EnbParams enb_pars[NUM_ENB], + /* copied over from MTC_CT on start of component */ + UeParams ue_pars, + /* currently used MME (index into enb_pars, S1AP, ...) */ + integer mme_idx } modulepar { + /* S1 interface */ + charstring mp_mme_ip := "127.0.0.1"; + integer mp_mme_s1ap_port := 36412; + charstring mp_s1_local_ip := "127.0.0.1"; + integer mp_s1_local_port := 50000; + + /* SGs interface */ charstring mp_sgs_local_ip := "127.0.0.1"; integer mp_sgs_local_port := 29118; charstring mp_vlr_name := "vlr.example.net"; @@ -68,11 +121,96 @@ vc_SGsAP.start(SGsAP_Emulation.main(ops, pars, id)); } +/* send incoming unit data messages (like reset) to global S1AP_UNIT port */ +friend function S1apForwardUnitdataCallback(S1AP_PDU msg) +runs on S1AP_Emulation_CT return template S1AP_PDU { + S1AP_UNIT.send(msg); + return omit; +} + +friend function S1apCreateCallback(S1AP_PDU msg, template (omit) MME_UE_S1AP_ID mme_id, + template (omit) ENB_UE_S1AP_ID enb_id, charstring id) +runs on S1AP_Emulation_CT return S1AP_ConnHdlr +{ + setverdict(fail, "implement this"); + mtc.stop; +} + +friend function f_init_one_enb(charstring id, integer num := 0) runs on MTC_CT { + id := id & "-S1AP" & int2str(num); + var S1APOps ops := { + create_cb := refers(S1apCreateCallback), + unitdata_cb := refers(S1apForwardUnitdataCallback) + } + var S1AP_conn_parameters pars := { + remote_ip := mp_mme_ip, + remote_sctp_port := mp_mme_s1ap_port, + local_ip := mp_s1_local_ip, + local_sctp_port := mp_s1_local_port + num, + role := NAS_ROLE_UE + } + var PLMNidentity plmn_id := '00f110'O; + var EnbParams enb_pars := { + global_enb_id := { + pLMNidentity := plmn_id, + eNB_ID := { + macroENB_ID := int2bit(num, 20) + }, + iE_Extensions := omit + }, + cell_identity := num, + supported_tas := { + { + tAC := int2oct(12345, 2), + broadcastPLMNs := { plmn_id }, + iE_Extensions := omit + } + } + }; + + g_enb_pars[num] := enb_pars; + vc_S1AP[num] := S1AP_Emulation_CT.create(id); + map(vc_S1AP[num]:S1AP, system:S1AP_CODEC_PT); + connect(vc_S1AP[num]:S1AP_PROC, self:S1AP_PROC[num]); + connect(vc_S1AP[num]:S1AP_UNIT, self:S1AP_UNIT[num]); + vc_S1AP[num].start(S1AP_Emulation.main(ops, pars, id)); + S1AP_UNIT[num].receive(S1APEM_Event:{up_down:=S1APEM_EVENT_UP}); +} +friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { + uep := { + imsi := f_gen_imsi(imsi_suffix) + } +} +friend function f_init_s1ap(charstring id, integer imsi_suffix) runs on MTC_CT { + var integer i; + for (i := 0; i < NUM_ENB; i := i+1) { + f_init_one_enb(id, i); + } + for (i := 0; i < NUM_UE; i := i+1) { + f_init_one_ue(g_ue_pars[i], i*1000 + imsi_suffix); + } +} + +friend template (value) TAI ts_enb_S1AP_TAI(EnbParams enb) := { + pLMNidentity := enb.global_enb_id.pLMNidentity, + tAC := enb.supported_tas[0].tAC, + iE_Extensions := omit +} + +friend template (value) EUTRAN_CGI ts_enb_S1AP_CGI(EnbParams enb) := { + pLMNidentity := enb.global_enb_id.pLMNidentity, + cell_ID := int2bit(enb.cell_identity, 28), + iE_Extensions := omit +} + + /* generate parameters for a connection handler */ -friend function f_init_pars(integer imsi_suffix) +friend function f_init_pars(integer ue_idx := 0) runs on MTC_CT return ConnHdlrPars { var ConnHdlrPars pars := { - imsi := f_gen_imsi(imsi_suffix) + enb_pars := g_enb_pars, + ue_pars := g_ue_pars[ue_idx], + mme_idx := 0 }; return pars; } @@ -86,9 +224,14 @@ var charstring id := testcasename() & int2str(s1ap_idx); vc_conn := ConnHdlr.create(id); - /* SGsAP part */ - connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); - connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + /* S1AP part */ + connect(vc_conn:S1AP, vc_S1AP[s1ap_idx]:S1AP_CLIENT); + connect(vc_conn:S1AP_PROC, vc_S1AP[s1ap_idx]:S1AP_PROC); + if (isbound(vc_SGsAP)) { + /* SGsAP part */ + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -110,8 +253,209 @@ /* start guard timre and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard()); - /* Route all SGsAP mesages for our IMSIto us */ - f_create_sgsap_expect(pars.imsi); + if (SGsAP_PROC.checkstate("Connected")) { + /* Route all SGsAP mesages for our IMSIto us */ + f_create_sgsap_expect(pars.ue_pars.imsi); + } +} + + + +friend function f_s1ap_setup(integer idx := 0, template Cause cause := omit) runs on MTC_CT { + var template (present) Cause exp_cause; + var boolean exp_fail := false; + timer T := 5.0; + if (not istemplatekind(cause, "omit")) { + exp_fail := true; + exp_cause := cause; + } + + S1AP_UNIT[idx].send(ts_S1AP_SetupReq(g_enb_pars[idx].global_enb_id, + g_enb_pars[idx].supported_tas, v32)); + T.start; + alt { + [exp_fail] S1AP_UNIT[idx].receive(tr_S1AP_SetupFail(exp_cause)) { + setverdict(pass); + } + [not exp_fail] S1AP_UNIT[idx].receive(tr_S1AP_SetupResp) { + setverdict(pass); + } + [] S1AP_UNIT[idx].receive { + setverdict(fail, "Received unexpected S1AP"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP Setup result"); + } + } +} + +/* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */ +testcase TC_s1ap_setup_wrong_plmn() runs on MTC_CT { + var charstring id := testcasename(); + f_init_s1ap(id, 1); + g_enb_pars[0].global_enb_id.pLMNidentity := '62F224'O; + f_s1ap_setup(0, {misc:=unknown_PLMN}); +} + +/* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */ +testcase TC_s1ap_setup_wrong_tac() runs on MTC_CT { + var charstring id := testcasename(); + f_init_s1ap(id, 2); + g_enb_pars[0].supported_tas[0].broadcastPLMNs[0] := '62F224'O; + f_s1ap_setup(0, {misc:=unknown_PLMN}); +} + +/* Successful S1 Setup procedure to MME */ +testcase TC_s1ap_setup() runs on MTC_CT { + var charstring id := testcasename(); + f_init_s1ap(id, 3); + f_s1ap_setup(0); +} + +private const EPS_QualityOfServiceV c_NAS_defaultQoS := { + qCI := '00'O, + maxBitRateUplink := omit, + maxBitRateDownlink := omit, + guaranteedBitRateUplink := omit, + guaranteedBitRateDownlink := omit, + maxBitRateUplinkExt := omit, + maxBitRateDownlinkExt := omit, + guaranteedBitRateUplinkExt := omit, + guaranteedBitRateDownlinkExt := omit, + maxBitRateUplinkExt2 := omit, + maxBitRateDownlinkExt2 := omit, + guaranteedBitRateUplinkExt2 := omit, + guaranteedBitRateDownlinkExt2 := omit +}; + +private const UENetworkCapabilityV c_NAS_defaultUeNetCap := { + eEA := '10000000'B, + eIA := '11000000'B, + uEA := omit, + uIA := omit, + uCS2 := omit, + nF := omit, + vCC := omit, + lCS := omit, + lPP := omit, + aCC_CSFB := omit, + h245_ASH := omit, + proSe := omit, + proSe_dd := omit, + proSe_dc := omit, + proSe_relay := omit, + cP_CIoT := omit, + uP_CIoT := omit, + s1_Udata := omit, + eRwoPDN := omit, + hC_CP_CIoT := omit, + ePCO := omit, + multipleDRB := omit, + v2XPC5 := omit, + restrictEC := omit, + cPbackoff := omit, + dCNR := omit, + n1Mode := omit, + sGC := omit, + spare1 := omit, + spare := omit +}; + +private const octetstring c_NAS_defaultAPN := '00'O; + +private altstep as_s1ap_handle_auth() runs on ConnHdlr { + var PDU_NAS_EPS rx_nas; + [] S1AP.receive(tr_NAS_AuthReq) -> value rx_nas { + /* static XRES result as we fixed the HSS RAND value and always have the following + RAND: 20080c3818183b522614162c07601d0d + AUTN: f11b89a2a8be00001f9c526f3d75d44c + IK: 11329aae8e8d2941bb226b2061137c58 + CK: 740d62df9803eebde5120acf358433d0 + RES: 6a91970e838fd079 + SRES: e91e4777 + Kc: 3b0f999e42198874 + SQN: 32 + IND: 0 + */ + /* KASME: 95AFAD9A0D29AFAA079A9451DF7161D7EE4CBF2AF9387F766D058BB6B44B905D */ + const OCT16 ck := '740d62df9803eebde5120acf358433d0'O; + const OCT16 ik := '11329aae8e8d2941bb226b2061137c58'O; + const OCT16 autn := 'f11b89a2a8be00001f9c526f3d75d44c'O; + const OCT8 res := '6a91970e838fd079'O; + const OCT3 plmn_id := '00F110'O; + const OCT6 sqn := '000000000020'O; + const OCT6 ak := substr(autn, 0, 6) xor4b sqn; + var octetstring kasme := f_kdf_kasme(ck, ik, plmn_id, sqn, ak); + var S1APEM_Config cfg := { + set_nas_keys := { + k_nas_int := f_kdf_nas_int(1, kasme), + k_nas_enc := f_kdf_nas_enc(1, kasme) + } + }; + S1AP.send(cfg); + S1AP.send(ts_NAS_AuthResp(res)); + } +} + +private altstep as_s1ap_handle_sec_mode() runs on ConnHdlr { + var PDU_NAS_EPS rx_nas; + var NAS_SecurityAlgorithmsV alg := { + typeOfIntegrityProtection := '001'B, + spare1 := '0'B, + typeOfCiphering := '000'B, + spare2 := '0'B + }; + var NAS_KeySetIdentifierV kset_id := { + identifier := '000'B, + tSC := '0'B + }; + [] S1AP.receive(tr_NAS_SecModeCmd(alg, kset_id, ?)) { + S1AP.send(ts_NAS_SecModeCmpl); + } +} + +private function f_TC_attach(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI('001010000000001'H); + var template (value) PDU_NAS_EPS nas_esm, nas_emm; +/* + nas_esm := ts_NAS_ActDefEpsBearCtxReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), + qos := c_NAS_defaultQoS, apn := c_NAS_defaultAPN, + addr_type := '000'B, addr_info := ''O); +*/ + nas_esm := ts_NAS_PdnConnReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), + pdn_type := NAS_PDN_T_IPv4, req_type := '001'B); + nas_emm := ts_NAS_AttachRequest(att_type := '000'B, kset_id := '000'B, mobile_id := mi, + ue_net_cap := c_NAS_defaultUeNetCap, + esm_enc := enc_PDU_NAS_EPS(valueof(nas_esm))); + var template (value) S1AP_PDU tx; + tx := ts_S1AP_InitialUE(p_eNB_value := 0, p_nasPdu := enc_PDU_NAS_EPS(valueof(nas_emm)), + p_tAI := ts_enb_S1AP_TAI(g_pars.enb_pars[g_pars.mme_idx]), + p_eUTRAN_CGI := ts_enb_S1AP_CGI(g_pars.enb_pars[g_pars.mme_idx]), + p_rrcCause := mo_Signalling); + S1AP.send(tx); + + as_s1ap_handle_auth(); + as_s1ap_handle_sec_mode(); + + f_sleep(10.0); +} +testcase TC_s1ap_attach() runs on MTC_CT { + var charstring id := testcasename(); + + f_init_s1ap(id, 4); + f_s1ap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_attach), pars); + vc_conn.done; +} + +control { + execute( TC_s1ap_setup_wrong_plmn() ); + execute( TC_s1ap_setup_wrong_tac() ); + execute( TC_s1ap_setup() ); } diff --git a/mme/MME_Tests_SGsAP.ttcn b/mme/MME_Tests_SGsAP.ttcn index 935a59e..d20479c 100644 --- a/mme/MME_Tests_SGsAP.ttcn +++ b/mme/MME_Tests_SGsAP.ttcn @@ -48,23 +48,23 @@ if (not istemplatekind(exp_cause, "omit")) { exp_success := false; } - SGsAP.send(ts_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, serv_ind, tmsi)); + SGsAP.send(ts_SGsAP_PAGING_REQ(g_pars.ue_pars.imsi, vlr_name, serv_ind, tmsi)); alt { /* we expect success */ - [exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + [exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.ue_pars.imsi, serv_ind, ?)) { setverdict(pass); } - [exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + [exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.ue_pars.imsi, ?)) { setverdict(fail, "Received unexpected PAGING REJECT"); } /* we expect failure */ - [not exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.imsi, serv_ind, ?)) { + [not exp_success] SGsAP.receive(tr_SGsAP_SERVICE_REQ(g_pars.ue_pars.imsi, serv_ind, ?)) { setverdict(fail, "Received SERVICE REQ waiting for PAGING REJECT"); } - [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, exp_cause)) { + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.ue_pars.imsi, exp_cause)) { setverdict(pass); } - [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.imsi, ?)) { + [not exp_success] SGsAP.receive(tr_SGsAP_PAGING_REJ(g_pars.ue_pars.imsi, ?)) { setverdict(fail, "Received unexpected PAGING REJECT cause"); } [] SGsAP.receive { @@ -80,21 +80,21 @@ if (not istemplatekind(exp_cause, "omit")) { exp_success := false; } - SGsAP.send(ts_SGsAP_ALERT_REQ(g_pars.imsi)); + SGsAP.send(ts_SGsAP_ALERT_REQ(g_pars.ue_pars.imsi)); alt { - [exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.ue_pars.imsi)) { setverdict(pass); } - [exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + [exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.ue_pars.imsi, ?)) -> value rx { setverdict(fail, "Received unexpected ALERT REJECT ", rx); } - [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.imsi)) { + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_ACK(g_pars.ue_pars.imsi)) { setverdict(fail, "Received unexpected ALERT ACK"); } - [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, exp_cause)) { + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.ue_pars.imsi, exp_cause)) { setverdict(pass) } - [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.imsi, ?)) -> value rx { + [not exp_success] SGsAP.receive(tr_SGsAP_ALERT_REJECT(g_pars.ue_pars.imsi, ?)) -> value rx { setverdict(fail, "Received ALERT REJECT with unexpected cause ", rx); } [] SGsAP.receive { @@ -168,7 +168,7 @@ /* TODO: register subscriber on S1 */ f_sgsap_alert(omit); /* TOOD: do something on S1 triggering UE ACT IND */ - SGsAP.receive(tr_SGsAP_UE_ACT_IND(g_pars.imsi)); + SGsAP.receive(tr_SGsAP_UE_ACT_IND(g_pars.ue_pars.imsi)); } testcase TC_sgsap_alert() runs on MTC_CT { var ConnHdlrPars pars; diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 8c1da59..66effb5 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -38,14 +38,14 @@ DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " -FILES+="S1AP_EncDec.cc S1AP_Types.ttcn " +FILES+="S1AP_EncDec.cc S1AP_Types.ttcn S1AP_Templates.ttcn " gen_links $DIR $FILES DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " -FILES+="S1AP_CodecPort.ttcn " +FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " FILES+="NAS_Templates.ttcn " gen_links $DIR $FILES diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 4752302..75fc31d 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15203 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: Id54071b901db720a0f88b91cdc5a8e09bea0fb58 Gerrit-Change-Number: 15203 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:23 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add GTPv2 support In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 ) Change subject: mme: Add GTPv2 support ...................................................................... mme: Add GTPv2 support this includes a GTPv2_CodecPort (for the usual transcoding) as wella as an empty GTPv2_PrivateExtensions.ttcn without which the TITAN GTPv2 ProtocolModule won't compile. Change-Id: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 --- A library/GTPv2_CodecPort.ttcn A library/GTPv2_PrivateExtensions.ttcn A library/GTPv2_Templates.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 5 files changed, 411 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GTPv2_CodecPort.ttcn b/library/GTPv2_CodecPort.ttcn new file mode 100644 index 0000000..1f08f19 --- /dev/null +++ b/library/GTPv2_CodecPort.ttcn @@ -0,0 +1,57 @@ +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTPv2C + * (C) 2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + +module GTPv2_CodecPort { + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from GTPv2C_Types all; + + /* identifies a remote peer (sender or receiver) */ + type record GtpPeer { + ConnectionId connId, + HostName remName, + PortNumber remPort + } + + /* Decoded GTP2C (Control Plane), used in send and receive direction */ + type record Gtp2cUnitdata { + GtpPeer peer, + PDU_GTPCv2 gtpc + } + + /* Translation port on top of IPL4asp; ASP_Event passed through transparently */ + type port GTPv2C_PT message { + out Gtp2cUnitdata; + in Gtp2cUnitdata, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(Gtp2cUnitdata -> ASP_SendTo: function(f_enc_Gtp2cUD)) + in(ASP_RecvFrom -> Gtp2cUnitdata: function(f_dec_Gtp2cUD); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" } + + private function f_enc_Gtp2cUD(in Gtp2cUnitdata in_ud, out ASP_SendTo out_ud) { + out_ud.connId := in_ud.peer.connId; + out_ud.remName := in_ud.peer.remName; + out_ud.remPort := in_ud.peer.remPort; + out_ud.proto := { udp := {} }; + out_ud.msg := enc_PDU_GTPCv2(in_ud.gtpc); + } with { extension "prototype(fast)" }; + + private function f_dec_Gtp2cUD(in ASP_RecvFrom in_ud, out Gtp2cUnitdata out_ud) { + out_ud.peer.connId := in_ud.connId; + out_ud.peer.remName := in_ud.remName; + out_ud.peer.remPort := in_ud.remPort; + out_ud.gtpc := dec_PDU_GTPCv2(in_ud.msg); + } with { extension "prototype(fast)" }; + +} diff --git a/library/GTPv2_PrivateExtensions.ttcn b/library/GTPv2_PrivateExtensions.ttcn new file mode 100644 index 0000000..63552f2 --- /dev/null +++ b/library/GTPv2_PrivateExtensions.ttcn @@ -0,0 +1,21 @@ +module GTPv2_PrivateExtensions { + +/* This is a small stub module to make GTPv2_Types.ttcn from + * titan.ProtocolModules.GTPv2_v13.7.0 compile */ + +import from General_Types all; + +type record PrivateExtension { + OCT1 elementIdentifier, + LIN2_BO_LAST lengthIndicator, + BIT4 instance, + BIT4 spare, + octetstring data +} with { + variant (lengthIndicator) "LENGTHTO(data)"; + variant "PRESENCE (elementIdentifier = 'FE'O; )" +} + +type record of PrivateExtension PrivateExtension_List; + +} with{ encode "RAW" } diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn new file mode 100644 index 0000000..23b0053 --- /dev/null +++ b/library/GTPv2_Templates.ttcn @@ -0,0 +1,323 @@ +module GTPv2_Templates { + +/* (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from GTPv2_Types all; + +private function fs_GTP2C_t_bit(template (omit) OCT4 teid) return BIT1 { + if (istemplatekind(teid, "omit")) { + return '0'B; + } else { + return '1'B; + } +} + +private function fs_GTP2C_p_bit(template (omit) PDU_GTPCv2 piggyback) return BIT1 { + if (istemplatekind(piggyback, "omit")) { + return '0'B; + } else { + return '1'B; + } +} + +template (present) PDU_GTPCv2 tr_PDU_GTP2C(template OCT4 teid := ?, + template (present) GTPCv2_PDUs pdus := ?, + template PDU_GTPCv2 piggyback := omit) := { + spare := '000'B, + t_Bit := ?, + p_Bit := ?, + version := '010'B, + messageType := ?, + lengthf := ?, + tEID := teid, + sequenceNumber := ?, + spare3 := '00'O, + gtpcv2_pdu := pdus, + piggybackPDU_GTPCv2 := piggyback +} + + +/* 8.3 */ +template (value) IMSI ts_GTP2C_Imsi(template (value) hexstring imsi) := { + elementIdentifier := '01'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + iMSI_Value := imsi +} +template (present) IMSI tr_GTP2C_Imsi(template (present) hexstring imsi) := { + elementIdentifier := '01'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + iMSI_Value := imsi +} + +/* 8.4-1 */ +/* +type enumerated GTP2C_Cause { + Local_Detach (2), + Complete_Detach (3), + RAT_changed_from_3GPP_to_Non_3GPP (4), + ISR_deactivation (5), + Error_Ind_from_RNC_eNB_SGSN_MME (5), + IMSI_Detach_Only (7), + Reactivation_Required (8), +} +*/ + +const integer c_GTP2C_Cause_LocalDetach := 1; + +/* 8.4 */ +template (value) Cause ts_GTP2C_Cause(template (value) OCT1 cause, + template (value) BIT1 cs) := { + elementIdentifier := '02'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + causeValue := cause, + cS := cs, + bCE := '0'B, + pCE := '0'B, + spare2 := '00000'B, + typeOfOffendingIE := omit, + lengthIndicator2 := omit, + instanceOfOffendingIE := omit, + spare3 := omit +} +template (present) Cause tr_GTP2C_Cause(template (present) OCT1 cause) := { + elementIdentifier := '02'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + causeValue := cause, + cS := ?, + bCE := ?, + pCE := ?, + spare2 := '00000'B, + typeOfOffendingIE := *, + lengthIndicator2 := *, + instanceOfOffendingIE := *, + spare3 := * +} + +/* 8.5 */ +template (value) AccessPointName ts_GTP2C_APN(template (value) octetstring apn) := { + elementIdentifier := '48'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + aPN_Value := apn +} +template (present) AccessPointName tr_GTP2C_APN(template (present) octetstring apn) := { + elementIdentifier := '48'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + aPN_Value := apn +} + +/* 8.14 */ +template (value) PDN_AddressAllocation +ts_GTP2C_PdnAddrAlloc(template (value) BIT3 pdn_type, + template (value) PDN_Address_and_Prefix addr_pfx) := { + elementIdentifier := '4F'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + pDN_Type := pdn_type, + spare2 := '00000'B, + pDN_Address_and_Prefix := addr_pfx +} +template (present) PDN_AddressAllocation +tr_GTP2C_PdnAddrAlloc(template (present) BIT3 pdn_type, + template (present) PDN_Address_and_Prefix addr_pfx) := { + elementIdentifier := '4F'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + pDN_Type := pdn_type, + spare2 := '00000'B, + pDN_Address_and_Prefix := addr_pfx +} +template (value) PDN_AddressAllocation +ts_GTP2C_PdnAddrAlloc_v4(template (value) OCT4 addr) := + ts_GTP2C_PdnAddrAlloc('001'B, {iPv4_Address:=addr}); +template (present) PDN_AddressAllocation +tr_GTP2C_PdnAddrAlloc_v4(template (present) OCT4 addr) := + ts_GTP2C_PdnAddrAlloc('001'B, {iPv4_Address:=addr}); + +/* 8.17 */ +template (value) RAT_Type ts_GTP2C_RatType(template (value) integer rat) := { + elementIdentifier := '53'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + rAT_TypeValue := rat, + additionalOctets := omit +} +template (present) RAT_Type tr_GTP2C_RatType(template (present) integer rat) := { + elementIdentifier := '53'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + rAT_TypeValue := rat, + additionalOctets := * +} + + +/* 8.22 */ +private function f_bit4oct(template (omit) octetstring os) return BIT1 +{ + if (istemplatekind(os, "omit")) { + return '0'B; + } else { + return '1'B; + } +} +template (value) FullyQualifiedTEID +ts_GTP2C_FTEID(integer if_type, OCT4 teid, template (omit) OCT4 v4_addr := omit, + template (omit) OCT16 v6_addr := omit) := { + elementIdentifier := '57'O, + lengthIndicator := 0, /* overwritten */ + instance := '0000'B, + spare := '0000'B, + interfaceType := if_type, + v6_Flag := f_bit4oct(v4_addr), + v4_Flag := f_bit4oct(v6_addr), + tEID_GRE_Key := teid, + iPv4_Address := v4_addr, + iPv6_Address := v6_addr, + additionalOctets := omit +} +template (present) FullyQualifiedTEID +tr_GTP2C_FTEID(template (present) integer if_type, template (present) OCT4 teid, + template OCT4 v4_addr := omit, + template OCT16 v6_addr := omit) := { + elementIdentifier := '57'O, + lengthIndicator := ?, + instance := ?, + spare := '0000'B, + interfaceType := if_type, + v6_Flag := ?, + v4_Flag := ?, + tEID_GRE_Key := teid, + iPv4_Address := v4_addr, + iPv6_Address := v6_addr, + additionalOctets := omit +} + + + +template (value) PDU_GTPCv2 ts_PDU_GTP2C(template (omit) OCT4 teid, template (value) OCT3 seq, + template (value) OCT1 msg_type, + template (value) GTPCv2_PDUs pdus, + template (omit) PDU_GTPCv2 piggyback := omit) := { + spare := '000'B, + t_Bit := fs_GTP2C_t_bit(teid), + p_Bit := fs_GTP2C_p_bit(piggyback), + version := '010'B, + messageType := msg_type, + lengthf := 0, /* overwritten */ + tEID := teid, + sequenceNumber := seq, + spare3 := '00'O, + gtpcv2_pdu := pdus, + piggybackPDU_GTPCv2 := piggyback +} + + +template (present) PDU_GTPCv2 +tr_GTP2C_CreateSessionReq(template (present) hexstring imsi) := tr_PDU_GTP2C('00000000'O, { + createSessionRequest := { + iMSI := tr_GTP2C_Imsi(imsi), + mSISDN := *, + mEI := *, + userLocationInfo := ?, + servingNetwork := ?, + rAT_Type := tr_GTP2C_RatType(6), + indication := *, + fullyQualifiedTEID := ?, + accessPointName := tr_GTP2C_APN('012a'O), // '*' + selectionMode := ?, + pDN_Type := ?, + pDN_AddressAllocation := ?, + maxAPN_Restriction := ?, + ambr := *, + linkedEPS_Bearer_ID := omit, + trustedWLANModeIndication := omit, + protocolConfigOptions := omit, + bearerContextGrouped := ?, + traceInformation := *, + recovery := omit, + csid := omit, + uE_TimeZone := ?, + user_CSG_Information := omit, + chargingCharacteristics := ?, + lDN := omit, + signallingPriorityIndication := *, + iP_Addr := omit, + portNumber := omit, + aPCO := omit, + trustedWLANAccessNetworkIdentifier := omit, + cNOperatorSelectionEntity := omit, + presenceReportingAreaInformation := omit, + overloadControlInformationGrouped := omit, + originationTimeStamp := *, + maximumWaitTime := *, + wLANLocationTimestamp := omit, + nBIFOMContainer := omit, + remoteUEContextGrouped := *, + nodeIdentifier := *, + extendedProtocolConfigOptions := omit, + servingPLMNRateControl := omit, + counter := omit, + privateExtension := omit + }}); + +template (value) PDU_GTPCv2 +ts_GTP2C_CreateSessionResp(template (value) FullyQualifiedTEID_List fteids, + template (value) PDN_AddressAllocation addr) := +ts_PDU_GTP2C('00000000'O, '000000'O, '20'O, { + createSessionResponse := { + cause := ts_GTP2C_Cause(int2oct(16, 1), '0'B), + changeReportingAction := omit, + cSG_InformationReportingAction := omit, + heNBInformationReporting := omit, + fullyQualifiedTEID := fteids, + pDN_AddressAllocation := addr, + aPN_Restriction := omit, + ambr := omit, + linkedEPS_Bearer_ID := omit, + protocolConfigOptions := omit, + bearerContextGrouped := omit, + recovery := omit, + chargingGatewayName := omit, + chargingGatewayAddress := omit, + csid := omit, + lDN := omit, + pGW_Back_OffTime := omit, + aPCO := omit, + trustedWLANIPv4Parameters := omit, + indicationFlags := omit, + presenceReportingAreaAction := omit, + loadControlInformationGrouped := omit, + overloadControlInformationGrouped := omit, + nBIFOMContainer := omit, + pDNConnectionChargingID := omit, + extendedProtocolConfigOptions := omit, + privateExtension := omit + }}); + + + +} diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 66effb5..5664711 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -35,6 +35,14 @@ FILES="NAS_EPS_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.GTPv2_v13.7.0/src +FILES="GTPv2_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.GTP_v13.5.0/src +FILES="GTPC_EncDec.cc GTPC_Types.ttcn GTPU_EncDec.cc GTPU_Types.ttcn" +gen_links $DIR $FILES + DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " @@ -46,7 +54,7 @@ FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " -FILES+="NAS_Templates.ttcn " +FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 75fc31d..9fb5f88 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15204 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: I1c1b8409077103dd4e64e467d21d33d8c9c4ac95 Gerrit-Change-Number: 15204 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:23 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add [generated] DIAMETER_Types.ttcn In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15205 ) Change subject: library: Add [generated] DIAMETER_Types.ttcn ...................................................................... library: Add [generated] DIAMETER_Types.ttcn The way how the TITAN support for DIAMETER works, is that there's an awk-based shell script and lots of DIAMETER dictionaries in the https://github.com/eclipse/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator repository. I've used 'AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf MobileIPv6_HA_IETF_RFC5778.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf' to generate the DIAMETER_Types file we use here. DIAMETER is used as signaling protocol between the HSS and other core element nodes in the EPC, such as the MME and S-GW. Change-Id: I85834e98e238b7ff6058264a0f365d05c15cd669 --- A library/DIAMETER_Types.ttcn 1 file changed, 6,652 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15205 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: I85834e98e238b7ff6058264a0f365d05c15cd669 Gerrit-Change-Number: 15205 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:24 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: library: Add DIAMETER Templates, Emulation, CodecPort In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15206 ) Change subject: library: Add DIAMETER Templates, Emulation, CodecPort ...................................................................... library: Add DIAMETER Templates, Emulation, CodecPort Contrary to the DIAMETER_Types.ttcn, these files are not generated but written by hand. Change-Id: Iafbf55ab25bbaa40960eb1744cff36dcd7970c17 --- A library/DIAMETER_CodecPort.ttcn A library/DIAMETER_CodecPort_CtrlFunct.ttcn A library/DIAMETER_CodecPort_CtrlFunctDef.cc A library/DIAMETER_Emulation.ttcn A library/DIAMETER_Templates.ttcn 5 files changed, 1,429 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DIAMETER_CodecPort.ttcn b/library/DIAMETER_CodecPort.ttcn new file mode 100644 index 0000000..65ae42b --- /dev/null +++ b/library/DIAMETER_CodecPort.ttcn @@ -0,0 +1,81 @@ +module DIAMETER_CodecPort { + +/* Simple DIAMETER Codec Port, translating between raw SCTP primitives with + * octetstring payload towards the IPL4asp provider, and DIAMETER primitives + * which carry the decoded DIAMETER data types as payload. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from DIAMETER_Types all; + + type record DIAMETER_RecvFrom { + ConnectionId connId, + HostName remName, + PortNumber remPort, + HostName locName, + PortNumber locPort, + PDU_DIAMETER msg + }; + + template DIAMETER_RecvFrom t_DIAMETER_RecvFrom(template PDU_DIAMETER msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + + type record DIAMETER_Send { + ConnectionId connId, + PDU_DIAMETER msg + } + + template DIAMETER_Send t_DIAMETER_Send(template ConnectionId connId, template PDU_DIAMETER msg) := { + connId := connId, + msg := msg + } + + private function IPL4_to_DIAMETER_RecvFrom(in ASP_RecvFrom pin, out DIAMETER_RecvFrom pout) { + pout.connId := pin.connId; + pout.remName := pin.remName; + pout.remPort := pin.remPort; + pout.locName := pin.locName; + pout.locPort := pin.locPort; + pout.msg := f_DIAMETER_Dec(pin.msg); + } with { extension "prototype(fast)" }; + + private function DIAMETER_to_IPL4_Send(in DIAMETER_Send pin, out ASP_Send pout) { + pout.connId := pin.connId; + pout.proto := { + sctp := { + sinfo_stream := omit, + sinfo_ppid := 46, /* plain text Diameter in SCTP DATA */ + remSocks := omit, + assocId := omit + } + }; + pout.msg := f_DIAMETER_Enc(pin.msg); + } with { extension "prototype(fast)" }; + + type port DIAMETER_CODEC_PT message { + out DIAMETER_Send; + in DIAMETER_RecvFrom, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(DIAMETER_Send -> ASP_Send:function(DIAMETER_to_IPL4_Send)) + in(ASP_RecvFrom -> DIAMETER_RecvFrom: function(IPL4_to_DIAMETER_RecvFrom); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" + } +} diff --git a/library/DIAMETER_CodecPort_CtrlFunct.ttcn b/library/DIAMETER_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..3b2230d --- /dev/null +++ b/library/DIAMETER_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,44 @@ +module DIAMETER_CodecPort_CtrlFunct { + + import from DIAMETER_CodecPort all; + import from IPL4asp_Types all; + + external function f_IPL4_listen( + inout DIAMETER_CODEC_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_connect( + inout DIAMETER_CODEC_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_close( + inout DIAMETER_CODEC_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } + ) return Result; + + external function f_IPL4_setUserData( + inout DIAMETER_CODEC_PT portRef, + in ConnectionId id, + in UserData userData + ) return Result; + + external function f_IPL4_getUserData( + inout DIAMETER_CODEC_PT portRef, + in ConnectionId id, + out UserData userData + ) return Result; + +} + diff --git a/library/DIAMETER_CodecPort_CtrlFunctDef.cc b/library/DIAMETER_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..782d176 --- /dev/null +++ b/library/DIAMETER_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,56 @@ +#include "IPL4asp_PortType.hh" +#include "DIAMETER_CodecPort.hh" +#include "IPL4asp_PT.hh" + +namespace DIAMETER__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + DIAMETER__CodecPort::DIAMETER__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} + diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn new file mode 100644 index 0000000..dc7bc94 --- /dev/null +++ b/library/DIAMETER_Emulation.ttcn @@ -0,0 +1,427 @@ +module DIAMETER_Emulation { + +/* DIAMETER Emulation, runs on top of DIAMETER_CodecPort. It multiplexes/demultiplexes + * the individual IMSIs/subscribers, so there can be separate TTCN-3 components handling + * each of them. + * + * The DIAMETER_Emulation.main() function processes DIAMETER primitives from the DIAMETER + * socket via the DIAMETER_CodecPort, and dispatches them to the per-IMSI components. + * + * For each new IMSI, the DiameterOps.create_cb() is called. It can create + * or resolve a TTCN-3 component, and returns a component reference to which that IMSI + * is routed/dispatched. + * + * If a pre-existing component wants to register to handle a future inbound IMSI, it can + * do so by registering an "expect" with the expected IMSI. + * + * Inbound DIAMETER messages without IMSI (such as RESET-IND/ACK) are dispatched to + * the DiameterOps.unitdata_cb() callback, which is registered with an argument to the + * main() function below. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from DIAMETER_CodecPort all; +import from DIAMETER_CodecPort_CtrlFunct all; +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from DNS_Helpers all; +import from MobileL3_Types all; + +type hexstring IMSI; + +type component DIAMETER_ConnHdlr { + port DIAMETER_Conn_PT DIAMETER; + /* procedure based port to register for incoming connections */ + port DIAMETEREM_PROC_PT DIAMETER_PROC; +} + +/* port between individual per-connection components and this dispatcher */ +type port DIAMETER_Conn_PT message { + inout PDU_DIAMETER, PDU_ML3_MS_NW, PDU_ML3_NW_MS; +} with { extension "internal" }; + +/* global test port e.g. for non-imsi/conn specific messages */ +type port DIAMETER_PT message { + inout PDU_DIAMETER; +} with { extension "internal" }; + + +/* represents a single DIAMETER Association */ +type record AssociationData { + DIAMETER_ConnHdlr comp_ref, + hexstring imsi optional +}; + +type component DIAMETER_Emulation_CT { + /* Port facing to the UDP SUT */ + port DIAMETER_CODEC_PT DIAMETER; + /* All DIAMETER_ConnHdlr DIAMETER ports connect here + * DIAMETER_Emulation_CT.main needs to figure out what messages + * to send where with CLIENT.send() to vc_conn */ + port DIAMETER_Conn_PT DIAMETER_CLIENT; + /* currently tracked connections */ + var AssociationData SgsapAssociationTable[16]; + /* pending expected CRCX */ + var ExpectData DiameterExpectTable[8]; + /* procedure based port to register for incoming connections */ + port DIAMETEREM_PROC_PT DIAMETER_PROC; + /* test port for unit data messages */ + port DIAMETER_PT DIAMETER_UNIT; + + var charstring g_diameter_id; + var integer g_diameter_conn_id := -1; +} + +type function DIAMETERCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr; + +type function DIAMETERUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER; + +type record DIAMETEROps { + DIAMETERCreateCallback create_cb, + DIAMETERUnitdataCallback unitdata_cb +} + +type record DIAMETER_conn_parameters { + HostName remote_ip, + PortNumber remote_sctp_port, + HostName local_ip, + PortNumber local_sctp_port +} + +function tr_DIAMETER_RecvFrom_R(template PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template DIAMETER_RecvFrom { + var template DIAMETER_RecvFrom mrf := { + connId := g_diameter_conn_id, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + return mrf; +} + +private function f_imsi_known(hexstring imsi) +runs on DIAMETER_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].imsi == imsi) { + return true; + } + } + return false; +} + +private function f_comp_known(DIAMETER_ConnHdlr client) +runs on DIAMETER_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == client) { + return true; + } + } + return false; +} + +private function f_comp_by_imsi(hexstring imsi) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].imsi == imsi) { + return SgsapAssociationTable[i].comp_ref; + } + } + setverdict(fail, "DIAMETER Association Table not found by IMSI", imsi); + mtc.stop; +} + +private function f_imsi_by_comp(DIAMETER_ConnHdlr client) +runs on DIAMETER_Emulation_CT return hexstring { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == client) { + return SgsapAssociationTable[i].imsi; + } + } + setverdict(fail, "DIAMETER Association Table not found by component ", client); + mtc.stop; +} + +private function f_imsi_table_add(DIAMETER_ConnHdlr comp_ref, hexstring imsi) +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (not isvalue(SgsapAssociationTable[i].imsi)) { + SgsapAssociationTable[i].imsi := imsi; + SgsapAssociationTable[i].comp_ref := comp_ref; + return; + } + } + testcase.stop("DIAMETER Association Table full!"); +} + +private function f_imsi_table_del(DIAMETER_ConnHdlr comp_ref, hexstring imsi) +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == comp_ref and + SgsapAssociationTable[i].imsi == imsi) { + SgsapAssociationTable[i].imsi := omit; + SgsapAssociationTable[i].comp_ref := null; + return; + } + } + setverdict(fail, "DIAMETER Association Table: Couldn't find to-be-deleted entry!"); + mtc.stop; +} + + +private function f_imsi_table_init() +runs on DIAMETER_Emulation_CT { + for (var integer i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + SgsapAssociationTable[i].comp_ref := null; + SgsapAssociationTable[i].imsi := omit; + } +} + +function f_DIAMETER_get_avp(PDU_DIAMETER pdu, template (present) AVP_Code avp_code) +return template (omit) AVP +{ + var integer i; + + for (i := 0; i < lengthof(pdu.avps); i := i+1) { + if (not ispresent(pdu.avps[i].avp)) { + continue; + } + var AVP_Header hdr := pdu.avps[i].avp.avp_header; + if (match(hdr.avp_code, avp_code)) { + return pdu.avps[i].avp; + } + } + return omit; +} + +function f_DIAMETER_get_imsi(PDU_DIAMETER pdu) return template (omit) IMSI +{ + var template (omit) AVP imsi_avp; + + imsi_avp := f_DIAMETER_get_avp(pdu, c_AVP_Code_BASE_NONE_User_Name); + if (istemplatekind(imsi_avp, "omit")) { + return omit; + } else { + var octetstring imsi_oct := valueof(imsi_avp.avp_data.avp_BASE_NONE_User_Name); + return str2hex(oct2char(imsi_oct)); + } +} + +private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { + sinfo_stream := omit, + sinfo_ppid := ppid, + remSocks := omit, + assocId := omit +}; + +private template PortEvent tr_SctpAssocChange := { + sctpEvent := { + sctpAssocChange := ? + } +} +private template PortEvent tr_SctpPeerAddrChange := { + sctpEvent := { + sctpPeerAddrChange := ? + } +} + +private function f_diameter_xceive(template (value) PDU_DIAMETER tx, + template PDU_DIAMETER rx_t := ?) +runs on DIAMETER_Emulation_CT return PDU_DIAMETER { + timer T := 10.0; + var DIAMETER_RecvFrom mrf; + + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, tx)); + alt { + [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(rx_t)) -> value mrf { } + [] DIAMETER.receive(tr_SctpAssocChange) { repeat; } + [] DIAMETER.receive(tr_SctpPeerAddrChange) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_t); + mtc.stop; + } + } + return mrf.msg; +} + +function main(DIAMETEROps ops, DIAMETER_conn_parameters p, charstring id) runs on DIAMETER_Emulation_CT { + var Result res; + g_diameter_id := id; + f_imsi_table_init(); + f_expect_table_init(); + + map(self:DIAMETER, system:DIAMETER_CODEC_PT); + if (p.remote_sctp_port == -1) { + res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_listen(DIAMETER, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + } else { + res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_connect(DIAMETER, p.remote_ip, p.remote_sctp_port, + p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + } + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect DIAMETER socket, check your configuration"); + mtc.stop; + } + g_diameter_conn_id := res.connId; + + while (true) { + var DIAMETER_ConnHdlr vc_conn; + var PDU_ML3_MS_NW l3_mo; + var PDU_ML3_NW_MS l3_mt; + var template IMSI imsi_t; + var hexstring imsi; + var DIAMETER_RecvFrom mrf; + var PDU_DIAMETER msg; + var charstring vlr_name, mme_name; + var PortEvent port_evt; + + alt { + [] DIAMETER.receive(PortEvent:{connOpened := ?}) -> value port_evt { + g_diameter_conn_id := port_evt.connOpened.connId; + } + [] DIAMETER.receive(PortEvent:?) { } + /* DIAMETER from client */ + [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg sender vc_conn { + /* Pass message through */ + /* TODO: check which ConnectionID client has allocated + store in table? */ + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, msg)); + } + + /* handle CER/CEA handshake */ + [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(tr_DIAMETER_R(cmd_code := Capabilities_Exchange))) -> value mrf { + var template (value) PDU_DIAMETER resp; + resp := ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id); + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, resp)); + } + + /* DIAMETER from remote peer */ + [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(?)) -> value mrf { + imsi_t := f_DIAMETER_get_imsi(mrf.msg); + if (isvalue(imsi_t)) { + imsi := valueof(imsi_t); + if (f_imsi_known(imsi)) { + vc_conn := f_comp_by_imsi(imsi); + DIAMETER_CLIENT.send(mrf.msg) to vc_conn; + } else { + vc_conn := ops.create_cb.apply(mrf.msg, imsi, id); + f_imsi_table_add(vc_conn, imsi); + DIAMETER_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* message contained no IMSI; is not IMSI-oriented */ + var template PDU_DIAMETER resp := ops.unitdata_cb.apply(mrf.msg); + if (isvalue(resp)) { + DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, valueof(resp))); + } + } + } + [] DIAMETER.receive(tr_SctpAssocChange) { } + [] DIAMETER.receive(tr_SctpPeerAddrChange) { } + [] DIAMETER_PROC.getcall(DIAMETEREM_register:{?,?}) -> param(imsi, vc_conn) { + f_create_expect(imsi, vc_conn); + DIAMETER_PROC.reply(DIAMETEREM_register:{imsi, vc_conn}) to vc_conn; + } + + } + + } +} + +/* "Expect" Handling */ + +type record ExpectData { + hexstring imsi optional, + DIAMETER_ConnHdlr vc_conn +} + +signature DIAMETEREM_register(in hexstring imsi, in DIAMETER_ConnHdlr hdlr); + +type port DIAMETEREM_PROC_PT procedure { + inout DIAMETEREM_register; +} with { extension "internal" }; + +/* Function that can be used as create_cb and will usse the expect table */ +function ExpectedCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id) +runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { + var DIAMETER_ConnHdlr ret := null; + var integer i; + + for (i := 0; i < sizeof(DiameterExpectTable); i := i+1) { + if (not ispresent(DiameterExpectTable[i].imsi)) { + continue; + } + if (imsi == DiameterExpectTable[i].imsi) { + ret := DiameterExpectTable[i].vc_conn; + /* Release this entry */ + DiameterExpectTable[i].imsi := omit; + DiameterExpectTable[i].vc_conn := null; + log("Found Expect[", i, "] for ", msg, " handled at ", ret); + return ret; + } + } + setverdict(fail, "Couldn't find Expect for ", msg); + mtc.stop; +} + +private function f_create_expect(hexstring imsi, DIAMETER_ConnHdlr hdlr) +runs on DIAMETER_Emulation_CT { + var integer i; + + /* Check an entry like this is not already presnt */ + for (i := 0; i < sizeof(DiameterExpectTable); i := i+1) { + if (imsi == DiameterExpectTable[i].imsi) { + setverdict(fail, "IMSI already present", imsi); + mtc.stop; + } + } + for (i := 0; i < sizeof(DiameterExpectTable); i := i+1) { + if (not ispresent(DiameterExpectTable[i].imsi)) { + DiameterExpectTable[i].imsi := imsi; + DiameterExpectTable[i].vc_conn := hdlr; + log("Created Expect[", i, "] for ", imsi, " to be handled at ", hdlr); + return; + } + } + testcase.stop("No space left in DiameterExpectTable") +} + +/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +function f_diameter_expect(hexstring imsi) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC.call(DIAMETEREM_register:{imsi, self}) { + [] DIAMETER_PROC.getreply(DIAMETEREM_register:{?,?}) {}; + } +} + +private function f_expect_table_init() +runs on DIAMETER_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(DiameterExpectTable); i := i + 1) { + DiameterExpectTable[i].imsi := omit; + } +} + +function DummyUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + log("Ignoring DIAMETER ", msg); + return omit; +} + + +} diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn new file mode 100644 index 0000000..2779536 --- /dev/null +++ b/library/DIAMETER_Templates.ttcn @@ -0,0 +1,821 @@ +module DIAMETER_Templates { + +/* (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from DIAMETER_Types all; +import from Osmocom_Types all; + +/* https://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml#aaa-parameters-4 */ +type enumerated DIAMETER_Resultcode { + /* Informational */ + DIAMETER_MULTI_ROUND_AUTH (1001), + + /* Success */ + DIAMETER_SUCCESS (2001), + DIAMETER_LIMITED_SUCCESS (2002), + DIAMETER_FIRST_REGISTRATION (2003), + DIAMETER_SUBSEQUENT_REGISTRATION (2004), + DIAMETER_UNREGISTERED_SERVICE (2005), + DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED (2006), + DIAMETER_SERVER_SELECTION (2007), + DIAMETER_SUCCESS_AUTH_SENT_SERVER_NOT_STORED (2008), + DIAMETER_SUCCESS_RELOCATE_HA (2009), + + /* Protocol Errors */ + DIAMETER_COMMAND_UNSUPPORTED (3001), + DIAMETER_UNABLE_TO_DELIVER (3002), + DIAMETER_REALM_NOT_SERVED (3003), + DIAMETER_TOO_BUSY (3004), + DIAMETER_LOOP_DETECTED (3005), + DIAMETER_REDIRECT_INDICATION (3006), + DIAMETER_APPLICATION_UNSUPPORTED (3007), + DIAMETER_INVALID_HDR_BITS (3008), + DIAMETER_INVALID_AVP_BITS (3009), + DIAMETER_UNKNOWN_PEER (3010), + DIAMETER_REALM_REDIRECT_INDICATION (3011), + + /* Transient Failures */ + DIAMETER_AUTHENTICATION_REJECTED (4001), + DIAMETER_OUT_OF_SPACE (4002), + ELECTION_LOST (4003), + DIAMETER_ERROR_MIP_REPLY_FAILURE (4005), + DIAMETER_ERROR_HA_NOT_AVAILABLE (4006), + DIAMETER_ERROR_BAD_KEY (4007), + DIAMETER_ERROR_MIP_FILTER_NOT_SUPPORTED (4008), + DIAMETER_END_USER_SERVICE_DENIED (4010), + DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE (4011), + DIAMETER_CREDIT_LIMIT_REACHED (4012), + DIAMETER_USER_NAME_REQUIRED (4013), + RESOURCE_FAILURE (4014), + + DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE (4181), + DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT (4882), + + /* Permanent Failure */ + DIAMETER_AVP_UNSUPPORTED (5001), + DIAMETER_UNKNOWN_SESSION_ID (5002), + DIAMETER_AUTHORIZATION_REJECTED (5003), + DIAMETER_INVALID_AVP_VALUE (5004), + DIAMETER_MISSING_AVP (5005), + DIAMETER_RESOURCES_EXCEEDED (5006), + DIAMETER_CONTRADICTING_AVPS (5007), + DIAMETER_AVP_NOT_ALLOWED (5008), + DIAMETER_AVP_OCCURS_TOO_MANY_TIMES (5009), + DIAMETER_NO_COMMON_APPLICATION (5010), + DIAMETER_UNSUPPORTED_VERSION (5011), + DIAMETER_UNABLE_TO_COMPLY (5012), + DIAMETER_INVALID_BIT_IN_HEADER (5013), + DIAMETER_INVALID_AVP_LENGTH (5014), + DIAMETER_INVALID_MESSAGE_LENGTH (5015), + DIAMETER_INVALID_AVP_BIT_COMBO (5016), + DIAMETER_NO_COMMON_SECURITY (5017), + DIAMETER_RADIUS_AVP_UNTRANSLATABLE (5018), + DIAMETER_ERROR_NO_FOREIGN_HA_SERVICE (5024), + DIAMETER_ERROR_END_TO_END_MIP_KEY_ENCRYPTION (5025), + DIAMETER_USER_UNKNOWN (5030), + DIAMETER_RATING_FAILED (5031), + DIAMETER_ERROR_USER_UNKNOWN (5032), + DIAMETER_ERROR_IDENTITIES_DONT_MATCH (5033), + DIAMETER_ERROR_IDENTITY_NOT_REGISTERED (5034), + DIAMETER_ERROR_ROAMING_NOT_ALLOWED (5035), + DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED (5036), + DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED (5037), + DIAMETER_ERROR_IN_ASSIGNMENT_TYPE (5038), + DIAMETER_ERROR_TOO_MUCH_DATA (5039), + DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA (5040), + DIAMETER_ERROR_MIP6_AUTH_MODE (5041), + UNKNOWN_BINDING_TEMPLATE_NAME (5042), + BINDING_FAILURE (5043), + MAX_BINDINGS_SET_FAILURE (5044), + MAXIMUM_BINDINGS_REACHED_FOR_ENDPOINT (5045), + SESSION_EXISTS (5046), + INSUFFICIENT_CLASSIFIERS (5047), + DIAMETER_ERROR_EAP_CODE_UNKNOWN (5048) +}; + +/* 3GPP TS 29.272 Section 7.1.8 */ +const uint32_t c_DIAMETER_3GPP_S6_AID := 16777251; +const uint32_t c_DIAMETER_3GPP_S13_AID := 16777252; +const uint32_t c_DIAMETER_3GPP_S7_AID := 16777308; + +template (value) PDU_DIAMETER +ts_DIAMETER(template (value) BIT8 flags, + template (value) Command_Code cmd_code, + template (value) OCTET4 app_id := '00000000'O, + template (value) UINT32 hbh_id, + template (value) UINT32 ete_id, + template (value) AVP_list avps := {} +) := { + version := 1, + message_length := 0, /* overwritten */ + RPETxxxx := flags, + command_code := cmd_code, + application_id := app_id, + hop_by_hop_id := hbh_id, + end_to_end_id := ete_id, + avps := avps +} +template (present) PDU_DIAMETER +tr_DIAMETER(template (present) BIT8 flags := ?, + template (present) Command_Code cmd_code := ?, + template (present) OCTET4 app_id := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) AVP_list avps := ?) := { + version := 1, + message_length := ?, + RPETxxxx := flags, + command_code := cmd_code, + application_id := app_id, + hop_by_hop_id := hbh_id, + end_to_end_id := ete_id, + avps := avps +} +template (present) PDU_DIAMETER +tr_DIAMETER_A( + template (present) Command_Code cmd_code := ?, + template (present) OCTET4 app_id := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) AVP_list avps := ?) := + tr_DIAMETER('0???????'B, cmd_code, app_id, hbh_id, ete_id, avps); +template (present) PDU_DIAMETER +tr_DIAMETER_R( + template (present) Command_Code cmd_code := ?, + template (present) OCTET4 app_id := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) AVP_list avps := ?) := + tr_DIAMETER('1???????'B, cmd_code, app_id, hbh_id, ete_id, avps); + + +template (value) AVP_Header +ts_DIA_Hdr(template (value) AVP_Code avp_code, + template (value) BIT8 flags := '01000000'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := 0, /* overwritten */ + vendor_id := omit +} +template (present) AVP_Header +tr_DIA_Hdr(template (present) AVP_Code avp_code, + template (present) BIT8 flags := '0???????'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := ?, /* overwritten */ + vendor_id := omit +} + +template (value) AVP_Header +ts_DIA_Hdr_3GPP(template (value) AVP_Code avp_code, + template (value) BIT8 flags := '11000000'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := 0, /* overwritten */ + vendor_id := vendor_id_3GPP +} +template (present) AVP_Header +tr_DIA_Hdr_3GPP(template (present) AVP_Code avp_code, + template (present) BIT8 flags := '1???????'B) := { + avp_code := avp_code, + VMPxxxxx := flags, + avp_length := ?, /* overwritten */ + vendor_id := vendor_id_3GPP +} + + +template (value) GenericAVP ts_AVP_OriginHost(template (value) charstring host) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Host), + avp_data := { + avp_BASE_NONE_Origin_Host := host + } + } +} +template (present) GenericAVP tr_AVP_OriginHost(template (present) charstring host := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Host), + avp_data := { + avp_BASE_NONE_Origin_Host := host + } + } +} + + +template (value) GenericAVP ts_AVP_OriginRealm(template (value) charstring realm) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Realm), + avp_data := { + avp_BASE_NONE_Origin_Realm := realm + } + } +} +template (present) GenericAVP tr_AVP_OriginRealm(template (present) charstring realm := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Realm), + avp_data := { + avp_BASE_NONE_Origin_Realm := realm + } + } +} + + +template (value) GenericAVP ts_AVP_OriginStateId(template (value) OCTET4 state_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_State_Id), + avp_data := { + avp_BASE_NONE_Origin_State_Id := state_id + } + } +} + +template (value) GenericAVP ts_AVP_HostIpAddr(template (value) OCTET4 ipv4_addr) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Host_IP_Address), + avp_data := { + avp_BASE_NONE_Host_IP_Address := { + address_type := IP, + address_data := ipv4_addr + } + } + } +} + +template (value) GenericAVP ts_AVP_VendorId(Vendor_Id vendor_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Id, '00000000'B), + avp_data := { + avp_BASE_NONE_Vendor_Id := int2oct(enum2int(vendor_id), 4) + } + } +} + +template (value) GenericAVP ts_AVP_ProductName(charstring name) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Product_Name, '00000000'B), + avp_data := { + avp_BASE_NONE_Product_Name := char2oct(name) + } + } +} + +template (value) GenericAVP ts_AVP_FwRevision(octetstring fw_version) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Firmware_Revision, '00000000'B), + avp_data := { + avp_BASE_NONE_Firmware_Revision := fw_version + } + } +} + +template (value) GenericAVP ts_AVP_InbSecId(template (value) OCTET4 inb_sec_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Inband_Security_Id), + avp_data := { + avp_BASE_NONE_Inband_Security_Id := inb_sec_id + } + } +} + +template (value) GenericAVP ts_AVP_VendorSpecAppId(Vendor_Id vendor_id, uint32_t auth_app_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id), + avp_data := { + avp_BASE_NONE_Vendor_Specific_Application_Id := { + { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Id), + avp_data := { + avp_BASE_NONE_Vendor_Id := int2oct(enum2int(vendor_id), 4) + } + } + }, { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Application_Id), + avp_data := { + avp_BASE_NONE_Auth_Application_Id := int2oct(auth_app_id, 4) + } + } + } + } + } + } +} + +template (value) GenericAVP ts_AVP_AuthAppId(template (value) OCTET4 auth_app_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Application_Id), + avp_data := { + avp_BASE_NONE_Auth_Application_Id := auth_app_id + } + } +} + +template (value) GenericAVP ts_AVP_SuppVendorIdRaw(uint32_t vendor_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Supported_Vendor_Id), + avp_data := { + avp_BASE_NONE_Supported_Vendor_Id := int2oct(vendor_id, 4) + } + } +} +template (value) GenericAVP ts_AVP_SuppVendorId(Vendor_Id vendor_id) := + ts_AVP_SuppVendorIdRaw(enum2int(vendor_id)); + +template (value) GenericAVP ts_AVP_ResultCode(DIAMETER_Resultcode res_code) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Result_Code), + avp_data := { + avp_BASE_NONE_Result_Code := int2oct(enum2int(res_code), 4) + } + } +} + +template (value) GenericAVP ts_AVP_AuthSessionState(template (value) BASE_NONE_Auth_Session_State ass := NO_STATE_MAINTAINED) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Session_State), + avp_data := { + avp_BASE_NONE_Auth_Session_State := ass + } + } +} +template (present) GenericAVP tr_AVP_AuthSessionState(template (present) BASE_NONE_Auth_Session_State ass := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Session_State), + avp_data := { + avp_BASE_NONE_Auth_Session_State := ass + } + } +} + +template (value) GenericAVP ts_AVP_SessionId(template (value) octetstring session_id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Session_Id), + avp_data := { + avp_BASE_NONE_Session_Id := session_id + } + } +} +template (present) GenericAVP tr_AVP_SessionId(template (present) octetstring session_id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Session_Id), + avp_data := { + avp_BASE_NONE_Session_Id := session_id + } + } +} + +/* 3.3 Destination Realm */ +template (value) GenericAVP ts_AVP_DestinationRealm(template (value) charstring dest_realm) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Realm), + avp_data := { + avp_BASE_NONE_Destination_Realm := dest_realm + } + } +} +template (present) GenericAVP tr_AVP_DestinationRealm(template (present) charstring dest_realm := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Realm), + avp_data := { + avp_BASE_NONE_Destination_Realm := dest_realm + } + } +} + +/* 8.14 User-Name */ +template (value) GenericAVP ts_AVP_UserName(template (value) octetstring uid) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_User_Name), + avp_data := { + avp_BASE_NONE_User_Name := uid + } + } +} +template (present) GenericAVP tr_AVP_UserName(template (present) octetstring uid := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_User_Name), + avp_data := { + avp_BASE_NONE_User_Name := uid + } + } +} +template (value) GenericAVP ts_AVP_UserNameImsi(hexstring imsi) := ts_AVP_UserName(char2oct(hex2str(imsi))); +template (present) GenericAVP tr_AVP_UserNameImsi(hexstring imsi) := tr_AVP_UserName(char2oct(hex2str(imsi))); + + + +/* TS 29.262 7.3.53 RAND */ +template (value) GenericAVP ts_AVP_RAND(template (value) octetstring rand) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_RAND), + avp_data := { + avp_AAA_3GPP_RAND := rand + } + } +} + +/* TS 29.262 7.3.54 XRES */ +template (value) GenericAVP ts_AVP_XRES(template (value) octetstring xres) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_XRES), + avp_data := { + avp_AAA_3GPP_XRES := xres + } + } +} + +/* TS 29.262 7.3.55 XRES */ +template (value) GenericAVP ts_AVP_AUTN(template (value) octetstring autn) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AUTN), + avp_data := { + avp_AAA_3GPP_AUTN := autn + } + } +} + +/* TS 29.262 7.3.56 KASME */ +template (value) GenericAVP ts_AVP_KASME(template (value) octetstring kasme) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), + avp_data := { + avp_AAA_3GPP_KASME := kasme + } + } +} + +/* TS 29.262 7.3.23 Item-Number */ +template (value) GenericAVP ts_AVP_ItemNumber(uint32_t num) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), + avp_data := { + avp_AAA_3GPP_Item_Number := int2oct(num, 4) + } + } +} + +/* TS 29.262 7.3.18 E-UTRAN Vector */ +template (value) GenericAVP ts_AVP_EutranVec(uint32_t item_num, octetstring rand, octetstring xres, + octetstring autn, octetstring kasme) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_E_UTRAN_Vector), + avp_data := { + avp_AAA_3GPP_E_UTRAN_Vector := { + ts_AVP_ItemNumber(item_num), + ts_AVP_RAND(rand), + ts_AVP_XRES(xres), + ts_AVP_AUTN(autn), + ts_AVP_KASME(kasme) + } + } + } +} + +/* TS 29.262 7.3.2 Subscription-Data */ +template (value) GenericAVP ts_AVP_3GPP_SubscriptionData(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscription_Data), + avp_data := { + avp_AAA_3GPP_Subscription_Data := content + } + } +} + + +/* TS 29.262 7.3.17 Authentication-Info */ +template (value) GenericAVP ts_AVP_3GPP_AuthInfo(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Authentication_Info), + avp_data := { + avp_AAA_3GPP_Authentication_Info := content + } + } +} + +/* TS 29.262 7.3.9 Visited-PLMN-Id */ +template (value) GenericAVP ts_AVP_3GPP_VisitedPlmnId(template (value) octetstring id) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Visited_PLMN_Id), + avp_data := { + avp_AAA_3GPP_Visited_PLMN_Id := id + } + } +} +template (present) GenericAVP tr_AVP_3GPP_VisitedPlmnId(template (present) octetstring id := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Visited_PLMN_Id), + avp_data := { + avp_AAA_3GPP_Visited_PLMN_Id := id + } + } +} + +/* TS 29.262 7.3.13 RAT-Type */ +template (value) GenericAVP ts_AVP_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), + avp_data := { + avp_PCC_3GPP_RAT_Type := rat_type + } + } +} +template (present) GenericAVP tr_AVP_3GPP_RatType(template (present) PCC_3GPP_RAT_Type rat_type := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), + avp_data := { + avp_PCC_3GPP_RAT_Type := rat_type + } + } +} + +/* TS 29.262 7.3.7 ULR-Flags */ +template (value) GenericAVP ts_AVP_3GPP_UlrFlags(template (value) UINT32 flags) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULR_Flags), + avp_data := { + avp_AAA_3GPP_ULR_Flags := flags + } + } +} +template (present) GenericAVP tr_AVP_3GPP_UlrFlags(template (present) UINT32 flags := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULR_Flags), + avp_data := { + avp_AAA_3GPP_ULR_Flags := flags + } + } +} + +/* TS 29.262 7.3.8 ULA-Flags */ +template (value) GenericAVP ts_AVP_3GPP_UlaFlags(template (value) UINT32 flags) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULA_Flags), + avp_data := { + avp_AAA_3GPP_ULA_Flags := flags + } + } +} +template (present) GenericAVP tr_AVP_3GPP_UlaFlags(template (present) UINT32 flags := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULA_Flags), + avp_data := { + avp_AAA_3GPP_ULA_Flags := flags + } + } +} + +/* TS 29.262 7.3.27 Context-Identifier */ +template (value) GenericAVP ts_AVP_3GPP_ContextId(uint32_t ctx) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Context_Identifier), + avp_data := { + avp_AAA_3GPP_Context_Identifier := int2oct(ctx, 4) + } + } +} + +/* Ts 29.262 7.3.29 Subscriber-Status */ +template (value) GenericAVP ts_AVP_3GPP_SubscriberStatus(template (value) AAA_3GPP_Subscriber_Status sts) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscriber_Status), + avp_data := { + avp_AAA_3GPP_Subscriber_Status := sts + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_SubscrRauTauTmr(uint32_t tmr) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer), + avp_data := { + avp_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer := int2oct(tmr, 4) + } + } +} + +/* TS 29.262 7.3.33 All-APN-Configurations-Included-Indicator */ +template (value) GenericAVP ts_AVP_3GPP_AllApnConfigsIncl(template (value) AAA_3GPP_All_APN_Configurations_Included_Indicator ind := All_APN_CONFIGURATIONS_INCLUDED) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_All_APN_Configurations_Included_Indicator), + avp_data := { + avp_AAA_3GPP_All_APN_Configurations_Included_Indicator := ind + } + } +} + +/* TS 29.262 7.3.34 APN-Configuration-Profile */ +template (value) GenericAVP ts_AVP_3GPP_ApnConfigProfile(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile), + avp_data := { + avp_AAA_3GPP_APN_Configuration_Profile := content + } + } +} + +/* TS 29.262 7.3.35 APN-Configuration */ +template (value) GenericAVP ts_AVP_3GPP_ApnConfig(uint32_t ctx, AAA_3GPP_PDN_Type pdn_type, + charstring apn) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile), + avp_data := { + avp_AAA_3GPP_APN_Configuration := { + ts_AVP_3GPP_ContextId(ctx), + ts_AVP_3GPP_PdnType(pdn_type), + ts_AVP_3GPP_EpsSubscrQosProfile(1, 1), + ts_AVP_ServiceSelection(apn) + } + } + } +} + +/* TS 29.262 7.3.36 Service-Selection (refers to RFC 5778) */ +template (value) GenericAVP ts_AVP_ServiceSelection(charstring apn) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_MIPv6_NONE_Service_Selection), + avp_data := { + avp_MIPv6_NONE_Service_Selection := char2oct(apn) + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_QosClassId(uint32_t id) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Class_Identifier), + avp_data := { + avp_PCC_3GPP_QoS_Class_Identifier := int2oct(id, 4) + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_PriorityLevel(uint32_t prio) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_Priority_Level), + avp_data := { + avp_PCC_3GPP_Priority_Level := int2oct(prio, 4) + } + } +} + + +template (value) GenericAVP ts_AVP_3GPP_AllocRetenPrio(uint32_t prio) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_Allocation_Retention_Priority), + avp_data := { + avp_PCC_3GPP_Allocation_Retention_Priority := { + ts_AVP_3GPP_PriorityLevel(prio) + /* pre-emption capability */ + /* pre-emption vulnerability */ + } + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_EpsSubscrQosProfile(uint32_t qos_class, uint32_t prio) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_EPS_Subscribed_QoS_Profile), + avp_data := { + avp_AAA_3GPP_EPS_Subscribed_QoS_Profile := { + ts_AVP_3GPP_QosClassId(qos_class), + ts_AVP_3GPP_AllocRetenPrio(prio) + } + } + } +} + + +/* TS 29.262 7.3.41 AMBR */ +template (value) GenericAVP ts_AVP_3GPP_AMBR(uint32_t ul, uint32_t dl) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AMBR), + avp_data := { + avp_AAA_3GPP_AMBR := { + ts_AVP_3GPP_MaxReqBwUL(ul), + ts_AVP_3GPP_MaxReqBwDL(dl) + } + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_MaxReqBwUL(uint32_t bw) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_RX_3GPP_Max_Requested_Bandwidth_UL), + avp_data := { + avp_RX_3GPP_Max_Requested_Bandwidth_UL := int2oct(bw, 4) + } + } +} + +template (value) GenericAVP ts_AVP_3GPP_MaxReqBwDL(uint32_t bw) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_RX_3GPP_Max_Requested_Bandwidth_DL), + avp_data := { + avp_RX_3GPP_Max_Requested_Bandwidth_DL := int2oct(bw, 4) + } + } +} + + + +/* TS 29.262 7.3.62 PDN-Type */ +template (value) GenericAVP ts_AVP_3GPP_PdnType(template (value) AAA_3GPP_PDN_Type pdn_type) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_PDN_Type), + avp_data := { + avp_AAA_3GPP_PDN_Type := pdn_type + } + } +} + + + +/* 5.3.2 Capabilities Exchange Answer */ +template (value) PDU_DIAMETER +ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id) +:= ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost("hss.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_HostIpAddr('7E000004'O), + ts_AVP_VendorId(vendor_id_3GPP), + ts_AVP_ProductName("TTCN-3 Testsuite"), + ts_AVP_OriginStateId('00000001'O), + ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */ + ts_AVP_SuppVendorId(vendor_id_3GPP), + ts_AVP_SuppVendorIdRaw(13019), /* ETSI */ + ts_AVP_AuthAppId('FFFFFFFF'O), + ts_AVP_InbSecId('00000000'O), + ts_AVP_VendorSpecAppId(vendor_id_3GPP, c_DIAMETER_3GPP_S6_AID) + }); + +template (present) PDU_DIAMETER +tr_DIA_AIR(hexstring imsi) := tr_DIAMETER(flags := '11000000'B, cmd_code:=Authentication_Information, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), + avps := superset( + tr_AVP_SessionId, + tr_AVP_DestinationRealm, + tr_AVP_UserNameImsi(imsi), + tr_AVP_3GPP_VisitedPlmnId + )); + +/* TS 29.262 5.2.3.1 + 7.2.6 Authentication Information Answer */ +template (value) PDU_DIAMETER +ts_DIA_AIA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) AVP_list auth_info_contents) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Authentication_Information, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost("hss.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_3GPP_AuthInfo(auth_info_contents) + }); + + +/* TS 29.262 7.2.3 Update Location Request */ +template (present) PDU_DIAMETER +tr_DIA_ULR(hexstring imsi) := tr_DIAMETER(flags:='11000000'B, cmd_code:=Update_Location, + app_id:=int2oct(c_DIAMETER_3GPP_S6_AID, 4), + avps := superset( + tr_AVP_SessionId, + tr_AVP_AuthSessionState, + tr_AVP_OriginHost, + tr_AVP_OriginRealm, + tr_AVP_DestinationRealm, + tr_AVP_UserNameImsi(imsi), + tr_AVP_3GPP_RatType(EUTRAN), + tr_AVP_3GPP_UlrFlags, + tr_AVP_3GPP_VisitedPlmnId + )); + +template (value) PDU_DIAMETER +ts_DIA_ULA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) AVP_list sub_data_content) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Update_Location, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), /* optional */ + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost("hss.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_3GPP_UlaFlags('00000002'O), + ts_AVP_3GPP_SubscriptionData(sub_data_content) + }); + + + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15206 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: Iafbf55ab25bbaa40960eb1744cff36dcd7970c17 Gerrit-Change-Number: 15206 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:14:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:14:24 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Integrate DIAMETER support into MME testsuite In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15207 ) Change subject: mme: Integrate DIAMETER support into MME testsuite ...................................................................... mme: Integrate DIAMETER support into MME testsuite The test suite can now send/receive DIAMETER messages via related test ports. Change-Id: I1691f87e19cced79ab0f9c3bb87608fc63e21eab --- M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh 3 files changed, 115 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index ae71173..da45485 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -21,6 +21,10 @@ import from NAS_EPS_Types all; import from NAS_Templates all; +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_Emulation all; + import from SGsAP_Types all; import from SGsAP_Templates all; import from SGsAP_Emulation all; @@ -58,6 +62,11 @@ port S1AP_PT S1AP_UNIT[NUM_ENB]; port S1APEM_PROC_PT S1AP_PROC[NUM_ENB]; + /* S6a/S6d interface of emulated HSS */ + var DIAMETER_Emulation_CT vc_DIAMETER; + port DIAMETER_PT DIAMETER_UNIT; + port DIAMETEREM_PROC_PT DIAMETER_PROC; + /* SGs interface of emulated MSC/VLR */ var SGsAP_Emulation_CT vc_SGsAP; port SGsAP_PT SGsAP_UNIT; @@ -66,7 +75,7 @@ var UeParams g_ue_pars[NUM_UE]; } -type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr { +type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr, DIAMETER_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; } @@ -87,6 +96,10 @@ charstring mp_s1_local_ip := "127.0.0.1"; integer mp_s1_local_port := 50000; + /* S6 interface */ + charstring mp_s6_local_ip := "127.0.0.4"; + integer mp_s6_local_port := 3868; + /* SGs interface */ charstring mp_sgs_local_ip := "127.0.0.1"; integer mp_sgs_local_port := 29118; @@ -191,6 +204,30 @@ } } +friend function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + DIAMETER_UNIT.send(msg); + return omit; +} + +friend function f_init_diameter(charstring id) runs on MTC_CT { + var DIAMETEROps ops := { + create_cb := refers(DIAMETER_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(DiameterForwardUnitdataCallback) + }; + var DIAMETER_conn_parameters pars := { + remote_ip := mp_mme_ip, + remote_sctp_port := -1, + local_ip := mp_s6_local_ip, + local_sctp_port := mp_s6_local_port + }; + vc_DIAMETER := DIAMETER_Emulation_CT.create(id); + map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); + connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); + vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); +} + friend template (value) TAI ts_enb_S1AP_TAI(EnbParams enb) := { pLMNidentity := enb.global_enb_id.pLMNidentity, tAC := enb.supported_tas[0].tAC, @@ -232,6 +269,10 @@ connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); } + if (isbound(vc_DIAMETER)) { + connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); + } /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -253,6 +294,9 @@ /* start guard timre and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard()); + if (DIAMETER_PROC.checkstate("Connected")) { + f_diameter_expect(g_pars.ue_pars.imsi); + } if (SGsAP_PROC.checkstate("Connected")) { /* Route all SGsAP mesages for our IMSIto us */ f_create_sgsap_expect(pars.ue_pars.imsi); @@ -414,9 +458,64 @@ } } +/* Exepect AuthInfoReq (AIR) from HSS; respond with AuthInforAnswer (AIA) */ +private altstep as_DIA_AuthInfo() runs on ConnHdlr { + var PDU_DIAMETER rx_dia; + [] DIAMETER.receive(tr_DIA_AIR(g_pars.ue_pars.imsi)) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + var octetstring vplmn_id; + var hexstring imsi; + var template (value) AVP_list auth_info_content; + + /* retrieve input data */ + imsi := valueof(f_DIAMETER_get_imsi(rx_dia)); + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_AAA_3GPP_Visited_PLMN_Id); + vplmn_id := valueof(avp.avp_data.avp_AAA_3GPP_Visited_PLMN_Id); + + /* compute tuple */ + auth_info_content := { ts_AVP_EutranVec(1, '20080c3818183b522614162c07601d0d'O, '6a91970e838fd079'O, 'f11b89a2a8be00001f9c526f3d75d44c'O, '95AFAD9A0D29AFAA079A9451DF7161D7EE4CBF2AF9387F766D058BB6B44B905D'O) }; + + DIAMETER.send(ts_DIA_AIA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, + sess_id, auth_info_content)); + } +} + +/* Expect UpdateLocationReq (ULR); respond with UpdateLocationAnswer (ULA) */ +private altstep as_DIA_UpdLoc() runs on ConnHdlr { + var PDU_DIAMETER rx_dia; + [] DIAMETER.receive(tr_DIA_ULR(g_pars.ue_pars.imsi)) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + var hexstring imsi; + var template (value) AVP_list sub_data; + + /* retrieve input data */ + imsi := valueof(f_DIAMETER_get_imsi(rx_dia)); + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + sub_data := { + ts_AVP_3GPP_SubscriberStatus(SERVICE_GRANTED), + ts_AVP_3GPP_SubscrRauTauTmr(30), + ts_AVP_3GPP_AMBR(1000, 2000), + ts_AVP_3GPP_ApnConfigProfile({ + ts_AVP_3GPP_ContextId(1), + ts_AVP_3GPP_AllApnConfigsIncl, + ts_AVP_3GPP_ApnConfig(1, IPv4, "*") + }) + }; + + DIAMETER.send(ts_DIA_ULA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, sub_data)); + } +} + private function f_TC_attach(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); - var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI('001010000000001'H); + var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI(pars.ue_pars.imsi); var template (value) PDU_NAS_EPS nas_esm, nas_emm; /* nas_esm := ts_NAS_ActDefEpsBearCtxReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), @@ -435,14 +534,24 @@ p_rrcCause := mo_Signalling); S1AP.send(tx); + as_DIA_AuthInfo(); as_s1ap_handle_auth(); - as_s1ap_handle_sec_mode(); + alt { + [] as_DIA_UpdLoc() { + as_s1ap_handle_sec_mode(); + } + [] as_s1ap_handle_sec_mode() { + as_DIA_UpdLoc(); + } + } f_sleep(10.0); } testcase TC_s1ap_attach() runs on MTC_CT { var charstring id := testcasename(); + f_init_diameter(id); + f_sleep(10.0); f_init_s1ap(id, 4); f_s1ap_setup(0); @@ -456,6 +565,7 @@ execute( TC_s1ap_setup_wrong_plmn() ); execute( TC_s1ap_setup_wrong_tac() ); execute( TC_s1ap_setup() ); + execute( TC_s1ap_attach() ); } diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 5664711..b59410b 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -55,6 +55,7 @@ FILES+="L3_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " +FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 9fb5f88..2d3bf59 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc " +FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc " export CPPFLAGS_TTCN3="" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15207 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: I1691f87e19cced79ab0f9c3bb87608fc63e21eab Gerrit-Change-Number: 15207 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:48:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:48:13 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add missing link to DIAMETER_EncDec.cc from TITAN Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15229 Change subject: mme: Add missing link to DIAMETER_EncDec.cc from TITAN ...................................................................... mme: Add missing link to DIAMETER_EncDec.cc from TITAN Change-Id: I9214ba6778ed6fc8c576e9d97217ecbb9996fb12 --- M deps/Makefile M mme/gen_links.sh 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/15229/1 diff --git a/deps/Makefile b/deps/Makefile index 61afb37..ec37e7c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -28,6 +28,7 @@ titan.ProtocolModules.TCP \ titan.ProtocolModules.UDP \ titan.ProtocolModules.RTP \ + titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \ titan.TestPorts.Common_Components.Socket-API \ titan.TestPorts.IPL4asp \ titan.TestPorts.LANL2asp \ @@ -91,6 +92,7 @@ titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A titan.ProtocolModules.NS_v7.3.0_commit= R.2.A titan.ProtocolModules.RTP_commit= R.5.A +titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9 diff --git a/mme/gen_links.sh b/mme/gen_links.sh index b59410b..f22f1ca 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -43,6 +43,10 @@ FILES="GTPC_EncDec.cc GTPC_Types.ttcn GTPU_EncDec.cc GTPU_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src +FILES="DIAMETER_EncDec.cc" +gen_links $DIR $FILES + DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15229 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: I9214ba6778ed6fc8c576e9d97217ecbb9996fb12 Gerrit-Change-Number: 15229 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:48:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:48:13 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: IPA_Emulation: Fix building without CTRL support Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 Change subject: IPA_Emulation: Fix building without CTRL support ...................................................................... IPA_Emulation: Fix building without CTRL support Back in JUne, Change-Id I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 attempted to introduce compilation of IPA_Emulation without CTRL but it failed to cover all references to CTRL with the correspondign ifdef/endif blocks. Let's fix this. Change-Id: I68349b32f613aacced84011601121f2265243600 --- M library/IPA_Emulation.ttcnpp 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/15230/1 diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 2305b7b..7b80c2d 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -51,8 +51,9 @@ import from RSPRO_Types all; #endif - +#ifdef IPA_EMULATION_CTRL import from Osmocom_CTRL_Types all; +#endif modulepar { /* Use Osmocom extended IPA mux header */ @@ -146,10 +147,12 @@ } with { extension "internal" } #endif +#ifdef IPA_EMULATION_CTRL /* Client port for CTRL inside IPA */ type port IPA_CTRL_PT message { inout CtrlMessage, ASP_IPA_Event; } with { extension "internal" } +#endif #ifdef IPA_EMULATION_GSUP /* Client port for CTRL inside IPA */ @@ -550,8 +553,10 @@ var ASP_Event asp_evt; var Socket_API_Definitions.PortEvent port_evt; var octetstring payload; - var CtrlMessage ctrl_msg; var ASP_IPA_Unitdata ipa_ud; +#ifdef IPA_EMULATION_CTRL + var CtrlMessage ctrl_msg; +#endif #ifdef IPA_EMULATION_SCCP var ASP_MTP3_TRANSFERreq mtp_req; #endif @@ -631,9 +636,11 @@ f_mgcp_to_user(ipa_rx.msg); } #endif +#ifdef IPA_EMULATION_CTRL case (IPAC_PROTO_EXT_CTRL) { f_ctrl_to_user(ipa_rx.msg); } +#endif #ifdef IPA_EMULATION_GSUP case (IPAC_PROTO_EXT_GSUP) { f_gsup_to_user(ipa_rx.msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 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: I68349b32f613aacced84011601121f2265243600 Gerrit-Change-Number: 15230 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:48:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:48:14 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15231 Change subject: DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS ...................................................................... DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS This is an artefact of copy+paste programming Change-Id: I10d56ef9971149350812b1504844217195623bd8 --- M library/DIAMETER_Emulation.ttcn 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/15231/1 diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index dc7bc94..fad44c3 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -33,8 +33,6 @@ import from DIAMETER_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; -import from DNS_Helpers all; -import from MobileL3_Types all; type hexstring IMSI; @@ -46,7 +44,7 @@ /* port between individual per-connection components and this dispatcher */ type port DIAMETER_Conn_PT message { - inout PDU_DIAMETER, PDU_ML3_MS_NW, PDU_ML3_NW_MS; + inout PDU_DIAMETER; } with { extension "internal" }; /* global test port e.g. for non-imsi/conn specific messages */ @@ -283,8 +281,6 @@ while (true) { var DIAMETER_ConnHdlr vc_conn; - var PDU_ML3_MS_NW l3_mo; - var PDU_ML3_NW_MS l3_mt; var template IMSI imsi_t; var hexstring imsi; var DIAMETER_RecvFrom mrf; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15231 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: I10d56ef9971149350812b1504844217195623bd8 Gerrit-Change-Number: 15231 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:48:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:48:14 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: NAS_EPS: fix 'make deps' (no commit specified) Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15232 Change subject: NAS_EPS: fix 'make deps' (no commit specified) ...................................................................... NAS_EPS: fix 'make deps' (no commit specified) Change-Id: I790c54568e745ea07afeed35b4d09a45b785711f --- M deps/Makefile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/15232/1 diff --git a/deps/Makefile b/deps/Makefile index ec37e7c..ed265c0 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -90,6 +90,7 @@ titan.ProtocolModules.M2PA_commit= R.2.A titan.ProtocolModules.M3UA_commit= R.2.A titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A +titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= 2ba853c7d197f7f39d97b76fca4726a7143fb4ad titan.ProtocolModules.NS_v7.3.0_commit= R.2.A titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15232 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: I790c54568e745ea07afeed35b4d09a45b785711f Gerrit-Change-Number: 15232 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add missing link to DIAMETER_EncDec.cc from TITAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15229 ) Change subject: mme: Add missing link to DIAMETER_EncDec.cc from TITAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15229 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: I9214ba6778ed6fc8c576e9d97217ecbb9996fb12 Gerrit-Change-Number: 15229 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 18 Aug 2019 17:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:28 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: IPA_Emulation: Fix building without CTRL support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 ) Change subject: IPA_Emulation: Fix building without CTRL support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 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: I68349b32f613aacced84011601121f2265243600 Gerrit-Change-Number: 15230 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 18 Aug 2019 17:49:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15231 ) Change subject: DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15231 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: I10d56ef9971149350812b1504844217195623bd8 Gerrit-Change-Number: 15231 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 18 Aug 2019 17:49:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: NAS_EPS: fix 'make deps' (no commit specified) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15232 ) Change subject: NAS_EPS: fix 'make deps' (no commit specified) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15232 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: I790c54568e745ea07afeed35b4d09a45b785711f Gerrit-Change-Number: 15232 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 18 Aug 2019 17:49:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:36 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: mme: Add missing link to DIAMETER_EncDec.cc from TITAN In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15229 ) Change subject: mme: Add missing link to DIAMETER_EncDec.cc from TITAN ...................................................................... mme: Add missing link to DIAMETER_EncDec.cc from TITAN Change-Id: I9214ba6778ed6fc8c576e9d97217ecbb9996fb12 --- M deps/Makefile M mme/gen_links.sh 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index 61afb37..ec37e7c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -28,6 +28,7 @@ titan.ProtocolModules.TCP \ titan.ProtocolModules.UDP \ titan.ProtocolModules.RTP \ + titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \ titan.TestPorts.Common_Components.Socket-API \ titan.TestPorts.IPL4asp \ titan.TestPorts.LANL2asp \ @@ -91,6 +92,7 @@ titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A titan.ProtocolModules.NS_v7.3.0_commit= R.2.A titan.ProtocolModules.RTP_commit= R.5.A +titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9 diff --git a/mme/gen_links.sh b/mme/gen_links.sh index b59410b..f22f1ca 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -43,6 +43,10 @@ FILES="GTPC_EncDec.cc GTPC_Types.ttcn GTPU_EncDec.cc GTPU_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src +FILES="DIAMETER_EncDec.cc" +gen_links $DIR $FILES + DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15229 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: I9214ba6778ed6fc8c576e9d97217ecbb9996fb12 Gerrit-Change-Number: 15229 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:37 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: IPA_Emulation: Fix building without CTRL support In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 ) Change subject: IPA_Emulation: Fix building without CTRL support ...................................................................... IPA_Emulation: Fix building without CTRL support Back in JUne, Change-Id I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 attempted to introduce compilation of IPA_Emulation without CTRL but it failed to cover all references to CTRL with the correspondign ifdef/endif blocks. Let's fix this. Change-Id: I68349b32f613aacced84011601121f2265243600 --- M library/IPA_Emulation.ttcnpp 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 2305b7b..7b80c2d 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -51,8 +51,9 @@ import from RSPRO_Types all; #endif - +#ifdef IPA_EMULATION_CTRL import from Osmocom_CTRL_Types all; +#endif modulepar { /* Use Osmocom extended IPA mux header */ @@ -146,10 +147,12 @@ } with { extension "internal" } #endif +#ifdef IPA_EMULATION_CTRL /* Client port for CTRL inside IPA */ type port IPA_CTRL_PT message { inout CtrlMessage, ASP_IPA_Event; } with { extension "internal" } +#endif #ifdef IPA_EMULATION_GSUP /* Client port for CTRL inside IPA */ @@ -550,8 +553,10 @@ var ASP_Event asp_evt; var Socket_API_Definitions.PortEvent port_evt; var octetstring payload; - var CtrlMessage ctrl_msg; var ASP_IPA_Unitdata ipa_ud; +#ifdef IPA_EMULATION_CTRL + var CtrlMessage ctrl_msg; +#endif #ifdef IPA_EMULATION_SCCP var ASP_MTP3_TRANSFERreq mtp_req; #endif @@ -631,9 +636,11 @@ f_mgcp_to_user(ipa_rx.msg); } #endif +#ifdef IPA_EMULATION_CTRL case (IPAC_PROTO_EXT_CTRL) { f_ctrl_to_user(ipa_rx.msg); } +#endif #ifdef IPA_EMULATION_GSUP case (IPAC_PROTO_EXT_GSUP) { f_gsup_to_user(ipa_rx.msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 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: I68349b32f613aacced84011601121f2265243600 Gerrit-Change-Number: 15230 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:37 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15231 ) Change subject: DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS ...................................................................... DIAMETER_Emulation: Remove unused dependency to MobileL3 and DNS This is an artefact of copy+paste programming Change-Id: I10d56ef9971149350812b1504844217195623bd8 --- M library/DIAMETER_Emulation.ttcn 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index dc7bc94..fad44c3 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -33,8 +33,6 @@ import from DIAMETER_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; -import from DNS_Helpers all; -import from MobileL3_Types all; type hexstring IMSI; @@ -46,7 +44,7 @@ /* port between individual per-connection components and this dispatcher */ type port DIAMETER_Conn_PT message { - inout PDU_DIAMETER, PDU_ML3_MS_NW, PDU_ML3_NW_MS; + inout PDU_DIAMETER; } with { extension "internal" }; /* global test port e.g. for non-imsi/conn specific messages */ @@ -283,8 +281,6 @@ while (true) { var DIAMETER_ConnHdlr vc_conn; - var PDU_ML3_MS_NW l3_mo; - var PDU_ML3_NW_MS l3_mt; var template IMSI imsi_t; var hexstring imsi; var DIAMETER_RecvFrom mrf; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15231 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: I10d56ef9971149350812b1504844217195623bd8 Gerrit-Change-Number: 15231 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 18 17:49:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 18 Aug 2019 17:49:37 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: NAS_EPS: fix 'make deps' (no commit specified) In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15232 ) Change subject: NAS_EPS: fix 'make deps' (no commit specified) ...................................................................... NAS_EPS: fix 'make deps' (no commit specified) Change-Id: I790c54568e745ea07afeed35b4d09a45b785711f --- M deps/Makefile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index ec37e7c..ed265c0 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -90,6 +90,7 @@ titan.ProtocolModules.M2PA_commit= R.2.A titan.ProtocolModules.M3UA_commit= R.2.A titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A +titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= 2ba853c7d197f7f39d97b76fca4726a7143fb4ad titan.ProtocolModules.NS_v7.3.0_commit= R.2.A titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15232 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: I790c54568e745ea07afeed35b4d09a45b785711f Gerrit-Change-Number: 15232 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 19 01:45:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 19 Aug 2019 01:45:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d59ff456575c_6b972b0f57a605f454947@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 453s] ar: `u' modifier ignored since `D' is the default (see `U') [ 453s] libtool: link: ranlib .libs/libtransceiver_common.a [ 453s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 453s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 453s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 453s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 453s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 453s] collect2: error: ld returned 1 exit status [ 453s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 453s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 453s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 453s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 453s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 453s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 453s] make[1]: *** [Makefile:444: all] Error 2 [ 453s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 453s] dh_auto_build: make -j1 returned exit code 2 [ 453s] make: *** [debian/rules:6: build] Error 255 [ 453s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 453s] [ 453s] morla3 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 01:45:15 UTC 2019. [ 453s] [ 453s] ### VM INTERACTION START ### [ 457s] [ 433.027751] sysrq: SysRq : Power Off [ 457s] [ 433.035639] reboot: Power down [ 457s] ### VM INTERACTION END ### [ 457s] [ 457s] morla3 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 01:45:19 UTC 2019. [ 457s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 19 01:46:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 19 Aug 2019 01:46:02 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5d59ff642d2bf_6b972b0f57a605f45495fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 224s] | configure:12838: checking for doxygen [ 224s] | configure:12856: found /usr/bin/doxygen [ 224s] | configure:12869: result: /usr/bin/doxygen [ 224s] | configure:12996: checking that generated files are newer than configure [ 224s] | configure:13002: result: done [ 224s] | configure:13033: creating ./config.status [ 224s] | [ 224s] | ## ---------------------- ## [ 224s] | ## Running config.status. ## [ 224s] | ## ---------------------- ## [ 224s] | [ 224s] | This file was extended by libosmo-netif config.status 0.6.0, which was [ 224s] | generated by GNU Autoconf 2.69. Invocation command line was [ 224s] | [ 224s] | CONFIG_FILES = [ 224s] | CONFIG_HEADERS = [ 224s] | CONFIG_LINKS = [ 224s] | CONFIG_COMMANDS = [ 224s] | $ ./config.status [ 224s] | [ 224s] | on armbuild13 [ 224s] | [ 224s] | config.status:1121: creating libosmo-netif.pc [ 226s] | config.status:1121: [ 191.046228] sysrq: SysRq : Power Off [ 226s] [ 191.047936] reboot: Power down [ 226s] ### VM INTERACTION END ### [ 226s] [ 226s] armbuild13 failed "build libosmo-netif_0.6.0.dsc" at Mon Aug 19 01:45:58 UTC 2019. [ 226s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 19 09:00:24 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Aug 2019 09:00:24 +0000 Subject: Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15222 ) Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared ...................................................................... msc_a: switch RAN type back to SGs when a CSFB-Call is cleared When a CSFB call is over the MS changes back to LTE after the call is cleared. However, at the moment the MSC does not change the cs.attached_via_ran flag. This may cause problems with the next call. Lets make sure that if there is an SGs association present, the ran type is set back to SGs when the call is cleared. Related: SYS#4624 Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 --- M src/libmsc/msc_a.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index bd69eed..553761f 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -754,6 +754,11 @@ }; msc_a_get(msc_a, MSC_A_USE_WAIT_CLEAR_COMPLETE); msc_a_ran_down(msc_a, MSC_ROLE_I, &msg); + + /* The connection is cleared. The MS will now go back to 4G, + Switch the RAN type back to SGS. */ + if (vsub && vsub->sgs_fsm->state == SGS_UE_ST_ASSOCIATED) + vsub->cs.attached_via_ran = OSMO_RAT_EUTRAN_SGS; } if (vsub) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 11:44:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 11:44:58 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit" Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit" ...................................................................... Revert "RAN_Adapter: invert check for RAN_ops == omit" This reverts commit 5932cd3463d04c45404c538daff6d25bc3f3d002. It caused a lot of tests in the ttcn3-bsc-test, ttcn3-bsc-test-latest and ttcn3-bsc-test-sccplite-latest testsuites to fail with: RAN_Adapter.ttcnpp:179 Dynamic test case error: Text encoder: Encoding an unbound optional value. Related: OS#4156 Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826 --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/15233/1 diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 8e19241..e995e8d 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -90,7 +90,7 @@ /* create components */ ba.vc_SCCP := SCCP_CT.create(id & "-SCCP"); - if (not istemplatekind(ops, "omit")) { + if (isvalue(ops)) { ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN"); } select (cfg.transport) { @@ -142,7 +142,7 @@ } } - if (not istemplatekind(ops, "omit")) { + if (isvalue(ops)) { timer T := 5.0; T.start; //T.timeout; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 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: I441c701553eef8e9e018d11923359eb3f3b26826 Gerrit-Change-Number: 15233 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 11:47:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 11:47:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 to look at the new patch set (#2). Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit" ...................................................................... Revert "RAN_Adapter: invert check for RAN_ops == omit" This reverts commit 5932cd3463d04c45404c538daff6d25bc3f3d002. It caused a lot of tests in the ttcn3-bsc-test, ttcn3-bsc-test-latest, ttcn3-bsc-test-sccplite and ttcn3-bsc-test-sccplite-latest testsuites to fail with: RAN_Adapter.ttcnpp:179 Dynamic test case error: Text encoder: Encoding an unbound optional value. Related: OS#4156 Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826 --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/15233/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 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: I441c701553eef8e9e018d11923359eb3f3b26826 Gerrit-Change-Number: 15233 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 11:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 11:50:26 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 ) Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit" ...................................................................... Patch Set 2: Code-Review+2 Tested locally, that it fixes the tests that were failing for this reason. Giving this a +2 myself, because it is a revert of something that is clearly broken. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 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: I441c701553eef8e9e018d11923359eb3f3b26826 Gerrit-Change-Number: 15233 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Aug 2019 11:50:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 11:50:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 11:50:36 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit" In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 ) Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit" ...................................................................... Revert "RAN_Adapter: invert check for RAN_ops == omit" This reverts commit 5932cd3463d04c45404c538daff6d25bc3f3d002. It caused a lot of tests in the ttcn3-bsc-test, ttcn3-bsc-test-latest, ttcn3-bsc-test-sccplite and ttcn3-bsc-test-sccplite-latest testsuites to fail with: RAN_Adapter.ttcnpp:179 Dynamic test case error: Text encoder: Encoding an unbound optional value. Related: OS#4156 Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826 --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 8e19241..e995e8d 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -90,7 +90,7 @@ /* create components */ ba.vc_SCCP := SCCP_CT.create(id & "-SCCP"); - if (not istemplatekind(ops, "omit")) { + if (isvalue(ops)) { ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN"); } select (cfg.transport) { @@ -142,7 +142,7 @@ } } - if (not istemplatekind(ops, "omit")) { + if (isvalue(ops)) { timer T := 5.0; T.start; //T.timeout; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 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: I441c701553eef8e9e018d11923359eb3f3b26826 Gerrit-Change-Number: 15233 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 11:51:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 11:51:47 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 ) Change subject: RAN_Adapter: invert check for RAN_ops == omit ...................................................................... Patch Set 2: Unfortunately this patch broke the bsc tests. Reverted: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 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: I639ab6d0586174c0f20b93a53169f0aa254970fa Gerrit-Change-Number: 15157 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Comment-Date: Mon, 19 Aug 2019 11:51:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 12:41:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 12:41:36 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4 Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 Change subject: BSC_Tests: update number-of-bts to 4 ...................................................................... BSC_Tests: update number-of-bts to 4 Fix failing TC_ctrl test for ttcn3-bsc-test and -latest. Depends: I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/15234/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 327326d..2bc1c62 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1188,7 +1188,7 @@ f_ctrl_get_exp(IPA_CTRL, "mcc", "001"); f_ctrl_get_exp(IPA_CTRL, "mnc", "01"); - f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "3"); + f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "4"); var integer bts_nr := 0; f_ctrl_get_exp_bts(IPA_CTRL, bts_nr, "location-area-code", "1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 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: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 12:41:49 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Aug 2019 12:41:49 +0000 Subject: Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3 Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 Change subject: sccplite/osmo-bsc.cfg: add bts 3 ...................................................................... sccplite/osmo-bsc.cfg: add bts 3 Have the same amount of bts like in the regular (non-sccplite) osmo-bsc.cfg, so we can make BSC_Tests.TC_ctrl pass for regular and sccplite again. Related: I1c57a04747f5ec004ccf4657954dcb0b003c24fc Related: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba (osmo-ttcn3-hacks) Related: OS#4156 Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 --- M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/35/15235/1 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index f7d640c..1cbd0c8 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -352,6 +352,35 @@ timeslot 7 phys_chan_config PDCH hopping enabled 0 + bts 3 + type sysmobts + band DCS1800 + cell_identity 3 + location_area_code 3 + # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config) + base_station_id_code 12 + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/H + timeslot 6 + phys_chan_config PDCH + timeslot 7 + phys_chan_config PDCH msc 0 ip.access rtp-base 4000 no bsc-welcome-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 12:56:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 12:56:04 +0000 Subject: Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 ) Change subject: sccplite/osmo-bsc.cfg: add bts 3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 12:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 12:56:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 12:56:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 ) Change subject: BSC_Tests: update number-of-bts to 4 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 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: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 12:56:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 14:52:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 14:52:11 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: ttcn3-sgsn-master: add support for Iu ...................................................................... Patch Set 2: Code-Review+2 Merging as without it all SGSN tests fail. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 14:52:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 15:09:12 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 19 Aug 2019 15:09:12 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: ttcn3-sgsn-master: add support for Iu ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 15:09:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 15:09:20 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 19 Aug 2019 15:09:20 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: ttcn3-sgsn-master: add support for Iu ...................................................................... ttcn3-sgsn-master: add support for Iu To support Iu tests, start osmo-stp when testing. Depends-on: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 (osmo-ttcn3-hacks) Change-Id: I4d6aef98832202652c5fe254105728430ba77119 --- M ttcn3-sgsn-test/SGSN_Tests.cfg M ttcn3-sgsn-test/jenkins.sh M ttcn3-sgsn-test/osmo-sgsn.cfg A ttcn3-sgsn-test/osmo-stp.cfg 4 files changed, 74 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved lynxis lazus: Verified diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 5ad5f7d..f7d6d9a 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -26,6 +26,11 @@ remote_ip := "172.18.8.10" } } +SGSN_Tests.mp_ranap_cfg := { + { + sctp_addr := { 23908, "172.18.8.103", 2905, "172.18.8.200" } + } +} SGSN_Tests.mp_hlr_ip := "172.18.8.103" SGSN_Tests.mp_ggsn_ip := "172.18.8.103" @@ -34,3 +39,4 @@ [EXECUTE] SGSN_Tests.control +SGSN_Tests_Iu.control diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9505624..621ad2e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -4,6 +4,7 @@ IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ "debian-stretch-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ "osmo-sgsn-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-sgsn-test" @@ -16,8 +17,18 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + mkdir $VOL_BASE_DIR/unix +echo Starting container with STP +docker run --rm \ + --network $NET_NAME --ip 172.18.8.200 \ + -v $VOL_BASE_DIR/stp:/data \ + --name ${BUILD_TAG}-stp -d \ + $REPO_USER/osmo-stp-$IMAGE_SUFFIX + echo Starting container with SGSN docker run --rm \ --network $NET_NAME --ip 172.18.8.10 \ @@ -45,6 +56,7 @@ echo Stopping containers docker container kill ${BUILD_TAG}-sgsn +docker container kill ${BUILD_TAG}-stp network_remove collect_logs diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 38b9945..0ca1a1d 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -52,6 +52,13 @@ ctrl bind 0.0.0.0 ! +cs7 instance 0 + point-code 0.23.4 + asp asp-clnt-OsmoSGSN-A 2905 0 m3ua + remote-ip 172.18.8.200 + as as-clnt-OsmoSGSN-A m3ua + asp asp-clnt-OsmoSGSN-A + routing-key 3 0.23.4 ns timer tns-block 3 timer tns-block-retries 3 diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg new file mode 100644 index 0000000..1871358 --- /dev/null +++ b/ttcn3-sgsn-test/osmo-stp.cfg @@ -0,0 +1,49 @@ +! +! OsmoSTP (0.8.1) configuration saved from vty +!! +! +log gsmtap 172.18.1.103 + logging level set-all debug +! +log file /data/osmo-stp.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice +! +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + asp virt-rnc0-0 23908 2905 m3ua + local-ip 172.18.8.200 + remote-ip 172.18.8.103 + as virt-rnc0 m3ua + asp virt-rnc0-0 + routing-key 2 0.24.3 + route-table system + update route 0.24.3 7.255.7 linkset virt-rnc0 + listen m3ua 2905 + accept-asp-connections dynamic-permitted + listen ipa 5000 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:02:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:02:50 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 ...................................................................... sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 Implementation of osmo_sccp_simple_client() API internally uses ss7 id 1, which is confusing since there's no 0 in use in osmo-sgsn. Let's explicitly use the 0 one so it is configured by "cs7 instance 0" in the VTY. Related: OS#4157 Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe --- M src/gprs/sgsn_main.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/36/15236/1 diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index ecfb79b..5979886 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -500,11 +500,11 @@ #if BUILD_IU /* Note that these are mostly defaults and can be overriden from the VTY */ - sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN", - (23 << 3) + 4, - OSMO_SS7_ASP_PROT_M3UA, - 0, NULL, - 0, "127.0.0.1"); + sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN", + (23 << 3) + 4, + OSMO_SS7_ASP_PROT_M3UA, + 0, NULL, + 0, "127.0.0.1"); if (!sccp) { printf("Setting up SCCP client failed.\n"); return 8; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe Gerrit-Change-Number: 15236 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:08:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:08:29 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests ...................................................................... ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests Previous commit was merged without dependent tests from osmo-ttcn3-hacks being yet present. Let's disable them until they are present. Fixes: ca2ef842522a9ac7c840dc3725cc2d8f8a5cd527 Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/37/15237/1 diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index f7d6d9a..55ea817 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -39,4 +39,4 @@ [EXECUTE] SGSN_Tests.control -SGSN_Tests_Iu.control +#SGSN_Tests_Iu.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:09:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:09:40 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 ) Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe Gerrit-Change-Number: 15236 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:09:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:10:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:10:11 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 ) Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 ...................................................................... Patch Set 1: Merging now since it fixes TTCN3 sgsn tests failing (no reset ack answered). Feel free to revert if it's not the correct fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe Gerrit-Change-Number: 15236 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:10:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:10:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:10:14 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 ) Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 ...................................................................... sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 Implementation of osmo_sccp_simple_client() API internally uses ss7 id 1, which is confusing since there's no 0 in use in osmo-sgsn. Let's explicitly use the 0 one so it is configured by "cs7 instance 0" in the VTY. Related: OS#4157 Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe --- M src/gprs/sgsn_main.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index ecfb79b..5979886 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -500,11 +500,11 @@ #if BUILD_IU /* Note that these are mostly defaults and can be overriden from the VTY */ - sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN", - (23 << 3) + 4, - OSMO_SS7_ASP_PROT_M3UA, - 0, NULL, - 0, "127.0.0.1"); + sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN", + (23 << 3) + 4, + OSMO_SS7_ASP_PROT_M3UA, + 0, NULL, + 0, "127.0.0.1"); if (!sccp) { printf("Setting up SCCP client failed.\n"); return 8; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe Gerrit-Change-Number: 15236 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:10:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:10:34 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 ) Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:10:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:23:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:23:09 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 ) Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:23:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:23:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:23:12 +0000 Subject: Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 ) Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests ...................................................................... ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests Previous commit was merged without dependent tests from osmo-ttcn3-hacks being yet present. Let's disable them until they are present. Fixes: ca2ef842522a9ac7c840dc3725cc2d8f8a5cd527 Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index f7d6d9a..55ea817 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -39,4 +39,4 @@ [EXECUTE] SGSN_Tests.control -SGSN_Tests_Iu.control +#SGSN_Tests_Iu.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 16:35:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 16:35:06 +0000 Subject: Change in ...osmo-sgsn[master]: examples: Add osmo-sgsn_custom-sccp.cfg Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 Change subject: examples: Add osmo-sgsn_custom-sccp.cfg ...................................................................... examples: Add osmo-sgsn_custom-sccp.cfg Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d --- A doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/15238/1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg new file mode 100644 index 0000000..a18d76a --- /dev/null +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -0,0 +1,38 @@ +! +! Osmocom SGSN configuration +! +! +line vty + no login +! +cs7 instance 0 + point-code 0.23.4 + asp asp-clnt-OsmoSGSN-A 2905 0 m3ua + remote-ip 172.18.8.200 ! where to reach the STP + as as-clnt-OsmoSGSN-A m3ua + asp asp-clnt-OsmoSGSN-A + routing-key 3 0.23.4 +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication required + auth-policy remote + gsup remote-ip 127.0.0.1 + gsup remote-port 4222 +! +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 + encapsulation udp local-ip 127.0.0.1 + encapsulation udp local-port 23000 + encapsulation framerelay-gre enabled 0 +! +bssgp +! -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d Gerrit-Change-Number: 15238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:07:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:07:06 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 Change subject: vty: Introduce cs7-instance-iu ...................................................................... vty: Introduce cs7-instance-iu Similar to what we already have in osmo-msc. Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 --- M doc/manuals/vty/sgsn_vty_reference.xml M include/osmocom/sgsn/sgsn.h M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c 4 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/39/15239/1 diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml index c3f91cf..38e21c2 100644 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ b/doc/manuals/vty/sgsn_vty_reference.xml @@ -2502,6 +2502,12 @@ + + + + + + diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 0a6ea29..f940a1c 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -124,6 +124,7 @@ #if BUILD_IU struct { enum ranap_nsap_addr_enc rab_assign_addr_enc; + uint32_t cs7_instance; } iu; #endif diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 5979886..4232e23 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -500,7 +500,9 @@ #if BUILD_IU /* Note that these are mostly defaults and can be overriden from the VTY */ - sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN", + sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, + sgsn->cfg.iu.cs7_instance, + "OsmoSGSN", (23 << 3) + 4, OSMO_SS7_ASP_PROT_M3UA, 0, NULL, diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index d1d53e6..13bc432 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -295,6 +295,8 @@ vty_out(vty, " no compression v42bis%s", VTY_NEWLINE); #ifdef BUILD_IU + vty_out(vty, " cs7-instance-iu %u%s", g_cfg->iu.cs7_instance, + VTY_NEWLINE); ranap_iu_vty_config_write(vty, " "); #endif @@ -1384,6 +1386,21 @@ return CMD_SUCCESS; } +DEFUN(cfg_sgsn_cs7_instance_iu, + cfg_sgsn_cs7_instance_iu_cmd, + "cs7-instance-iu <0-15>", + "Set SS7 to be used by the Iu-Interface.\n" "SS7 instance reference number (default: 0)\n") +{ +#if BUILD_IU + g_cfg->iu.cs7_instance = atoi(argv[0]); + return CMD_SUCCESS; +#else + vty_out(vty, "WARNING: 'cs7-instance-iu' without effect: built without Iu support%s", + VTY_NEWLINE); + return CMD_WARNING; +#endif +} + int sgsn_vty_init(struct sgsn_config *cfg) { g_cfg = cfg; @@ -1454,6 +1471,7 @@ install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd); #ifdef BUILD_IU + install_element(SGSN_NODE, &cfg_sgsn_cs7_instance_iu_cmd); ranap_iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc); #endif return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:14:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:14:45 +0000 Subject: Change in ...docker-playground[master]: Fix ttcn3-sgsn-latest (cs7 instance override) Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15240 Change subject: Fix ttcn3-sgsn-latest (cs7 instance override) ...................................................................... Fix ttcn3-sgsn-latest (cs7 instance override) Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/15240/1 diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 621ad2e..462c5b2 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -16,6 +16,12 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ +# Latest release of osmo-sgsn (1.5.0) uses harcoded default ss7 id 1 from +# libosmo-sccp (1.1.0). when new osmo-sgsn release is available, these lines +# below can be dropped: +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/cs7 instance 0/cs7 instance 1/g" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg +fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 Gerrit-Change-Number: 15240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:19:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:19:09 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 to look at the new patch set (#2). Change subject: vty: Introduce cs7-instance-iu ...................................................................... vty: Introduce cs7-instance-iu Similar to what we already have in osmo-msc. Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 --- M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg M doc/manuals/vty/sgsn_vty_reference.xml M include/osmocom/sgsn/sgsn.h M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c 5 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/39/15239/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:19:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:19:47 +0000 Subject: Change in ...docker-playground[master]: Fix ttcn3-sgsn-latest (cs7 instance override) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15240 ) Change subject: Fix ttcn3-sgsn-latest (cs7 instance override) ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 Gerrit-Change-Number: 15240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 17:19:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:19:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:19:52 +0000 Subject: Change in ...docker-playground[master]: Fix ttcn3-sgsn-latest (cs7 instance override) In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15240 ) Change subject: Fix ttcn3-sgsn-latest (cs7 instance override) ...................................................................... Fix ttcn3-sgsn-latest (cs7 instance override) Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 621ad2e..462c5b2 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -16,6 +16,12 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ +# Latest release of osmo-sgsn (1.5.0) uses harcoded default ss7 id 1 from +# libosmo-sccp (1.1.0). when new osmo-sgsn release is available, these lines +# below can be dropped: +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/cs7 instance 0/cs7 instance 1/g" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg +fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 Gerrit-Change-Number: 15240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:25:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:25:13 +0000 Subject: Change in ...docker-playground[master]: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15241 Change subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux ...................................................................... ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux Last releases of osmo-bsc and osmo-bsc already support Osmux, so we can drop those lines as indicated. Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-msc-test/jenkins.sh 3 files changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/15241/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ed8ffc3..0a2ff8b 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -14,9 +14,6 @@ mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 453fcf0..af5c965 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -12,10 +12,6 @@ mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -# osmux must be disabled until release AFTER osmo-bsc 1.4.1 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index ca2936a..a0a5f87 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -14,10 +14,6 @@ mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -# osmux must be disabled until release AFTER osmo-msc 1.3.1 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MSC_Tests.mp_enable_osmux_test := true;/MSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/msc-tester/MSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de Gerrit-Change-Number: 15241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 17:29:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 19 Aug 2019 17:29:38 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Fix typo in log message In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 ) Change subject: gprs_gmm.c: Fix typo in log message ...................................................................... gprs_gmm.c: Fix typo in log message Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index e1bed0d..95a1842 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2122,7 +2122,7 @@ case GSM48_MT_GMM_PTMSI_REALL_COMPL: if (!mmctx) goto null_mmctx; - LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLLICATION COMPLETE\n"); + LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLOCATION COMPLETE\n"); mmctx_timer_stop(mmctx, 3350); mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a Gerrit-Change-Number: 15189 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 19 20:00:58 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 19 Aug 2019 20:00:58 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5b0010c579c_38b22ae9ed7f0600335082@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 439s] ar: `u' modifier ignored since `D' is the default (see `U') [ 439s] libtool: link: ranlib .libs/libtransceiver_common.a [ 439s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 439s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 439s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 439s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 439s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 439s] collect2: error: ld returned 1 exit status [ 439s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 439s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 439s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 439s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 439s] make[1]: *** [Makefile:444: all] Error 2 [ 439s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 439s] dh_auto_build: make -j1 returned exit code 2 [ 439s] make: *** [debian/rules:6: build] Error 255 [ 439s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 439s] [ 439s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:00:41 UTC 2019. [ 439s] [ 439s] ### VM INTERACTION START ### [ 443s] [ 422.767149] sysrq: SysRq : Power Off [ 443s] [ 422.771795] reboot: Power down [ 443s] ### VM INTERACTION END ### [ 443s] [ 443s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:00:45 UTC 2019. [ 443s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 19 20:09:18 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 19 Aug 2019 20:09:18 +0000 Subject: Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15218 ) Change subject: osmo_tdef_get(): allow passing -1 as default timeout ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15218/2/src/tdef.c File src/tdef.c: https://gerrit.osmocom.org/#/c/15218/2/src/tdef.c at 186 PS2, Line 186: osmo_tdef_get > Alternatively, you could add another function without that optional parameter, so it would simply cr [?] quite possible, but osmo-bsc already uses the API as it was intended, so I'd rather just fix it here... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 20:09:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 20:09:21 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 19 Aug 2019 20:09:21 +0000 Subject: Change in ...libosmocore[master]: add vty logp command to echo on all log targets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14986 ) Change subject: add vty logp command to echo on all log targets ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9 Gerrit-Change-Number: 14986 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 19 Aug 2019 20:09:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 20:09:33 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 19 Aug 2019 20:09:33 +0000 Subject: Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15218 ) Change subject: osmo_tdef_get(): allow passing -1 as default timeout ...................................................................... osmo_tdef_get(): allow passing -1 as default timeout The intention of osmo_tdef_get()'s val_if_not_present argument was to return a default timeout, or to optionally abort the program for missing timer definitions if the default timeout is < 0. This was the case in the original implementation of this API in osmo-bsc, but in the migration to libosmocore, the argument was by accident changed to an unsigned type. In consequence, the assertion in the implementation that was intended to abort the program seemed bogus to coverity, and was fixed by removal in I7a544d2d43b83135def296674f777e48fe5fd80a -- the wrong direction, as is obvious from the API doc for osmo_tdef_get(). Note that osmo-bsc master passes -1 in various places and expects the program-abort behavior that was missing from the libosmocore implementation. Change the val_if_not_present argument to a signed type, and revert removal of the assertion, so that passing -1 has the effect described in the API doc: program abort on missing timer definition. This bug was not detected because it is hard to write tests that expect a program abort to happen, hence no tests for this API feature exist. Related: OS#4152 Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 --- M TODO-RELEASE M include/osmocom/core/tdef.h M src/tdef.c 3 files changed, 4 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..665ecf7 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +core osmo_tdef_get() change val_if_not_present arg from unsigned long to long to allow passing -1 diff --git a/include/osmocom/core/tdef.h b/include/osmocom/core/tdef.h index c8d9053..566f5dd 100644 --- a/include/osmocom/core/tdef.h +++ b/include/osmocom/core/tdef.h @@ -95,7 +95,7 @@ void osmo_tdefs_reset(struct osmo_tdef *tdefs); unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, - unsigned long val_if_not_present); + long val_if_not_present); struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T); /*! Using osmo_tdef for osmo_fsm_inst: array entry for a mapping of state numbers to timeout definitions. diff --git a/src/tdef.c b/src/tdef.c index 3cfb17c..40a9900 100644 --- a/src/tdef.c +++ b/src/tdef.c @@ -183,10 +183,11 @@ * \param[in] val_if_not_present Fallback value to return if no timeout is defined. * \return Timeout value in the unit given by as_unit, rounded up if necessary, or val_if_not_present. */ -unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, unsigned long val_if_not_present) +unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, long val_if_not_present) { const struct osmo_tdef *t = osmo_tdef_get_entry((struct osmo_tdef*)tdefs, T); if (!t) { + OSMO_ASSERT(val_if_not_present >= 0); return val_if_not_present; } return osmo_tdef_round(t->val, t->unit, as_unit); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 20:09:32 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 19 Aug 2019 20:09:32 +0000 Subject: Change in ...libosmocore[master]: add vty logp command to echo on all log targets In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/14986 ) Change subject: add vty logp command to echo on all log targets ...................................................................... add vty logp command to echo on all log targets When reading SUT logs resulting from TTCN3 runs, it can be hard to figure out which log section corresponds to which test code. Add a 'logp' command on VIEW and ENABLE nodes that simply echos an arbitrary message on log output, useful to set markers / explanations from the TTCN3 code, which then appear in all log outputs and can make it trivial to figure out which log section is interesting. logging_vty_test# logp lglobal notice This is the log message DLGLOBAL NOTICE This is the log message >From TTCN3, could be used like this, e.g. in BSC_Tests.ttcn: private function f_logp(charstring log_msg) runs on MSC_ConnHdlr { // log on TTCN3 log output log(log_msg); // log in stderr log f_vty_transceive(BSCVTY, "logp lglobal notice " & log_msg); } ... f_logp("f_probe_for_handover(" & log_label & "): Ending the test: Handover Failure stops the procedure."); Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9 --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 94 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index b785be4..243d6eb 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -991,6 +991,44 @@ install_element(CFG_LOG_NODE, cmd); } +/* logp () (debug|...|fatal) .LOGMESSAGE*/ +DEFUN(vty_logp, + vty_logp_cmd, + NULL, /* cmdstr is dynamically set in gen_vty_logp_cmd_strs(). */ + NULL) /* same thing for helpstr. */ +{ + int category = log_parse_category(argv[0]); + int level = log_parse_level(argv[1]); + char *str = argv_concat(argv, argc, 2); + LOGP(category, level, "%s\n", str); + return CMD_SUCCESS; +} + +static void gen_vty_logp_cmd_strs(struct cmd_element *cmd) +{ + char *cmd_str = NULL; + char *doc_str = NULL; + + assert_loginfo(__func__); + + OSMO_ASSERT(cmd->string == NULL); + OSMO_ASSERT(cmd->doc == NULL); + + osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logp ("); + osmo_talloc_asprintf(tall_log_ctx, doc_str, + "Print a message on all log outputs; useful for placing markers in test logs\n"); + add_category_strings(&cmd_str, &doc_str, osmo_log_info); + osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", LOG_LEVEL_ARGS); + osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", LOG_LEVEL_STRS); + + osmo_talloc_asprintf(tall_log_ctx, cmd_str, " .LOGMESSAGE"); + osmo_talloc_asprintf(tall_log_ctx, doc_str, + "Arbitrary message to log on given category and log level\n"); + + cmd->string = cmd_str; + cmd->doc = doc_str; +} + /*! Register logging related commands to the VTY. Call this once from * your application if you want to support those commands. */ void logging_vty_add_cmds() @@ -1026,6 +1064,9 @@ install_element_ve(&show_logging_vty_cmd); install_element_ve(&show_alarms_cmd); + gen_vty_logp_cmd_strs(&vty_logp_cmd); + install_element_ve(&vty_logp_cmd); + install_node(&cfg_log_node, config_write_log); install_element(CFG_LOG_NODE, &logging_fltr_all_cmd); install_element(CFG_LOG_NODE, &logging_use_clr_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index 895d2bc..d77f8ce 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -468,3 +468,56 @@ DDDDD ERROR Log message for DDDDD on level LOGL_ERROR DDDDD FATAL Log message for DDDDD on level LOGL_FATAL DEEE FATAL Log message for DEEE on level LOGL_FATAL + +logging_vty_test# list +... + logp (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro) (debug|info|notice|error|fatal) .LOGMESSAGE +... + +logging_vty_test# logp? + logp Print a message on all log outputs; useful for placing markers in test logs + +logging_vty_test# logp ? + aa Antropomorphic Armadillos (AA) + bb Bidirectional Breadspread (BB) + ccc Chaos Communication Congress (CCC) + dddd Dehydrated Dribbling Duck Dunkers (DDDD) + eee Exhaustive Entropy Extraction (EEE) + lglobal Library-internal global log family + llapd LAPD in libosmogsm + linp A-bis Intput Subsystem + lmux A-bis B-Subchannel TRAU Frame Multiplex + lmi A-bis Input Driver for Signalling + lmib A-bis Input Driver for B-Channels (voice) + lsms Layer3 Short Message Service (SMS) + lctrl Control Interface + lgtp GPRS GTP library + lstats Statistics messages and logging + lgsup Generic Subscriber Update Protocol + loap Osmocom Authentication Protocol + lss7 libosmo-sigtran Signalling System 7 + lsccp libosmo-sigtran SCCP Implementation + lsua libosmo-sigtran SCCP User Adaptation + lm3ua libosmo-sigtran MTP3 User Adaptation + lmgcp libosmo-mgcp Media Gateway Control Protocol + ljibuf libosmo-netif Jitter Buffer + lrspro Remote SIM protocol + +logging_vty_test# logp lglobal ? + debug Log debug messages and higher levels + info Log informational messages and higher levels + notice Log noticeable messages and higher levels + error Log error messages and higher levels + fatal Log only fatal messages + +logging_vty_test# logp lglobal info ? + LOGMESSAGE Arbitrary message to log on given category and log level + +logging_vty_test# logging level set-all notice + +logging_vty_test# logp aa error This is the log message +DAA ERROR This is the log message + +logging_vty_test# logp lglobal debug This log message is not echoed +logging_vty_test# logp lglobal notice This log message is echoed +DLGLOBAL NOTICE This log message is echoed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9 Gerrit-Change-Number: 14986 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 19 20:28:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 19 Aug 2019 20:28:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5b0680c1be7_38b22ae9ed7f06003489f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 514s] ar: `u' modifier ignored since `D' is the default (see `U') [ 514s] libtool: link: ranlib .libs/libtransceiver_common.a [ 514s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 514s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 514s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 515s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 515s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 515s] collect2: error: ld returned 1 exit status [ 515s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 515s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 515s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[1]: *** [Makefile:444: all] Error 2 [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_auto_build: make -j1 returned exit code 2 [ 515s] make: *** [debian/rules:6: build] Error 255 [ 515s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 515s] [ 515s] lamb24 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:28:13 UTC 2019. [ 515s] [ 515s] ### VM INTERACTION START ### [ 518s] [ 493.615186] sysrq: SysRq : Power Off [ 518s] [ 493.623043] reboot: Power down [ 518s] ### VM INTERACTION END ### [ 518s] [ 518s] lamb24 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:28:17 UTC 2019. [ 518s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:24:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:24:29 +0000 Subject: Change in ...osmo-sgsn[master]: examples: Add osmo-sgsn_custom-sccp.cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 ) Change subject: examples: Add osmo-sgsn_custom-sccp.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d Gerrit-Change-Number: 15238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 19 Aug 2019 21:24:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:24:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:24:58 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 ) Change subject: vty: Introduce cs7-instance-iu ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:24:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:25:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:25:34 +0000 Subject: Change in ...osmo-trx[master]: osmo-trx: log to stderr on signal received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15210 ) Change subject: osmo-trx: log to stderr on signal received ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c Gerrit-Change-Number: 15210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:25:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:25:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:25:39 +0000 Subject: Change in ...osmo-trx[master]: osmo-trx: log to stderr on signal received In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15210 ) Change subject: osmo-trx: log to stderr on signal received ...................................................................... osmo-trx: log to stderr on signal received Since osmo-trx it's a big multithreaded process and shutdown sequence can be complex, better use stderr to log signal received events to make sure log is outputted straigh away and not buffered. In general stdout is usually line-buffered, but buffering strategy can be more conservative if output is for instance redirected to a file. Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c --- M Transceiver52M/osmo-trx.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 15f744c..ab0b631 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -173,11 +173,11 @@ action like printing */ return; - fprintf(stdout, "signal %d received\n", signo); + fprintf(stderr, "signal %d received\n", signo); switch (signo) { case SIGINT: case SIGTERM: - fprintf(stdout, "shutting down\n"); + fprintf(stderr, "shutting down\n"); gshutdown = true; break; case SIGABRT: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c Gerrit-Change-Number: 15210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:26:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:26:07 +0000 Subject: Change in ...osmo-ggsn[master]: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 ) Change subject: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 Gerrit-Change-Number: 15219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:26:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:26:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:26:12 +0000 Subject: Change in ...osmo-ggsn[master]: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 ) Change subject: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST ...................................................................... build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST $target/$target_os is never used, so AC_CANONICAL_TARGET is useless. $host is, so employ AC_CANONICAL_HOST. Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 4c39681..c8bfae9 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR([.]) AC_CONFIG_TESTDIR(tests) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 Gerrit-Change-Number: 15219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:26:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:26:47 +0000 Subject: Change in ...docker-playground[master]: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15241 ) Change subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de Gerrit-Change-Number: 15241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 19 Aug 2019 21:26:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:27:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:27:27 +0000 Subject: Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 ) Change subject: sccplite/osmo-bsc.cfg: add bts 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:27:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:27:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:27:51 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 ) Change subject: BSC_Tests: update number-of-bts to 4 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 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: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:27:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 19 21:27:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 19 Aug 2019 21:27:53 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4 In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 ) Change subject: BSC_Tests: update number-of-bts to 4 ...................................................................... BSC_Tests: update number-of-bts to 4 Fix failing TC_ctrl test for ttcn3-bsc-test and -latest. Depends: I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 327326d..2bc1c62 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1188,7 +1188,7 @@ f_ctrl_get_exp(IPA_CTRL, "mcc", "001"); f_ctrl_get_exp(IPA_CTRL, "mnc", "01"); - f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "3"); + f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "4"); var integer bts_nr := 0; f_ctrl_get_exp_bts(IPA_CTRL, bts_nr, "location-area-code", "1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 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: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 01:15:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 20 Aug 2019 01:15:53 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... fix crashes: don't assert on incoming RTP packet size Remove various OSMO_ASSERT() on size of incoming packets. Doing an assert on incoming data is a DoS attack vector, absolute no-go. Instead, return -EINVAL and keep running. Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/42/15242/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index bb29d2b..d5f197d 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -475,7 +475,12 @@ uint8_t pt_in; int pt_out; - OSMO_ASSERT(len >= sizeof(struct rtp_hdr)); + if (msg->len < sizeof(struct rtp_hdr)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u < %zu)\n", + msg->len, sizeof(struct rtp_hdr)); + return -EINVAL; + } + rtp_hdr = (struct rtp_hdr *)data; pt_in = rtp_hdr->payload_type; @@ -641,7 +646,7 @@ * the receiving end expects GSM-HR data to be formated after RFC 5993, this * function is used to convert between RFC 5993 and TS 101318, which we normally * use. */ -static void rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len) +static int rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len) { /* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is * plenty of space available to store the slightly larger, converted @@ -649,7 +654,12 @@ struct rtp_hdr *rtp_hdr; - OSMO_ASSERT(*len >= sizeof(struct rtp_hdr)); + if (*len < sizeof(struct rtp_hdr)) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", + *len, sizeof(struct rtp_hdr)); + return -EINVAL; + } + rtp_hdr = (struct rtp_hdr *)data; if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr)) { @@ -667,7 +677,9 @@ * packet. This is not supported yet. */ LOGPENDP(endp, DRTP, LOGL_ERROR, "cannot figure out how to convert RTP packet\n"); + return -ENOTSUP; } + return 0; } /* For AMR RTP two framing modes are defined RFC3267. There is a bandwith @@ -685,7 +697,11 @@ unsigned int payload_len; int rc; - OSMO_ASSERT(*len >= sizeof(struct rtp_hdr)); + if (*len < sizeof(struct rtp_hdr)) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", *len, sizeof(struct rtp_hdr)); + return -EINVAL; + } + rtp_hdr = (struct rtp_hdr *)data; payload_len = *len - sizeof(struct rtp_hdr); @@ -736,17 +752,21 @@ /* Check if a given RTP with AMR payload for octet-aligned mode */ -static bool amr_oa_check(char *data, int len) +static int amr_oa_check(char *data, int len) { struct rtp_hdr *rtp_hdr; unsigned int payload_len; - OSMO_ASSERT(len >= sizeof(struct rtp_hdr)); + if (len < sizeof(struct rtp_hdr)) + return -EINVAL; + rtp_hdr = (struct rtp_hdr *)data; payload_len = len - sizeof(struct rtp_hdr); + if (payload_len < sizeof(struct amr_hdr)) + return -EINVAL; - return osmo_amr_is_oa(rtp_hdr->data, payload_len); + return osmo_amr_is_oa(rtp_hdr->data, payload_len) ? 1 : 0; } /* Forward data to a debug tap. This is debug function that is intended for @@ -1340,7 +1360,10 @@ * define, then we check if the incoming payload matches that * expectation. */ if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) { - if (amr_oa_check(buf, len) != conn_src->end.codec->param.amr_octet_aligned) + int oa = amr_oa_check(buf, len); + if (oa < 0) + return -1; + if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned) return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 01:15:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 20 Aug 2019 01:15:53 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15243 Change subject: mgcp_send(): stop looping on conversion error ...................................................................... mgcp_send(): stop looping on conversion error If mgcp_send() runs a transcoder loop, break the loop if rfc5993_hr_convert() or amr_oa_bwe_convert() return with error. Possibly fixes an infinite loop situation for erratic packets? (Didn't check for that in detail.) Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/15243/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index d5f197d..190ccd4 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -871,13 +871,23 @@ addr, buf, buflen); if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) { - amr_oa_bwe_convert(endp, buf, &buflen, - conn_dst->end.codec->param.amr_octet_aligned); + rc = amr_oa_bwe_convert(endp, buf, &buflen, + conn_dst->end.codec->param.amr_octet_aligned); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, + "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion\n"); + break; + } } else if (rtp_end->rfc5993_hr_convert && strcmp(conn_src->end.codec->subtype_name, "GSM-HR-08") == 0) - rfc5993_hr_convert(endp, buf, &buflen); + rc = rfc5993_hr_convert(endp, buf, &buflen); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n"); + break; + } + } LOGPENDP(endp, DRTP, LOGL_DEBUG, "process/send to %s %s " -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 01:24:54 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 20 Aug 2019 01:24:54 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 to look at the new patch set (#2). Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... fix crashes: don't assert on incoming RTP packet size Remove various OSMO_ASSERT() on size of incoming packets. Doing an assert on incoming data is a DoS attack vector, absolute no-go. Instead, return -EINVAL and keep running. Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 28 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/42/15242/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 01:24:54 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 20 Aug 2019 01:24:54 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 to look at the new patch set (#2). Change subject: mgcp_send(): stop looping on conversion error ...................................................................... mgcp_send(): stop looping on conversion error If mgcp_send() runs a transcoder loop, break the loop if rfc5993_hr_convert() or amr_oa_bwe_convert() return with error. Possibly fixes an infinite loop situation for erratic packets? (Didn't check for that in detail.) Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/15243/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Aug 20 04:00:07 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 20 Aug 2019 04:00:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5b7056c3c71_38b22ae9ed7f0600449282@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 493s] ar: `u' modifier ignored since `D' is the default (see `U') [ 493s] libtool: link: ranlib .libs/libtransceiver_common.a [ 493s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 493s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 493s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 493s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 493s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 493s] collect2: error: ld returned 1 exit status [ 493s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 493s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 493s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 493s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 493s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 493s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 493s] make[1]: *** [Makefile:444: all] Error 2 [ 493s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 493s] dh_auto_build: make -j1 returned exit code 2 [ 493s] make: *** [debian/rules:6: build] Error 255 [ 493s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 493s] [ 493s] morla3 failed "build osmo-trx_1.1.1.dsc" at Tue Aug 20 03:59:55 UTC 2019. [ 493s] [ 493s] ### VM INTERACTION START ### [ 497s] [ 473.273141] sysrq: SysRq : Power Off [ 497s] [ 473.317674] reboot: Power down [ 497s] ### VM INTERACTION END ### [ 497s] [ 497s] morla3 failed "build osmo-trx_1.1.1.dsc" at Tue Aug 20 03:59:59 UTC 2019. [ 497s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 20 04:23:16 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 20 Aug 2019 04:23:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5b75bc92c1a_38b22ae9ed7f06004524c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 224s] asciidoc: gsup.adoc: line 1459: evaluating: {counter2:target-number} [ 224s] asciidoc: gsup.adoc: line 1459: evaluating: {set2:target:test-usermanual__52.png} [ 224s] asciidoc: gsup.adoc: line 1474: filtering: packetdiag -o "/usr/src/packages/BUILD/tests/test-usermanual__52.png" -Tpng - && echo " " [ 224s] asciidoc: gsup.adoc: line 1542: evaluating: {counter2:target-number} [ 224s] asciidoc: gsup.adoc: line 1542: evaluating: {set2:target:test-usermanual__53.png} [ 224s] asciidoc: gsup.adoc: line 1551: filtering: "/usr/bin/python2" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__53.png" -Tpng - [ 224s] asciidoc: gsup.adoc: line 1574: evaluating: {counter2:target-number} [ 224s] asciidoc: gsup.adoc: line 1574: evaluating: {set2:target:test-usermanual__54.png} [ 224s] asciidoc: gsup.adoc: line 1584: filtering: packetdiag -o "/usr/src/packages/BUILD/tests/test-usermanual__54.png" -Tpng - && echo " " [ 224s] [ 224s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 224s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 224s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 224s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 224s] make[1]: *** [Makefile:362: all] Error 2 [ 224s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 224s] dh_auto_build: make -j1 returned exit code 2 [ 224s] make: *** [debian/rules:5: binary] Error 255 [ 224s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 224s] [ 224s] sheep84 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Tue Aug 20 04:23:02 UTC 2019. [ 224s] [ 224s] ### VM INTERACTION START ### [ 227s] [ 215.759507] sysrq: SysRq : Power Off [ 227s] [ 215.766287] reboot: Power down [ 227s] ### VM INTERACTION END ### [ 227s] [ 227s] sheep84 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Tue Aug 20 04:23:06 UTC 2019. [ 227s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 20 07:16:43 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 20 Aug 2019 07:16:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5b9e65d6dd3_38b22ae9ed7f06005000ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 453s] ar: `u' modifier ignored since `D' is the default (see `U') [ 453s] libtool: link: ranlib .libs/libtransceiver_common.a [ 454s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 454s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 454s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 454s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 454s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 454s] collect2: error: ld returned 1 exit status [ 454s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 454s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 454s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 454s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 454s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 454s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 454s] make[1]: *** [Makefile:444: all] Error 2 [ 454s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 454s] dh_auto_build: make -j1 returned exit code 2 [ 454s] make: *** [debian/rules:6: build] Error 255 [ 454s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 454s] [ 454s] lamb18 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Tue Aug 20 07:16:29 UTC 2019. [ 454s] [ 454s] ### VM INTERACTION START ### [ 457s] [ 438.188881] sysrq: SysRq : Power Off [ 457s] [ 438.195729] reboot: Power down [ 457s] ### VM INTERACTION END ### [ 457s] [ 457s] lamb18 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Tue Aug 20 07:16:32 UTC 2019. [ 457s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Aug 20 07:52:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 07:52:25 +0000 Subject: Change in ...docker-playground[master]: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15241 ) Change subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de Gerrit-Change-Number: 15241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 07:52:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 07:52:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 07:52:29 +0000 Subject: Change in ...docker-playground[master]: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15241 ) Change subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux ...................................................................... ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux Last releases of osmo-bsc and osmo-bsc already support Osmux, so we can drop those lines as indicated. Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-msc-test/jenkins.sh 3 files changed, 0 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ed8ffc3..0a2ff8b 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -14,9 +14,6 @@ mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 453fcf0..af5c965 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -12,10 +12,6 @@ mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -# osmux must be disabled until release AFTER osmo-bsc 1.4.1 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index ca2936a..a0a5f87 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -14,10 +14,6 @@ mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -# osmux must be disabled until release AFTER osmo-msc 1.3.1 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MSC_Tests.mp_enable_osmux_test := true;/MSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/msc-tester/MSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de Gerrit-Change-Number: 15241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 07:53:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 07:53:46 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15243 ) Change subject: mgcp_send(): stop looping on conversion error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 07:53:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 08:00:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 08:00:11 +0000 Subject: Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 ) Change subject: sccplite/osmo-bsc.cfg: add bts 3 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 08:00:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 08:00:15 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 08:00:15 +0000 Subject: Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3 In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 ) Change subject: sccplite/osmo-bsc.cfg: add bts 3 ...................................................................... sccplite/osmo-bsc.cfg: add bts 3 Have the same amount of bts like in the regular (non-sccplite) osmo-bsc.cfg, so we can make BSC_Tests.TC_ctrl pass for regular and sccplite again. Related: I1c57a04747f5ec004ccf4657954dcb0b003c24fc Related: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba (osmo-ttcn3-hacks) Related: OS#4156 Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 --- M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index f7d640c..1cbd0c8 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -352,6 +352,35 @@ timeslot 7 phys_chan_config PDCH hopping enabled 0 + bts 3 + type sysmobts + band DCS1800 + cell_identity 3 + location_area_code 3 + # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config) + base_station_id_code 12 + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/H + timeslot 6 + phys_chan_config PDCH + timeslot 7 + phys_chan_config PDCH msc 0 ip.access rtp-base 4000 no bsc-welcome-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 08:00:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 08:00:48 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 ) Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/15242/2/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/#/c/15242/2/src/libosmo-mgcp/mgcp_network.c at 752 PS2, Line 752: static int amr_oa_check(char *data, int len) non-related. Why changing it? https://gerrit.osmocom.org/#/c/15242/2/src/libosmo-mgcp/mgcp_network.c at 1363 PS2, Line 1363: if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned) non-related change. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 08:00:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 08:41:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 08:41:51 +0000 Subject: Change in ...libosmocore[master]: vty: Register logp cmd next to logging commands Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15244 Change subject: vty: Register logp cmd next to logging commands ...................................................................... vty: Register logp cmd next to logging commands This way it's easier by osmo_verify_transcript_vty.py to skip and avoid breaking existent test in osmo-hlr. Fixes: d0b3b9edac978c91bf84aa2537aa24426685b1fb Change-Id: Iab9423661e4f4eefca2e3d02b60a43f913ed92a3 --- M src/vty/logging_vty.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/15244/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 243d6eb..d639a8f 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -1061,12 +1061,13 @@ install_element_ve(&deprecated_logging_level_everything_cmd); install_element_ve(&deprecated_logging_level_all_cmd); install_element_ve(&deprecated_logging_level_all_everything_cmd); - install_element_ve(&show_logging_vty_cmd); - install_element_ve(&show_alarms_cmd); gen_vty_logp_cmd_strs(&vty_logp_cmd); install_element_ve(&vty_logp_cmd); + install_element_ve(&show_logging_vty_cmd); + install_element_ve(&show_alarms_cmd); + install_node(&cfg_log_node, config_write_log); install_element(CFG_LOG_NODE, &logging_fltr_all_cmd); install_element(CFG_LOG_NODE, &logging_use_clr_cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab9423661e4f4eefca2e3d02b60a43f913ed92a3 Gerrit-Change-Number: 15244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 08:51:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 08:51:31 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 2: ping -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 08:51:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:11:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 10:11:26 +0000 Subject: Change in ...libosmocore[master]: vty: Register logp cmd next to logging commands In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15244 ) Change subject: vty: Register logp cmd next to logging commands ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab9423661e4f4eefca2e3d02b60a43f913ed92a3 Gerrit-Change-Number: 15244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Aug 2019 10:11:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:21:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 10:21:56 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 ) Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-Comment-Date: Tue, 20 Aug 2019 10:21:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:29:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 10:29:09 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 ) Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 10:29:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:30:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 10:30:56 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Verify that timers can be set over VTY In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 ) Change subject: tests: Verify that timers can be set over VTY ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Aug 2019 10:30:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:31:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:31:46 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce in46a_is_v{4,6}() helpers Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 Change subject: Introduce in46a_is_v{4,6}() helpers ...................................................................... Introduce in46a_is_v{4,6}() helpers It's clearer having size-related checks in one place for a daa structure in46_addr, instead of spread around the code. Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb --- M ggsn/ggsn.c M lib/in46_addr.h 2 files changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/45/15245/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 95371a2..593c319 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -482,19 +482,15 @@ * \returns The selected peer matching the given IP version. NULL if not present. */ static struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { - uint8_t len1, len2, i; - - if (is_ipv6) { - len1 = 8; - len2 = 16; - } else { - len1 = sizeof(struct in_addr); - len2 = len1; - } + uint8_t i; for (i = 0; i < 2; i++) { struct ippoolm_t * ippool = pdp->peer[i]; - if (ippool && (ippool->addr.len == len1 || ippool->addr.len == len2)) + if (!ippool) + continue; + if (is_ipv6 && in46a_is_v6(&ippool->addr)) + return ippool; + else if (!is_ipv6 && in46a_is_v4(&ippool->addr)) return ippool; } return NULL; @@ -798,7 +794,7 @@ /* Allocate dynamic addresses from the pool */ for (i = 0; i < num_addr; i++) { - if (addr[i].len == sizeof(struct in_addr)) { + if (in46a_is_v4(&addr[i])) { /* does this APN actually have an IPv4 pool? */ if (!apn_supports_ipv4(apn)) goto err_wrong_af; @@ -811,7 +807,7 @@ addrv4 = member; - } else if (addr[i].len == sizeof(struct in6_addr)) { + } else if (in46a_is_v6(&addr[i])) { /* does this APN actually have an IPv6 pool? */ if (!apn_supports_ipv6(apn)) diff --git a/lib/in46_addr.h b/lib/in46_addr.h index e4654cc..153df00 100644 --- a/lib/in46_addr.h +++ b/lib/in46_addr.h @@ -31,3 +31,11 @@ int in46a_to_eua(const struct in46_addr *src, unsigned int size, struct ul66_t *eua); int in46a_from_eua(const struct ul66_t *eua, struct in46_addr *dst); + +static inline bool in46a_is_v6(const struct in46_addr *addr) { + return addr->len == 8 || addr->len == 16; +} + +static inline bool in46a_is_v4(const struct in46_addr *addr) { + return addr->len == sizeof(struct in_addr); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb Gerrit-Change-Number: 15245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:31:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:31:46 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 Change subject: ggsn: Move PCO handling code into its own file ...................................................................... ggsn: Move PCO handling code into its own file This way ggsn.c is shrinked in size and get rid of a lot of code there, which is of no interest unless the reader is interesting in that really specific part. Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/pco.c A ggsn/pco.h 5 files changed, 341 insertions(+), 312 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/46/15246/1 diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index eca385f..022cdef 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -12,4 +12,4 @@ endif osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h +osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 593c319..7832338 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -68,6 +68,7 @@ #include "../gtp/pdp.h" #include "../gtp/gtp.h" #include "icmpv6.h" +#include "pco.h" #include "ggsn.h" void *tall_ggsn_ctx; @@ -79,14 +80,6 @@ struct ul255_t qos; struct ul255_t apn; -#define LOGPAPN(level, apn, fmt, args...) \ - LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) - -#define LOGPGGSN(level, ggsn, fmt, args...) \ - LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args) - -#define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args) - static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what); static int cb_tun_ind(struct tun_t *tun, void *pack, unsigned len); @@ -396,92 +389,12 @@ return 0; } -#include - -/* RFC 1332 */ -enum ipcp_options { - IPCP_OPT_IPADDR = 3, - IPCP_OPT_PRIMARY_DNS = 129, - IPCP_OPT_SECONDARY_DNS = 131, -}; - -struct ipcp_option_hdr { - uint8_t type; - uint8_t len; - uint8_t data[0]; -} __attribute__ ((packed)); - -struct ipcp_hdr { - uint8_t code; - uint8_t id; - uint16_t len; - uint8_t options[0]; -} __attribute__ ((packed)); - -/* determine if IPCP contains given option */ -static const uint8_t *ipcp_contains_option(const struct ipcp_hdr *ipcp, size_t ipcp_len, - enum ipcp_options opt, size_t opt_minlen) -{ - const uint8_t *cur_opt = ipcp->options; - - /* iterate over Options and check if protocol contained */ - while (cur_opt + sizeof(struct ipcp_option_hdr) <= (uint8_t*)ipcp + ipcp_len) { - const struct ipcp_option_hdr *cur_opt_hdr = (const struct ipcp_option_hdr *)cur_opt; - /* length value includes 2 bytes type/length */ - if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr)) - return NULL; - if (cur_opt_hdr->type == opt && - cur_opt_hdr->len >= sizeof(struct ipcp_option_hdr) + opt_minlen) - return cur_opt; - cur_opt += cur_opt_hdr->len; - } - return NULL; -} - -/* 3GPP TS 24.008 10.6.5.3 */ -enum pco_protocols { - PCO_P_LCP = 0xC021, - PCO_P_PAP = 0xC023, - PCO_P_CHAP = 0xC223, - PCO_P_IPCP = 0x8021, - PCO_P_PCSCF_ADDR = 0x0001, - PCO_P_IM_CN_SS_F = 0x0002, - PCO_P_DNS_IPv6_ADDR = 0x0003, - PCO_P_POLICY_CTRL_REJ = 0x0004, /* only in Network->MS */ - PCO_P_MS_SUP_NETREQ_BCI = 0x0005, - /* reserved */ - PCO_P_DSMIPv6_HA_ADDR = 0x0007, - PCO_P_DSMIPv6_HN_PREF = 0x0008, - PCO_P_DSMIPv6_v4_HA_ADDR= 0x0009, - PCO_P_IP_ADDR_VIA_NAS = 0x000a, /* only MS->Network */ - PCO_P_IPv4_ADDR_VIA_DHCP= 0x000b, /* only MS->Netowrk */ - PCO_P_PCSCF_IPv4_ADDR = 0x000c, - PCO_P_DNS_IPv4_ADDR = 0x000d, - PCO_P_MSISDN = 0x000e, - PCO_P_IFOM_SUPPORT = 0x000f, - PCO_P_IPv4_LINK_MTU = 0x0010, - PCO_P_MS_SUPP_LOC_A_TFT = 0x0011, - PCO_P_PCSCF_RESEL_SUP = 0x0012, /* only MS->Network */ - PCO_P_NBIFOM_REQ = 0x0013, - PCO_P_NBIFOM_MODE = 0x0014, - PCO_P_NONIP_LINK_MTU = 0x0015, - PCO_P_APN_RATE_CTRL_SUP = 0x0016, - PCO_P_PS_DATA_OFF_UE = 0x0017, - PCO_P_REL_DATA_SVC = 0x0018, -}; - -struct pco_element { - uint16_t protocol_id; /* network byte order */ - uint8_t length; /* length of data below */ - uint8_t data[0]; -} __attribute__((packed)); - /*! Get the peer of pdp based on IP version used. * \param[in] pdp PDP context to select the peer from. * \param[in] v4v6 IP version to select. Valid values are 4 and 6. * \returns The selected peer matching the given IP version. NULL if not present. */ -static struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { +struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { uint8_t i; for (i = 0; i < 2; i++) { @@ -496,228 +409,6 @@ return NULL; } -/* RFC 1334, section 3.2. Packet Format */ -struct pap_element { - uint8_t code; - uint8_t id; - uint16_t len; /* length including header */ - uint8_t data[0]; -} __attribute__((packed)); - -enum pap_code { - PAP_CODE_AUTH_REQ = 1, - PAP_CODE_AUTH_ACK = 2, - PAP_CODE_AUTH_NAK = 3, -}; - -static const char *pap_welcome = "Welcome to OsmoGGSN " PACKAGE_VERSION; - -/* Handle PAP protocol according to RFC 1334 */ -static void process_pco_element_pap(const struct pco_element *pco_in, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - const struct pap_element *pap_in = (const struct pap_element *) pco_in->data; - uint16_t pap_in_len; - uint8_t peer_id_len; - const uint8_t *peer_id; - unsigned int pap_welcome_len; - uint8_t pap_out_size; - struct pap_element *pap_out; - - if (pco_in->length < sizeof(struct pap_element)) - goto ret_broken; - - pap_in_len = osmo_load16be(&pap_in->len); - if (pco_in->length < pap_in_len) - goto ret_broken; - /* "pco_in->length > pap_in_len" is allowed: RFC1334 2.2 states: - "Octets outside the range of the Length field should be treated as - Data Link Layer padding and should be ignored on reception." - */ - - switch (pap_in->code) { - case PAP_CODE_AUTH_REQ: - if (pap_in_len < sizeof(struct pap_element) + 1) - goto ret_broken_auth; - peer_id_len = pap_in->data[0]; - if (pap_in_len < sizeof(struct pap_element) + 1 + peer_id_len) - goto ret_broken_auth; - peer_id = &pap_in->data[1]; - LOGPPDP(LOGL_DEBUG, pdp, "PCO PAP PeerId = %s, ACKing\n", - osmo_quote_str((const char *)peer_id, peer_id_len)); - /* Password-Length + Password following here, but we don't care */ - - /* Prepare response, we ACK all of them: */ - pap_welcome_len = strlen(pap_welcome); - /* +1: Length field of pap_welcome Message */ - pap_out_size = sizeof(struct pap_element) + 1 + pap_welcome_len; - pap_out = alloca(pap_out_size); - pap_out->code = PAP_CODE_AUTH_ACK; - pap_out->id = pap_in->id; - pap_out->len = htons(pap_out_size); - pap_out->data[0] = pap_welcome_len; - memcpy(pap_out->data+1, pap_welcome, pap_welcome_len); - msgb_t16lv_put(resp, PCO_P_PAP, pap_out_size, (uint8_t *) pap_out); - break; - case PAP_CODE_AUTH_ACK: - case PAP_CODE_AUTH_NAK: - default: - LOGPPDP(LOGL_NOTICE, pdp, "Unsupported PAP PCO Code %u, ignoring\n", pap_in->code); - break; - } - return; - -ret_broken_auth: - LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP AuthenticateReq: %s, ignoring\n", - osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); - return; - -ret_broken: - LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP PCO Length: %s, ignoring\n", - osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); -} - -static void process_pco_element_ipcp(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - struct ippoolm_t *peer_v4 = pdp_get_peer_ipv(pdp, false); - const struct in46_addr *dns1 = &apn->v4.cfg.dns[0]; - const struct in46_addr *dns2 = &apn->v4.cfg.dns[1]; - uint8_t *start = resp->tail; - const struct ipcp_hdr *ipcp; - uint16_t ipcp_len; - uint8_t *len1, *len2; - unsigned int len_appended; - ptrdiff_t consumed; - size_t remain; - - if (!peer_v4) { - LOGPPDP(LOGL_ERROR, pdp, "IPCP but no IPv4 type ?!?\n"); - return; - } - - ipcp = (const struct ipcp_hdr *)pco_elem->data; - consumed = (pco_elem->data - &pdp->pco_req.v[0]); - remain = sizeof(pdp->pco_req.v) - consumed; - ipcp_len = osmo_load16be(&ipcp->len); - if (remain < 0 || remain < ipcp_len) { - LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n"); - return; - } - - /* Three byte T16L header */ - msgb_put_u16(resp, 0x8021); /* IPCP */ - len1 = msgb_put(resp, 1); /* Length of contents: delay */ - - msgb_put_u8(resp, 0x02); /* ACK */ - msgb_put_u8(resp, ipcp->id); /* ID: Needs to match request */ - msgb_put_u8(resp, 0x00); /* Length MSB */ - len2 = msgb_put(resp, 1); /* Length LSB: delay */ - - if (dns1->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_PRIMARY_DNS, 4)) { - msgb_put_u8(resp, 0x81); /* DNS1 Tag */ - msgb_put_u8(resp, 2 + dns1->len); /* DNS1 Length, incl. TL */ - msgb_put_u32(resp, ntohl(dns1->v4.s_addr)); - } - - if (dns2->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_SECONDARY_DNS, 4)) { - msgb_put_u8(resp, 0x83); /* DNS2 Tag */ - msgb_put_u8(resp, 2 + dns2->len); /* DNS2 Length, incl. TL */ - msgb_put_u32(resp, ntohl(dns2->v4.s_addr)); - } - - /* patch in length values */ - len_appended = resp->tail - start; - *len1 = len_appended - 3; - *len2 = len_appended - 3; -} - -static void process_pco_element_dns_ipv6(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - unsigned int i; - const uint8_t *tail = resp->tail; - - for (i = 0; i < ARRAY_SIZE(apn->v6.cfg.dns); i++) { - const struct in46_addr *i46a = &apn->v6.cfg.dns[i]; - if (i46a->len != 16) - continue; - msgb_t16lv_put(resp, PCO_P_DNS_IPv6_ADDR, i46a->len, i46a->v6.s6_addr); - } - if (resp->tail == tail) - LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv6 DNS, but APN has none configured\n"); -} - -static void process_pco_element_dns_ipv4(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - unsigned int i; - const uint8_t *tail = resp->tail; - - for (i = 0; i < ARRAY_SIZE(apn->v4.cfg.dns); i++) { - const struct in46_addr *i46a = &apn->v4.cfg.dns[i]; - if (i46a->len != 4) - continue; - msgb_t16lv_put(resp, PCO_P_DNS_IPv4_ADDR, i46a->len, (uint8_t *)&i46a->v4); - } - if (resp->tail == tail) - LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv4 DNS, but APN has none configured\n"); -} - -static void process_pco_element(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - uint16_t protocol_id = osmo_load16be(&pco_elem->protocol_id); - - LOGPPDP(LOGL_DEBUG, pdp, "PCO Protocol 0x%04x\n", protocol_id); - switch (protocol_id) { - case PCO_P_PAP: - process_pco_element_pap(pco_elem, resp, apn, pdp); - break; - case PCO_P_IPCP: - process_pco_element_ipcp(pco_elem, resp, apn, pdp); - break; - case PCO_P_DNS_IPv6_ADDR: - process_pco_element_dns_ipv6(pco_elem, resp, apn, pdp); - break; - case PCO_P_DNS_IPv4_ADDR: - process_pco_element_dns_ipv4(pco_elem, resp, apn, pdp); - break; - default: - LOGPPDP(LOGL_INFO, pdp, "Unknown/Unimplemented PCO Protocol 0x%04x: %s\n", - protocol_id, osmo_hexdump_nospc(pco_elem->data, pco_elem->length)); - break; - } -} - -/* process one PCO request from a MS/UE, putting together the proper responses */ -static void process_pco(const struct apn_ctx *apn, struct pdp_t *pdp) -{ - struct msgb *resp = msgb_alloc(256, "PCO.resp"); - const struct ul255_t *pco = &pdp->pco_req; - const struct pco_element *pco_elem; - const uint8_t *cur; - - /* build the header of the PCO response */ - OSMO_ASSERT(resp); - msgb_put_u8(resp, 0x80); /* ext-bit + configuration protocol byte */ - - /* iterate over the PCO elements in the request; call process_pco_element() for each */ - for (cur = pco->v + 1, pco_elem = (const struct pco_element *) cur; - cur + sizeof(struct pco_element) <= pco->v + pco->l; - cur += pco_elem->length + sizeof(*pco_elem), pco_elem = (const struct pco_element *) cur) { - process_pco_element(pco_elem, resp, apn, pdp); - } - - /* copy the PCO response msgb and copy its contents over to the PDP context */ - if (msgb_length(resp) > 1) { - memcpy(pdp->pco_neg.v, msgb_data(resp), msgb_length(resp)); - pdp->pco_neg.l = msgb_length(resp); - } else - pdp->pco_neg.l = 0; - msgb_free(resp); -} - static bool apn_supports_ipv4(const struct apn_ctx *apn) { if (apn->v4.cfg.static_prefix.addr.len || apn->v4.cfg.dynamic_prefix.addr.len) diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 09cd0f6..a37381f 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -141,3 +141,12 @@ extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); extern int apn_stop(struct apn_ctx *apn); +extern struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6); + +#define LOGPAPN(level, apn, fmt, args...) \ + LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) + +#define LOGPGGSN(level, ggsn, fmt, args...) \ + LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args) + +#define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args) diff --git a/ggsn/pco.c b/ggsn/pco.c new file mode 100644 index 0000000..a55b768 --- /dev/null +++ b/ggsn/pco.c @@ -0,0 +1,248 @@ +/* + * PCO parsing related code + * Copyright 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include +#include + +#include +#include + +#include "pco.h" +#include "ggsn.h" + +/* determine if IPCP contains given option */ +static const uint8_t *ipcp_contains_option(const struct ipcp_hdr *ipcp, size_t ipcp_len, + enum ipcp_options opt, size_t opt_minlen) +{ + const uint8_t *cur_opt = ipcp->options; + + /* iterate over Options and check if protocol contained */ + while (cur_opt + sizeof(struct ipcp_option_hdr) <= (uint8_t*)ipcp + ipcp_len) { + const struct ipcp_option_hdr *cur_opt_hdr = (const struct ipcp_option_hdr *)cur_opt; + /* length value includes 2 bytes type/length */ + if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr)) + return NULL; + if (cur_opt_hdr->type == opt && + cur_opt_hdr->len >= sizeof(struct ipcp_option_hdr) + opt_minlen) + return cur_opt; + cur_opt += cur_opt_hdr->len; + } + return NULL; +} + + +static const char *pap_welcome = "Welcome to OsmoGGSN " PACKAGE_VERSION; + +/* Handle PAP protocol according to RFC 1334 */ +static void process_pco_element_pap(const struct pco_element *pco_in, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + const struct pap_element *pap_in = (const struct pap_element *) pco_in->data; + uint16_t pap_in_len; + uint8_t peer_id_len; + const uint8_t *peer_id; + unsigned int pap_welcome_len; + uint8_t pap_out_size; + struct pap_element *pap_out; + + if (pco_in->length < sizeof(struct pap_element)) + goto ret_broken; + + pap_in_len = osmo_load16be(&pap_in->len); + if (pco_in->length < pap_in_len) + goto ret_broken; + /* "pco_in->length > pap_in_len" is allowed: RFC1334 2.2 states: + "Octets outside the range of the Length field should be treated as + Data Link Layer padding and should be ignored on reception." + */ + + switch (pap_in->code) { + case PAP_CODE_AUTH_REQ: + if (pap_in_len < sizeof(struct pap_element) + 1) + goto ret_broken_auth; + peer_id_len = pap_in->data[0]; + if (pap_in_len < sizeof(struct pap_element) + 1 + peer_id_len) + goto ret_broken_auth; + peer_id = &pap_in->data[1]; + LOGPPDP(LOGL_DEBUG, pdp, "PCO PAP PeerId = %s, ACKing\n", + osmo_quote_str((const char *)peer_id, peer_id_len)); + /* Password-Length + Password following here, but we don't care */ + + /* Prepare response, we ACK all of them: */ + pap_welcome_len = strlen(pap_welcome); + /* +1: Length field of pap_welcome Message */ + pap_out_size = sizeof(struct pap_element) + 1 + pap_welcome_len; + pap_out = alloca(pap_out_size); + pap_out->code = PAP_CODE_AUTH_ACK; + pap_out->id = pap_in->id; + pap_out->len = htons(pap_out_size); + pap_out->data[0] = pap_welcome_len; + memcpy(pap_out->data+1, pap_welcome, pap_welcome_len); + msgb_t16lv_put(resp, PCO_P_PAP, pap_out_size, (uint8_t *) pap_out); + break; + case PAP_CODE_AUTH_ACK: + case PAP_CODE_AUTH_NAK: + default: + LOGPPDP(LOGL_NOTICE, pdp, "Unsupported PAP PCO Code %u, ignoring\n", pap_in->code); + break; + } + return; + +ret_broken_auth: + LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP AuthenticateReq: %s, ignoring\n", + osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); + return; + +ret_broken: + LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP PCO Length: %s, ignoring\n", + osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); +} + +static void process_pco_element_ipcp(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + struct ippoolm_t *peer_v4 = pdp_get_peer_ipv(pdp, false); + const struct in46_addr *dns1 = &apn->v4.cfg.dns[0]; + const struct in46_addr *dns2 = &apn->v4.cfg.dns[1]; + uint8_t *start = resp->tail; + const struct ipcp_hdr *ipcp; + uint16_t ipcp_len; + uint8_t *len1, *len2; + unsigned int len_appended; + ptrdiff_t consumed; + size_t remain; + + if (!peer_v4) { + LOGPPDP(LOGL_ERROR, pdp, "IPCP but no IPv4 type ?!?\n"); + return; + } + + ipcp = (const struct ipcp_hdr *)pco_elem->data; + consumed = (pco_elem->data - &pdp->pco_req.v[0]); + remain = sizeof(pdp->pco_req.v) - consumed; + ipcp_len = osmo_load16be(&ipcp->len); + if (remain < 0 || remain < ipcp_len) { + LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n"); + return; + } + + /* Three byte T16L header */ + msgb_put_u16(resp, 0x8021); /* IPCP */ + len1 = msgb_put(resp, 1); /* Length of contents: delay */ + + msgb_put_u8(resp, 0x02); /* ACK */ + msgb_put_u8(resp, ipcp->id); /* ID: Needs to match request */ + msgb_put_u8(resp, 0x00); /* Length MSB */ + len2 = msgb_put(resp, 1); /* Length LSB: delay */ + + if (dns1->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_PRIMARY_DNS, 4)) { + msgb_put_u8(resp, 0x81); /* DNS1 Tag */ + msgb_put_u8(resp, 2 + dns1->len); /* DNS1 Length, incl. TL */ + msgb_put_u32(resp, ntohl(dns1->v4.s_addr)); + } + + if (dns2->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_SECONDARY_DNS, 4)) { + msgb_put_u8(resp, 0x83); /* DNS2 Tag */ + msgb_put_u8(resp, 2 + dns2->len); /* DNS2 Length, incl. TL */ + msgb_put_u32(resp, ntohl(dns2->v4.s_addr)); + } + + /* patch in length values */ + len_appended = resp->tail - start; + *len1 = len_appended - 3; + *len2 = len_appended - 3; +} + +static void process_pco_element_dns_ipv6(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + unsigned int i; + const uint8_t *tail = resp->tail; + + for (i = 0; i < ARRAY_SIZE(apn->v6.cfg.dns); i++) { + const struct in46_addr *i46a = &apn->v6.cfg.dns[i]; + if (i46a->len != 16) + continue; + msgb_t16lv_put(resp, PCO_P_DNS_IPv6_ADDR, i46a->len, i46a->v6.s6_addr); + } + if (resp->tail == tail) + LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv6 DNS, but APN has none configured\n"); +} + +static void process_pco_element_dns_ipv4(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + unsigned int i; + const uint8_t *tail = resp->tail; + + for (i = 0; i < ARRAY_SIZE(apn->v4.cfg.dns); i++) { + const struct in46_addr *i46a = &apn->v4.cfg.dns[i]; + if (i46a->len != 4) + continue; + msgb_t16lv_put(resp, PCO_P_DNS_IPv4_ADDR, i46a->len, (uint8_t *)&i46a->v4); + } + if (resp->tail == tail) + LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv4 DNS, but APN has none configured\n"); +} + +static void process_pco_element(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + uint16_t protocol_id = osmo_load16be(&pco_elem->protocol_id); + + LOGPPDP(LOGL_DEBUG, pdp, "PCO Protocol 0x%04x\n", protocol_id); + switch (protocol_id) { + case PCO_P_PAP: + process_pco_element_pap(pco_elem, resp, apn, pdp); + break; + case PCO_P_IPCP: + process_pco_element_ipcp(pco_elem, resp, apn, pdp); + break; + case PCO_P_DNS_IPv6_ADDR: + process_pco_element_dns_ipv6(pco_elem, resp, apn, pdp); + break; + case PCO_P_DNS_IPv4_ADDR: + process_pco_element_dns_ipv4(pco_elem, resp, apn, pdp); + break; + default: + LOGPPDP(LOGL_INFO, pdp, "Unknown/Unimplemented PCO Protocol 0x%04x: %s\n", + protocol_id, osmo_hexdump_nospc(pco_elem->data, pco_elem->length)); + break; + } +} + +/* process one PCO request from a MS/UE, putting together the proper responses */ +void process_pco(const struct apn_ctx *apn, struct pdp_t *pdp) +{ + struct msgb *resp = msgb_alloc(256, "PCO.resp"); + const struct ul255_t *pco = &pdp->pco_req; + const struct pco_element *pco_elem; + const uint8_t *cur; + + /* build the header of the PCO response */ + OSMO_ASSERT(resp); + msgb_put_u8(resp, 0x80); /* ext-bit + configuration protocol byte */ + + /* iterate over the PCO elements in the request; call process_pco_element() for each */ + for (cur = pco->v + 1, pco_elem = (const struct pco_element *) cur; + cur + sizeof(struct pco_element) <= pco->v + pco->l; + cur += pco_elem->length + sizeof(*pco_elem), pco_elem = (const struct pco_element *) cur) { + process_pco_element(pco_elem, resp, apn, pdp); + } + + /* copy the PCO response msgb and copy its contents over to the PDP context */ + if (msgb_length(resp) > 1) { + memcpy(pdp->pco_neg.v, msgb_data(resp), msgb_length(resp)); + pdp->pco_neg.l = msgb_length(resp); + } else + pdp->pco_neg.l = 0; + msgb_free(resp); +} diff --git a/ggsn/pco.h b/ggsn/pco.h new file mode 100644 index 0000000..7ebe05a --- /dev/null +++ b/ggsn/pco.h @@ -0,0 +1,81 @@ +#pragma once + +#include + +#include "../gtp/pdp.h" + +/* 3GPP TS 24.008 10.6.5.3 */ +enum pco_protocols { + PCO_P_LCP = 0xC021, + PCO_P_PAP = 0xC023, + PCO_P_CHAP = 0xC223, + PCO_P_IPCP = 0x8021, + PCO_P_PCSCF_ADDR = 0x0001, + PCO_P_IM_CN_SS_F = 0x0002, + PCO_P_DNS_IPv6_ADDR = 0x0003, + PCO_P_POLICY_CTRL_REJ = 0x0004, /* only in Network->MS */ + PCO_P_MS_SUP_NETREQ_BCI = 0x0005, + /* reserved */ + PCO_P_DSMIPv6_HA_ADDR = 0x0007, + PCO_P_DSMIPv6_HN_PREF = 0x0008, + PCO_P_DSMIPv6_v4_HA_ADDR= 0x0009, + PCO_P_IP_ADDR_VIA_NAS = 0x000a, /* only MS->Network */ + PCO_P_IPv4_ADDR_VIA_DHCP= 0x000b, /* only MS->Netowrk */ + PCO_P_PCSCF_IPv4_ADDR = 0x000c, + PCO_P_DNS_IPv4_ADDR = 0x000d, + PCO_P_MSISDN = 0x000e, + PCO_P_IFOM_SUPPORT = 0x000f, + PCO_P_IPv4_LINK_MTU = 0x0010, + PCO_P_MS_SUPP_LOC_A_TFT = 0x0011, + PCO_P_PCSCF_RESEL_SUP = 0x0012, /* only MS->Network */ + PCO_P_NBIFOM_REQ = 0x0013, + PCO_P_NBIFOM_MODE = 0x0014, + PCO_P_NONIP_LINK_MTU = 0x0015, + PCO_P_APN_RATE_CTRL_SUP = 0x0016, + PCO_P_PS_DATA_OFF_UE = 0x0017, + PCO_P_REL_DATA_SVC = 0x0018, +}; + +struct pco_element { + uint16_t protocol_id; /* network byte order */ + uint8_t length; /* length of data below */ + uint8_t data[0]; +} __attribute__((packed)); + + +/* RFC 1332 */ +enum ipcp_options { + IPCP_OPT_IPADDR = 3, + IPCP_OPT_PRIMARY_DNS = 129, + IPCP_OPT_SECONDARY_DNS = 131, +}; + +struct ipcp_option_hdr { + uint8_t type; + uint8_t len; + uint8_t data[0]; +} __attribute__ ((packed)); + +struct ipcp_hdr { + uint8_t code; + uint8_t id; + uint16_t len; + uint8_t options[0]; +} __attribute__ ((packed)); + +/* RFC 1334, section 3.2. Packet Format */ +struct pap_element { + uint8_t code; + uint8_t id; + uint16_t len; /* length including header */ + uint8_t data[0]; +} __attribute__((packed)); + +enum pap_code { + PAP_CODE_AUTH_REQ = 1, + PAP_CODE_AUTH_ACK = 2, + PAP_CODE_AUTH_NAK = 3, +}; + +struct apn_ctx; +void process_pco(const struct apn_ctx *apn, struct pdp_t *pdp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:31:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:31:47 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... in46_addr: Improve in46a_ntop documentation Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 --- M lib/in46_addr.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/47/15247/1 diff --git a/lib/in46_addr.c b/lib/in46_addr.c index f4bb8a2..98f83ed 100644 --- a/lib/in46_addr.c +++ b/lib/in46_addr.c @@ -60,7 +60,11 @@ return 0; } -/*! Convenience wrapper around inet_ntop() for \ref in46_addr */ +/*! Convenience wrapper around inet_ntop() for in46_addr. + * \param[in] in the in46_addr to print + * \param[out] dst destination buffer where string representation of the address is stored + * \param[out] dst_size size dst. Usually it should be at least INET6_ADDRSTRLEN. + * \return address of dston success, NULL on error */ const char *in46a_ntop(const struct in46_addr *in, char *dst, socklen_t dst_size) { int af; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:31:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:31:47 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 Change subject: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas in46a_from_eua() API documentation clearly states an array of 2 items should be passed as pointer, but show_one_pdp() was passing only one, which would end up in out-of-bounds writes on v4v6 EUAs. Let's better use ippool to print allocated ip addresses instead of parsing EUAs we sent some point in the past. Related OS#4154 Change-Id: Ia34939957bb7856388cb52a741cec0c015a08c70 --- M ggsn/ggsn_vty.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/48/15248/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index eb7cca7..0a86f49 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -734,7 +734,7 @@ static void show_one_pdp(struct vty *vty, struct pdp_t *pdp) { - struct in46_addr eua46; + struct ippoolm_t *peer; char name_buf[256]; char *apn_name; int rc; @@ -757,8 +757,12 @@ apn_name = osmo_apn_to_str(name_buf, pdp->apn_use.v, pdp->apn_use.l); vty_out(vty, " APN in use: %s%s", apn_name ? name_buf : "(NONE)", VTY_NEWLINE); - in46a_from_eua(&pdp->eua, &eua46); - vty_out(vty, " End-User Address: %s%s", in46a_ntoa(&eua46), VTY_NEWLINE); + if ((peer = pdp_get_peer_ipv(pdp, false))) + vty_out(vty, " End-User Address (IPv4): %s%s", + in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); + if ((peer = pdp_get_peer_ipv(pdp, true))) + vty_out(vty, " End-User Address (IPv6): %s%s", + in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); vty_out(vty, " Transmit GTP Sequence Number for G-PDU: %s%s", pdp->tx_gpdu_seq ? "Yes" : "No", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia34939957bb7856388cb52a741cec0c015a08c70 Gerrit-Change-Number: 15248 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:33:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:33:05 +0000 Subject: Change in ...libosmocore[master]: vty: Register logp cmd next to logging commands In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15244 ) Change subject: vty: Register logp cmd next to logging commands ...................................................................... vty: Register logp cmd next to logging commands This way it's easier by osmo_verify_transcript_vty.py to skip and avoid breaking existent test in osmo-hlr. Fixes: d0b3b9edac978c91bf84aa2537aa24426685b1fb Change-Id: Iab9423661e4f4eefca2e3d02b60a43f913ed92a3 --- M src/vty/logging_vty.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 243d6eb..d639a8f 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -1061,12 +1061,13 @@ install_element_ve(&deprecated_logging_level_everything_cmd); install_element_ve(&deprecated_logging_level_all_cmd); install_element_ve(&deprecated_logging_level_all_everything_cmd); - install_element_ve(&show_logging_vty_cmd); - install_element_ve(&show_alarms_cmd); gen_vty_logp_cmd_strs(&vty_logp_cmd); install_element_ve(&vty_logp_cmd); + install_element_ve(&show_logging_vty_cmd); + install_element_ve(&show_alarms_cmd); + install_node(&cfg_log_node, config_write_log); install_element(CFG_LOG_NODE, &logging_fltr_all_cmd); install_element(CFG_LOG_NODE, &logging_use_clr_cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab9423661e4f4eefca2e3d02b60a43f913ed92a3 Gerrit-Change-Number: 15244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:34:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:34:31 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce and use log macros when no mm ctx available In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 ) Change subject: Introduce and use log macros when no mm ctx available ...................................................................... Introduce and use log macros when no mm ctx available Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 --- M include/osmocom/sgsn/gprs_llc.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_llc.c 4 files changed, 46 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 8a0b9ef..ce0e63c 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -96,6 +96,7 @@ GPRS_LLMS_UNASSIGNED = 1, /* No TLLI yet */ GPRS_LLMS_ASSIGNED = 2, /* TLLI assigned */ }; +extern const struct value_string gprs_llc_llme_state_names[]; /* Section 8.9.9 LLC layer parameter default values */ struct gprs_llc_params { diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 10455d6..9753ea2 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -262,6 +262,28 @@ LOGP(DMM, level, "MM(%s/%08x) " fmt, (mm) ? (mm)->imsi : "---", \ (mm) ? (mm)->p_tmsi : GSM_RESERVED_TMSI, ## args) +#ifdef BUILD_IU +#define LOGIUP(ue, level, fmt, args...) \ + LOGP(DMM, level, "UE(0x%x){%s} " fmt, ue->conn_id, osmo_rai_name(&(ue)->ra_id), ## args) +#else +#define LOGIUP(ue, level, fmt, args...) \ + LOGP(DMM, level, "UE(%p){NOTSUPPORTED} " fmt, ue, ## args) +#endif + +#define LOGGBP(llme, level, fmt, args...) \ + LOGP(DMM, level, "LLME(%08x/%08x){%s} " fmt, (llme)->old_tlli, \ + (llme)->tlli, get_value_string_or_null(gprs_llc_llme_state_names, (llme)->state), ## args); + +#define LOGGBIUP(llme, msg, level, fmt, args...) \ + do { \ + struct ranap_ue_conn_ctx * _ue; \ + if (llme) { \ + LOGGBP(llme, level, fmt, ## args); \ + } else if ((msg) && (_ue = MSG_IU_UE_CTX(msg))) { \ + LOGIUP(_ue, level, fmt, ## args); \ + } else { OSMO_ASSERT(0); } \ + } while (0) + /* look-up a SGSN MM context based on TLLI + RAI */ struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli(uint32_t tlli, const struct gprs_ra_id *raid); diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 6c87032..2f27182 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -186,7 +186,7 @@ #define REQUIRE_MM \ if (!mm) { \ - LOGP(DRANAP, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \ + LOGIUP(ctx, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \ return rc; \ } @@ -202,8 +202,7 @@ if (mm) LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); else - LOGMMCTXP(LOGL_INFO, mm, "IU release for UE conn 0x%x\n", - ctx->conn_id); + LOGIUP(ctx, LOGL_INFO, "IU release\n"); if (mm && mm->pmm_state == PMM_CONNECTED) mmctx_set_pmm_state(mm, PMM_IDLE); rc = 0; @@ -220,7 +219,10 @@ osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Unknown event received: %i\n", type); + if (mm) + LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type); + else + LOGIUP(ctx, LOGL_NOTICE, "Unknown event received: %i\n", type); rc = -1; break; } @@ -630,7 +632,7 @@ /* 3GPP TS 24.008 ? 10.5.5.19: */ rc = osmo_get_rand_id(&rbyte, 1); if (rc < 0) { - LOGP(DMM, LOGL_ERROR, "osmo_get_rand_id() failed for A&C ref: %s\n", strerror(-rc)); + LOGMMCTXP(LOGL_ERROR, mm, "osmo_get_rand_id() failed for A&C ref: %s\n", strerror(-rc)); return rc; } @@ -1659,7 +1661,7 @@ upd_type = *cur++ & 0x07; rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_REQUEST]); - LOGP(DMM, LOGL_INFO, "-> GMM RA UPDATE REQUEST type=\"%s\"\n", + LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM RA UPDATE REQUEST type=\"%s\"\n", get_value_string(gprs_upd_t_strs, upd_type)); /* Old routing area identification 10.5.5.15 */ @@ -1669,7 +1671,7 @@ /* MS Radio Access Capability 10.5.5.12a */ ms_ra_acc_cap_len = *cur++; if (ms_ra_acc_cap_len > 52) { - LOGP(DMM, LOGL_ERROR, + LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS Radio Access Capability too long" " (ms_ra_acc_cap_len = %u > 52)\n", ms_ra_acc_cap_len); reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; @@ -1685,7 +1687,7 @@ switch (upd_type) { case GPRS_UPD_T_RA_LA: case GPRS_UPD_T_RA_LA_IMSI_ATT: - LOGP(DMM, LOGL_NOTICE, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type); + LOGMMCTXP(LOGL_NOTICE, mmctx, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type); reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; goto rejected; case GPRS_UPD_T_RA: @@ -1722,7 +1724,8 @@ mmctx = sgsn_mm_ctx_by_ptmsi(tmsi); } #else - LOGP(DMM, LOGL_ERROR, "Rejecting GMM RA Update Request: No Iu support\n"); + LOGIUP(MSG_IU_UE_CTX(msg), LOGL_ERROR, + "Rejecting GMM RA Update Request: No Iu support\n"); goto rejected; #endif } @@ -1758,13 +1761,13 @@ if (llme) { /* send a XID reset to re-set all LLC sequence numbers * in the MS */ - LOGMMCTXP(LOGL_NOTICE, mmctx, "LLC XID RESET\n"); + LOGGBP(llme, LOGL_NOTICE, "LLC XID RESET\n"); gprs_llgmm_reset(llme); } /* The MS has to perform GPRS attach */ /* Device is still IMSI attached for CS but initiate GPRS ATTACH, * see GSM 04.08, 4.7.5.1.4 and G.6 */ - LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS should GMM Attach first\n"); + LOGGBIUP(llme, msg, LOGL_ERROR, "Rejecting GMM RA Update Request: MS should GMM Attach first\n"); reject_cause = GMM_CAUSE_IMPL_DETACHED; goto rejected; } @@ -1986,7 +1989,7 @@ if (llme && !mmctx && gh->msg_type != GSM48_MT_GMM_ATTACH_REQ && gh->msg_type != GSM48_MT_GMM_RA_UPD_REQ) { - LOGP(DMM, LOGL_NOTICE, "Cannot handle GMM for unknown MM CTX\n"); + LOGGBP(llme, LOGL_NOTICE, "Cannot handle GMM for unknown MM CTX\n"); /* 4.7.10 */ if (gh->msg_type == GSM48_MT_GMM_STATUS) { /* TLLI unassignment */ @@ -2168,7 +2171,7 @@ return rc; null_mmctx: - LOGP(DMM, LOGL_ERROR, + LOGGBIUP(llme, msg, LOGL_ERROR, "Received GSM 04.08 message type 0x%02x," " but no MM context available\n", gh->msg_type); @@ -2842,7 +2845,7 @@ /* MMCTX can be NULL when called */ if (!mmctx) { - LOGP(DMM, LOGL_NOTICE, "Cannot handle SM for unknown MM CTX\n"); + LOGGBIUP(llme, msg, LOGL_NOTICE, "Cannot handle SM for unknown MM CTX\n"); /* 6.1.3.6 */ if (gh->msg_type == GSM48_MT_GSM_STATUS) return 0; diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c index a301a63..2a27da8 100644 --- a/src/gprs/gprs_llc.c +++ b/src/gprs/gprs_llc.c @@ -41,6 +41,12 @@ #include #include +const struct value_string gprs_llc_llme_state_names[] = { + { GPRS_LLMS_UNASSIGNED, "UNASSIGNED" }, + { GPRS_LLMS_ASSIGNED, "ASSIGNED" }, + { 0, NULL } +}; + static struct gprs_llc_llme *llme_alloc(uint32_t tlli); static int gprs_llc_tx_xid(struct gprs_llc_lle *lle, struct msgb *msg, int command); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 Gerrit-Change-Number: 15211 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:34:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:34:30 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 ) Change subject: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type ...................................................................... gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type For new readers it's very confusing why PMM states and MM states are in the same enum, but handled with different functions, and sometimes called one right after the other with different enums. Calling them when on a different ran_type makes the function early return, so let's better conditionally call the function to make it clear in the flow when the function is expected to do something. Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 --- M src/gprs/gprs_gmm.c 1 file changed, 27 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 95a1842..6c87032 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -138,8 +138,7 @@ static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { - if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) - return; + OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); if (ctx->pmm_state == state) return; @@ -164,8 +163,7 @@ static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { - if (ctx->ran_type != MM_CTX_T_GERAN_Gb) - return; + OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb); if (ctx->pmm_state == state) return; @@ -326,8 +324,15 @@ /* Mark MM state as deregistered */ ctx->gmm_state = GMM_DEREGISTERED; - mmctx_set_pmm_state(ctx, PMM_DETACHED); - mmctx_set_mm_state(ctx, MM_IDLE); + + switch(ctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(ctx, PMM_DETACHED); + break; + case MM_CTX_T_GERAN_Gb: + mmctx_set_mm_state(ctx, MM_IDLE); + break; + } sgsn_mm_ctx_cleanup_free(ctx); } @@ -2078,16 +2083,20 @@ mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; mmctx->pending_req = 0; - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + mmctx->gmm_state = GMM_REGISTERED_NORMAL; + switch(mmctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + break; + case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llme_copy_key(mmctx, mmctx->gb.llme); gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); + mmctx_set_mm_state(mmctx, MM_READY); + break; } - mmctx->gmm_state = GMM_REGISTERED_NORMAL; - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); - mmctx_set_mm_state(mmctx, MM_READY); rc = 0; osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 0); @@ -2104,15 +2113,19 @@ mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; mmctx->pending_req = 0; - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + mmctx->gmm_state = GMM_REGISTERED_NORMAL; + switch(mmctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + break; + case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); + mmctx_set_mm_state(mmctx, MM_READY); + break; } - mmctx->gmm_state = GMM_REGISTERED_NORMAL; - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); - mmctx_set_mm_state(mmctx, MM_READY); rc = 0; memset(&sig_data, 0, sizeof(sig_data)); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73 Gerrit-Change-Number: 15186 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:34:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:34:31 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm: Avoid spaces in fsm events and enum strings In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 ) Change subject: gprs_gmm: Avoid spaces in fsm events and enum strings ...................................................................... gprs_gmm: Avoid spaces in fsm events and enum strings FSM doesn't expect receiving event names containing spaces (log lines generated are confusing). Similar for enums, it's better using code names to match easily and make log lines more clear. Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 --- M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c 2 files changed, 17 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 2f27182..b8b0116 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -107,12 +107,12 @@ }; static const struct value_string gprs_pmm_state_names[] = { - { PMM_DETACHED, "PMM DETACH" }, - { PMM_CONNECTED, "PMM CONNECTED" }, - { PMM_IDLE, "PMM IDLE" }, - { MM_IDLE, "MM IDLE" }, - { MM_READY, "MM READY" }, - { MM_STANDBY, "MM STANDBY" }, + OSMO_VALUE_STRING(PMM_DETACHED), + OSMO_VALUE_STRING(PMM_CONNECTED), + OSMO_VALUE_STRING(PMM_IDLE), + OSMO_VALUE_STRING(MM_IDLE), + OSMO_VALUE_STRING(MM_READY), + OSMO_VALUE_STRING(MM_STANDBY), { 0, NULL } }; diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 1ab11f7..2217b0a 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -316,17 +316,17 @@ }; const struct value_string gmm_attach_req_fsm_event_names[] = { - { E_ATTACH_REQ_RECV, "Received an attach request" }, - { E_IDEN_RESP_RECV, "Identity Request received" }, - { E_AUTH_RESP_RECV_SUCCESS, "Authentication Response received" }, - { E_AUTH_RESP_RECV_RESYNC, "Authentication Failure with resync received" }, - { E_ATTACH_ACCEPTED, "Attach accepted" }, - { E_ATTACH_ACCEPT_SENT, "Attach accept sent" }, - { E_ATTACH_COMPLETE_RECV, "Attach complete received." }, - { E_IU_SECURITY_CMD_COMPLETE, "IU Security Command Complete received." }, - { E_REJECT, "Reject the MS"}, - { E_VLR_ANSWERED, "VLR answered"}, - { 0, NULL } + OSMO_VALUE_STRING(E_ATTACH_REQ_RECV), + OSMO_VALUE_STRING(E_IDEN_RESP_RECV), + OSMO_VALUE_STRING(E_AUTH_RESP_RECV_SUCCESS), + OSMO_VALUE_STRING(E_AUTH_RESP_RECV_RESYNC), + OSMO_VALUE_STRING(E_ATTACH_ACCEPTED), + OSMO_VALUE_STRING(E_ATTACH_ACCEPT_SENT), + OSMO_VALUE_STRING(E_ATTACH_COMPLETE_RECV), + OSMO_VALUE_STRING(E_IU_SECURITY_CMD_COMPLETE), + OSMO_VALUE_STRING(E_REJECT), + OSMO_VALUE_STRING(E_VLR_ANSWERED), + { 0, NULL } }; void gmm_attach_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16ede8bf8352b09bc772fd7b43fad2c2274b3ec1 Gerrit-Change-Number: 15212 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:34:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:34:32 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Verify that timers can be set over VTY In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 ) Change subject: tests: Verify that timers can be set over VTY ...................................................................... tests: Verify that timers can be set over VTY Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 --- M tests/vty_test_runner.py 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 73dd399..19eaf28 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -266,6 +266,15 @@ self.assert_(res.find(" cdr interval 900") > 0) self.assertEquals(res.find(" cdr interval 600"), -1) + def testVtyTimers(self): + self.vty.enable() + self.assertTrue(self.vty.verify('configure terminal', [''])) + self.assertEquals(self.vty.node(), 'config') + self.assertTrue(self.vty.verify('sgsn', [''])) + self.assertEquals(self.vty.node(), 'config-sgsn') + + for t in [3312, 3322, 3350, 3360, 3370, 3313, 3314, 3316, 3385, 3395, 3397]: + self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) def add_gbproxy_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-gbproxy")): -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I486fc2a56e235a539836894d2042c1ca6e514ab9 Gerrit-Change-Number: 15213 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:48:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 10:48:58 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 2: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/15214/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15214/2//COMMIT_MSG at 8 PS2, Line 8: How about mentioning the new VTY commands here? https://gerrit.osmocom.org/#/c/15214/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15214/2/src/gprs/gprs_gmm.c at 2287 PS2, Line 2287: empty line at start of function https://gerrit.osmocom.org/#/c/15214/2/src/gprs/gprs_gmm.c at 2291 PS2, Line 2291: unrelated change -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 10:48:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 10:53:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 10:53:38 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Split application lifecycle related code into ggsn_main.c Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 Change subject: ggsn: Split application lifecycle related code into ggsn_main.c ...................................................................... ggsn: Split application lifecycle related code into ggsn_main.c This way we further shrink ggsn.c and leave there GGSN related code. Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/ggsn_main.c 4 files changed, 212 insertions(+), 176 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/49/15249/1 diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index 022cdef..a8ddf1e 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -12,4 +12,4 @@ endif osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h +osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 7832338..d519621 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -42,22 +42,8 @@ #include #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "../lib/tun.h" @@ -71,19 +57,9 @@ #include "pco.h" #include "ggsn.h" -void *tall_ggsn_ctx; - -static int end = 0; -static int daemonize = 0; -static struct ctrl_handle *g_ctrlh; - -struct ul255_t qos; -struct ul255_t apn; - static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what); static int cb_tun_ind(struct tun_t *tun, void *pack, unsigned len); - static void pool_close_all_pdp(struct ippool_t *pool) { unsigned int i; @@ -690,8 +666,6 @@ return tun_encaps((struct tun_t *)pdp->ipif, pack, len); } -static char *config_file = "osmo-ggsn.cfg"; - /* callback for tun device osmocom select loop integration */ static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what) { @@ -749,29 +723,6 @@ ggsn_gtp_tmr_start(ggsn); } -/* To exit gracefully. Used with GCC compilation flag -pg and gprof */ -static void signal_handler(int s) -{ - LOGP(DGGSN, LOGL_NOTICE, "signal %d received\n", s); - switch (s) { - case SIGINT: - case SIGTERM: - LOGP(DGGSN, LOGL_NOTICE, "SIGINT received, shutting down\n"); - end = 1; - break; - case SIGABRT: - case SIGUSR1: - talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_ggsn_ctx, stderr); - break; - case SIGUSR2: - talloc_report_full(tall_vty_ctx, stderr); - break; - default: - break; - } -} - /* libgtp callback for confirmations */ static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp) { @@ -882,128 +833,3 @@ ggsn->started = false; return 0; } - -static void print_usage() -{ - printf("Usage: osmo-ggsn [-h] [-D] [-c configfile] [-V]\n"); -} - -static void print_help() -{ - printf( " Some useful help...\n" - " -h --help This help text\n" - " -D --daemonize Fork the process into a background daemon\n" - " -c --config-file filename The config file to use\n" - " -V --version Print the version of OsmoGGSN\n" - ); -} - -static void handle_options(int argc, char **argv) -{ - while (1) { - int option_index = 0, c; - static struct option long_options[] = { - { "help", 0, 0, 'h' }, - { "daemonize", 0, 0, 'D' }, - { "config-file", 1, 0, 'c' }, - { "version", 0, 0, 'V' }, - { 0, 0, 0, 0 } - }; - - c = getopt_long(argc, argv, "hdc:V", long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 'h': - print_usage(); - print_help(); - exit(0); - case 'D': - daemonize = 1; - break; - case 'c': - config_file = optarg; - break; - case 'V': - print_version(1); - exit(0); - break; - } - } -} - -int main(int argc, char **argv) -{ - struct ggsn_ctx *ggsn; - int rc; - - tall_ggsn_ctx = talloc_named_const(NULL, 0, "OsmoGGSN"); - msgb_talloc_ctx_init(tall_ggsn_ctx, 0); - g_vty_info.tall_ctx = tall_ggsn_ctx; - - /* Handle keyboard interrupt SIGINT */ - signal(SIGINT, &signal_handler); - signal(SIGTERM, &signal_handler); - signal(SIGABRT, &signal_handler); - signal(SIGUSR1, &signal_handler); - signal(SIGUSR2, &signal_handler); - - osmo_init_ignore_signals(); - osmo_init_logging2(tall_ggsn_ctx, &log_info); - osmo_stats_init(tall_ggsn_ctx); - - vty_init(&g_vty_info); - logging_vty_add_cmds(); - osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(); - ggsn_vty_init(); - ctrl_vty_init(tall_ggsn_ctx); - - handle_options(argc, argv); - - rate_ctr_init(tall_ggsn_ctx); - - rc = vty_read_config_file(config_file, NULL); - if (rc < 0) { - fprintf(stderr, "Failed to open config file: '%s'\n", config_file); - exit(2); - } - - rc = telnet_init_dynif(tall_ggsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_GGSN); - if (rc < 0) - exit(1); - - g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_GGSN, NULL); - if (!g_ctrlh) { - LOGP(DGGSN, LOGL_ERROR, "Failed to create CTRL interface.\n"); - exit(1); - } - - if (daemonize) { - rc = osmo_daemonize(); - if (rc < 0) { - perror("Error during daemonize"); - exit(1); - } - } - -#if 0 - /* qos */ - qos.l = 3; - qos.v[2] = (args_info.qos_arg) & 0xff; - qos.v[1] = ((args_info.qos_arg) >> 8) & 0xff; - qos.v[0] = ((args_info.qos_arg) >> 16) & 0xff; -#endif - - /* Main select loop */ - while (!end) { - osmo_select_main(0); - } - - llist_for_each_entry(ggsn, &g_ggsn_list, list) - ggsn_stop(ggsn); - - return 0; -} diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index a37381f..1bd067e 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "../lib/tun.h" #include "../lib/ippool.h" @@ -135,8 +136,11 @@ struct apn_ctx *ggsn_find_apn(struct ggsn_ctx *ggsn, const char *name); struct apn_ctx *ggsn_find_or_create_apn(struct ggsn_ctx *ggsn, const char *name); -/* ggsn.c */ +/* ggsn_main.c */ +extern struct ctrl_handle *g_ctrlh; extern void *tall_ggsn_ctx; + +/* ggsn.c */ extern int ggsn_start(struct ggsn_ctx *ggsn); extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); diff --git a/ggsn/ggsn_main.c b/ggsn/ggsn_main.c new file mode 100644 index 0000000..797b101 --- /dev/null +++ b/ggsn/ggsn_main.c @@ -0,0 +1,206 @@ +/* + * OsmoGGSN - Gateway GPRS Support Node + * Copyright 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include "../config.h" + +#ifdef HAVE_STDINT_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ggsn.h" + +void *tall_ggsn_ctx; + +static int end = 0; +static int daemonize = 0; +struct ctrl_handle *g_ctrlh; + +struct ul255_t qos; +struct ul255_t apn; + +static char *config_file = "osmo-ggsn.cfg"; + +/* To exit gracefully. Used with GCC compilation flag -pg and gprof */ +static void signal_handler(int s) +{ + LOGP(DGGSN, LOGL_NOTICE, "signal %d received\n", s); + switch (s) { + case SIGINT: + case SIGTERM: + LOGP(DGGSN, LOGL_NOTICE, "SIGINT received, shutting down\n"); + end = 1; + break; + case SIGABRT: + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_ggsn_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static void print_usage() +{ + printf("Usage: osmo-ggsn [-h] [-D] [-c configfile] [-V]\n"); +} + +static void print_help() +{ + printf( " Some useful help...\n" + " -h --help This help text\n" + " -D --daemonize Fork the process into a background daemon\n" + " -c --config-file filename The config file to use\n" + " -V --version Print the version of OsmoGGSN\n" + ); +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "version", 0, 0, 'V' }, + { 0, 0, 0, 0 } + }; + + c = getopt_long(argc, argv, "hdc:V", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 'D': + daemonize = 1; + break; + case 'c': + config_file = optarg; + break; + case 'V': + print_version(1); + exit(0); + break; + } + } +} + +int main(int argc, char **argv) +{ + struct ggsn_ctx *ggsn; + int rc; + + tall_ggsn_ctx = talloc_named_const(NULL, 0, "OsmoGGSN"); + msgb_talloc_ctx_init(tall_ggsn_ctx, 0); + g_vty_info.tall_ctx = tall_ggsn_ctx; + + /* Handle keyboard interrupt SIGINT */ + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + + osmo_init_ignore_signals(); + osmo_init_logging2(tall_ggsn_ctx, &log_info); + osmo_stats_init(tall_ggsn_ctx); + + vty_init(&g_vty_info); + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_stats_vty_add_cmds(); + ggsn_vty_init(); + ctrl_vty_init(tall_ggsn_ctx); + + handle_options(argc, argv); + + rate_ctr_init(tall_ggsn_ctx); + + rc = vty_read_config_file(config_file, NULL); + if (rc < 0) { + fprintf(stderr, "Failed to open config file: '%s'\n", config_file); + exit(2); + } + + rc = telnet_init_dynif(tall_ggsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_GGSN); + if (rc < 0) + exit(1); + + g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), + OSMO_CTRL_PORT_GGSN, NULL); + if (!g_ctrlh) { + LOGP(DGGSN, LOGL_ERROR, "Failed to create CTRL interface.\n"); + exit(1); + } + + if (daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + exit(1); + } + } + +#if 0 + /* qos */ + qos.l = 3; + qos.v[2] = (args_info.qos_arg) & 0xff; + qos.v[1] = ((args_info.qos_arg) >> 8) & 0xff; + qos.v[0] = ((args_info.qos_arg) >> 16) & 0xff; +#endif + + /* Main select loop */ + while (!end) { + osmo_select_main(0); + } + + llist_for_each_entry(ggsn, &g_ggsn_list, list) + ggsn_stop(ggsn); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 Gerrit-Change-Number: 15249 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 11:07:02 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 11:07:02 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... Patch Set 2: Code-Review-1 (4 comments) -1 because of missing breaks https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c at 150 PS2, Line 150: mmctx_set_mm_state(mm, MM_STANDBY); missing "break" https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c at 153 PS2, Line 153: get_value_string(gprs_pmm_state_names, mm->pmm_state)); missing "break" https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c at 169 PS2, Line 169: T, mm->gb.state_T); Is it intentional, that the timer gets re-scheduled below even if the error message was written? If so, maybe it makes sense to mention this in the message, reading it now makes it seem like it does not change the timer, because it is already active. https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c at 3076 PS2, Line 3076: gsm0408_gprs_notify_pdu_gb(mmctx); why is this not part of the above "if (mmctx)"? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 11:07:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 11:28:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 11:28:22 +0000 Subject: Change in ...osmo-ggsn[master]: Move pdp_get_peer_ipv() to lib/util.* Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 Change subject: Move pdp_get_peer_ipv() to lib/util.* ...................................................................... Move pdp_get_peer_ipv() to lib/util.* Preparation for next commit, where this function will be needed inside libmisc (lib/*). Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 --- M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c M ggsn/pco.c M lib/Makefile.am A lib/util.c A lib/util.h 7 files changed, 60 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/50/15250/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index d519621..35f2527 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -51,6 +51,7 @@ #include "../lib/syserr.h" #include "../lib/in46_addr.h" #include "../lib/gtp-kernel.h" +#include "../lib/util.h" #include "../gtp/pdp.h" #include "../gtp/gtp.h" #include "icmpv6.h" @@ -365,26 +366,6 @@ return 0; } -/*! Get the peer of pdp based on IP version used. - * \param[in] pdp PDP context to select the peer from. - * \param[in] v4v6 IP version to select. Valid values are 4 and 6. - * \returns The selected peer matching the given IP version. NULL if not present. - */ -struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { - uint8_t i; - - for (i = 0; i < 2; i++) { - struct ippoolm_t * ippool = pdp->peer[i]; - if (!ippool) - continue; - if (is_ipv6 && in46a_is_v6(&ippool->addr)) - return ippool; - else if (!is_ipv6 && in46a_is_v4(&ippool->addr)) - return ippool; - } - return NULL; -} - static bool apn_supports_ipv4(const struct apn_ctx *apn) { if (apn->v4.cfg.static_prefix.addr.len || apn->v4.cfg.dynamic_prefix.addr.len) diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 1bd067e..88fd8b9 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -145,7 +145,6 @@ extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); extern int apn_stop(struct apn_ctx *apn); -extern struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6); #define LOGPAPN(level, apn, fmt, args...) \ LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 0a86f49..b85df77 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -37,6 +37,8 @@ #include "../gtp/gtp.h" #include "../gtp/pdp.h" +#include "../lib/util.h" + #include "ggsn.h" #define PREFIX_STR "Prefix (Network/Netmask)\n" diff --git a/ggsn/pco.c b/ggsn/pco.c index a55b768..a495e86 100644 --- a/ggsn/pco.c +++ b/ggsn/pco.c @@ -15,6 +15,8 @@ #include #include +#include "../lib/util.h" + #include "pco.h" #include "ggsn.h" diff --git a/lib/Makefile.am b/lib/Makefile.am index b6e7aba..533d777 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,10 +1,10 @@ noinst_LIBRARIES = libmisc.a -noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h +noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h util.h AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) -libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c +libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c util.c if ENABLE_GTP_KERNEL AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) diff --git a/lib/util.c b/lib/util.c new file mode 100644 index 0000000..6bb0d85 --- /dev/null +++ b/lib/util.c @@ -0,0 +1,35 @@ +/* + * misc helpers + * Copyright 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include "../gtp/pdp.h" + +#include "ippool.h" +#include "in46_addr.h" + +/*! Get the peer of pdp based on IP version used. +* \param[in] pdp PDP context to select the peer from. +* \param[in] v4v6 IP version to select. Valid values are 4 and 6. +* \returns The selected peer matching the given IP version. NULL if not present. +*/ +struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { + uint8_t i; + + for (i = 0; i < 2; i++) { + struct ippoolm_t * ippool = pdp->peer[i]; + if (!ippool) + continue; + if (is_ipv6 && in46a_is_v6(&ippool->addr)) + return ippool; + else if (!is_ipv6 && in46a_is_v4(&ippool->addr)) + return ippool; + } + return NULL; +} diff --git a/lib/util.h b/lib/util.h new file mode 100644 index 0000000..bc9674d --- /dev/null +++ b/lib/util.h @@ -0,0 +1,18 @@ +#pragma once +/* + * misc helpers + * Copyright 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include + +struct ippoolm_t; +struct pdp_t; + +struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 Gerrit-Change-Number: 15250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 11:28:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 11:28:22 +0000 Subject: Change in ...osmo-ggsn[master]: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 Change subject: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas in46a_from_eua() API documentation clearly states an array of 2 items should be passed as pointer, but show_one_pdp() was passing only one, which would end up in out-of-bounds writes on v4v6 EUAs. Let's better use ippool to print allocated ip addresses instead of parsing EUAs we sent some point in the past. Change-Id: I7e164f40f50de43027bcd4464aa879450d2fb10e --- M lib/gtp-kernel.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/51/15251/1 diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index 48811bc..f6df408 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -26,6 +26,8 @@ #include "../lib/tun.h" #include "../lib/syserr.h" +#include "../lib/util.h" +#include "../lib/ippool.h" #include "../gtp/pdp.h" #include "../gtp/gtp.h" @@ -37,16 +39,23 @@ static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp) { - struct in46_addr ia46; + char buf4[INET_ADDRSTRLEN], buf6[INET6_ADDRSTRLEN]; + struct ippoolm_t *peer; struct in_addr ia; - in46a_from_eua(&pdp->eua, &ia46); + buf4[0] = '\0'; + if ((peer = pdp_get_peer_ipv(pdp, false))) + in46a_ntop(&peer->addr, buf4, sizeof(buf4)); + buf6[0] = '\0'; + if ((peer = pdp_get_peer_ipv(pdp, true))) + in46a_ntop(&peer->addr, buf6, sizeof(buf6)); + gsna2in_addr(&ia, &pdp->gsnrc); - LOGPDPX(DGGSN, LOGL_DEBUG, pdp, "%s %s v%u TEID %"PRIx64" EUA=%s SGSN=%s\n", prefix, + LOGPDPX(DGGSN, LOGL_DEBUG, pdp, "%s %s v%u TEID %"PRIx64" EUA=(%s,%s) SGSN=%s\n", prefix, devname, pdp->version, pdp->version == 0 ? pdp_gettid(pdp->imsi, pdp->nsapi) : pdp->teid_gn, - in46a_ntoa(&ia46), inet_ntoa(ia)); + buf4, buf6, inet_ntoa(ia)); } static struct { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7e164f40f50de43027bcd4464aa879450d2fb10e Gerrit-Change-Number: 15251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 11:43:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 11:43:44 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce LOGTUN log helper Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 Change subject: Introduce LOGTUN log helper ...................................................................... Introduce LOGTUN log helper Change-Id: I237acdee0be19498804e0d509c610f4e0454ba72 --- M ggsn/ggsn.c M ggsn/ggsn.h 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/52/15252/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 35f2527..a8c9847 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -556,7 +556,7 @@ pool = apn->v6.pool; break; default: - LOGP(DTUN, LOGL_NOTICE, "non-IPv%u packet received from tun\n", iph->version); + LOGTUN(LOGL_NOTICE, tun, "non-IPv%u packet received\n", iph->version); return -1; } @@ -564,15 +564,15 @@ if (!pool) return 0; - DEBUGP(DTUN, "Received packet for APN(%s) from tun %s", apn->cfg.name, tun->devname); - if (ippool_getip(pool, &ipm, &dst)) { - DEBUGPC(DTUN, " with no PDP contex! (%s)\n", iph->version == 4 ? + LOGTUN(LOGL_DEBUG, tun, "Received packet for APN(%s) with no PDP contex! (%s)\n", + apn->cfg.name, + iph->version == 4 ? inet_ntop(AF_INET, &iph->saddr, straddr, sizeof(straddr)) : inet_ntop(AF_INET6, &ip6h->ip6_src, straddr, sizeof(straddr))); return 0; } - DEBUGPC(DTUN, "\n"); + LOGTUN(LOGL_DEBUG, tun, "Received packet for APN(%s)\n", apn->cfg.name); if (ipm->peer) /* Check if a peer protocol is defined */ gtp_data_req(apn->ggsn->gsn, (struct pdp_t *)ipm->peer, pack, len); diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 88fd8b9..6155b30 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -153,3 +153,6 @@ LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args) #define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args) + +#define LOGTUN(level, tun, fmt, args...) \ + LOGP(DTUN, level, "TUN(%s): " fmt, (tun)->devname, ## args) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I237acdee0be19498804e0d509c610f4e0454ba72 Gerrit-Change-Number: 15252 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 12:25:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 12:25:32 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 Change subject: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs ...................................................................... ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs Fixes potential duplicates when calling following VTY cmd: show pdp-context ggsn NAME show pdp-context ggsn NAME apn APN Related: OS#4154 Change-Id: I98db39a710a72a1438d71aabaf4f8227984643e3 --- M ggsn/ggsn_vty.c 1 file changed, 24 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/53/15253/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index b85df77..a649173 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -734,13 +734,22 @@ return in46a_ntoa(&in46); } -static void show_one_pdp(struct vty *vty, struct pdp_t *pdp) +/* Useful for v4v6 APNs, where we first iterate over v4 pool and then over v6 + pool. param v4only can be used to avoid printing duplicates for pdp context + containing both IPv4 and IPv6 addresses. */ +static void show_one_pdp_v4only(struct vty *vty, struct pdp_t *pdp, bool v4only) { - struct ippoolm_t *peer; + struct ippoolm_t *peer4, *peer6; char name_buf[256]; char *apn_name; int rc; + peer4 = pdp_get_peer_ipv(pdp, false); + peer6 = pdp_get_peer_ipv(pdp, true); + + if (v4only && peer6) + return; + /* Attempt to decode MSISDN */ rc = gsm48_decode_bcd_number2(name_buf, sizeof(name_buf), pdp->msisdn.v, pdp->msisdn.l, 0); @@ -759,16 +768,21 @@ apn_name = osmo_apn_to_str(name_buf, pdp->apn_use.v, pdp->apn_use.l); vty_out(vty, " APN in use: %s%s", apn_name ? name_buf : "(NONE)", VTY_NEWLINE); - if ((peer = pdp_get_peer_ipv(pdp, false))) + if (peer4) vty_out(vty, " End-User Address (IPv4): %s%s", - in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); - if ((peer = pdp_get_peer_ipv(pdp, true))) + in46a_ntop(&peer4->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); + if (peer6) vty_out(vty, " End-User Address (IPv6): %s%s", - in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); + in46a_ntop(&peer6->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); vty_out(vty, " Transmit GTP Sequence Number for G-PDU: %s%s", pdp->tx_gpdu_seq ? "Yes" : "No", VTY_NEWLINE); } +static void show_one_pdp(struct vty *vty, struct pdp_t *pdp) +{ + show_one_pdp_v4only(vty, pdp, false); +} + DEFUN(show_pdpctx_imsi, show_pdpctx_imsi_cmd, "show pdp-context ggsn NAME imsi IMSI [<0-15>]", SHOW_STR "Display information on PDP Context\n" @@ -853,7 +867,7 @@ } /* show all (active) PDP contexts within a pool */ -static void ippool_show_pdp_contexts(struct vty *vty, struct ippool_t *pool) +static void ippool_show_pdp_contexts(struct vty *vty, struct ippool_t *pool, bool pdp_v4only) { unsigned int i; @@ -864,15 +878,15 @@ struct ippoolm_t *member = &pool->member[i]; if (member->inuse == 0) continue; - show_one_pdp(vty, member->peer); + show_one_pdp_v4only(vty, member->peer, pdp_v4only); } } /* show all (active) PDP contexts within an APN */ static void apn_show_pdp_contexts(struct vty *vty, struct apn_ctx *apn) { - ippool_show_pdp_contexts(vty, apn->v4.pool); - ippool_show_pdp_contexts(vty, apn->v6.pool); + ippool_show_pdp_contexts(vty, apn->v4.pool, true); + ippool_show_pdp_contexts(vty, apn->v6.pool, false); } DEFUN(show_pdpctx, show_pdpctx_cmd, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I98db39a710a72a1438d71aabaf4f8227984643e3 Gerrit-Change-Number: 15253 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 13:29:20 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 13:29:20 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: f_ipa_unknown_unit_id: use different id Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 Change subject: bsc: f_ipa_unknown_unit_id: use different id ...................................................................... bsc: f_ipa_unknown_unit_id: use different id Change the unit_id value, that is supposed to be unknown at BTS, from 0/0/0 to 42/0/0 to make TC_oml_unknown_unit_id pass again. The test was failing, because a new bts that matches 0/0/0 was added to osmo-bsc.cfg in [1], [2] and [3]. [1] Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc [2] I1c57a04747f5ec004ccf4657954dcb0b003c24fc (docker-playground) [3] I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: I585ff825c7b6bca17e5c6fb6d670a649965a1653 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/15254/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 2bc1c62..e25bf7f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1670,7 +1670,7 @@ bts[0].rsl.vc_IPA := IPA_Emulation_CT.create(bts[0].rsl.id & "-IPA"); bts[0].rsl.ccm_pars := c_IPA_default_ccm_pars; bts[0].rsl.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator"; - bts[0].rsl.ccm_pars.unit_id := "0/0/0"; /* value which is unknown at BTS */ + bts[0].rsl.ccm_pars.unit_id := "99/0/0"; /* value which is unknown at BTS */ f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 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: I585ff825c7b6bca17e5c6fb6d670a649965a1653 Gerrit-Change-Number: 15254 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 13:29:48 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 13:29:48 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: f_ipa_unknown_unit_id: use different id In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 ) Change subject: bsc: f_ipa_unknown_unit_id: use different id ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 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: I585ff825c7b6bca17e5c6fb6d670a649965a1653 Gerrit-Change-Number: 15254 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 13:29:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 13:30:55 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 13:30:55 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: f_ipa_unknown_unit_id: use different id In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 to look at the new patch set (#2). Change subject: bsc: f_ipa_unknown_unit_id: use different id ...................................................................... bsc: f_ipa_unknown_unit_id: use different id Change the unit_id value, that is supposed to be unknown at BTS, from 0/0/0 to 99/0/0 to make TC_oml_unknown_unit_id pass again. The test was failing, because a new bts that matches 0/0/0 was added to osmo-bsc.cfg in [1], [2] and [3]. [1] Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc [2] I1c57a04747f5ec004ccf4657954dcb0b003c24fc (docker-playground) [3] I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: I585ff825c7b6bca17e5c6fb6d670a649965a1653 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/15254/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 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: I585ff825c7b6bca17e5c6fb6d670a649965a1653 Gerrit-Change-Number: 15254 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 14:31:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Aug 2019 14:31:29 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15243 ) Change subject: mgcp_send(): stop looping on conversion error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 14:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 15:10:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 15:10:57 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: f_ipa_unknown_unit_id: use different id In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 ) Change subject: bsc: f_ipa_unknown_unit_id: use different id ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 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: I585ff825c7b6bca17e5c6fb6d670a649965a1653 Gerrit-Change-Number: 15254 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 15:10:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 15:30:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 15:30:05 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/12009/2/src/gprs/gprs_gmm.c at 169 PS2, Line 169: T, mm->gb.state_T); > Is it intentional, that the timer gets re-scheduled below even if the error message was written? If [?] I'd say that's pretty standard warning regarding timers of this kind. It's simply a way of logging showing some state transition probably not expected (but if it happens it should be clarified). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 20 Aug 2019 15:30:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 15:30:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 15:30:49 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: Hello fixeria, neels, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 to look at the new patch set (#3). Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Replace own timer infra with libosmocore osmo_tdef VTY command "show timer" is also available now. Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c M src/gprs/sgsn_vty.c 4 files changed, 125 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/15214/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 15:30:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 15:30:49 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#3) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY When a MS MM state is READY its exact location is known (PCU). On Gb, T3314 (aka TS 23.060 "READY timer") sets the MM state from READY to STANDBY, where only the RA is known. Introduce a second set of timer variables, because state timer can run while another packet state timer is timing out. Related: OS#1941 Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c M tests/test_nodes.vty 5 files changed, 98 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/09/12009/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 15:48:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 15:48:50 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: Hello fixeria, neels, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 to look at the new patch set (#4). Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Replace own timer infra with libosmocore osmo_tdef VTY command "show timer" is also available now. Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c M src/gprs/sgsn_vty.c M tests/sgsn/sgsn_test.c 5 files changed, 132 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/15214/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 17:11:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 17:11:57 +0000 Subject: Change in ...osmo-ggsn[master]: pdp: constify param in pdp_count_secondary() Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 Change subject: pdp: constify param in pdp_count_secondary() ...................................................................... pdp: constify param in pdp_count_secondary() Change-Id: Ie772f2c54264c8bc91f50d9030479861dd8868b7 --- M gtp/pdp.c M gtp/pdp.h 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/55/15255/1 diff --git a/gtp/pdp.c b/gtp/pdp.c index d745916..6ecf48c 100644 --- a/gtp/pdp.c +++ b/gtp/pdp.c @@ -348,7 +348,7 @@ /* Count amount of secondary PDP contexts linked to this primary PDP context * (itself included). Must be called on a primary PDP context. */ -unsigned int pdp_count_secondary(struct pdp_t *pdp) +unsigned int pdp_count_secondary(const struct pdp_t *pdp) { unsigned int n; unsigned int count = 0; diff --git a/gtp/pdp.h b/gtp/pdp.h index d64d394..b95dc7f 100644 --- a/gtp/pdp.h +++ b/gtp/pdp.h @@ -260,7 +260,7 @@ uint64_t pdp_gettid(uint64_t imsi, uint8_t nsapi); void pdp_set_imsi_nsapi(struct pdp_t *pdp, uint64_t teid); -unsigned int pdp_count_secondary(struct pdp_t *pdp); +unsigned int pdp_count_secondary(const struct pdp_t *pdp); /* Deprecated APIs (support for only 1 GSN per process). Must be used only after first call to gtp_new() and until it is freed. */ int pdp_init(struct gsn_t *gsn); /* Use only allowed inside libgtp to keep compatiblity with deprecated APIs defined here. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie772f2c54264c8bc91f50d9030479861dd8868b7 Gerrit-Change-Number: 15255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 20 17:11:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 20 Aug 2019 17:11:57 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... ggsn_vty.c: Improve output of VTY show pdp-context Related: OS#4154 Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 --- M ggsn/ggsn_vty.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/56/15256/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index a649173..5684f5a 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -757,6 +757,20 @@ vty_out(vty, "IMSI: %s, NSAPI: %u, MSISDN: %s%s", imsi_gtp2str(&pdp->imsi), pdp->nsapi, rc ? "(NONE)" : name_buf, VTY_NEWLINE); + vty_out(vty, " Version: %d", pdp->version); + if (pdp->version == 1) { + if (!pdp->secondary) { + vty_out(vty, ", Primary, Num Secondaries: %d%s%s", + pdp_count_secondary(pdp) - 1, /* primary included in count */ + pdp->nodata ? ", No User Plane": "", + VTY_NEWLINE); + } else { + vty_out(vty, ", Secondary%s", VTY_NEWLINE); + } + } else { + vty_out(vty, "%s", VTY_NEWLINE); + } + vty_out(vty, " Control: %s:%08x ", print_gsnaddr(&pdp->gsnlc), pdp->teic_own); vty_out(vty, "<-> %s:%08x%s", print_gsnaddr(&pdp->gsnrc), pdp->teic_gn, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 21 01:36:30 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 01:36:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5d5ca02d1ea62_57a92abb14d2e5fc2962a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_9.0/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 232s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/osmocom-cbs.msc [ 232s] asciidoc: cell-broadcast.adoc: line 46: reading: /usr/src/packages/BUILD/common/chapters/osmocom-cbs.msc [ 232s] asciidoc: cell-broadcast.adoc: line 45: evaluating: {counter2:target-number} [ 232s] asciidoc: cell-broadcast.adoc: line 45: evaluating: {set2:target:test-usermanual__54.png} [ 232s] asciidoc: osmocom-cbs.msc: line 12: filtering: "/usr/bin/python" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__54.png" -Tpng - [ 232s] [ 232s] ../build/Makefile.asciidoc.inc:61: recipe for target 'test-usermanual.pdf' failed [ 232s] make[3]: *** [test-usermanual.pdf] Error 1 [ 232s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 232s] Makefile:438: recipe for target 'all-recursive' failed [ 232s] make[2]: *** [all-recursive] Error 1 [ 232s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 232s] Makefile:362: recipe for target 'all' failed [ 232s] make[1]: *** [all] Error 2 [ 232s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 232s] dh_auto_build: make -j1 returned exit code 2 [ 232s] debian/rules:5: recipe for target 'binary' failed [ 232s] make: *** [binary] Error 2 [ 232s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 232s] [ 232s] lamb09 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Wed Aug 21 01:36:15 UTC 2019. [ 232s] [ 232s] ### VM INTERACTION START ### [ 235s] [ 220.323603] sysrq: SysRq : Power Off [ 235s] [ 220.328820] reboot: Power down [ 235s] ### VM INTERACTION END ### [ 235s] [ 235s] lamb09 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Wed Aug 21 01:36:19 UTC 2019. [ 235s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 21 03:29:27 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 21 Aug 2019 03:29:27 +0000 Subject: Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15161 ) Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE connections ...................................................................... Patch Set 6: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b Gerrit-Change-Number: 15161 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 03:29:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 21 03:32:46 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 03:32:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5cbb7c17ce_57a92abb14d2e5fc313949@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 296s] ar: `u' modifier ignored since `D' is the default (see `U') [ 296s] libtool: link: ranlib .libs/libtransceiver_common.a [ 297s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 297s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 297s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 297s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 297s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 297s] collect2: error: ld returned 1 exit status [ 297s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 297s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 297s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 297s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 297s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 297s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 297s] make[1]: *** [Makefile:444: all] Error 2 [ 297s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 297s] dh_auto_build: make -j1 returned exit code 2 [ 297s] make: *** [debian/rules:6: build] Error 255 [ 297s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 297s] [ 297s] sheep81 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 03:32:27 UTC 2019. [ 297s] [ 297s] ### VM INTERACTION START ### [ 300s] [ 287.939136] sysrq: SysRq : Power Off [ 300s] [ 287.946051] reboot: Power down [ 300s] ### VM INTERACTION END ### [ 300s] [ 300s] sheep81 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 03:32:31 UTC 2019. [ 300s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 21 05:53:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 05:53:06 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: f_ipa_unknown_unit_id: use different id In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 ) Change subject: bsc: f_ipa_unknown_unit_id: use different id ...................................................................... Patch Set 2: Merging with only one review, as this is a trivial patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 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: I585ff825c7b6bca17e5c6fb6d670a649965a1653 Gerrit-Change-Number: 15254 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 05:53:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 05:53:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 05:53:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bsc: f_ipa_unknown_unit_id: use different id In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 ) Change subject: bsc: f_ipa_unknown_unit_id: use different id ...................................................................... bsc: f_ipa_unknown_unit_id: use different id Change the unit_id value, that is supposed to be unknown at BTS, from 0/0/0 to 99/0/0 to make TC_oml_unknown_unit_id pass again. The test was failing, because a new bts that matches 0/0/0 was added to osmo-bsc.cfg in [1], [2] and [3]. [1] Ia4ba0e75abd3d45a3422b2525e5f938cdc5a04cc [2] I1c57a04747f5ec004ccf4657954dcb0b003c24fc (docker-playground) [3] I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: I585ff825c7b6bca17e5c6fb6d670a649965a1653 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 2bc1c62..e25bf7f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1670,7 +1670,7 @@ bts[0].rsl.vc_IPA := IPA_Emulation_CT.create(bts[0].rsl.id & "-IPA"); bts[0].rsl.ccm_pars := c_IPA_default_ccm_pars; bts[0].rsl.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator"; - bts[0].rsl.ccm_pars.unit_id := "0/0/0"; /* value which is unknown at BTS */ + bts[0].rsl.ccm_pars.unit_id := "99/0/0"; /* value which is unknown at BTS */ f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15254 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: I585ff825c7b6bca17e5c6fb6d670a649965a1653 Gerrit-Change-Number: 15254 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 05:58:32 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 05:58:32 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 05:58:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 06:00:59 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 06:00:59 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 06:00:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 21 07:18:12 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 07:18:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5cf0387c917_57a92abb14d2e5fc34993d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 495s] ar: `u' modifier ignored since `D' is the default (see `U') [ 495s] libtool: link: ranlib .libs/libtransceiver_common.a [ 495s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 495s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 495s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 496s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 496s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 496s] collect2: error: ld returned 1 exit status [ 496s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 496s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 496s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 496s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 496s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 496s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 496s] make[1]: *** [Makefile:444: all] Error 2 [ 496s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 496s] dh_auto_build: make -j1 returned exit code 2 [ 496s] make: *** [debian/rules:6: build] Error 255 [ 496s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 496s] [ 496s] lamb62 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 07:17:59 UTC 2019. [ 496s] [ 496s] ### VM INTERACTION START ### [ 499s] [ 477.666698] sysrq: SysRq : Power Off [ 499s] [ 477.684788] reboot: Power down [ 499s] ### VM INTERACTION END ### [ 499s] [ 499s] lamb62 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 07:18:02 UTC 2019. [ 499s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 21 07:30:46 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 07:30:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5cf3416e429_57a92abb14d2e5fc3542bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 649s] ar: `u' modifier ignored since `D' is the default (see `U') [ 649s] libtool: link: ranlib .libs/libtransceiver_common.a [ 649s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 649s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 649s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 650s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 650s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 650s] collect2: error: ld returned 1 exit status [ 650s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 650s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 650s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 650s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 650s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 650s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 650s] make[1]: *** [Makefile:444: all] Error 2 [ 650s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 650s] dh_auto_build: make -j1 returned exit code 2 [ 650s] make: *** [debian/rules:6: build] Error 255 [ 650s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 650s] [ 650s] lamb51 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 07:30:34 UTC 2019. [ 650s] [ 650s] ### VM INTERACTION START ### [ 653s] [ 588.211715] sysrq: SysRq : Power Off [ 653s] [ 588.218246] reboot: Power down [ 653s] ### VM INTERACTION END ### [ 653s] [ 653s] lamb51 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 07:30:37 UTC 2019. [ 653s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 21 07:39:20 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 07:39:20 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5cf54033f0a_57a92abb14d2e5fc3570b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 833s] ar: `u' modifier ignored since `D' is the default (see `U') [ 833s] libtool: link: ranlib .libs/libtransceiver_common.a [ 833s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 833s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 834s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 834s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 834s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 834s] collect2: error: ld returned 1 exit status [ 834s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 834s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 834s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 834s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 834s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 834s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 834s] make[1]: *** [Makefile:444: all] Error 2 [ 834s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 834s] dh_auto_build: make -j1 returned exit code 2 [ 834s] make: *** [debian/rules:6: build] Error 255 [ 834s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 834s] [ 834s] lamb62 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 07:39:11 UTC 2019. [ 834s] [ 834s] ### VM INTERACTION START ### [ 837s] [ 815.362399] sysrq: SysRq : Power Off [ 837s] [ 815.396635] reboot: Power down [ 837s] ### VM INTERACTION END ### [ 837s] [ 837s] lamb62 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 07:39:15 UTC 2019. [ 837s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 21 08:03:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 08:03:13 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 08:03:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:02:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:02:52 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 1: Does warn checking (if warns are found) mean job will fail? Why do we have it disabled by default but we seem to enable it everywhere here? Or it's because we don't enable it in OBS? I lack some explanation regarding those matters. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 09:02:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:06:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:06:27 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Patch Set 4: Code-Review+2 +2, it was already reviewed by more people before last fixup changes -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 09:06:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:07:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:07:39 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... Patch Set 4: Code-Review+2 +2, re-adding the vote from laforge after including the missing breaks catched by osmith. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 09:07:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:07:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:07:45 +0000 Subject: Change in ...osmo-sgsn[master]: Replace own timer infra with libosmocore osmo_tdef In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 ) Change subject: Replace own timer infra with libosmocore osmo_tdef ...................................................................... Replace own timer infra with libosmocore osmo_tdef VTY command "show timer" is also available now. Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c M src/gprs/sgsn_vty.c M tests/sgsn/sgsn_test.c 5 files changed, 132 insertions(+), 126 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 0a6ea29..6e4f5ca 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -86,20 +86,8 @@ /* CDR configuration */ struct sgsn_cdr cdr; - struct { - int T3312; - int T3322; - int T3350; - int T3360; - int T3370; - int T3313; - int T3314; - int T3316; - int T3385; - int T3386; - int T3395; - int T3397; - } timers; + /* Timer defintions */ + struct osmo_tdef *T_defs; int dynamic_lookup; diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index b8b0116..db8defc 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -235,12 +236,15 @@ static void mmctx_timer_cb(void *_mm); -static void mmctx_timer_start(struct sgsn_mm_ctx *mm, unsigned int T, - unsigned int seconds) +static void mmctx_timer_start(struct sgsn_mm_ctx *mm, unsigned int T) { + unsigned long seconds; if (osmo_timer_pending(&mm->timer)) LOGMMCTXP(LOGL_ERROR, mm, "Starting MM timer %u while old " "timer %u pending\n", T, mm->T); + + seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1); + mm->T = T; mm->num_T_exp = 0; @@ -259,7 +263,11 @@ time_t gprs_max_time_to_idle(void) { - return sgsn->cfg.timers.T3314 + (sgsn->cfg.timers.T3312 + 4 * 60); + unsigned long T3314, T3312; + + T3314 = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + T3312 = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); + return T3314 + (T3312 + 4 * 60); } /* Send a message through the underlying layer. @@ -449,6 +457,7 @@ struct gsm48_hdr *gh; struct gsm48_attach_ack *aa; uint8_t *mid; + unsigned long t; #if 0 uint8_t *ptsig; #endif @@ -465,7 +474,8 @@ aa = (struct gsm48_attach_ack *) msgb_put(msg, sizeof(*aa)); aa->force_stby = 0; /* not indicated */ aa->att_result = 1; /* GPRS only */ - aa->ra_upd_timer = gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3312); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); + aa->ra_upd_timer = gprs_secs_to_tmr_floor(t); aa->radio_prio = 4; /* lowest */ gsm48_encode_ra(&aa->ra_id, &mm->ra); @@ -482,8 +492,8 @@ * (fixed 44s, default value, GSM 04.08, table 11.4a) to safely limit * the inactivity time READY->STANDBY. */ - msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, - gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3314)); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, gprs_secs_to_tmr_floor(t)); #ifdef PTMSI_ALLOC /* Optional: Allocated P-TMSI */ @@ -1019,12 +1029,12 @@ /* Request IMSI and IMEI from the MS if they are unknown */ if (!strlen(ctx->imei)) { ctx->t3370_id_type = GSM_MI_TYPE_IMEI; - mmctx_timer_start(ctx, 3370, sgsn->cfg.timers.T3370); + mmctx_timer_start(ctx, 3370); return gsm48_tx_gmm_id_req(ctx, GSM_MI_TYPE_IMEI); } if (!strlen(ctx->imsi)) { ctx->t3370_id_type = GSM_MI_TYPE_IMSI; - mmctx_timer_start(ctx, 3370, sgsn->cfg.timers.T3370); + mmctx_timer_start(ctx, 3370); return gsm48_tx_gmm_id_req(ctx, GSM_MI_TYPE_IMSI); } @@ -1047,7 +1057,7 @@ && !sgsn_mm_ctx_is_authenticated(ctx)) { struct gsm_auth_tuple *at = &ctx->auth_triplet; - mmctx_timer_start(ctx, 3360, sgsn->cfg.timers.T3360); + mmctx_timer_start(ctx, 3360); return gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, false); } @@ -1086,7 +1096,7 @@ extract_subscr_hlr(ctx); #ifdef PTMSI_ALLOC /* Start T3350 and re-transmit up to 5 times until ATTACH COMPLETE */ - mmctx_timer_start(ctx, 3350, sgsn->cfg.timers.T3350); + mmctx_timer_start(ctx, 3350); ctx->t3350_mode = GMM_T3350_MODE_ATT; #else memset(&sig_data, 0, sizeof(sig_data)); @@ -1534,6 +1544,7 @@ struct gsm48_hdr *gh; struct gsm48_ra_upd_ack *rua; uint8_t *mid; + unsigned long t; rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_ACKED]); LOGMMCTXP(LOGL_INFO, mm, "<- ROUTING AREA UPDATE ACCEPT\n"); @@ -1547,7 +1558,8 @@ rua = (struct gsm48_ra_upd_ack *) msgb_put(msg, sizeof(*rua)); rua->force_stby = 0; /* not indicated */ rua->upd_result = 0; /* RA updated */ - rua->ra_upd_timer = gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3312); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); + rua->ra_upd_timer = gprs_secs_to_tmr_floor(t); gsm48_encode_ra(&rua->ra_id, &mm->ra); @@ -1568,8 +1580,8 @@ #endif /* Optional: Negotiated READY timer value */ - msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, - gprs_secs_to_tmr_floor(sgsn->cfg.timers.T3314)); + t = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, gprs_secs_to_tmr_floor(t)); /* Option: MS ID, ... */ return gsm48_gmm_sendmsg(msg, 0, mm, true); @@ -1793,7 +1805,7 @@ /* Start T3350 and re-transmit up to 5 times until ATTACH COMPLETE */ mmctx->t3350_mode = GMM_T3350_MODE_RAU; - mmctx_timer_start(mmctx, 3350, sgsn->cfg.timers.T3350); + mmctx_timer_start(mmctx, 3350); #else /* Make sure we are NORMAL (i.e. not SUSPENDED anymore) */ mmctx->gmm_state = GMM_REGISTERED_NORMAL; @@ -2183,6 +2195,7 @@ struct sgsn_mm_ctx *mm = _mm; struct gsm_auth_tuple *at; int rc; + unsigned long seconds; mm->num_T_exp++; @@ -2210,7 +2223,8 @@ "T3350 mode wasn't set, ignoring timeout\n"); break; } - osmo_timer_schedule(&mm->timer, sgsn->cfg.timers.T3350, 0); + seconds = osmo_tdef_get(sgsn->cfg.T_defs, 3350, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->timer, seconds, 0); break; case 3360: /* waiting for AUTH AND CIPH RESP */ if (mm->num_T_exp >= 5) { @@ -2228,10 +2242,12 @@ at = &mm->auth_triplet; rc = gsm48_tx_gmm_auth_ciph_req(mm, &at->vec, at->key_seq, false); - if (rc < 0) + if (rc < 0) { LOGMMCTXP(LOGL_ERROR, mm, "failed sending Auth. & Ciph. Request: %s \n", strerror(-rc)); - else - osmo_timer_schedule(&mm->timer, sgsn->cfg.timers.T3360, 0); + } else { + seconds = osmo_tdef_get(sgsn->cfg.T_defs, 3360, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->timer, seconds, 0); + } break; case 3370: /* waiting for IDENTITY RESPONSE */ if (mm->num_T_exp >= 5) { @@ -2242,7 +2258,8 @@ } /* re-tranmit IDENTITY REQUEST and re-start timer */ gsm48_tx_gmm_id_req(mm, mm->t3370_id_type); - osmo_timer_schedule(&mm->timer, sgsn->cfg.timers.T3370, 0); + seconds = osmo_tdef_get(sgsn->cfg.T_defs, 3370, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->timer, seconds, 0); break; default: LOGMMCTXP(LOGL_ERROR, mm, "timer expired in unknown mode %u\n", @@ -2255,16 +2272,17 @@ static void pdpctx_timer_cb(void *_mm); -static void pdpctx_timer_rearm(struct sgsn_pdp_ctx *pdp, unsigned int T, unsigned int seconds) +static void pdpctx_timer_rearm(struct sgsn_pdp_ctx *pdp, unsigned int T) { + unsigned long seconds; if (osmo_timer_pending(&pdp->timer)) LOGPDPCTXP(LOGL_ERROR, pdp, "Scheduling PDP timer %u while old " "timer %u pending\n", T, pdp->T); + seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1); osmo_timer_schedule(&pdp->timer, seconds, 0); } -static void pdpctx_timer_start(struct sgsn_pdp_ctx *pdp, unsigned int T, - unsigned int seconds) +static void pdpctx_timer_start(struct sgsn_pdp_ctx *pdp, unsigned int T) { if (osmo_timer_pending(&pdp->timer)) LOGPDPCTXP(LOGL_ERROR, pdp, "Starting PDP timer %u while old " @@ -2273,7 +2291,7 @@ pdp->num_T_exp = 0; osmo_timer_setup(&pdp->timer, pdpctx_timer_cb, pdp); - pdpctx_timer_rearm(pdp, pdp->T, seconds); + pdpctx_timer_rearm(pdp, pdp->T); } static void pdpctx_timer_stop(struct sgsn_pdp_ctx *pdp, unsigned int T) @@ -2410,7 +2428,7 @@ } int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause, bool teardown) { - pdpctx_timer_start(pdp, 3395, sgsn->cfg.timers.T3395); + pdpctx_timer_start(pdp, 3395); return _gsm48_tx_gsm_deact_pdp_req(pdp->mm, pdp->ti, sm_cause, teardown); } @@ -2826,7 +2844,7 @@ break; } _gsm48_tx_gsm_deact_pdp_req(pdp->mm, pdp->ti, GSM_CAUSE_NET_FAIL, true); - pdpctx_timer_rearm(pdp, 3395, sgsn->cfg.timers.T3395); + pdpctx_timer_rearm(pdp, 3395); break; default: LOGPDPCTXP(LOGL_ERROR, pdp, "timer expired in unknown mode %u\n", diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 2217b0a..130f8d1 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -1,3 +1,5 @@ +#include + #include #include @@ -10,6 +12,18 @@ static int require_identity_imei = 1; static int require_auth = 1; +static const struct osmo_tdef_state_timeout gmm_attach_fsm_timeouts[32] = { + [ST_IDENTIY] = { .T=3370 }, + [ST_AUTH] = { .T=3360 }, + [ST_ACCEPT] = { .T=3350 }, + [ST_ASK_VLR] = { .T=3350 }, + [ST_IU_SECURITY_CMD] = { .T=3350 }, +}; + +#define gmm_attach_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, gmm_attach_fsm_timeouts, sgsn->cfg.T_defs, -1) + + static void st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct sgsn_mm_ctx *ctx = fi->priv; @@ -33,14 +47,14 @@ if (require_identity_imei) { ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMEI; - osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + gmm_attach_fsm_state_chg(fi, ST_IDENTIY); } else if (!strlen(ctx->imsi)) { ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMSI; - osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + gmm_attach_fsm_state_chg(fi, ST_IDENTIY); } else if (require_auth) - osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + gmm_attach_fsm_state_chg(fi, ST_AUTH); else - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); } static void st_identity_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -94,11 +108,11 @@ if (type == GSM_MI_TYPE_IMEI && !strlen(ctx->imsi)) { ctx->gmm_att_req.id_type = GSM_MI_TYPE_IMSI; - osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + gmm_attach_fsm_state_chg(fi, ST_IDENTIY); } else if (require_auth) - osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + gmm_attach_fsm_state_chg(fi, ST_AUTH); else - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); } static void st_auth_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -124,19 +138,19 @@ switch(auth_state) { case SGSN_AUTH_UMTS_RESYNC: /* ask the vlr for a new vector to match the simcards seq */ case SGSN_AUTH_UNKNOWN: /* the SGSN doesn know this MS */ - osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ASK_VLR); break; case SGSN_AUTH_REJECTED: /* TODO: correct GMM cause */ osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_GPRS_NOTALLOWED); break; case SGSN_AUTH_ACCEPTED: - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); break; case SGSN_AUTH_AUTHENTICATE: if (ctx->auth_triplet.key_seq == GSM_KEY_SEQ_INVAL) { /* invalid key material */ - osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ASK_VLR); } struct gsm_auth_tuple *at = &ctx->auth_triplet; @@ -159,14 +173,14 @@ sgsn_auth_request(ctx); #ifdef BUILD_IU if (ctx->ran_type == MM_CTX_T_UTRAN_Iu && !ctx->iu.ue_ctx->integrity_active) - osmo_fsm_inst_state_chg(fi, ST_IU_SECURITY_CMD, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_IU_SECURITY_CMD); else #endif /* BUILD_IU */ - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); break; case E_AUTH_RESP_RECV_RESYNC: if (ctx->gmm_att_req.auth_reattempt <= 1) - osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ASK_VLR); else osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_SYNC_FAIL); break; @@ -234,7 +248,7 @@ { switch(event) { case E_VLR_ANSWERED: - osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + gmm_attach_fsm_state_chg(fi, ST_AUTH); break; } } @@ -246,7 +260,7 @@ /* TODO: shouldn't this set always? not only when the integrity_active? */ if (ctx->iu.ue_ctx->integrity_active) { - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); return; } @@ -259,7 +273,7 @@ { switch(event) { case E_IU_SECURITY_CMD_COMPLETE: - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + gmm_attach_fsm_state_chg(fi, ST_ACCEPT); break; } } @@ -373,6 +387,7 @@ { struct sgsn_mm_ctx *ctx = fi->priv; struct gsm_auth_tuple *at = &ctx->auth_triplet; + unsigned long t_secs; ctx->num_T_exp++; @@ -392,7 +407,9 @@ break; } gsm48_tx_gmm_id_req(ctx, ctx->gmm_att_req.id_type); - osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3370, 0); + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3370, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); + break; case ST_AUTH: /* T3360 */ @@ -401,7 +418,8 @@ break; } gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, false); - osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3360, 0); + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3360, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); break; case ST_ACCEPT: /* T3350 */ @@ -410,7 +428,8 @@ break; } gsm48_tx_gmm_att_ack(ctx); - osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3350, 0); + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3350, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); break; } diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index d1d53e6..ae26cbe 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -39,6 +40,7 @@ #include #include +#include #include #include #include @@ -88,39 +90,42 @@ #define GSM0408_T3395_SECS 8 /* wait for DEACT PDP CTX ACK */ #define GSM0408_T3397_SECS 8 /* wait for DEACT AA PDP CTX ACK */ -#define DECLARE_TIMER(number, doc) \ - DEFUN(cfg_sgsn_T##number, \ - cfg_sgsn_T##number##_cmd, \ - "timer t" #number " <0-65535>", \ - "Configure GPRS Timers\n" \ - doc "\nTimer Value in seconds\n") \ -{ \ - int value = atoi(argv[0]); \ - \ - if (value < 0 || value > 65535) { \ - vty_out(vty, "Timer value %s out of range.%s", \ - argv[0], VTY_NEWLINE); \ - return CMD_WARNING; \ - } \ - \ - g_cfg->timers.T##number = value; \ - return CMD_SUCCESS; \ + +static struct osmo_tdef sgsn_T_defs[] = { + { .T=3312, .default_val=GSM0408_T3312_SECS, .desc="Periodic RA Update timer (s)" }, + { .T=3313, .default_val=GSM0408_T3313_SECS, .desc="Waiting for paging response timer (s)" }, + { .T=3314, .default_val=GSM0408_T3314_SECS, .desc="Force to STANDBY on expiry timer (s)" }, + { .T=3316, .default_val=GSM0408_T3316_SECS, .desc="AA-Ready timer (s)" }, + { .T=3322, .default_val=GSM0408_T3322_SECS, .desc="Detach request -> accept timer (s)" }, + { .T=3350, .default_val=GSM0408_T3350_SECS, .desc="Waiting for ATT/RAU/TMSI_COMPL timer (s)" }, + { .T=3360, .default_val=GSM0408_T3360_SECS, .desc="Waiting for AUTH/CIPH response timer (s)" }, + { .T=3370, .default_val=GSM0408_T3370_SECS, .desc="Waiting for IDENTITY response timer (s)" }, + { .T=3385, .default_val=GSM0408_T3385_SECS, .desc="Wait for ACT PDP CTX REQ timer (s)" }, + { .T=3386, .default_val=GSM0408_T3386_SECS, .desc="Wait for MODIFY PDP CTX ACK timer (s)" }, + { .T=3395, .default_val=GSM0408_T3395_SECS, .desc="Wait for DEACT PDP CTX ACK timer (s)" }, + { .T=3397, .default_val=GSM0408_T3397_SECS, .desc="Wait for DEACT AA PDP CTX ACK timer (s)" }, + {} +}; + +DEFUN(show_timer, show_timer_cmd, + "show timer " OSMO_TDEF_VTY_ARG_T_OPTIONAL, + SHOW_STR "Show timers\n" + OSMO_TDEF_VTY_DOC_T) +{ + const char *T_arg = argc > 0 ? argv[0] : NULL; + return osmo_tdef_vty_show_cmd(vty, g_cfg->T_defs, T_arg, NULL); } -DECLARE_TIMER(3312, "Periodic RA Update timer (s)") -DECLARE_TIMER(3322, "Detach request -> accept timer (s)") -DECLARE_TIMER(3350, "Waiting for ATT/RAU/TMSI_COMPL timer (s)") -DECLARE_TIMER(3360, "Waiting for AUTH/CIPH response timer (s)") -DECLARE_TIMER(3370, "Waiting for IDENTITY response timer (s)") - -DECLARE_TIMER(3313, "Waiting for paging response timer (s)") -DECLARE_TIMER(3314, "Force to STANDBY on expiry timer (s)") -DECLARE_TIMER(3316, "AA-Ready timer (s)") - -DECLARE_TIMER(3385, "Wait for ACT PDP CTX REQ timer (s)") -DECLARE_TIMER(3386, "Wait for MODIFY PDP CTX ACK timer (s)") -DECLARE_TIMER(3395, "Wait for DEACT PDP CTX ACK timer (s)") -DECLARE_TIMER(3397, "Wait for DEACT AA PDP CTX ACK timer (s)") +DEFUN(cfg_sgsn_timer, cfg_sgsn_timer_cmd, + "timer " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, + "Configure or show timers\n" + OSMO_TDEF_VTY_DOC_SET) +{ + /* If any arguments are missing, redirect to 'show' */ + if (argc < 2) + return show_timer(self, vty, argc, argv); + return osmo_tdef_vty_set_cmd(vty, g_cfg->T_defs, argv); +} char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len) { @@ -253,18 +258,7 @@ vty_out(vty, " no cdr trap%s", VTY_NEWLINE); vty_out(vty, " cdr interval %d%s", g_cfg->cdr.interval, VTY_NEWLINE); - vty_out(vty, " timer t3312 %d%s", g_cfg->timers.T3312, VTY_NEWLINE); - vty_out(vty, " timer t3322 %d%s", g_cfg->timers.T3322, VTY_NEWLINE); - vty_out(vty, " timer t3350 %d%s", g_cfg->timers.T3350, VTY_NEWLINE); - vty_out(vty, " timer t3360 %d%s", g_cfg->timers.T3360, VTY_NEWLINE); - vty_out(vty, " timer t3370 %d%s", g_cfg->timers.T3370, VTY_NEWLINE); - vty_out(vty, " timer t3313 %d%s", g_cfg->timers.T3313, VTY_NEWLINE); - vty_out(vty, " timer t3314 %d%s", g_cfg->timers.T3314, VTY_NEWLINE); - vty_out(vty, " timer t3316 %d%s", g_cfg->timers.T3316, VTY_NEWLINE); - vty_out(vty, " timer t3385 %d%s", g_cfg->timers.T3385, VTY_NEWLINE); - vty_out(vty, " timer t3386 %d%s", g_cfg->timers.T3386, VTY_NEWLINE); - vty_out(vty, " timer t3395 %d%s", g_cfg->timers.T3395, VTY_NEWLINE); - vty_out(vty, " timer t3397 %d%s", g_cfg->timers.T3397, VTY_NEWLINE); + osmo_tdef_vty_write(vty, g_cfg->T_defs, " timer "); if (g_cfg->pcomp_rfc1144.active) { vty_out(vty, " compression rfc1144 active slots %d%s", @@ -1388,12 +1382,16 @@ { g_cfg = cfg; + g_cfg->T_defs = sgsn_T_defs; + osmo_tdefs_reset(g_cfg->T_defs); + install_element_ve(&show_sgsn_cmd); //install_element_ve(&show_mmctx_tlli_cmd); install_element_ve(&show_mmctx_imsi_cmd); install_element_ve(&show_mmctx_all_cmd); install_element_ve(&show_pdpctx_all_cmd); install_element_ve(&show_subscr_cache_cmd); + install_element_ve(&show_timer_cmd); install_element(ENABLE_NODE, &update_subscr_insert_auth_triplet_cmd); install_element(ENABLE_NODE, &update_subscr_create_cmd); @@ -1433,18 +1431,7 @@ install_element(SGSN_NODE, &cfg_ggsn_dynamic_lookup_cmd); install_element(SGSN_NODE, &cfg_grx_ggsn_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3312_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3322_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3350_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3360_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3370_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3313_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3314_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3316_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3385_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3386_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3395_cmd); - install_element(SGSN_NODE, &cfg_sgsn_T3397_cmd); + install_element(SGSN_NODE, &cfg_sgsn_timer_cmd); install_element(SGSN_NODE, &cfg_no_comp_rfc1144_cmd); install_element(SGSN_NODE, &cfg_comp_rfc1144_cmd); @@ -1466,19 +1453,6 @@ /* make sure sgsn_vty_init() was called before this */ OSMO_ASSERT(g_cfg); - g_cfg->timers.T3312 = GSM0408_T3312_SECS; - g_cfg->timers.T3322 = GSM0408_T3322_SECS; - g_cfg->timers.T3350 = GSM0408_T3350_SECS; - g_cfg->timers.T3360 = GSM0408_T3360_SECS; - g_cfg->timers.T3370 = GSM0408_T3370_SECS; - g_cfg->timers.T3313 = GSM0408_T3313_SECS; - g_cfg->timers.T3314 = GSM0408_T3314_SECS; - g_cfg->timers.T3316 = GSM0408_T3316_SECS; - g_cfg->timers.T3385 = GSM0408_T3385_SECS; - g_cfg->timers.T3386 = GSM0408_T3386_SECS; - g_cfg->timers.T3395 = GSM0408_T3395_SECS; - g_cfg->timers.T3397 = GSM0408_T3397_SECS; - rc = vty_read_config_file(config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file); diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 23cb4fb..cc25d47 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -1646,6 +1647,10 @@ .num_cat = ARRAY_SIZE(gprs_categories), }; +static struct vty_app_info vty_info = { + .name = "testSGSN", +}; + int main(int argc, char **argv) { void *osmo_sgsn_ctx; @@ -1659,6 +1664,8 @@ sgsn_rate_ctr_init(); sgsn_auth_init(sgsn); gprs_subscr_init(sgsn); + vty_init(&vty_info); + sgsn_vty_init(&sgsn->cfg); test_llme(); test_subscriber(); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia0cf5f0a49737fbc419e2ccc86312d01c6e0056e Gerrit-Change-Number: 15214 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:07:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:07:45 +0000 Subject: Change in ...osmo-sgsn[master]: tests: Introduce vty-transcript-test tests In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 ) Change subject: tests: Introduce vty-transcript-test tests ...................................................................... tests: Introduce vty-transcript-test tests Add a few commands to make sure it's working fine, and print all available timers with default values. Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 89 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 035cfb0..6c392af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,6 +33,7 @@ $(TESTSUITE) \ vty_test_runner.py \ ctrl_test_runner.py \ + test_nodes.vty \ $(NULL) TESTSUITE = $(srcdir)/testsuite @@ -43,16 +44,38 @@ if ENABLE_EXT_TESTS python-tests: $(BUILT_SOURCES) - osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v - rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + $(MAKE) vty-test + $(MAKE) ctrl-python-test else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" endif +vty-python-test: $(BUILT_SOURCES) + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-transcript-test U=-u +vty-transcript-test: + osmo_verify_transcript_vty.py -v \ + -n OsmoSGSN -p 4245 \ + -r "$(top_builddir)/src/gprs/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ + $(U) $${T:-$(srcdir)/*.vty} + rm -f $(builddir)/sms.db $(builddir)/gsn_restart + +# don't run multiple tests concurrently so that the ports don't conflict +vty-test: + $(MAKE) vty-python-test + $(MAKE) vty-transcript-test + +ctrl-python-test: $(BUILT_SOURCES) + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty new file mode 100644 index 0000000..630094f --- /dev/null +++ b/tests/test_nodes.vty @@ -0,0 +1,61 @@ +OsmoSGSN> enable +OsmoSGSN# show timer +T3312 = 600 s Periodic RA Update timer (s) (default: 600 s) +T3313 = 30 s Waiting for paging response timer (s) (default: 30 s) +T3314 = 44 s Force to STANDBY on expiry timer (s) (default: 44 s) +T3316 = 44 s AA-Ready timer (s) (default: 44 s) +T3322 = 6 s Detach request -> accept timer (s) (default: 6 s) +T3350 = 6 s Waiting for ATT/RAU/TMSI_COMPL timer (s) (default: 6 s) +T3360 = 6 s Waiting for AUTH/CIPH response timer (s) (default: 6 s) +T3370 = 6 s Waiting for IDENTITY response timer (s) (default: 6 s) +T3385 = 8 s Wait for ACT PDP CTX REQ timer (s) (default: 8 s) +T3386 = 8 s Wait for MODIFY PDP CTX ACK timer (s) (default: 8 s) +T3395 = 8 s Wait for DEACT PDP CTX ACK timer (s) (default: 8 s) +T3397 = 8 s Wait for DEACT AA PDP CTX ACK timer (s) (default: 8 s) +OsmoSGSN# configure terminal +OsmoSGSN(config)# list +... + sgsn + ctrl +... + ns + bssgp +... + +OsmoSGSN(config)# sgsn +OsmoSGSN(config-sgsn)# list +... + gtp local-ip A.B.C.D + ggsn <0-255> remote-ip A.B.C.D + ggsn <0-255> gtp-version (0|1) + ggsn <0-255> echo-interval <1-36000> + ggsn <0-255> no echo-interval + imsi-acl (add|del) IMSI + auth-policy (accept-all|closed|acl-only|remote) + authentication (optional|required) + encryption (GEA0|GEA1|GEA2|GEA3|GEA4) + gsup ipa-name NAME + gsup remote-ip A.B.C.D + gsup remote-port <0-65535> + gsup oap-id <0-65535> + gsup oap-k K + gsup oap-opc OPC + apn APNAME ggsn <0-255> + apn APNAME imsi-prefix IMSIPRE ggsn <0-255> + access-point-name NAME + no access-point-name NAME + cdr filename NAME + no cdr filename + cdr trap + no cdr trap + cdr interval <1-2147483647> + ggsn dynamic + grx-dns-add A.B.C.D + timer [TNNNN] [(<0-2147483647>|default)] + no compression rfc1144 + compression rfc1144 active slots <1-256> + compression rfc1144 passive + no compression v42bis + compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250> + compression v42bis passive +... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd092b9561d49be1f62769d95ba49f6e4aeb4066 Gerrit-Change-Number: 15215 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:07:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:07:45 +0000 Subject: Change in ...osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY ...................................................................... gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY When a MS MM state is READY its exact location is known (PCU). On Gb, T3314 (aka TS 23.060 "READY timer") sets the MM state from READY to STANDBY, where only the RA is known. Introduce a second set of timer variables, because state timer can run while another packet state timer is timing out. Related: OS#1941 Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c M tests/test_nodes.vty 5 files changed, 98 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 9753ea2..336155c 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -156,6 +156,10 @@ struct gprs_llc_llme *llme; uint32_t tlli; uint32_t tlli_new; + + /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */ + struct osmo_timer_list state_timer; + unsigned int state_T; /* Txxxx number but only used for pmm_states */ } gb; struct { int new_key; diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index db8defc..f7aff73 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -137,6 +137,57 @@ } } +static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); +static void mmctx_state_timer_cb(void *_mm) +{ + struct sgsn_mm_ctx *mm = _mm; + + switch (mm->gb.state_T) { + case 3314: + switch (mm->pmm_state) { + case MM_READY: + LOGMMCTXP(LOGL_INFO, mm, "T3314 expired\n"); + mmctx_set_mm_state(mm, MM_STANDBY); + break; + default: + LOGMMCTXP(LOGL_ERROR, mm, "T3314 expired in state %s != MM_READY\n", + get_value_string(gprs_pmm_state_names, mm->pmm_state)); + break; + } + break; + default: + LOGMMCTXP(LOGL_ERROR, mm, "state timer expired in unknown mode %u\n", + mm->gb.state_T); + break; + } +} + +static void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T) +{ + unsigned long seconds; + + if (mm->gb.state_T && mm->gb.state_T != T) + LOGMMCTXP(LOGL_ERROR, mm, "Attempting to start timer %u but %u is active!\n", + T, mm->gb.state_T); + + mm->gb.state_T = T; + mm->gb.state_timer.data = mm; + mm->gb.state_timer.cb = &mmctx_state_timer_cb; + + seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1); + osmo_timer_schedule(&mm->gb.state_timer, seconds, 0); +} + +static void mmctx_state_timer_stop(struct sgsn_mm_ctx *mm, unsigned int T) +{ + if (mm->gb.state_T == T) + osmo_timer_del(&mm->gb.state_timer); + else + LOGMMCTXP(LOGL_ERROR, mm, "Attempting to stop timer %u but %u is active!\n", + T, mm->gb.state_T); + mm->gb.state_T = 0; +} + static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); @@ -173,6 +224,24 @@ get_value_string(gprs_pmm_state_names, ctx->pmm_state), get_value_string(gprs_pmm_state_names, state)); + switch (state) { + case MM_READY: + /* on expiration, T3314 moves mm state back to MM_STANDBY */ + mmctx_state_timer_start(ctx, 3314); + break; + case MM_IDLE: + if (ctx->pmm_state == MM_READY) + mmctx_state_timer_stop(ctx, 3314); + break; + case MM_STANDBY: + if (ctx->pmm_state == MM_READY) + mmctx_state_timer_stop(ctx, 3314); + break; + default: + /* when changing to state != MM_READY */ + break; + } + ctx->pmm_state = state; } @@ -2968,6 +3037,21 @@ return rc; } +/* Update the MM context state */ +static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx) +{ + switch (mmctx->pmm_state) { + case MM_STANDBY: + mmctx_set_mm_state(mmctx, MM_READY); + break; + case MM_READY: /* RE-arm the timer upon receival of Gb PDUs */ + mmctx_state_timer_start(mmctx, 3314); + break; + default: + break; + } +} + /* Main entry point for incoming 04.08 GPRS messages from Gb */ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable) @@ -2988,6 +3072,9 @@ /* MMCTX can be NULL */ + if (mmctx) + gsm0408_gprs_notify_pdu_gb(mmctx); + switch (pdisc) { case GSM48_PDISC_MM_GPRS: rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable); diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index eb04846..9f02d54 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -341,6 +341,11 @@ osmo_timer_del(&mm->timer); } + if (osmo_timer_pending(&mm->gb.state_timer)) { + LOGMMCTXP(LOGL_INFO, mm, "Cancelling MM state timer %u\n", mm->gb.state_T); + osmo_timer_del(&mm->gb.state_timer); + } + memset(&sig_data, 0, sizeof(sig_data)); sig_data.mm = mm; osmo_signal_dispatch(SS_SGSN, S_SGSN_MM_FREE, &sig_data); diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index ae26cbe..6698691 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -94,7 +94,7 @@ static struct osmo_tdef sgsn_T_defs[] = { { .T=3312, .default_val=GSM0408_T3312_SECS, .desc="Periodic RA Update timer (s)" }, { .T=3313, .default_val=GSM0408_T3313_SECS, .desc="Waiting for paging response timer (s)" }, - { .T=3314, .default_val=GSM0408_T3314_SECS, .desc="Force to STANDBY on expiry timer (s)" }, + { .T=3314, .default_val=GSM0408_T3314_SECS, .desc="READY timer. Force to STANDBY on expiry timer (s)" }, { .T=3316, .default_val=GSM0408_T3316_SECS, .desc="AA-Ready timer (s)" }, { .T=3322, .default_val=GSM0408_T3322_SECS, .desc="Detach request -> accept timer (s)" }, { .T=3350, .default_val=GSM0408_T3350_SECS, .desc="Waiting for ATT/RAU/TMSI_COMPL timer (s)" }, diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 630094f..2ef926a 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -2,7 +2,7 @@ OsmoSGSN# show timer T3312 = 600 s Periodic RA Update timer (s) (default: 600 s) T3313 = 30 s Waiting for paging response timer (s) (default: 30 s) -T3314 = 44 s Force to STANDBY on expiry timer (s) (default: 44 s) +T3314 = 44 s READY timer. Force to STANDBY on expiry timer (s) (default: 44 s) T3316 = 44 s AA-Ready timer (s) (default: 44 s) T3322 = 6 s Detach request -> accept timer (s) (default: 6 s) T3350 = 6 s Waiting for ATT/RAU/TMSI_COMPL timer (s) (default: 6 s) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:07:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:07:46 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Use osmo_rai_name() in log line In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 ) Change subject: gprs_gmm.c: Use osmo_rai_name() in log line ...................................................................... gprs_gmm.c: Use osmo_rai_name() in log line Change-Id: Ieab9b7696c93de9a5d3d42f614072a6f2181e37d --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index f7aff73..dccec2b 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1827,9 +1827,8 @@ { /* We cannot use the mmctx */ LOGMMCTXP(LOGL_INFO, mmctx, - "The MM context cannot be used, RA: %03d-%0*d-%d-%d\n", - mmctx->ra.mcc, mmctx->ra.mnc_3_digits, mmctx->ra.mnc, - mmctx->ra.lac, mmctx->ra.rac); + "The MM context cannot be used, RA: %s\n", + osmo_rai_name(&mmctx->ra)); /* mmctx is set to NULL and gprs_llgmm_unassign(llme) will be called below, let's make sure we don't keep dangling llme pointers in mmctx (OS#3957). */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ieab9b7696c93de9a5d3d42f614072a6f2181e37d Gerrit-Change-Number: 15224 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:08:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:08:19 +0000 Subject: Change in ...osmo-sgsn[master]: examples: Add osmo-sgsn_custom-sccp.cfg In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 ) Change subject: examples: Add osmo-sgsn_custom-sccp.cfg ...................................................................... examples: Add osmo-sgsn_custom-sccp.cfg Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d --- A doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg 1 file changed, 38 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg new file mode 100644 index 0000000..a18d76a --- /dev/null +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -0,0 +1,38 @@ +! +! Osmocom SGSN configuration +! +! +line vty + no login +! +cs7 instance 0 + point-code 0.23.4 + asp asp-clnt-OsmoSGSN-A 2905 0 m3ua + remote-ip 172.18.8.200 ! where to reach the STP + as as-clnt-OsmoSGSN-A m3ua + asp asp-clnt-OsmoSGSN-A + routing-key 3 0.23.4 +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication required + auth-policy remote + gsup remote-ip 127.0.0.1 + gsup remote-port 4222 +! +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 + encapsulation udp local-ip 127.0.0.1 + encapsulation udp local-port 23000 + encapsulation framerelay-gre enabled 0 +! +bssgp +! -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d Gerrit-Change-Number: 15238 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 09:58:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 09:58:12 +0000 Subject: Change in ...osmo-trx[master]: lms: Use define LOG_LEVEL_CRITICIAL instead of value Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15257 Change subject: lms: Use define LOG_LEVEL_CRITICIAL instead of value ...................................................................... lms: Use define LOG_LEVEL_CRITICIAL instead of value Change-Id: Ie5bb99a76580c5780a24f190682700c5e69b3d85 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/57/15257/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index f55b555..d4e8640 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -81,7 +81,7 @@ { /* map lime specific log levels */ static const int lvl_map[5] = { - [0] = LOGL_FATAL, + [LOG_LEVEL_CRITICAL] = LOGL_FATAL, [LMS_LOG_ERROR] = LOGL_ERROR, [LMS_LOG_WARNING] = LOGL_NOTICE, [LMS_LOG_INFO] = LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie5bb99a76580c5780a24f190682700c5e69b3d85 Gerrit-Change-Number: 15257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 10:06:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 10:06:41 +0000 Subject: Change in ...osmo-trx[master]: lms: Use define LOG_LEVEL_CRITICIAL instead of value In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15257 ) Change subject: lms: Use define LOG_LEVEL_CRITICIAL instead of value ...................................................................... Patch Set 1: the define is only available in Logger.h, but not yet in C API. See https://github.com/myriadrf/LimeSuite/pull/275 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie5bb99a76580c5780a24f190682700c5e69b3d85 Gerrit-Change-Number: 15257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 10:06:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:04:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 11:04:46 +0000 Subject: Change in ...osmo-trx[master]: Drop old setPriority related code Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15258 Change subject: Drop old setPriority related code ...................................................................... Drop old setPriority related code This code is not needed anymore since we are setting SCHED_RR scheduler with a real time priority in main thread during startup, so all threads will inherit same rt priority, which should be enough to keep the process working reliably even on high system loads (from non rt processes). osmo-trx was tested to be reliable during test with stress-ng as explained in related ticket below. Related: OS#2344 Change-Id: I3a88946dd71e9aeeaac9d19d396e2236c302b608 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.h M Transceiver52M/radioInterface.h 8 files changed, 0 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/58/15258/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 4da1876..2d5c04e 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1126,8 +1126,6 @@ snprintf(thread_name, 16, "RxUpper%zu", num); set_selfthread_name(thread_name); - trx->setPriority(0.42); - while (1) { trx->driveReceiveFIFO(num); pthread_testcancel(); @@ -1139,8 +1137,6 @@ { set_selfthread_name("RxLower"); - transceiver->setPriority(0.45); - while (1) { transceiver->driveReceiveRadio(); pthread_testcancel(); @@ -1152,8 +1148,6 @@ { set_selfthread_name("TxLower"); - transceiver->setPriority(0.44); - while (1) { transceiver->driveTxFIFO(); pthread_testcancel(); @@ -1190,8 +1184,6 @@ snprintf(thread_name, 16, "TxUpper%zu", num); set_selfthread_name(thread_name); - trx->setPriority(0.40); - while (1) { trx->driveTxPriorityQueue(num); pthread_testcancel(); diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 18dc5f2..1a4d28f 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -247,9 +247,6 @@ void reset(); - /** set priority on current thread */ - void setPriority(float prio = 0.5) { mRadioInterface->setPriority(prio); } - void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi); }; diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index cd378a8..e637611 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -70,9 +70,6 @@ /** Get the Tx window type */ virtual enum TxWindowType getWindowType()=0; - /** Enable thread priority */ - virtual void setPriority(float prio = 0.5) = 0; - /** Read samples from the radio. @param buf preallocated buf to contain read result diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index bc79f97..47bac94 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -85,10 +85,6 @@ /** Stop the LMS */ bool stop(); - /** Set priority not supported */ - void setPriority(float prio = 0.5) { - } - enum TxWindowType getWindowType() { return TX_WINDOW_LMS1; } diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 8bb94d6..5b38df4 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -125,7 +125,6 @@ void *async_event_loop(uhd_device *dev) { set_selfthread_name("UHDAsyncEvent"); - dev->setPriority(0.43); while (1) { dev->recv_async_msg(); @@ -643,12 +642,6 @@ return true; } -void uhd_device::setPriority(float prio) -{ - uhd::set_thread_priority_safe(prio); - return; -} - int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls) { if (!num_smpls) { diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index d5a6348..944578a 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -71,7 +71,6 @@ bool start(); bool stop(); bool restart(); - void setPriority(float prio); enum TxWindowType getWindowType() { return tx_window; } int readSamples(std::vector &bufs, int len, bool *overrun, diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 9a2426c..4123c7d 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -107,9 +107,6 @@ /** Stop the USRP */ bool stop(); - /** Set priority not supported */ - void setPriority(float prio = 0.5) { } - enum TxWindowType getWindowType() { return TX_WINDOW_USRP1; } /** diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index f19a8dc..dcfb67f 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -127,9 +127,6 @@ /** returns the full-scale receive amplitude **/ double fullScaleOutputValue(); - /** set thread priority on current thread */ - void setPriority(float prio = 0.5) { mRadio->setPriority(prio); } - /** get transport window type of attached device */ enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3a88946dd71e9aeeaac9d19d396e2236c302b608 Gerrit-Change-Number: 15258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:20:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 11:20:19 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 1: > Patch Set 1: > > Does warn checking (if warns are found) mean job will fail? Yes. > Why do we have it disabled by default but we seem to enable it everywhere here? Or it's because we don't enable it in OBS? I lack some explanation regarding those matters. We don't want to have this check enabled in OBS, because we are building for different distros with different asciidoc versions. These may throw different warnings than the asciidoc version installed in jenkins, and then unexpectedly fail the build because of a warning that jenkins did not report. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 11:20:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:24:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 11:24:04 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 1: Code-Review+2 Thanks, that's what I was missing (and would be great to have in the commit log for future reference) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 11:24:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:24:50 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 11:24:50 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 ) Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15030/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15030/1//COMMIT_MSG at 15 PS1, Line 15: This prevents losing the error message in case asciidoc or a2x fail > I don't really understand what you mean in the paragraph. While analyzing OS#4131 (leveloffset attribute warning), I saw once in the logs that asciidoc running with a2x failed. But we were not running a2x with -vv, so there was no error message. Then the Makefile ran asciidoc as standalone to find the error, and then it did not fail anymore. Another example that I experienced at some point is, that a2x may fail for a reason unrelated to asciidoc. Then we run asciidoc as standalone and it reports that everything went okay. This is confusing and makes it harder to find the actual error message. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 11:24:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:32:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 11:32:30 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: warnings check not default In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 ) Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15031/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/15031/1/build/Makefile.asciidoc.inc at 79 PS1, Line 79: if [ -n "$$ASCIIDOC_WARNINGS_CHECK" ]; then \ > I guess the ratioanle is that "make check" currently only relates to whether our unit tests pass. Before this patch, ./configure --enable-manuals and "make check" would always check the manuals too. That is due to how automake works, it finds the "check" rule and runs it in the subdirectory. With the patch, this behavior is overwritten and now the checks only run with "ASCIIDOC_WARNINGS_CHECK=1 make check". > I'm sure that some years down the road asciidoc has more warnings than today, and you wouldn't be able to pass a "make check" anymore, which in turn makes people believe that the software is somehow broken. Yes, the warnings changing being asciidoc versions is the reason why I created the patch. Not only some years down the road, but also in OBS where we have various distros and asciidoc versions, some may print additional warnings that let the documentation check fail. The new logic is that we don't check for the documentation warnings in OBS or other regular builds, just in jenkins where we have one specific asciidoc version. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 11:32:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:45:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 11:45:19 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: Hello pespin, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 to look at the new patch set (#2). Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK The asciidoc warnings check fails the build if asciidoc prints a warning while building the documentation. We had this enabled by default, but since OBS uses various asciidoc versions, we could get unexpected build failures (different asciidoc versions print different warnings). Now that it is disabled by default, explicitly enable it for jenkins again. Related: OS#4140 Depends: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 (osmo-gsm-manuals) Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/15029/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:46:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 11:46:04 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 2: Code-Review+2 Commit message updated to make it more clear. Re-applying +2 from previous reviews. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 11:46:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 11:46:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 11:46:24 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK The asciidoc warnings check fails the build if asciidoc prints a warning while building the documentation. We had this enabled by default, but since OBS uses various asciidoc versions, we could get unexpected build failures (different asciidoc versions print different warnings). Now that it is disabled by default, explicitly enable it for jenkins again. Related: OS#4140 Depends: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 (osmo-gsm-manuals) Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 26 insertions(+), 16 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 0b983dd..cb370e9 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -20,7 +20,7 @@ combination_filter: '' sequential: false # most common build invocation - cmd: ./contrib/jenkins.sh + cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/{repos}' gerrit_project: '{repos}' @@ -46,7 +46,7 @@ - libosmo-abis - libosmo-netif - libosmo-sccp: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -81,6 +81,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -102,6 +103,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -124,7 +126,7 @@ (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: ASCIIDOC_WARNINGS_CHECK="1" './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP @@ -134,12 +136,12 @@ combination_filter: > (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") - cmd: ./contrib/jenkins.sh + cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-gsm-manuals - osmo-hlr: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-iuh: cmd: WITH_MANUALS=1 ./contrib/jenkins.sh @@ -154,6 +156,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -178,6 +181,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -u build \ @@ -225,6 +229,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ @@ -232,7 +237,7 @@ osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-trx: a1_name: INSTR @@ -246,7 +251,7 @@ (INSTR == "--with-sse" && WITH_MANUALS == "1") - osmocom-bb: - cmd: WITH_MANUALS=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-tetra - osmo-sysmon - osmo-remsim diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fc5744b..ed180a4 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -19,7 +19,7 @@ combination_filter: '' sequential: false # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) - cmd: ./contrib/jenkins.sh + cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh wrappers: [] trigger: email: jenkins-notifications at lists.osmocom.org laforge at gnumonks.org @@ -83,7 +83,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -159,6 +159,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -177,6 +178,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -199,7 +201,7 @@ (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") - cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP @@ -209,7 +211,7 @@ combination_filter: > (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-gmr: @@ -224,7 +226,7 @@ cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh - osmo-hlr: - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-iuh: cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh @@ -247,6 +249,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -276,6 +279,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ @@ -305,7 +309,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -326,6 +330,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e PUBLISH="1" \ + -e ASCIIDOC_WARNINGS_CHECK="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -333,7 +338,7 @@ - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -348,10 +353,10 @@ concurrent: true combination_filter: > (INSTR == "--with-sse" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmocom-bb: - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh - osmo-sysmon - osmo-remsim -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 12:01:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Aug 2019 12:01:19 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 ) Change subject: vty: Introduce cs7-instance-iu ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 12:01:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 13:08:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 13:08:33 +0000 Subject: Change in ...osmo-ci[master]: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15029 ) Change subject: gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8775d45b4dc1a5a46e2ba042fc7ee7d9f10f18cc Gerrit-Change-Number: 15029 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 13:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 13:09:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 13:09:45 +0000 Subject: Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always run verbose asciidoc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 ) Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 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: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 13:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 13:10:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 13:10:07 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 ) Change subject: vty: Introduce cs7-instance-iu ...................................................................... vty: Introduce cs7-instance-iu Similar to what we already have in osmo-msc. Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 --- M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg M doc/manuals/vty/sgsn_vty_reference.xml M include/osmocom/sgsn/sgsn.h M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c 5 files changed, 25 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg index a18d76a..f60c076 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -21,6 +21,7 @@ auth-policy remote gsup remote-ip 127.0.0.1 gsup remote-port 4222 + cs7-instance-iu 0 ! ns timer tns-block 3 diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml index c3f91cf..38e21c2 100644 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ b/doc/manuals/vty/sgsn_vty_reference.xml @@ -2502,6 +2502,12 @@ + + + + + + diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 6e4f5ca..78803c7 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -112,6 +112,7 @@ #if BUILD_IU struct { enum ranap_nsap_addr_enc rab_assign_addr_enc; + uint32_t cs7_instance; } iu; #endif diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 5979886..4232e23 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -500,7 +500,9 @@ #if BUILD_IU /* Note that these are mostly defaults and can be overriden from the VTY */ - sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN", + sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, + sgsn->cfg.iu.cs7_instance, + "OsmoSGSN", (23 << 3) + 4, OSMO_SS7_ASP_PROT_M3UA, 0, NULL, diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 6698691..68d3a77 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -289,6 +289,8 @@ vty_out(vty, " no compression v42bis%s", VTY_NEWLINE); #ifdef BUILD_IU + vty_out(vty, " cs7-instance-iu %u%s", g_cfg->iu.cs7_instance, + VTY_NEWLINE); ranap_iu_vty_config_write(vty, " "); #endif @@ -1378,6 +1380,17 @@ return CMD_SUCCESS; } +#if BUILD_IU +DEFUN(cfg_sgsn_cs7_instance_iu, + cfg_sgsn_cs7_instance_iu_cmd, + "cs7-instance-iu <0-15>", + "Set SS7 to be used by the Iu-Interface.\n" "SS7 instance reference number (default: 0)\n") +{ + g_cfg->iu.cs7_instance = atoi(argv[0]); + return CMD_SUCCESS; +} +#endif + int sgsn_vty_init(struct sgsn_config *cfg) { g_cfg = cfg; @@ -1441,6 +1454,7 @@ install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd); #ifdef BUILD_IU + install_element(SGSN_NODE, &cfg_sgsn_cs7_instance_iu_cmd); ranap_iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc); #endif return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 13:51:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 13:51:49 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 Change subject: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected ...................................................................... libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected The libgtp application may have already allocated related resources associated to the pdp context, so we need to signal its deletion in order to let the application free the resources. This should fix the duplication of pdp contexts seen in osmo-ggsn when "show pdp-context" related VTY commands are used. It was spotted due to some MS requesting a v4v6 context on a v4-only APN, where first v4 address was allocated, and then upon v6 allocation create_context_ind() called gtp_create_context_resp(GTPCAUSE_MISSING_APN) but the first address was not freed. Upon receiving the callback, osmo-ggsn should now free the related resources. Related: OS#4154 Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 --- M ggsn/ggsn.c M gtp/gtp.c 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/59/15259/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 95371a2..d71855d 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -386,7 +386,7 @@ LOGPPDP(LOGL_ERROR, pdp, "Cannot find/free IP Pool member\n"); } - if (apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { + if (apn && apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { if (gtp_kernel_tunnel_del(pdp, apn->tun.cfg.dev_name)) { LOGPPDP(LOGL_ERROR, pdp, "Cannot delete tunnel from kernel:%s\n", strerror(errno)); diff --git a/gtp/gtp.c b/gtp/gtp.c index 94c3245..becedd2 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1296,9 +1296,8 @@ /* Now send off a reply to the peer */ gtp_create_pdp_resp(gsn, pdp->version, pdp, cause); - if (cause != GTPCAUSE_ACC_REQ) { - pdp_freepdp(pdp); - } + if (cause != GTPCAUSE_ACC_REQ) + gtp_freepdp(gsn, pdp); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Gerrit-Change-Number: 15259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 14:32:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 14:32:24 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Add missing v4v6 tests in expected-results.xml Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15260 Change subject: ggsn: Add missing v4v6 tests in expected-results.xml ...................................................................... ggsn: Add missing v4v6 tests in expected-results.xml Change-Id: I80598fad57b8e7172ac073ebe2b3445e5ab132f0 --- M ggsn_tests/expected-results.xml 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/15260/1 diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index c60a804..445d566 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -19,6 +19,13 @@ + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15260 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: I80598fad57b8e7172ac073ebe2b3445e5ab132f0 Gerrit-Change-Number: 15260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 14:32:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 14:32:24 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Update test xfail->pass in expected-results.xml Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15261 Change subject: ggsn: Update test xfail->pass in expected-results.xml ...................................................................... ggsn: Update test xfail->pass in expected-results.xml Commit below fixed the test but forgot to update this file. Fixes: 8e7a396656f8d32c44254de0c65f26c6a2c833f2 Change-Id: Ia5006c9258de9b442b32ae92ae75ef08670de7cf --- M ggsn_tests/expected-results.xml 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/15261/1 diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index 445d566..e57a7df 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -8,12 +8,7 @@ - - Secondary DNS IPv4 PCO option not found - GGSN_Tests.ttcn:MASKED GGSN_Tests control part - GGSN_Tests.ttcn:MASKED TC_pdp4_act_deact_with_separate_dns testcase - - + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15261 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: Ia5006c9258de9b442b32ae92ae75ef08670de7cf Gerrit-Change-Number: 15261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 14:32:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 14:32:25 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp46_act_deact_apn4 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262 Change subject: ggsn: Introduce test TC_pdp46_act_deact_apn4 ...................................................................... ggsn: Introduce test TC_pdp46_act_deact_apn4 Related osmo-ggsn.git libgtp fix: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Related: OS#4154 Change-Id: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml 2 files changed, 26 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/15262/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 31c1056..ae92626 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -247,7 +247,7 @@ } /* send a PDP context activation */ - function f_pdp_ctx_act(inout PdpContext ctx) runs on GT_CT { + function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; var default d; @@ -260,7 +260,7 @@ alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; - if (cpr.cause.causevalue == '80'O) { + if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { /* Check if EUA type corresponds to requested type */ if (match(ctx.eua, t_EuaIPv4(?)) and not match(cpr.endUserAddress, tr_EuaIPv4(?))){ @@ -292,6 +292,12 @@ ctx.eua := cpr.endUserAddress; ctx.pco_neg := cpr.protConfigOptions; setverdict(pass); + } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { + if (ispresent(cpr.endUserAddress)) { + log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); + setverdict(fail); + } + setverdict(pass); } else { setverdict(fail); } @@ -1287,6 +1293,22 @@ f_pdp_ctx_del(ctxA, '1'B); } + /* Test IPv4v6 context activation for dynamic IPv4v6 EUA on a v4-only APN */ + testcase TC_pdp46_act_deact_apn4() runs on GT_CT { + f_init(); + /* A typical MS first attempts v4v6, and if rejected, then tries v4 and v6 separetly */ + var PdpContext ctx46 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dynv6Dyn))); + f_pdp_ctx_act(ctx46, 'DC'O); /* Cause: Unknown PDP address or PDP type */ + + var PdpContext ctx4 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctx4, '80'O); /* Normal accept cause */ + + var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv6Dyn))); + f_pdp_ctx_act(ctx6, 'DC'O); /* Cause: Unknown PDP address or PDP type */ + + f_pdp_ctx_del(ctx4, '1'B); + } + /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent responses (60 seconds): If same delete req is sent and duplicate is detected, saved duplicate response should be sent back. */ @@ -1332,6 +1354,7 @@ execute(TC_pdp46_act_deact_pcodns6()); execute(TC_pdp46_act_deact_gtpu_access()); execute(TC_pdp46_clients_interact()); + execute(TC_pdp46_act_deact_apn4()); execute(TC_echo_req_resp()); execute(TC_act_deact_retrans_duplicate()); diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index e57a7df..374cde0 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -21,6 +21,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262 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: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8 Gerrit-Change-Number: 15262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 15:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 15:21:05 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Print value_string of reject cause Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15263 Change subject: gprs_gmm.c: Print value_string of reject cause ...................................................................... gprs_gmm.c: Print value_string of reject cause Change-Id: I71d9abcf7e3a836c475b7adbb95a82580e41ae6d --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/15263/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index dccec2b..1d8ec57 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2455,7 +2455,8 @@ struct gsm48_hdr *gh; uint8_t transaction_id = tid ^ 0x8; /* flip */ - LOGMMCTXP(LOGL_NOTICE, mm, "<- ACTIVATE PDP CONTEXT REJ(cause=%u)\n", cause); + LOGMMCTXP(LOGL_NOTICE, mm, "<- ACTIVATE PDP CONTEXT REJ: %s\n", + get_value_string(gsm48_gsm_cause_names, cause)); rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_PDP_ACTIVATE_REJECT]); mmctx2msgid(msg, mm); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I71d9abcf7e3a836c475b7adbb95a82580e41ae6d Gerrit-Change-Number: 15263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 15:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 21 Aug 2019 15:21:05 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Add spec document to function documentation Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15264 Change subject: gprs_gmm.c: Add spec document to function documentation ...................................................................... gprs_gmm.c: Add spec document to function documentation Change-Id: Ibb89499e9c1ab588336df34fde26faf3fbf2c72c --- M src/gprs/gprs_gmm.c 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/64/15264/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 1d8ec57..e44b3ec 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -674,7 +674,7 @@ return false; } -/* 3GPP TS 24.008 Section 9.4.9: Authentication and Ciphering Request */ +/* 3GPP TS 24.008 ? 9.4.9: Authentication and Ciphering Request */ int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, const struct osmo_auth_vector *vec, uint8_t key_seq, bool force_standby) @@ -742,7 +742,7 @@ return gsm48_gmm_sendmsg(msg, 1, mm, false); } -/* Section 9.4.11: Authentication and Ciphering Reject */ +/* 3GPP TS 24.008 ? 9.4.11: Authentication and Ciphering Reject */ static int gsm48_tx_gmm_auth_ciph_rej(struct sgsn_mm_ctx *mm) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH CIPH REJ"); @@ -815,7 +815,7 @@ return OSMO_AUTH_TYPE_NONE; } -/* Section 9.4.10: Authentication and Ciphering Response */ +/* 3GPP TS 24.008 ? 9.4.10: Authentication and Ciphering Response */ static int gsm48_rx_gmm_auth_ciph_resp(struct sgsn_mm_ctx *ctx, struct msgb *msg) { @@ -892,7 +892,7 @@ return osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_AUTH_RESP_RECV_SUCCESS, NULL); } -/* Section 9.4.10: Authentication and Ciphering Failure */ +/* 3GPP TS 24.008 ? 9.4.10: Authentication and Ciphering Failure */ static int gsm48_rx_gmm_auth_ciph_fail(struct sgsn_mm_ctx *ctx, struct msgb *msg) { @@ -1357,7 +1357,7 @@ ctx->gmm_state = GMM_COMMON_PROC_INIT; } -/* Section 9.4.1 Attach request */ +/* 3GPP TS 24.008 ? 9.4.1 Attach request */ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, struct gprs_llc_llme *llme) { @@ -1569,7 +1569,7 @@ return !!memcmp(gh_a, gh_b, GMM_ATTACH_REQ_LEN); } -/* Section 4.7.4.1 / 9.4.5.2 MO Detach request */ +/* 3GPP TS 24.008 ? 4.7.4.1 / 9.4.5.2 MO Detach request */ static int gsm48_rx_gmm_det_req(struct sgsn_mm_ctx *ctx, struct msgb *msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); @@ -1707,7 +1707,7 @@ } } -/* 3GPP TS 24.008 Section 4.7.13.4 Service request procedure not accepted by the +/* 3GPP TS 24.008 ? 4.7.13.4 Service request procedure not accepted by the * network. Returns true if MS has active PDP contexts in pdp_status */ bool pdp_status_has_active_nsapis(const uint8_t *pdp_status, const size_t pdp_status_len) { @@ -1919,7 +1919,7 @@ return rc; } -/* 3GPP TS 24.008 Section 9.4.20 Service request. +/* 3GPP TS 24.008 ? 9.4.20 Service request. * In Iu, a UE in PMM-IDLE mode can use GSM48_MT_GMM_SERVICE_REQ to switch back * to PMM-CONNECTED mode. */ static int gsm48_rx_gmm_service_req(struct sgsn_mm_ctx *ctx, struct msgb *msg) @@ -2009,7 +2009,7 @@ process_ms_ctx_status(ctx, pdp_status); - /* 3GPP TS 24.008 Section 4.7.13.4 Service request procedure not + /* 3GPP TS 24.008 ? 4.7.13.4 Service request procedure not * accepted by the network. Cause #40. If MS has PDP Contexts in * Active state in pdp_status but there is no PDP contexts on * SGSN side then Reject with the cause will force the mobile to @@ -2403,7 +2403,7 @@ } #endif -/* Section 9.5.2: Activate PDP Context Accept */ +/* 3GPP TS 24.008 ? 9.5.2: Activate PDP Context Accept */ int gsm48_tx_gsm_act_pdp_acc(struct sgsn_pdp_ctx *pdp) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP ACC"); @@ -2447,7 +2447,7 @@ return gsm48_gmm_sendmsg(msg, 0, pdp->mm, true); } -/* Section 9.5.3: Activate PDP Context reject */ +/* 3GPP TS 24.008 ? 9.5.3: Activate PDP Context reject */ int gsm48_tx_gsm_act_pdp_rej(struct sgsn_mm_ctx *mm, uint8_t tid, uint8_t cause, uint8_t pco_len, uint8_t *pco_v) { @@ -2472,7 +2472,7 @@ return gsm48_gmm_sendmsg(msg, 0, mm, true); } -/* Section 9.5.8: Deactivate PDP Context Request */ +/* 3GPP TS 24.008 ? 9.5.8: Deactivate PDP Context Request */ static int _gsm48_tx_gsm_deact_pdp_req(struct sgsn_mm_ctx *mm, uint8_t tid, uint8_t sm_cause, bool teardown) { @@ -2502,7 +2502,7 @@ return _gsm48_tx_gsm_deact_pdp_req(pdp->mm, pdp->ti, sm_cause, teardown); } -/* Section 9.5.9: Deactivate PDP Context Accept */ +/* 3GPP TS 24.008 ? 9.5.9: Deactivate PDP Context Accept */ static int _gsm48_tx_gsm_deact_pdp_acc(struct sgsn_mm_ctx *mm, uint8_t tid) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP DET ACC"); @@ -2800,7 +2800,7 @@ gsm_cause, 0, NULL); } -/* Section 9.5.1: Activate PDP Context Request */ +/* 3GPP TS 24.008 ? 9.5.1: Activate PDP Context Request */ static int gsm48_rx_gsm_act_pdp_req(struct sgsn_mm_ctx *mmctx, struct msgb *_msg) { @@ -2837,7 +2837,7 @@ return rc; } -/* Section 9.5.8: Deactivate PDP Context Request */ +/* 3GPP TS 24.008 ? 9.5.8: Deactivate PDP Context Request */ static int gsm48_rx_gsm_deact_pdp_req(struct sgsn_mm_ctx *mm, struct msgb *msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); @@ -2859,7 +2859,7 @@ return sgsn_delete_pdp_ctx(pdp); } -/* Section 9.5.9: Deactivate PDP Context Accept */ +/* 3GPP TS 24.008 ? 9.5.9: Deactivate PDP Context Accept */ static int gsm48_rx_gsm_deact_pdp_ack(struct sgsn_mm_ctx *mm, struct msgb *msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb89499e9c1ab588336df34fde26faf3fbf2c72c Gerrit-Change-Number: 15264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 15:49:19 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 21 Aug 2019 15:49:19 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 Change subject: fix: vty crash by logging to killed telnet session ...................................................................... fix: vty crash by logging to killed telnet session When a telnet session dies (e.g. killall telnet) and also has logging enabled, the closing of the telnet session logs to the killed telnet session and segfaults: the vty->obuf is already NULL. In vty_out(), guard against this situation by not composing an output if vty->obuf is NULL. Also guard all buffer_*() functions against a NULL buffer argument, which should catch all other hypothetical code paths trying to add to a closed vty->obuf. Related: OS#4164 Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 --- M src/vty/buffer.c M src/vty/vty.c 2 files changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/15265/1 diff --git a/src/vty/buffer.c b/src/vty/buffer.c index e68e3a2..486aafb 100644 --- a/src/vty/buffer.c +++ b/src/vty/buffer.c @@ -92,6 +92,8 @@ /* Free buffer. */ void buffer_free(struct buffer *b) { + if (!b) + return; buffer_reset(b); talloc_free(b); } @@ -104,6 +106,9 @@ char *s; char *p; + if (!b) + return NULL; + for (data = b->head; data; data = data->next) totlen += data->cp - data->sp; if (!(s = _talloc_zero(tall_vty_ctx, (totlen + 1), "buffer_getstr"))) @@ -120,7 +125,7 @@ /* Return 1 if buffer is empty. */ int buffer_empty(struct buffer *b) { - return (b->head == NULL); + return (!b || b->head == NULL); } /* Clear and free all allocated data. */ @@ -129,6 +134,9 @@ struct buffer_data *data; struct buffer_data *next; + if (!b) + return; + for (data = b->head; data; data = next) { next = data->next; BUFFER_DATA_FREE(data); @@ -141,6 +149,9 @@ { struct buffer_data *d; + if (!b) + return NULL; + d = _talloc_zero(b, offsetof(struct buffer_data, data[b->size]), "buffer_add"); @@ -161,9 +172,14 @@ /* Write data to buffer. */ void buffer_put(struct buffer *b, const void *p, size_t size) { - struct buffer_data *data = b->tail; + struct buffer_data *data; const char *ptr = p; + if (!b) + return; + + data = b->tail; + /* We use even last one byte of data buffer. */ while (size) { size_t chunk; @@ -185,12 +201,16 @@ /* Insert character into the buffer. */ void buffer_putc(struct buffer *b, unsigned char c) { + if (!b) + return; buffer_put(b, &c, 1); } /* Put string to the buffer. */ void buffer_putstr(struct buffer *b, const char *c) { + if (!b) + return; buffer_put(b, c, strlen(c)); } @@ -202,7 +222,7 @@ struct buffer_data *head; size_t head_sp; - if (!b->head) + if (!b || !b->head) return BUFFER_EMPTY; head_sp = (head = b->head)->sp; /* Flush all data. */ @@ -395,6 +415,9 @@ size_t iovcnt = 0; size_t nbyte = 0; + if (!b) + return BUFFER_EMPTY; + for (d = b->head; d && (iovcnt < MAX_CHUNKS) && (nbyte < MAX_FLUSH); d = d->next, iovcnt++) { iov[iovcnt].iov_base = d->data + d->sp; @@ -440,6 +463,8 @@ { ssize_t nbytes; + if (!b) + return BUFFER_ERROR; #if 0 /* Should we attempt to drain any previously buffered data? This could help reduce latency in pushing out the data if we are stuck in a long-running thread that is preventing the main select loop from calling the flush thread... */ diff --git a/src/vty/vty.c b/src/vty/vty.c index a96d86c..27e35fe 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -260,6 +260,13 @@ vprintf(format, ap); } else { va_list args; + + if (!vty->obuf) { + /* There is no output buffer. This can happen from logging to a telnet session, during cleanup + * of this same (killed) telnet session. See OS#4146. */ + return 0; + } + /* Try to write to initial buffer. */ va_copy(args, ap); len = vsnprintf(buf, sizeof buf, format, args); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 20:49:36 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 21 Aug 2019 20:49:36 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 ) Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/15242/2/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/#/c/15242/2/src/libosmo-mgcp/mgcp_network.c at 752 PS2, Line 752: static int amr_oa_check(char *data, int len) > non-related. [?] if you return true or false, it always says whether octet-aligned is on or off. I need a third value saying that the RTP header was invalid, so ... should add an api doc https://gerrit.osmocom.org/#/c/15242/2/src/libosmo-mgcp/mgcp_network.c at 1363 PS2, Line 1363: if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned) > non-related change. it is related: instead of asserting on invalid header size, I need to handle that error by returning -1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 21 Aug 2019 20:49:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 21 21:06:42 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 21 Aug 2019 21:06:42 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 to look at the new patch set (#3). Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... fix crashes: don't assert on incoming RTP packet size Remove various OSMO_ASSERT() on size of incoming packets. Doing an assert on incoming data is a DoS attack vector, absolute no-go. Instead, return -EINVAL and keep running. Change some return values to be able to distinguish successful operation from invalid RTP sizes. In rtp_data_net(), make sure to return negative if the RTP packet was invalid. Some of the error return codes implemented here will only be used in upcoming patch Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c. Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 32 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/42/15242/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 21 22:26:51 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 22:26:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5dc5453640d_57a92abb14d2e5fc645792@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 515s] ar: `u' modifier ignored since `D' is the default (see `U') [ 515s] libtool: link: ranlib .libs/libtransceiver_common.a [ 515s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 515s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 515s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 516s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 516s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 516s] collect2: error: ld returned 1 exit status [ 516s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 516s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 516s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 516s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 516s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 516s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 516s] make[1]: *** [Makefile:444: all] Error 2 [ 516s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 516s] dh_auto_build: make -j1 returned exit code 2 [ 516s] make: *** [debian/rules:6: build] Error 255 [ 516s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 516s] [ 516s] build34 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 22:26:44 UTC 2019. [ 516s] [ 516s] ### VM INTERACTION START ### [ 519s] [ 494.229093] sysrq: SysRq : Power Off [ 519s] [ 494.232653] reboot: Power down [ 520s] ### VM INTERACTION END ### [ 520s] [ 520s] build34 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 22:26:49 UTC 2019. [ 520s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 21 22:34:34 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 22:34:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5dc708461b1_57a92abb14d2e5fc64739c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 844s] ar: `u' modifier ignored since `D' is the default (see `U') [ 844s] libtool: link: ranlib .libs/libtransceiver_common.a [ 844s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 844s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 845s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 845s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 845s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 845s] collect2: error: ld returned 1 exit status [ 845s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 845s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 845s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 845s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 845s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 845s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 845s] make[1]: *** [Makefile:444: all] Error 2 [ 845s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 845s] dh_auto_build: make -j1 returned exit code 2 [ 845s] make: *** [debian/rules:6: build] Error 255 [ 845s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 845s] [ 845s] cloud123 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 22:34:11 UTC 2019. [ 845s] [ 845s] ### VM INTERACTION START ### [ 849s] [ 740.053224] sysrq: SysRq : Power Off [ 849s] [ 740.090192] reboot: Power down [ 850s] ### VM INTERACTION END ### [ 850s] [ 850s] cloud123 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 22:34:17 UTC 2019. [ 850s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 21 23:30:51 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 23:30:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5dd447c8223_57a92abb14d2e5fc6522ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 299s] asciidoc: control_if.adoc: line 115: evaluating: {set2:target:test-usermanual__53.png} [ 299s] asciidoc: control_if.adoc: line 121: filtering: "/usr/bin/python2" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__53.png" -Tpng - [ 299s] asciidoc: control_if.adoc: line 131: evaluating: {counter2:target-number} [ 299s] asciidoc: control_if.adoc: line 131: evaluating: {set2:target:test-usermanual__54.png} [ 299s] asciidoc: control_if.adoc: line 136: filtering: "/usr/bin/python2" "./build/filter-wrapper.py" mscgen -o "/usr/src/packages/BUILD/tests/test-usermanual__54.png" -Tpng - [ 299s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/abis.adoc [ 299s] asciidoc: test-usermanual.adoc: line 31: reading: /usr/src/packages/BUILD/common/chapters/abis.adoc [ 299s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/spectrum.adoc [ 299s] asciidoc: test-usermanual.adoc: line 32: reading: /usr/src/packages/BUILD/common/chapters/spectrum.adoc [ 299s] [ 299s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 299s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 299s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 299s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 299s] make[1]: *** [Makefile:362: all] Error 2 [ 299s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 299s] dh_auto_build: make -j1 returned exit code 2 [ 299s] make: *** [debian/rules:5: binary] Error 255 [ 299s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 299s] [ 299s] lamb62 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Wed Aug 21 23:30:34 UTC 2019. [ 299s] [ 299s] ### VM INTERACTION START ### [ 302s] [ 285.895177] sysrq: SysRq : Power Off [ 302s] [ 285.904283] reboot: Power down [ 303s] ### VM INTERACTION END ### [ 303s] [ 303s] lamb62 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Wed Aug 21 23:30:38 UTC 2019. [ 303s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 21 23:38:51 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 23:38:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5dd6269ccfc_57a92abb14d2e5fc652817@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 398s] ar: `u' modifier ignored since `D' is the default (see `U') [ 398s] libtool: link: ranlib .libs/libtransceiver_common.a [ 398s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 398s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 399s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 399s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 399s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 399s] collect2: error: ld returned 1 exit status [ 399s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 399s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 399s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 399s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 399s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 399s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 399s] make[1]: *** [Makefile:444: all] Error 2 [ 399s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 399s] dh_auto_build: make -j1 returned exit code 2 [ 399s] make: *** [debian/rules:6: build] Error 255 [ 399s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 399s] [ 399s] lamb07 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 23:38:43 UTC 2019. [ 399s] [ 399s] ### VM INTERACTION START ### [ 402s] [ 384.721553] sysrq: SysRq : Power Off [ 402s] [ 384.728767] reboot: Power down [ 402s] ### VM INTERACTION END ### [ 402s] [ 402s] lamb07 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Wed Aug 21 23:38:46 UTC 2019. [ 402s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 21 23:40:17 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 21 Aug 2019 23:40:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5dd664b7e5d_57a92abb14d2e5fc652973@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 226s] ar: `u' modifier ignored since `D' is the default (see `U') [ 226s] libtool: link: ranlib .libs/libtransceiver_common.a [ 226s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 226s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 226s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 226s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 226s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 226s] collect2: error: ld returned 1 exit status [ 226s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 226s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 226s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 226s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 226s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 226s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 226s] make[1]: *** [Makefile:444: all] Error 2 [ 226s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 226s] dh_auto_build: make -j1 returned exit code 2 [ 226s] make: *** [debian/rules:6: build] Error 255 [ 226s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 226s] [ 226s] build79 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 23:40:02 UTC 2019. [ 226s] [ 226s] ### VM INTERACTION START ### [ 229s] [ 217.738136] sysrq: SysRq : Power Off [ 229s] [ 217.739790] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] build79 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 21 23:40:05 UTC 2019. [ 229s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 01:44:17 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 01:44:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5df375a7aa0_57a92abb14d2e5fc66072f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 394s] ar: `u' modifier ignored since `D' is the default (see `U') [ 394s] libtool: link: ranlib .libs/libtransceiver_common.a [ 394s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 394s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 394s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 394s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 394s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 394s] collect2: error: ld returned 1 exit status [ 394s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 394s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 394s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 394s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 394s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 394s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 394s] make[1]: *** [Makefile:444: all] Error 2 [ 394s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 394s] dh_auto_build: make -j1 returned exit code 2 [ 394s] make: *** [debian/rules:6: build] Error 255 [ 394s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 395s] [ 395s] lamb05 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 01:44:09 UTC 2019. [ 395s] [ 395s] ### VM INTERACTION START ### [ 398s] [ 380.302326] sysrq: SysRq : Power Off [ 398s] [ 380.310297] reboot: Power down [ 398s] ### VM INTERACTION END ### [ 398s] [ 398s] lamb05 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 01:44:13 UTC 2019. [ 398s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 01:45:08 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 01:45:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5df3aedb40e_57a92abb14d2e5fc660976@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 396s] ar: `u' modifier ignored since `D' is the default (see `U') [ 396s] libtool: link: ranlib .libs/libtransceiver_common.a [ 396s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 396s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 397s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 397s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 397s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 397s] collect2: error: ld returned 1 exit status [ 397s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 397s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 397s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 397s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 397s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 397s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 397s] make[1]: *** [Makefile:444: all] Error 2 [ 397s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 397s] dh_auto_build: make -j1 returned exit code 2 [ 397s] make: *** [debian/rules:6: build] Error 255 [ 397s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 397s] [ 397s] lamb17 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 01:45:01 UTC 2019. [ 397s] [ 397s] ### VM INTERACTION START ### [ 400s] [ 381.761690] sysrq: SysRq : Power Off [ 400s] [ 381.769739] reboot: Power down [ 400s] ### VM INTERACTION END ### [ 400s] [ 400s] lamb17 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 01:45:04 UTC 2019. [ 400s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 03:53:42 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 03:53:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5e11ccbdc53_57a92abb14d2e5fc6656b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 253s] ar: `u' modifier ignored since `D' is the default (see `U') [ 253s] libtool: link: ranlib .libs/libtransceiver_common.a [ 253s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 253s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 254s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 254s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 254s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 254s] collect2: error: ld returned 1 exit status [ 254s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 254s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 254s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 254s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 254s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 254s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 254s] make[1]: *** [Makefile:444: all] Error 2 [ 254s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 254s] dh_auto_build: make -j1 returned exit code 2 [ 254s] make: *** [debian/rules:6: build] Error 255 [ 254s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 254s] [ 254s] build84 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 03:53:33 UTC 2019. [ 254s] [ 254s] ### VM INTERACTION START ### [ 257s] [ 244.902740] sysrq: SysRq : Power Off [ 257s] [ 244.904730] reboot: Power down [ 257s] ### VM INTERACTION END ### [ 257s] [ 257s] build84 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 03:53:36 UTC 2019. [ 257s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 03:55:42 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 03:55:42 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5e124768aa5_57a92abb14d2e5fc66601b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 394s] ar: `u' modifier ignored since `D' is the default (see `U') [ 394s] libtool: link: ranlib .libs/libtransceiver_common.a [ 394s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 394s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 394s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 394s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 394s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 394s] collect2: error: ld returned 1 exit status [ 394s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 394s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 394s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 394s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 394s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 394s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 394s] make[1]: *** [Makefile:444: all] Error 2 [ 394s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 394s] dh_auto_build: make -j1 returned exit code 2 [ 394s] make: *** [debian/rules:6: build] Error 255 [ 394s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 394s] [ 394s] lamb17 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 22 03:55:33 UTC 2019. [ 394s] [ 394s] ### VM INTERACTION START ### [ 397s] [ 379.431231] sysrq: SysRq : Power Off [ 397s] [ 379.440660] reboot: Power down [ 397s] ### VM INTERACTION END ### [ 397s] [ 397s] lamb17 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 22 03:55:35 UTC 2019. [ 397s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 22 10:25:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 22 Aug 2019 10:25:44 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: fix: vty crash by logging to killed telnet session ...................................................................... Patch Set 1: (6 comments) https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 11 PS1, Line 11: segfaults: the vty->obuf is already NULL. Why do we try to send a message to a killed session first of all? That seems to be the route of the issue. https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 13 PS1, Line 13: In vty_out(), guard against this situation by not composing an output if Fine with this part so far. https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 16 PS1, Line 16: Also guard all buffer_*() functions against a NULL buffer argument, which this looks like a hack to fix other parts of the code which may be wrong, and looks like it should be fixed in other places rather than here. https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 20 PS1, Line 20: Related: OS#4164 This ticket doesn't look related to me. https://gerrit.osmocom.org/#/c/15265/1/src/vty/buffer.c File src/vty/buffer.c: https://gerrit.osmocom.org/#/c/15265/1/src/vty/buffer.c at 95 PS1, Line 95: if (!b) I don't think these checks are really needed to fix the issue at hand, so at least they should go into a separate commit. https://gerrit.osmocom.org/#/c/15265/1/src/vty/vty.c File src/vty/vty.c: https://gerrit.osmocom.org/#/c/15265/1/src/vty/vty.c at 266 PS1, Line 266: * of this same (killed) telnet session. See OS#4146. */ OS#4146 (https://osmocom.org/issues/4146) seems non-related to what you say here, probably wrong ticket number. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 22 Aug 2019 10:25:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 10:35:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 22 Aug 2019 10:35:38 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 ) Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... Patch Set 3: (1 comment) I think you have lots of duplicates for same check (len < sizeof(struct rtp_hdr)) all around, some them being hit by same packet. That's because these checks are at the end of code paths, while they should be in previous more generic paths (like when receiving an rtp packet), and have it only there. Specially since most functions containing the checks are static which means are called by same parent functions... https://gerrit.osmocom.org/#/c/15242/3/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/#/c/15242/3/src/libosmo-mgcp/mgcp_network.c at 511 PS3, Line 511: return; This one shoudl return -EINVAL too. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 22 Aug 2019 10:35:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 14:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 22 Aug 2019 14:59:58 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 Change subject: libgtp: Introduce cb_recovery3 ...................................................................... libgtp: Introduce cb_recovery3 Since osmo-ggsn can manage several GSN structures simultaneously, it needs the gsn_t pointer to know the ggsn it should forward the call to. Related: OS#4165 Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/66/15266/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 94c3245..949b62a 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -219,6 +219,8 @@ gsn->cb_recovery(peer, recovery); if (gsn->cb_recovery2) gsn->cb_recovery2(peer, pdp, recovery); + if (gsn->cb_recovery3) + gsn->cb_recovery3(gsn, peer, pdp, recovery); } int gtp_set_cb_recovery(struct gsn_t *gsn, @@ -242,6 +244,20 @@ return 0; } +/* cb_recovery() + * pdp may be NULL if Recovery IE was received from a message independent + * of any PDP ctx (such as Echo Response), or because pdp ctx is unknown to the + * local setup. In case pdp is known, caller may want to keep that pdp alive to + * handle subsequent msg cb as this specific pdp ctx is still valid according to + * specs. + */ +int gtp_set_cb_recovery3(struct gsn_t *gsn, + int (*cb_recovery3) (struct gsn_t * gsn, struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery)) +{ + gsn->cb_recovery3 = cb_recovery3; + return 0; +} + int gtp_set_cb_data_ind(struct gsn_t *gsn, int (*cb_data_ind) (struct pdp_t * pdp, void *pack, unsigned len)) diff --git a/gtp/gtp.h b/gtp/gtp.h index c2c5122..a1d5f18 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -277,6 +277,7 @@ int (*cb_data_ind) (struct pdp_t * pdp, void *pack, unsigned len); int (*cb_recovery) (struct sockaddr_in * peer, uint8_t recovery); int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery); + int (*cb_recovery3) (struct gsn_t * gsn, struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery); /* Counters */ @@ -373,6 +374,11 @@ int gtp_set_cb_recovery2(struct gsn_t *gsn, int (*cb) (struct sockaddr_in * peer, struct pdp_t * pdp, + uint8_t recovery)) + OSMO_DEPRECATED("Use gtp_set_cb_recovery3() instead, to obtain gsn handling the recovery");; +int gtp_set_cb_recovery3(struct gsn_t *gsn, + int (*cb) (struct gsn_t * gsn, struct sockaddr_in * peer, + struct pdp_t * pdp, uint8_t recovery)); void gtp_clear_queues(struct gsn_t *gsn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 14:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 22 Aug 2019 14:59:58 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... ggsn: Implement echo req/resp and recovery This patch is quite big because implementing echo req/resp and recovery requires having knowledge and managing differntiated state for each GSN peer attached/connected to osmo-ggsn. This kind of information was not available in osmo-ggsn nor in libgtp. So osmo-ggsn is now able to track GSN peers connected to a ggsn_ctx (associated gsn_t from libgtp) by means of "sgsn_peer" data structure, and accessible from the ggsn through a list. The instances of sgsn_peer are currently allocated and destroyed dynamically based on discovered peer who have at least a pdp context attached to us (we are not interested in peers without pdp contexts because we don't need o send echo requests/responses and maintain state in that case). A new private pointer (pdp_t->priv) data structure struct pdp_priv_t is added to be able to relate a pdp_t to an sgsn as well as the already existing pointer to an apn. An "echo-interval <0-36000>" VTY command is added which allows configuring time wait between echo requests being sent to each sgsn_peer. Transmission of echo requests is disabled by default. Finally, a new "show sgsn" VTY command is introduced, and its output is also printed during "show ggsn". Related: OS#4165 Change-Id: Id2c84165dc59dff495106758146a701ca488834f --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c A ggsn/sgsn.c A ggsn/sgsn.h 6 files changed, 377 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/67/15267/1 diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index a8ddf1e..ca389f0 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -12,4 +12,4 @@ endif osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h +osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index a8c9847..fb380d4 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -61,6 +61,17 @@ static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what); static int cb_tun_ind(struct tun_t *tun, void *pack, unsigned len); +void ggsn_close_one_pdp(struct pdp_t *pdp) +{ + LOGPPDP(LOGL_DEBUG, pdp, "Sending DELETE PDP CTX due to shutdown\n"); + gtp_delete_context_req2(pdp->gsn, pdp, NULL, 1); + /* We have nothing more to do with pdp ctx, free it. Upon cb_delete_context + called during this call we'll clean up ggsn related stuff attached to this + pdp context. After this call, ippool member is cleared so + data is no longer valid and should not be accessed anymore. */ + gtp_freepdp_teardown(pdp->gsn, pdp); +} + static void pool_close_all_pdp(struct ippool_t *pool) { unsigned int i; @@ -77,13 +88,7 @@ pdp = member->peer; if (!pdp) continue; - LOGPPDP(LOGL_DEBUG, pdp, "Sending DELETE PDP CTX due to shutdown\n"); - gtp_delete_context_req2(pdp->gsn, pdp, NULL, 1); - /* We have nothing more to do with pdp ctx, free it. Upon cb_delete_context - called during this call we'll clean up ggsn related stuff attached to this - pdp context. After this call, ippool member is cleared so - data is no longer valid and should not be accessed anymore. */ - gtp_freepdp_teardown(pdp->gsn, pdp); + ggsn_close_one_pdp(pdp); } } @@ -341,7 +346,8 @@ static int delete_context(struct pdp_t *pdp) { struct gsn_t *gsn = pdp->gsn; - struct apn_ctx *apn = pdp->priv; + struct pdp_priv_t *pdp_priv = pdp->priv; + struct apn_ctx *apn = pdp_priv->apn; struct ippoolm_t *member; int i; @@ -356,6 +362,15 @@ LOGPPDP(LOGL_ERROR, pdp, "Cannot find/free IP Pool member\n"); } + if (!pdp_priv) { + LOGPPDP(LOGL_NOTICE, pdp, "Deleting PDP context: without private structure!\n"); + return 0; + } + + /* Remove from SGSN */ + sgsn_peer_remove_pdp_priv(pdp_priv); + + apn = pdp_priv->apn; if (apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { if (gtp_kernel_tunnel_del(pdp, apn->tun.cfg.dev_name)) { LOGPPDP(LOGL_ERROR, pdp, "Cannot delete tunnel from kernel:%s\n", @@ -363,6 +378,8 @@ } } + talloc_free(pdp_priv); + return 0; } @@ -380,6 +397,36 @@ return false; } +static struct sgsn_peer* ggsn_find_sgsn(struct ggsn_ctx *ggsn, struct in_addr *peer_addr) +{ + struct sgsn_peer *sgsn; + + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) { + if (memcmp(&sgsn->addr, peer_addr, sizeof(*peer_addr)) == 0) + return sgsn; + } + return NULL; +} + +static struct sgsn_peer* ggsn_find_or_create_sgsn(struct ggsn_ctx *ggsn, struct pdp_t *pdp) +{ + struct sgsn_peer *sgsn; + struct in_addr ia; + + if (gsna2in_addr(&ia, &pdp->gsnrc)) { + LOGPPDP(LOGL_ERROR, pdp, "Failed parsing gsnrc (len=%u) to discover SGSN\n", + pdp->gsnrc.l); + return NULL; + } + + if ((sgsn = ggsn_find_sgsn(ggsn, &ia))) + return sgsn; + + sgsn = sgsn_peer_allocate(ggsn, &ia, pdp->version); + llist_add(&sgsn->entry, &ggsn->sgsn_list); + return sgsn; +} + int create_context_ind(struct pdp_t *pdp) { static char name_buf[256]; @@ -391,6 +438,8 @@ struct apn_ctx *apn = NULL; int rc, num_addr, i; char *apn_name; + struct sgsn_peer *sgsn; + struct pdp_priv_t *pdp_priv; apn_name = osmo_apn_to_str(name_buf, pdp->apn_req.v, pdp->apn_req.l); LOGPPDP(LOGL_DEBUG, pdp, "Processing create PDP context request for APN '%s'\n", @@ -492,7 +541,14 @@ } pdp->ipif = apn->tun.tun; /* TODO */ - pdp->priv = apn; + + pdp_priv = talloc_zero(ggsn, struct pdp_priv_t); + pdp->priv = pdp_priv; + pdp_priv->lib = pdp; + /* Create sgsn and assign pdp to it */ + sgsn = ggsn_find_or_create_sgsn(ggsn, pdp); + sgsn_peer_add_pdp_priv(sgsn, pdp_priv); + pdp_priv->apn = apn; /* TODO: change trap to send 2 IPs */ if (!send_trap(gsn, pdp, member, "imsi-ass-ip")) { /* TRAP with IP assignment */ @@ -707,6 +763,7 @@ /* libgtp callback for confirmations */ static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp) { + struct sgsn_peer* sgsn; int rc = 0; if (cause == EOF) @@ -725,12 +782,31 @@ Rx path. This code is nevertheless left here in order to ease future developent and avoid possible future memleaks once more scenarios where GGSN sends a DeleteCtxRequest are introduced. */ - if (pdp) + if (pdp) rc = pdp_freepdp(pdp); + break; + case GTP_ECHO_REQ: + sgsn = (struct sgsn_peer*) cbp; + sgsn_peer_echo_resp(sgsn, cause == EOF); + break; } return rc; } +static int cb_recovery3(struct gsn_t* gsn, struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery) +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *)gsn->priv; + struct sgsn_peer *sgsn; + + sgsn = ggsn_find_sgsn(ggsn, &peer->sin_addr); + if (!sgsn) { + LOGPGGSN(LOGL_NOTICE, ggsn, "Received Recovery IE for unknown SGSN (no PDP contexts active)\n"); + return -EINVAL; + } + + return sgsn_peer_handle_recovery(sgsn, pdp, recovery); +} + /* Start a given GGSN */ int ggsn_start(struct ggsn_ctx *ggsn) { @@ -778,6 +854,7 @@ gtp_set_cb_delete_context(ggsn->gsn, delete_context); gtp_set_cb_create_context_ind(ggsn->gsn, create_context_ind); gtp_set_cb_conf(ggsn->gsn, cb_conf); + gtp_set_cb_recovery3(ggsn->gsn, cb_recovery3); LOGPGGSN(LOGL_NOTICE, ggsn, "Successfully started\n"); ggsn->started = true; diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 6155b30..5b8ab0b 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -14,6 +14,8 @@ #include "../lib/in46_addr.h" #include "../gtp/gtp.h" +#include "sgsn.h" + #define APN_TYPE_IPv4 0x01 /* v4-only */ #define APN_TYPE_IPv6 0x02 /* v6-only */ #define APN_TYPE_IPv4v6 0x04 /* v4v6 dual-stack */ @@ -89,6 +91,14 @@ struct apn_ctx_ip v6; }; +struct pdp_priv_t { + struct pdp_t *lib; /* pointer to libgtp associated pdp_t instance */ + //struct ggsn_ctx *ggsn; can be reached through pdp->gsn->priv + struct sgsn_peer *sgsn; + struct apn_ctx *apn; + struct llist_head entry; /* to be included into sgsn_peer */ +}; + struct ggsn_ctx { /* global list of GGSNs */ struct llist_head list; @@ -96,6 +106,9 @@ /* list of APNs in this GGSN */ struct llist_head apn_list; + /* list of SGSN peers (struct sgsn_peer) in this GGSN. TODO: hash table with key ? */ + struct llist_head sgsn_list; + bool started; struct { @@ -125,6 +138,9 @@ struct osmo_fd gtp_fd1u; struct osmo_timer_list gtp_timer; + + /* Time between Echo requests on each SGSN */ + int echo_interval; }; /* ggsn_vty.c */ @@ -145,6 +161,7 @@ extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); extern int apn_stop(struct apn_ctx *apn); +void ggsn_close_one_pdp(struct pdp_t *pdp); #define LOGPAPN(level, apn, fmt, args...) \ LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 5684f5a..ab2a9f5 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -40,6 +40,7 @@ #include "../lib/util.h" #include "ggsn.h" +#include "sgsn.h" #define PREFIX_STR "Prefix (Network/Netmask)\n" #define IFCONFIG_STR "GGSN-based interface configuration\n" @@ -79,6 +80,7 @@ ggsn->cfg.state_dir = talloc_strdup(ggsn, "/tmp"); ggsn->cfg.shutdown = true; INIT_LLIST_HEAD(&ggsn->apn_list); + INIT_LLIST_HEAD(&ggsn->sgsn_list); llist_add_tail(&ggsn->list, &g_ggsn_list); return ggsn; @@ -328,6 +330,66 @@ return CMD_SUCCESS; } +static void show_one_sgsn(struct vty *vty, const struct sgsn_peer *sgsn, const char* prefix) +{ + char buf[INET_ADDRSTRLEN]; + + inet_ntop(AF_INET, &sgsn->addr, buf, sizeof(buf)); + vty_out(vty, "%s(S)GSN %s%s", prefix, buf, VTY_NEWLINE); + vty_out(vty, "%s Restart Counter: %d%s", prefix, sgsn->remote_restart_ctr, VTY_NEWLINE); + vty_out(vty, "%s PDP contexts: %d%s", prefix, llist_count(&sgsn->pdp_list), VTY_NEWLINE); + vty_out(vty, "%s Echo Requests in-flight: %u%s", prefix, sgsn->tx_msgs_queued, VTY_NEWLINE); +} + +DEFUN(cfg_ggsn_show_sgsn, cfg_ggsn_show_sgsn_cmd, + "show sgsn", + NO_STR GGSN_STR "Remove the GGSN from administrative shut-down\n") +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; + struct sgsn_peer *sgsn; + + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) { + show_one_sgsn(vty, sgsn, ""); + } + + return CMD_SUCCESS; +} + +/* Seee 3GPP TS 29.060 section 7.2.1 */ +DEFUN(cfg_ggsn_echo_interval, cfg_ggsn_echo_interval_cmd, + "echo-interval <0-36000>", + GGSN_STR "GGSN Number\n" + "Send an echo request to this static GGSN every interval.\n" + "Interval between echo requests in seconds (default: 0, disabled).\n") +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; + int prev_interval = ggsn->echo_interval; + struct sgsn_peer *sgsn; + + ggsn->echo_interval = atoi(argv[0]); + + if (ggsn->echo_interval != 0 && ggsn->echo_interval < 60) + vty_out(vty, "%% 3GPP TS 29.060 section states inteval should " \ + "not be lower than 60 seconds, use this value for " \ + "testing purposes only!%s", VTY_NEWLINE); + + if (prev_interval == ggsn->echo_interval) + return CMD_SUCCESS; + + if (ggsn->echo_interval) { + /* Re-enable echo timer for all sgsn */ + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) + sgsn_echo_timer_start(sgsn); + } else { + /* Disable echo timer for all sgsn */ + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) + sgsn_echo_timer_stop(sgsn); + } + + return CMD_SUCCESS; +} + + /* APN Node */ static struct cmd_node apn_node = { @@ -964,12 +1026,15 @@ static void show_one_ggsn(struct vty *vty, struct ggsn_ctx *ggsn) { struct apn_ctx *apn; + struct sgsn_peer *sgsn; vty_out(vty, "GGSN %s: Bound to %s%s", ggsn->cfg.name, in46a_ntoa(&ggsn->cfg.listen_addr), VTY_NEWLINE); /* FIXME */ llist_for_each_entry(apn, &ggsn->apn_list, list) show_apn(vty, apn); + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) + show_one_sgsn(vty, sgsn, " "); } DEFUN(show_ggsn, show_ggsn_cmd, @@ -1016,6 +1081,8 @@ install_element(GGSN_NODE, &cfg_ggsn_no_apn_cmd); install_element(GGSN_NODE, &cfg_ggsn_default_apn_cmd); install_element(GGSN_NODE, &cfg_ggsn_no_default_apn_cmd); + install_element(GGSN_NODE, &cfg_ggsn_show_sgsn_cmd); + install_element(GGSN_NODE, &cfg_ggsn_echo_interval_cmd); install_node(&apn_node, NULL); install_element(APN_NODE, &cfg_description_cmd); diff --git a/ggsn/sgsn.c b/ggsn/sgsn.c new file mode 100644 index 0000000..b3bd7d0 --- /dev/null +++ b/ggsn/sgsn.c @@ -0,0 +1,159 @@ +#include "sgsn.h" +#include "ggsn.h" + + +static bool sgsn_peer_attempt_free(struct sgsn_peer *sgsn) +{ + /* We have to be careful here, since if all pdp ctx for that sgsn were + deactivated in-between we sent the Echo Req and receivied the timeout + idnication, the sgsn (cbp) may be already gone. We'll probably need + to add some counter reference of echo requets in flight and only free + sgsn structures when it goes to zero decreased for all Echo Resp. We + do it this way because currently in libgtp there's no understanding + of "gsn peer" for which messages are grouped and hence we cannot + request libgtp to drop all queued messages for a specific peer. */ + if (sgsn->tx_msgs_queued) { + LOGSGSN(LOGL_INFO, sgsn, "Delaying delete, still %u echo messages queued\n", + sgsn->tx_msgs_queued); + return false; + } + llist_del(&sgsn->entry); + LOGSGSN(LOGL_INFO, sgsn, "Deleting SGSN\n"); + talloc_free(sgsn); + return true; +} + +static void sgsn_peer_echo_req(struct sgsn_peer *sgsn) +{ + struct ggsn_ctx *ggsn = sgsn->ggsn; + LOGSGSN(LOGL_INFO, sgsn, "Tx Echo Request\n"); + gtp_echo_req(ggsn->gsn, sgsn->gtp_version, sgsn, &sgsn->addr); + sgsn->tx_msgs_queued++; +} + +void sgsn_peer_echo_resp(struct sgsn_peer *sgsn, bool timeout) +{ + if (timeout) { + LOGSGSN(LOGL_NOTICE, sgsn, "Rx Echo Request timed out!\n"); + sgsn_peer_drop_all_pdp(sgsn); + } else { + LOGSGSN(LOGL_INFO, sgsn, "Rx Echo Response\n"); + } + + /* We decrement it here after dropping all pdps to make sure sgsn was + not freed upon last pdp ctx deleted and is still alive now */ + sgsn->tx_msgs_queued--; + if (llist_empty(&sgsn->pdp_list)) + sgsn_peer_attempt_free(sgsn); +} + +void sgsn_echo_timer_start(struct sgsn_peer *sgsn) +{ + if (sgsn->ggsn->echo_interval == 0) + return; + sgsn_peer_echo_req(sgsn); + osmo_timer_schedule(&sgsn->echo_timer, sgsn->ggsn->echo_interval, 0); +} + +void sgsn_echo_timer_stop(struct sgsn_peer *sgsn) +{ + osmo_timer_del(&sgsn->echo_timer); +} + +static void sgsn_echo_timer_cb(void *data) +{ + struct sgsn_peer *sgsn = (struct sgsn_peer *) data; + sgsn_echo_timer_start(sgsn); +} + +struct sgsn_peer *sgsn_peer_allocate(struct ggsn_ctx *ggsn, struct in_addr *ia, unsigned int gtp_version) +{ + struct sgsn_peer *sgsn; + + sgsn = talloc_zero_size(ggsn, sizeof(struct sgsn_peer)); + sgsn->ggsn = ggsn; + sgsn->addr = *ia; + sgsn->remote_restart_ctr = -1; + INIT_LLIST_HEAD(&sgsn->pdp_list); + INIT_LLIST_HEAD(&sgsn->entry); + + osmo_timer_setup(&sgsn->echo_timer, sgsn_echo_timer_cb, sgsn); + + LOGSGSN(LOGL_INFO, sgsn, "Discovered\n"); + return sgsn; +} + +void sgsn_peer_add_pdp_priv(struct sgsn_peer *sgsn, struct pdp_priv_t *pdp_priv) +{ + bool was_empty = llist_empty(&sgsn->pdp_list); + pdp_priv->sgsn = sgsn; + llist_add(&pdp_priv->entry, &sgsn->pdp_list); + if (was_empty) + sgsn_echo_timer_start(sgsn); +} + +void sgsn_peer_remove_pdp_priv(struct pdp_priv_t* pdp_priv) +{ + struct sgsn_peer *sgsn = pdp_priv->sgsn; + llist_del(&pdp_priv->entry); + if (sgsn && llist_empty(&sgsn->pdp_list)) { + /* No PDP contexts associated to this SGSN, no need to keep it */ + sgsn_echo_timer_stop(sgsn); + /* sgsn may not be freed if there are some messages still queued + in libgtp which could return a pointer to it */ + sgsn_peer_attempt_free(sgsn); + } + + pdp_priv->sgsn = NULL; +} + +/* High-level function to be called in case a GGSN has disappeared or + * otherwise lost state (recovery procedure). It will detach all related pdp ctx + * from a ggsn and communicate deact to MS. Optionally (!NULL), one pdp ctx can + * be kept alive to allow handling later message which contained the Recovery IE. */ +static unsigned int sgsn_peer_drop_all_pdp_except(struct sgsn_peer *sgsn, struct pdp_priv_t *except) +{ + unsigned int num = 0; + char buf[INET_ADDRSTRLEN]; + + inet_ntop(AF_INET, &sgsn->addr, buf, sizeof(buf)); + + struct pdp_priv_t *pdp, *pdp2; + llist_for_each_entry_safe(pdp, pdp2, &sgsn->pdp_list, entry) { + if (pdp == except) + continue; + ggsn_close_one_pdp(pdp->lib); + num++; + } + + /* Note: if except is NULL, all pdp contexts are freed and sgsn is + already freed at this point */ + LOGP(DGGSN, LOGL_INFO, "SGSN(%s) Dropped %u PDP contexts\n", buf, num); + + return num; +} + +unsigned int sgsn_peer_drop_all_pdp(struct sgsn_peer *sgsn) +{ + return sgsn_peer_drop_all_pdp_except(sgsn, NULL); +} + +int sgsn_peer_handle_recovery(struct sgsn_peer *sgsn, struct pdp_t *pdp, uint8_t recovery) +{ + struct pdp_priv_t *pdp_priv = NULL; + + if (sgsn->remote_restart_ctr == -1) { + /* First received ECHO RESPONSE, note the restart ctr */ + sgsn->remote_restart_ctr = recovery; + } else if (sgsn->remote_restart_ctr != recovery) { + /* counter has changed (SGSN restart): release all PDP */ + LOGSGSN(LOGL_NOTICE, sgsn, "SGSN recovery (%u->%u) pdp=%p, " + "releasing all%s PDP contexts\n", + sgsn->remote_restart_ctr, recovery, pdp, pdp ? " other" : ""); + sgsn->remote_restart_ctr = recovery; + if (pdp) + pdp_priv = pdp->priv; + sgsn_peer_drop_all_pdp_except(sgsn, pdp_priv); + } + return 0; +} diff --git a/ggsn/sgsn.h b/ggsn/sgsn.h new file mode 100644 index 0000000..1312345 --- /dev/null +++ b/ggsn/sgsn.h @@ -0,0 +1,46 @@ +#pragma once + +#include +#include +#include +#include + +#include +#include + +#include "../gtp/pdp.h" + +struct ggsn_ctx; +struct pdp_priv_t; + +struct sgsn_peer { + struct llist_head entry; /* to be included into ggsn_ctx */ + struct ggsn_ctx *ggsn; /* backpointer to ggsn_ctx */ + struct in_addr addr; /* Addr of the sgsn peer */ + unsigned int gtp_version; /* GTP version */ + int remote_restart_ctr; /* Last received Restart Ctr from sgsn peer, -1 == unknown */ + /* list of pdp contexts associated with this sgsn */ + struct llist_head pdp_list; + /* Sends echo request towards SGSN on expiration. Echo Resp is received + through cb_recovery2(), and echo Req timeout through + cb_conf(GTP_ECHO_REQ, EOF, NULL, cbp); */ + struct osmo_timer_list echo_timer; + /* Number of GTP messages in libgtp transmit queue */ + unsigned int tx_msgs_queued; +}; + +struct sgsn_peer *sgsn_peer_allocate(struct ggsn_ctx *ggsn, struct in_addr *ia, unsigned int gtp_version); +void sgsn_peer_add_pdp_priv(struct sgsn_peer *sgsn, struct pdp_priv_t *pdp_priv); +void sgsn_peer_remove_pdp_priv(struct pdp_priv_t* pdp_priv); + +void sgsn_echo_timer_start(struct sgsn_peer *sgsn); +void sgsn_echo_timer_stop(struct sgsn_peer *sgsn); + +void sgsn_peer_echo_resp(struct sgsn_peer *sgsn, bool timeout); +unsigned int sgsn_peer_drop_all_pdp(struct sgsn_peer *sgsn); +int sgsn_peer_handle_recovery(struct sgsn_peer *sgsn, struct pdp_t *pdp, uint8_t recovery); + +#define LOGSGSN(level, sgsn, fmt, args...) { \ + char _buf[INET_ADDRSTRLEN]; \ + LOGP(DGGSN, level, "SGSN(%s): " fmt, inet_ntop(AF_INET, &sgsn->addr, _buf, sizeof(_buf)), ## args); \ + } while (0) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 15:01:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 22 Aug 2019 15:01:27 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... Patch Set 1: Working fine with manual testing (against osmo-sgsn). I still need to add some TTCN3 cases before merging it, so setting it as WIP. TTCN3 test cases already exist in ttcn3-sgsn suite, so it's mostly about replicating similar tests in ttcn3-ggsn. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 22 Aug 2019 15:01:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 16:08:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 22 Aug 2019 16:08:25 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... Patch Set 1: Code-Review-1 (2 comments) This change is ready for review. https://gerrit.osmocom.org/#/c/15267/1/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/#/c/15267/1/ggsn/ggsn.c at 350 PS1, Line 350: struct apn_ctx *apn = pdp_priv->apn; Self-note: This line needs to be: struct apn_ctx *apn; https://gerrit.osmocom.org/#/c/15267/1/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/#/c/15267/1/ggsn/ggsn_vty.c at 360 PS1, Line 360: "echo-interval <0-36000>", TODO: update VTY .xml file. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 22 Aug 2019 16:08:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:07:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:07:19 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce in46a_is_v{4,6}() helpers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 ) Change subject: Introduce in46a_is_v{4,6}() helpers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb Gerrit-Change-Number: 15245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:07:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:10:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:10:23 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 ) Change subject: ggsn: Move PCO handling code into its own file ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15246/1/ggsn/pco.c File ggsn/pco.c: https://gerrit.osmocom.org/#/c/15246/1/ggsn/pco.c at 3 PS1, Line 3: * Copyright 2019 sysmocom - s.f.m.c. GmbH are we sure this is true? moving this between files invalidates the ability to track the commit history ad figure out who acutally wrote the code. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:10:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:10:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:10:34 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 ) Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:10:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:11:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:11:18 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 ) Change subject: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia34939957bb7856388cb52a741cec0c015a08c70 Gerrit-Change-Number: 15248 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:11:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:13:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:13:58 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Split application lifecycle related code into ggsn_main.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 ) Change subject: ggsn: Split application lifecycle related code into ggsn_main.c ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15249/1/ggsn/ggsn_main.c File ggsn/ggsn_main.c: https://gerrit.osmocom.org/#/c/15249/1/ggsn/ggsn_main.c at 3 PS1, Line 3: * Copyright 2019 sysmocom - s.f.m.c. GmbH same here, I would be very careful about putting this copyright statement with only sysmocom here, unless you have actually checked in detail that all commits leading to the lines you're moving actually have been written by sysmocom employees. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 Gerrit-Change-Number: 15249 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:13:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:14:23 +0000 Subject: Change in ...osmo-ggsn[master]: Move pdp_get_peer_ipv() to lib/util.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 ) Change subject: Move pdp_get_peer_ipv() to lib/util.* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 Gerrit-Change-Number: 15250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:14:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:15:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:15:00 +0000 Subject: Change in ...osmo-ggsn[master]: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 ) Change subject: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7e164f40f50de43027bcd4464aa879450d2fb10e Gerrit-Change-Number: 15251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:15:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:15:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:15:13 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce LOGTUN log helper In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 ) Change subject: Introduce LOGTUN log helper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I237acdee0be19498804e0d509c610f4e0454ba72 Gerrit-Change-Number: 15252 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:15:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:15:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:15:35 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 ) Change subject: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I98db39a710a72a1438d71aabaf4f8227984643e3 Gerrit-Change-Number: 15253 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:15:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:15:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:15:46 +0000 Subject: Change in ...osmo-ggsn[master]: pdp: constify param in pdp_count_secondary() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 ) Change subject: pdp: constify param in pdp_count_secondary() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie772f2c54264c8bc91f50d9030479861dd8868b7 Gerrit-Change-Number: 15255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:15:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:18:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:18:29 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 ) Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:18:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 21:18:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 22 Aug 2019 21:18:56 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 ) Change subject: libgtp: Introduce cb_recovery3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 22 Aug 2019 21:18:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 22:28:32 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 22 Aug 2019 22:28:32 +0000 Subject: Change in ...osmo-iuh[master]: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15268 Change subject: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw ...................................................................... hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw Otherwise the process hangs if the user enters: $ show hnb NAME Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f --- M src/hnbgw_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/68/15268/1 diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c index 15fdaf8..84a5f01 100644 --- a/src/hnbgw_vty.c +++ b/src/hnbgw_vty.c @@ -231,7 +231,7 @@ return CMD_SUCCESS; } - hnb = hnb_context_by_identity_info(&g_hnb_gw, identity_info); + hnb = hnb_context_by_identity_info(g_hnb_gw, identity_info); if (hnb == NULL) { vty_out(vty, "No HNB found with identity '%s'%s", identity_info, VTY_NEWLINE); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f Gerrit-Change-Number: 15268 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 22 22:32:38 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 22 Aug 2019 22:32:38 +0000 Subject: Change in ...osmo-iuh[master]: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-iuh/+/15268 ) Change subject: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw ...................................................................... hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw Otherwise the process hangs if the user enters: $ show hnb NAME hnbgw_vty.c: In function ?show_one_hnb?: hnbgw_vty.c:234:2: warning: passing argument 1 of ?hnb_context_by_identity_info? from incompatible pointer type [enabled by default] iuh/hnbgw.h:154:21: note: expected ?struct hnb_gw *? but argument is of type ?struct hnb_gw **? Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f --- M src/hnbgw_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/68/15268/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f Gerrit-Change-Number: 15268 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:42:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:42:02 +0000 Subject: Change in ...osmo-iuh[master]: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15268 ) Change subject: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f Gerrit-Change-Number: 15268 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 06:42:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:42:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:42:04 +0000 Subject: Change in ...osmo-iuh[master]: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15268 ) Change subject: hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw ...................................................................... hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw Otherwise the process hangs if the user enters: $ show hnb NAME hnbgw_vty.c: In function ?show_one_hnb?: hnbgw_vty.c:234:2: warning: passing argument 1 of ?hnb_context_by_identity_info? from incompatible pointer type [enabled by default] iuh/hnbgw.h:154:21: note: expected ?struct hnb_gw *? but argument is of type ?struct hnb_gw **? Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f --- M src/hnbgw_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c index 15fdaf8..84a5f01 100644 --- a/src/hnbgw_vty.c +++ b/src/hnbgw_vty.c @@ -231,7 +231,7 @@ return CMD_SUCCESS; } - hnb = hnb_context_by_identity_info(&g_hnb_gw, identity_info); + hnb = hnb_context_by_identity_info(g_hnb_gw, identity_info); if (hnb == NULL) { vty_out(vty, "No HNB found with identity '%s'%s", identity_info, VTY_NEWLINE); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I42fdb10af5f6427886b5797325830dfc212af30f Gerrit-Change-Number: 15268 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:42:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:42:32 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 ) Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 06:42:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:43:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:43:04 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15243 ) Change subject: mgcp_send(): stop looping on conversion error ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 06:43:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:53:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:53:51 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Add missing v4v6 tests in expected-results.xml In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15260 ) Change subject: ggsn: Add missing v4v6 tests in expected-results.xml ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15260 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: I80598fad57b8e7172ac073ebe2b3445e5ab132f0 Gerrit-Change-Number: 15260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 06:53:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:53:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:53:56 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Update test xfail->pass in expected-results.xml In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15261 ) Change subject: ggsn: Update test xfail->pass in expected-results.xml ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15261 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: Ia5006c9258de9b442b32ae92ae75ef08670de7cf Gerrit-Change-Number: 15261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 06:53:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:54:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:54:29 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp46_act_deact_apn4 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262 ) Change subject: ggsn: Introduce test TC_pdp46_act_deact_apn4 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262 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: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8 Gerrit-Change-Number: 15262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 06:54:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:54:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:54:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Add missing v4v6 tests in expected-results.xml In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15260 ) Change subject: ggsn: Add missing v4v6 tests in expected-results.xml ...................................................................... ggsn: Add missing v4v6 tests in expected-results.xml Change-Id: I80598fad57b8e7172ac073ebe2b3445e5ab132f0 --- M ggsn_tests/expected-results.xml 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index c60a804..445d566 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -19,6 +19,13 @@ + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15260 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: I80598fad57b8e7172ac073ebe2b3445e5ab132f0 Gerrit-Change-Number: 15260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:54:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:54:31 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Update test xfail->pass in expected-results.xml In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15261 ) Change subject: ggsn: Update test xfail->pass in expected-results.xml ...................................................................... ggsn: Update test xfail->pass in expected-results.xml Commit below fixed the test but forgot to update this file. Fixes: 8e7a396656f8d32c44254de0c65f26c6a2c833f2 Change-Id: Ia5006c9258de9b442b32ae92ae75ef08670de7cf --- M ggsn_tests/expected-results.xml 1 file changed, 1 insertion(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index 445d566..e57a7df 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -8,12 +8,7 @@ - - Secondary DNS IPv4 PCO option not found - GGSN_Tests.ttcn:MASKED GGSN_Tests control part - GGSN_Tests.ttcn:MASKED TC_pdp4_act_deact_with_separate_dns testcase - - + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15261 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: Ia5006c9258de9b442b32ae92ae75ef08670de7cf Gerrit-Change-Number: 15261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:54:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:54:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp46_act_deact_apn4 In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262 ) Change subject: ggsn: Introduce test TC_pdp46_act_deact_apn4 ...................................................................... ggsn: Introduce test TC_pdp46_act_deact_apn4 Related osmo-ggsn.git libgtp fix: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Related: OS#4154 Change-Id: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml 2 files changed, 26 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 31c1056..ae92626 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -247,7 +247,7 @@ } /* send a PDP context activation */ - function f_pdp_ctx_act(inout PdpContext ctx) runs on GT_CT { + function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; var default d; @@ -260,7 +260,7 @@ alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; - if (cpr.cause.causevalue == '80'O) { + if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { /* Check if EUA type corresponds to requested type */ if (match(ctx.eua, t_EuaIPv4(?)) and not match(cpr.endUserAddress, tr_EuaIPv4(?))){ @@ -292,6 +292,12 @@ ctx.eua := cpr.endUserAddress; ctx.pco_neg := cpr.protConfigOptions; setverdict(pass); + } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { + if (ispresent(cpr.endUserAddress)) { + log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); + setverdict(fail); + } + setverdict(pass); } else { setverdict(fail); } @@ -1287,6 +1293,22 @@ f_pdp_ctx_del(ctxA, '1'B); } + /* Test IPv4v6 context activation for dynamic IPv4v6 EUA on a v4-only APN */ + testcase TC_pdp46_act_deact_apn4() runs on GT_CT { + f_init(); + /* A typical MS first attempts v4v6, and if rejected, then tries v4 and v6 separetly */ + var PdpContext ctx46 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dynv6Dyn))); + f_pdp_ctx_act(ctx46, 'DC'O); /* Cause: Unknown PDP address or PDP type */ + + var PdpContext ctx4 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctx4, '80'O); /* Normal accept cause */ + + var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv6Dyn))); + f_pdp_ctx_act(ctx6, 'DC'O); /* Cause: Unknown PDP address or PDP type */ + + f_pdp_ctx_del(ctx4, '1'B); + } + /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent responses (60 seconds): If same delete req is sent and duplicate is detected, saved duplicate response should be sent back. */ @@ -1332,6 +1354,7 @@ execute(TC_pdp46_act_deact_pcodns6()); execute(TC_pdp46_act_deact_gtpu_access()); execute(TC_pdp46_clients_interact()); + execute(TC_pdp46_act_deact_apn4()); execute(TC_echo_req_resp()); execute(TC_act_deact_retrans_duplicate()); diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index e57a7df..374cde0 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -21,6 +21,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262 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: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8 Gerrit-Change-Number: 15262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:55:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:55:07 +0000 Subject: Change in ...osmo-trx[master]: Drop old setPriority related code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15258 ) Change subject: Drop old setPriority related code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3a88946dd71e9aeeaac9d19d396e2236c302b608 Gerrit-Change-Number: 15258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 06:55:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 06:55:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 06:55:10 +0000 Subject: Change in ...osmo-trx[master]: Drop old setPriority related code In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15258 ) Change subject: Drop old setPriority related code ...................................................................... Drop old setPriority related code This code is not needed anymore since we are setting SCHED_RR scheduler with a real time priority in main thread during startup, so all threads will inherit same rt priority, which should be enough to keep the process working reliably even on high system loads (from non rt processes). osmo-trx was tested to be reliable during test with stress-ng as explained in related ticket below. Related: OS#2344 Change-Id: I3a88946dd71e9aeeaac9d19d396e2236c302b608 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.h M Transceiver52M/radioInterface.h 8 files changed, 0 insertions(+), 32 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 4da1876..2d5c04e 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1126,8 +1126,6 @@ snprintf(thread_name, 16, "RxUpper%zu", num); set_selfthread_name(thread_name); - trx->setPriority(0.42); - while (1) { trx->driveReceiveFIFO(num); pthread_testcancel(); @@ -1139,8 +1137,6 @@ { set_selfthread_name("RxLower"); - transceiver->setPriority(0.45); - while (1) { transceiver->driveReceiveRadio(); pthread_testcancel(); @@ -1152,8 +1148,6 @@ { set_selfthread_name("TxLower"); - transceiver->setPriority(0.44); - while (1) { transceiver->driveTxFIFO(); pthread_testcancel(); @@ -1190,8 +1184,6 @@ snprintf(thread_name, 16, "TxUpper%zu", num); set_selfthread_name(thread_name); - trx->setPriority(0.40); - while (1) { trx->driveTxPriorityQueue(num); pthread_testcancel(); diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 18dc5f2..1a4d28f 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -247,9 +247,6 @@ void reset(); - /** set priority on current thread */ - void setPriority(float prio = 0.5) { mRadioInterface->setPriority(prio); } - void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi); }; diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index cd378a8..e637611 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -70,9 +70,6 @@ /** Get the Tx window type */ virtual enum TxWindowType getWindowType()=0; - /** Enable thread priority */ - virtual void setPriority(float prio = 0.5) = 0; - /** Read samples from the radio. @param buf preallocated buf to contain read result diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index bc79f97..47bac94 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -85,10 +85,6 @@ /** Stop the LMS */ bool stop(); - /** Set priority not supported */ - void setPriority(float prio = 0.5) { - } - enum TxWindowType getWindowType() { return TX_WINDOW_LMS1; } diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 8bb94d6..5b38df4 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -125,7 +125,6 @@ void *async_event_loop(uhd_device *dev) { set_selfthread_name("UHDAsyncEvent"); - dev->setPriority(0.43); while (1) { dev->recv_async_msg(); @@ -643,12 +642,6 @@ return true; } -void uhd_device::setPriority(float prio) -{ - uhd::set_thread_priority_safe(prio); - return; -} - int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls) { if (!num_smpls) { diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index d5a6348..944578a 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -71,7 +71,6 @@ bool start(); bool stop(); bool restart(); - void setPriority(float prio); enum TxWindowType getWindowType() { return tx_window; } int readSamples(std::vector &bufs, int len, bool *overrun, diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 9a2426c..4123c7d 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -107,9 +107,6 @@ /** Stop the USRP */ bool stop(); - /** Set priority not supported */ - void setPriority(float prio = 0.5) { } - enum TxWindowType getWindowType() { return TX_WINDOW_USRP1; } /** diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index f19a8dc..dcfb67f 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -127,9 +127,6 @@ /** returns the full-scale receive amplitude **/ double fullScaleOutputValue(); - /** set thread priority on current thread */ - void setPriority(float prio = 0.5) { mRadio->setPriority(prio); } - /** get transport window type of attached device */ enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3a88946dd71e9aeeaac9d19d396e2236c302b608 Gerrit-Change-Number: 15258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 07:00:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 07:00:03 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 ) Change subject: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Gerrit-Change-Number: 15259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 07:00:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 07:00:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 07:00:31 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Add spec document to function documentation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15264 ) Change subject: gprs_gmm.c: Add spec document to function documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb89499e9c1ab588336df34fde26faf3fbf2c72c Gerrit-Change-Number: 15264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 07:00:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 07:00:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 07:00:52 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Print value_string of reject cause In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15263 ) Change subject: gprs_gmm.c: Print value_string of reject cause ...................................................................... gprs_gmm.c: Print value_string of reject cause Change-Id: I71d9abcf7e3a836c475b7adbb95a82580e41ae6d --- M src/gprs/gprs_gmm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index dccec2b..1d8ec57 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2455,7 +2455,8 @@ struct gsm48_hdr *gh; uint8_t transaction_id = tid ^ 0x8; /* flip */ - LOGMMCTXP(LOGL_NOTICE, mm, "<- ACTIVATE PDP CONTEXT REJ(cause=%u)\n", cause); + LOGMMCTXP(LOGL_NOTICE, mm, "<- ACTIVATE PDP CONTEXT REJ: %s\n", + get_value_string(gsm48_gsm_cause_names, cause)); rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_PDP_ACTIVATE_REJECT]); mmctx2msgid(msg, mm); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I71d9abcf7e3a836c475b7adbb95a82580e41ae6d Gerrit-Change-Number: 15263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 07:00:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 07:00:46 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Print value_string of reject cause In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15263 ) Change subject: gprs_gmm.c: Print value_string of reject cause ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I71d9abcf7e3a836c475b7adbb95a82580e41ae6d Gerrit-Change-Number: 15263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 23 Aug 2019 07:00:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 07:00:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 23 Aug 2019 07:00:53 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Add spec document to function documentation In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15264 ) Change subject: gprs_gmm.c: Add spec document to function documentation ...................................................................... gprs_gmm.c: Add spec document to function documentation Change-Id: Ibb89499e9c1ab588336df34fde26faf3fbf2c72c --- M src/gprs/gprs_gmm.c 1 file changed, 16 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 1d8ec57..e44b3ec 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -674,7 +674,7 @@ return false; } -/* 3GPP TS 24.008 Section 9.4.9: Authentication and Ciphering Request */ +/* 3GPP TS 24.008 ? 9.4.9: Authentication and Ciphering Request */ int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, const struct osmo_auth_vector *vec, uint8_t key_seq, bool force_standby) @@ -742,7 +742,7 @@ return gsm48_gmm_sendmsg(msg, 1, mm, false); } -/* Section 9.4.11: Authentication and Ciphering Reject */ +/* 3GPP TS 24.008 ? 9.4.11: Authentication and Ciphering Reject */ static int gsm48_tx_gmm_auth_ciph_rej(struct sgsn_mm_ctx *mm) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH CIPH REJ"); @@ -815,7 +815,7 @@ return OSMO_AUTH_TYPE_NONE; } -/* Section 9.4.10: Authentication and Ciphering Response */ +/* 3GPP TS 24.008 ? 9.4.10: Authentication and Ciphering Response */ static int gsm48_rx_gmm_auth_ciph_resp(struct sgsn_mm_ctx *ctx, struct msgb *msg) { @@ -892,7 +892,7 @@ return osmo_fsm_inst_dispatch(ctx->gmm_att_req.fsm, E_AUTH_RESP_RECV_SUCCESS, NULL); } -/* Section 9.4.10: Authentication and Ciphering Failure */ +/* 3GPP TS 24.008 ? 9.4.10: Authentication and Ciphering Failure */ static int gsm48_rx_gmm_auth_ciph_fail(struct sgsn_mm_ctx *ctx, struct msgb *msg) { @@ -1357,7 +1357,7 @@ ctx->gmm_state = GMM_COMMON_PROC_INIT; } -/* Section 9.4.1 Attach request */ +/* 3GPP TS 24.008 ? 9.4.1 Attach request */ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, struct gprs_llc_llme *llme) { @@ -1569,7 +1569,7 @@ return !!memcmp(gh_a, gh_b, GMM_ATTACH_REQ_LEN); } -/* Section 4.7.4.1 / 9.4.5.2 MO Detach request */ +/* 3GPP TS 24.008 ? 4.7.4.1 / 9.4.5.2 MO Detach request */ static int gsm48_rx_gmm_det_req(struct sgsn_mm_ctx *ctx, struct msgb *msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); @@ -1707,7 +1707,7 @@ } } -/* 3GPP TS 24.008 Section 4.7.13.4 Service request procedure not accepted by the +/* 3GPP TS 24.008 ? 4.7.13.4 Service request procedure not accepted by the * network. Returns true if MS has active PDP contexts in pdp_status */ bool pdp_status_has_active_nsapis(const uint8_t *pdp_status, const size_t pdp_status_len) { @@ -1919,7 +1919,7 @@ return rc; } -/* 3GPP TS 24.008 Section 9.4.20 Service request. +/* 3GPP TS 24.008 ? 9.4.20 Service request. * In Iu, a UE in PMM-IDLE mode can use GSM48_MT_GMM_SERVICE_REQ to switch back * to PMM-CONNECTED mode. */ static int gsm48_rx_gmm_service_req(struct sgsn_mm_ctx *ctx, struct msgb *msg) @@ -2009,7 +2009,7 @@ process_ms_ctx_status(ctx, pdp_status); - /* 3GPP TS 24.008 Section 4.7.13.4 Service request procedure not + /* 3GPP TS 24.008 ? 4.7.13.4 Service request procedure not * accepted by the network. Cause #40. If MS has PDP Contexts in * Active state in pdp_status but there is no PDP contexts on * SGSN side then Reject with the cause will force the mobile to @@ -2403,7 +2403,7 @@ } #endif -/* Section 9.5.2: Activate PDP Context Accept */ +/* 3GPP TS 24.008 ? 9.5.2: Activate PDP Context Accept */ int gsm48_tx_gsm_act_pdp_acc(struct sgsn_pdp_ctx *pdp) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP ACC"); @@ -2447,7 +2447,7 @@ return gsm48_gmm_sendmsg(msg, 0, pdp->mm, true); } -/* Section 9.5.3: Activate PDP Context reject */ +/* 3GPP TS 24.008 ? 9.5.3: Activate PDP Context reject */ int gsm48_tx_gsm_act_pdp_rej(struct sgsn_mm_ctx *mm, uint8_t tid, uint8_t cause, uint8_t pco_len, uint8_t *pco_v) { @@ -2472,7 +2472,7 @@ return gsm48_gmm_sendmsg(msg, 0, mm, true); } -/* Section 9.5.8: Deactivate PDP Context Request */ +/* 3GPP TS 24.008 ? 9.5.8: Deactivate PDP Context Request */ static int _gsm48_tx_gsm_deact_pdp_req(struct sgsn_mm_ctx *mm, uint8_t tid, uint8_t sm_cause, bool teardown) { @@ -2502,7 +2502,7 @@ return _gsm48_tx_gsm_deact_pdp_req(pdp->mm, pdp->ti, sm_cause, teardown); } -/* Section 9.5.9: Deactivate PDP Context Accept */ +/* 3GPP TS 24.008 ? 9.5.9: Deactivate PDP Context Accept */ static int _gsm48_tx_gsm_deact_pdp_acc(struct sgsn_mm_ctx *mm, uint8_t tid) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP DET ACC"); @@ -2800,7 +2800,7 @@ gsm_cause, 0, NULL); } -/* Section 9.5.1: Activate PDP Context Request */ +/* 3GPP TS 24.008 ? 9.5.1: Activate PDP Context Request */ static int gsm48_rx_gsm_act_pdp_req(struct sgsn_mm_ctx *mmctx, struct msgb *_msg) { @@ -2837,7 +2837,7 @@ return rc; } -/* Section 9.5.8: Deactivate PDP Context Request */ +/* 3GPP TS 24.008 ? 9.5.8: Deactivate PDP Context Request */ static int gsm48_rx_gsm_deact_pdp_req(struct sgsn_mm_ctx *mm, struct msgb *msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); @@ -2859,7 +2859,7 @@ return sgsn_delete_pdp_ctx(pdp); } -/* Section 9.5.9: Deactivate PDP Context Accept */ +/* 3GPP TS 24.008 ? 9.5.9: Deactivate PDP Context Accept */ static int gsm48_rx_gsm_deact_pdp_ack(struct sgsn_mm_ctx *mm, struct msgb *msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb89499e9c1ab588336df34fde26faf3fbf2c72c Gerrit-Change-Number: 15264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 08:16:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 08:16:24 +0000 Subject: Change in ...libosmocore[master]: Cosmetic: l1sap.h: change /* !< to /*!< Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15269 Change subject: Cosmetic: l1sap.h: change /* !< to /*!< ...................................................................... Cosmetic: l1sap.h: change /* !< to /*!< Change-Id: Icaec95a9c6105fd17bc1151fdc77394f4efd3b70 --- M include/osmocom/gsm/l1sap.h 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/15269/1 diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index 19cc87a..3d2ad25 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -67,8 +67,8 @@ /* elements added on 2018-02-26 */ int8_t rssi; /*!< RSSI of RACH indication */ uint16_t ber10k; /*!< BER in units of 0.01% */ - int16_t acc_delay_256bits;/* !< Burst TA Offset in 1/256th bits */ - int16_t lqual_cb; /* !< Link quality in centiBel */ + int16_t acc_delay_256bits;/*!< Burst TA Offset in 1/256th bits */ + int16_t lqual_cb; /*!< Link quality in centiBel */ }; /*! for PH-[UNIT]DATA.{req,ind} | PH-RTS.ind */ @@ -79,10 +79,10 @@ int8_t rssi; /*!< RSSI of receivedindication */ uint16_t ber10k; /*!< BER in units of 0.01% */ union { - int16_t ta_offs_qbits; /* !< Burst TA Offset in quarter bits */ + int16_t ta_offs_qbits; /*!< Burst TA Offset in quarter bits */ int16_t ta_offs_256bits;/*!< timing advance offset (in 1/256th bits) */ }; - int16_t lqual_cb; /* !< Link quality in centiBel */ + int16_t lqual_cb; /*!< Link quality in centiBel */ enum osmo_ph_pres_info_type pdch_presence_info; /*!< Info regarding presence/validity of header and data parts */ }; @@ -93,7 +93,7 @@ int8_t rssi; /*!< RSSI of received indication */ uint8_t marker; /*!< RTP Marker bit (speech onset indicator) */ uint16_t ber10k; /*!< BER in units of 0.01% */ - int16_t lqual_cb; /* !< Link quality in centiBel */ + int16_t lqual_cb; /*!< Link quality in centiBel */ }; /*! for PH-CONN.ind */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaec95a9c6105fd17bc1151fdc77394f4efd3b70 Gerrit-Change-Number: 15269 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:16:20 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:16:20 +0000 Subject: Change in ...osmo-bts[master]: Cosmetic: virtual: l1sap.c: fix typos Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15270 Change subject: Cosmetic: virtual: l1sap.c: fix typos ...................................................................... Cosmetic: virtual: l1sap.c: fix typos Change-Id: Id24e75812bda17e99f17a37b367462533a5607f9 --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/70/15270/1 diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index d0c368e..0e77651 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -121,7 +121,7 @@ l1sap.u.rach_ind.acc_delay = 0; /* probably not used in virt um */ l1sap.u.rach_ind.is_11bit = 0; l1sap.u.rach_ind.fn = fn; - /* we don't rally know which RACH bursrt type the virtual MS is using, as this field is not + /* we don't really know which RACH burst type the virtual MS is using, as this field is not * part of information present in the GSMTAP header. So we simply report all of them as 0 */ l1sap.u.rach_ind.burst_type = GSM_L1_BURST_TYPE_ACCESS_0; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id24e75812bda17e99f17a37b367462533a5607f9 Gerrit-Change-Number: 15270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:16:21 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:16:21 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... virtual: set link quality for GSMTAP_CHANNEL_RACH Don't ignore all incoming RACH requests anymore: 000881/00/23/14/09 Ignoring RACH request: link quality (0) below the minimum (50) Related: OS#3925 Fixes: b777c0f3ecb8b770f032db449e947f0f9731de11 ("Move Access Burst link quality handling to L1SAP") Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/71/15271/1 diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 0e77651..454c2c1 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -124,6 +124,7 @@ /* we don't really know which RACH burst type the virtual MS is using, as this field is not * part of information present in the GSMTAP header. So we simply report all of them as 0 */ l1sap.u.rach_ind.burst_type = GSM_L1_BURST_TYPE_ACCESS_0; + l1sap.u.data.lqual_cb = 10 * signal_dbm; /* Link quality in centiBel = 10 * dB. */ break; case GSMTAP_CHANNEL_TCH_F: case GSMTAP_CHANNEL_TCH_H: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:28:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:28:17 +0000 Subject: Change in ...osmo-ci[master]: gerrit-verifications: fix osmo-bts cmd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15272 Change subject: gerrit-verifications: fix osmo-bts cmd ...................................................................... gerrit-verifications: fix osmo-bts cmd Fixes: 932b0037506130692bc8a1aa1edd95d5f54efd11 ("gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK") Change-Id: Ia17d6a14ede93bae715fb67826b074ab91f87749 --- M jobs/gerrit-verifications.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/15272/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index cb370e9..abd8090 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -126,7 +126,7 @@ (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") - cmd: ASCIIDOC_WARNINGS_CHECK="1" './contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia17d6a14ede93bae715fb67826b074ab91f87749 Gerrit-Change-Number: 15272 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:28:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:28:56 +0000 Subject: Change in ...osmo-ci[master]: gerrit-verifications: fix osmo-bts cmd In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15272 ) Change subject: gerrit-verifications: fix osmo-bts cmd ...................................................................... Patch Set 1: Verified+1 Code-Review+2 Super trivial and tested, merging directly. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia17d6a14ede93bae715fb67826b074ab91f87749 Gerrit-Change-Number: 15272 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 23 Aug 2019 10:28:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:29:08 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:29:08 +0000 Subject: Change in ...osmo-ci[master]: gerrit-verifications: fix osmo-bts cmd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ci/+/15272 ) Change subject: gerrit-verifications: fix osmo-bts cmd ...................................................................... gerrit-verifications: fix osmo-bts cmd Fixes: 932b0037506130692bc8a1aa1edd95d5f54efd11 ("gerrit, master builds: use ASCIIDOC_WARNINGS_CHECK") Change-Id: Ia17d6a14ede93bae715fb67826b074ab91f87749 --- M jobs/gerrit-verifications.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index cb370e9..abd8090 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -126,7 +126,7 @@ (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") - cmd: ASCIIDOC_WARNINGS_CHECK="1" './contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia17d6a14ede93bae715fb67826b074ab91f87749 Gerrit-Change-Number: 15272 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:33:56 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 10:33:56 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 ) Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15271/1/src/osmo-bts-virtual/l1_if.c File src/osmo-bts-virtual/l1_if.c: https://gerrit.osmocom.org/#/c/15271/1/src/osmo-bts-virtual/l1_if.c at 127 PS1, Line 127: data rach_ind -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 23 Aug 2019 10:33:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:34:02 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:34:02 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 ) Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... Patch Set 1: (Jenkins failures are unrelated, retriggered) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 10:34:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:34:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:34:58 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 to look at the new patch set (#2). Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... virtual: set link quality for GSMTAP_CHANNEL_RACH Don't ignore all incoming RACH requests anymore: 000881/00/23/14/09 Ignoring RACH request: link quality (0) below the minimum (50) Related: OS#3925 Fixes: b777c0f3ecb8b770f032db449e947f0f9731de11 ("Move Access Burst link quality handling to L1SAP") Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/71/15271/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 10:36:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 10:36:19 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 ) Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15271/1/src/osmo-bts-virtual/l1_if.c File src/osmo-bts-virtual/l1_if.c: https://gerrit.osmocom.org/#/c/15271/1/src/osmo-bts-virtual/l1_if.c at 127 PS1, Line 127: data > rach_ind copy paste mistake from GSMTAP_CHANNEL_PTCCH below, fixed -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 10:36:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:02:35 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 11:02:35 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 ) Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 11:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:03:34 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 11:03:34 +0000 Subject: Change in ...osmo-bts[master]: Cosmetic: virtual: l1sap.c: fix typos In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15270 ) Change subject: Cosmetic: virtual: l1sap.c: fix typos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id24e75812bda17e99f17a37b367462533a5607f9 Gerrit-Change-Number: 15270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 23 Aug 2019 11:03:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:04:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 11:04:10 +0000 Subject: Change in ...libosmocore[master]: Cosmetic: l1sap.h: change /* !< to /*!< In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15269 ) Change subject: Cosmetic: l1sap.h: change /* !< to /*!< ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaec95a9c6105fd17bc1151fdc77394f4efd3b70 Gerrit-Change-Number: 15269 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 23 Aug 2019 11:04:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:18:38 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 11:18:38 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 ) Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 11:18:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:19:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 11:19:18 +0000 Subject: Change in ...osmo-bts[master]: Cosmetic: virtual: l1sap.c: fix typos In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15270 ) Change subject: Cosmetic: virtual: l1sap.c: fix typos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id24e75812bda17e99f17a37b367462533a5607f9 Gerrit-Change-Number: 15270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 11:19:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:19:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 11:19:30 +0000 Subject: Change in ...osmo-bts[master]: Cosmetic: virtual: l1sap.c: fix typos In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15270 ) Change subject: Cosmetic: virtual: l1sap.c: fix typos ...................................................................... Cosmetic: virtual: l1sap.c: fix typos Change-Id: Id24e75812bda17e99f17a37b367462533a5607f9 --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index d0c368e..0e77651 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -121,7 +121,7 @@ l1sap.u.rach_ind.acc_delay = 0; /* probably not used in virt um */ l1sap.u.rach_ind.is_11bit = 0; l1sap.u.rach_ind.fn = fn; - /* we don't rally know which RACH bursrt type the virtual MS is using, as this field is not + /* we don't really know which RACH burst type the virtual MS is using, as this field is not * part of information present in the GSMTAP header. So we simply report all of them as 0 */ l1sap.u.rach_ind.burst_type = GSM_L1_BURST_TYPE_ACCESS_0; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id24e75812bda17e99f17a37b367462533a5607f9 Gerrit-Change-Number: 15270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:20:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 11:20:09 +0000 Subject: Change in ...libosmocore[master]: Cosmetic: l1sap.h: change /* !< to /*!< In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15269 ) Change subject: Cosmetic: l1sap.h: change /* !< to /*!< ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaec95a9c6105fd17bc1151fdc77394f4efd3b70 Gerrit-Change-Number: 15269 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 11:20:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:20:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 11:20:11 +0000 Subject: Change in ...libosmocore[master]: Cosmetic: l1sap.h: change /* !< to /*!< In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15269 ) Change subject: Cosmetic: l1sap.h: change /* !< to /*!< ...................................................................... Cosmetic: l1sap.h: change /* !< to /*!< Change-Id: Icaec95a9c6105fd17bc1151fdc77394f4efd3b70 --- M include/osmocom/gsm/l1sap.h 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, approved diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index 19cc87a..3d2ad25 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -67,8 +67,8 @@ /* elements added on 2018-02-26 */ int8_t rssi; /*!< RSSI of RACH indication */ uint16_t ber10k; /*!< BER in units of 0.01% */ - int16_t acc_delay_256bits;/* !< Burst TA Offset in 1/256th bits */ - int16_t lqual_cb; /* !< Link quality in centiBel */ + int16_t acc_delay_256bits;/*!< Burst TA Offset in 1/256th bits */ + int16_t lqual_cb; /*!< Link quality in centiBel */ }; /*! for PH-[UNIT]DATA.{req,ind} | PH-RTS.ind */ @@ -79,10 +79,10 @@ int8_t rssi; /*!< RSSI of receivedindication */ uint16_t ber10k; /*!< BER in units of 0.01% */ union { - int16_t ta_offs_qbits; /* !< Burst TA Offset in quarter bits */ + int16_t ta_offs_qbits; /*!< Burst TA Offset in quarter bits */ int16_t ta_offs_256bits;/*!< timing advance offset (in 1/256th bits) */ }; - int16_t lqual_cb; /* !< Link quality in centiBel */ + int16_t lqual_cb; /*!< Link quality in centiBel */ enum osmo_ph_pres_info_type pdch_presence_info; /*!< Info regarding presence/validity of header and data parts */ }; @@ -93,7 +93,7 @@ int8_t rssi; /*!< RSSI of received indication */ uint8_t marker; /*!< RTP Marker bit (speech onset indicator) */ uint16_t ber10k; /*!< BER in units of 0.01% */ - int16_t lqual_cb; /* !< Link quality in centiBel */ + int16_t lqual_cb; /*!< Link quality in centiBel */ }; /*! for PH-CONN.ind */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icaec95a9c6105fd17bc1151fdc77394f4efd3b70 Gerrit-Change-Number: 15269 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 23 08:34:31 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 08:34:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5fa52d6532f_4f982b24709105f424434@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 392s] ar: `u' modifier ignored since `D' is the default (see `U') [ 392s] libtool: link: ranlib .libs/libtransceiver_common.a [ 392s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 392s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 393s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 393s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 393s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 393s] collect2: error: ld returned 1 exit status [ 393s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 393s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 393s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 393s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 393s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 393s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 393s] make[1]: *** [Makefile:444: all] Error 2 [ 393s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 393s] dh_auto_build: make -j1 returned exit code 2 [ 393s] make: *** [debian/rules:6: build] Error 255 [ 393s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 393s] [ 393s] lamb09 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 23 08:34:14 UTC 2019. [ 393s] [ 393s] ### VM INTERACTION START ### [ 396s] [ 378.800935] sysrq: SysRq : Power Off [ 396s] [ 378.807814] reboot: Power down [ 396s] ### VM INTERACTION END ### [ 396s] [ 396s] lamb09 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 23 08:34:17 UTC 2019. [ 396s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 23 03:33:16 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 03:33:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5f5e9a54de4_57a92abb14d2e5fc1017870@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 536s] ar: `u' modifier ignored since `D' is the default (see `U') [ 536s] libtool: link: ranlib .libs/libtransceiver_common.a [ 536s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 536s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 537s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 537s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 537s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 537s] collect2: error: ld returned 1 exit status [ 537s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 537s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 537s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 537s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 537s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 537s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 537s] make[1]: *** [Makefile:444: all] Error 2 [ 537s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 537s] dh_auto_build: make -j1 returned exit code 2 [ 537s] make: *** [debian/rules:6: build] Error 255 [ 537s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 537s] [ 537s] lamb52 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 03:33:06 UTC 2019. [ 537s] [ 537s] ### VM INTERACTION START ### [ 540s] [ 517.125797] sysrq: SysRq : Power Off [ 540s] [ 517.178437] reboot: Power down [ 540s] ### VM INTERACTION END ### [ 540s] [ 540s] lamb52 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 03:33:09 UTC 2019. [ 540s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 23:07:54 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 23:07:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5f206672d75_57a92abb14d2e5fc96838d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 393s] ar: `u' modifier ignored since `D' is the default (see `U') [ 393s] libtool: link: ranlib .libs/libtransceiver_common.a [ 393s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 393s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 393s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 393s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 393s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 393s] collect2: error: ld returned 1 exit status [ 393s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 393s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 393s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 393s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 393s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 393s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 393s] make[1]: *** [Makefile:444: all] Error 2 [ 393s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 393s] dh_auto_build: make -j1 returned exit code 2 [ 393s] make: *** [debian/rules:6: build] Error 255 [ 393s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 393s] [ 393s] lamb06 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 23:07:44 UTC 2019. [ 393s] [ 393s] ### VM INTERACTION START ### [ 397s] [ 378.362676] sysrq: SysRq : Power Off [ 397s] [ 378.369577] reboot: Power down [ 397s] ### VM INTERACTION END ### [ 397s] [ 397s] lamb06 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 23:07:48 UTC 2019. [ 397s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 23 07:21:50 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 07:21:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5f94252d29f_57a92abb14d2e5fc1063298@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 402s] ar: `u' modifier ignored since `D' is the default (see `U') [ 402s] libtool: link: ranlib .libs/libtransceiver_common.a [ 402s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 402s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 403s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 403s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 403s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 403s] collect2: error: ld returned 1 exit status [ 403s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 403s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 403s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 403s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 403s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 403s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make[1]: *** [Makefile:444: all] Error 2 [ 403s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 403s] dh_auto_build: make -j1 returned exit code 2 [ 403s] make: *** [debian/rules:6: build] Error 255 [ 403s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 403s] [ 403s] lamb17 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 07:21:30 UTC 2019. [ 403s] [ 403s] ### VM INTERACTION START ### [ 406s] [ 387.392865] sysrq: SysRq : Power Off [ 406s] [ 387.399797] reboot: Power down [ 406s] ### VM INTERACTION END ### [ 406s] [ 406s] lamb17 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 07:21:34 UTC 2019. [ 406s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 16:03:59 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 16:03:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5ebd04484d8_57a92abb14d2e5fc9323f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 430s] ar: `u' modifier ignored since `D' is the default (see `U') [ 430s] libtool: link: ranlib .libs/libtransceiver_common.a [ 430s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 430s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 430s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 431s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 431s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 431s] collect2: error: ld returned 1 exit status [ 431s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 431s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 431s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 431s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 431s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 431s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 431s] make[1]: *** [Makefile:444: all] Error 2 [ 431s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 431s] dh_auto_build: make -j1 returned exit code 2 [ 431s] make: *** [debian/rules:6: build] Error 255 [ 431s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 431s] [ 431s] lamb24 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 16:03:50 UTC 2019. [ 431s] [ 431s] ### VM INTERACTION START ### [ 434s] [ 413.361810] sysrq: SysRq : Power Off [ 434s] [ 413.368393] reboot: Power down [ 434s] ### VM INTERACTION END ### [ 434s] [ 434s] lamb24 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Thu Aug 22 16:03:54 UTC 2019. [ 434s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 16:06:18 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 16:06:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5ebd7ec7cbb_57a92abb14d2e5fc9336b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 462s] ar: `u' modifier ignored since `D' is the default (see `U') [ 462s] libtool: link: ranlib .libs/libtransceiver_common.a [ 462s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 462s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 463s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 463s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 463s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 463s] collect2: error: ld returned 1 exit status [ 463s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 463s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 463s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 463s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 463s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 463s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 463s] make[1]: *** [Makefile:444: all] Error 2 [ 463s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 463s] dh_auto_build: make -j1 returned exit code 2 [ 463s] make: *** [debian/rules:6: build] Error 255 [ 463s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 463s] [ 463s] lamb51 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 22 16:06:05 UTC 2019. [ 463s] [ 463s] ### VM INTERACTION START ### [ 466s] [ 448.256375] sysrq: SysRq : Power Off [ 466s] [ 448.263974] reboot: Power down [ 466s] ### VM INTERACTION END ### [ 466s] [ 466s] lamb51 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 22 16:06:09 UTC 2019. [ 466s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 23 03:16:07 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 03:16:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d5f5a7e1e6e7_57a92abb14d2e5fc1014856@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 489s] ar: `u' modifier ignored since `D' is the default (see `U') [ 489s] libtool: link: ranlib .libs/libtransceiver_common.a [ 490s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 490s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 490s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 490s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 490s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 490s] collect2: error: ld returned 1 exit status [ 490s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 490s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 490s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 490s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 490s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 490s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 490s] make[1]: *** [Makefile:444: all] Error 2 [ 490s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 490s] dh_auto_build: make -j1 returned exit code 2 [ 490s] make: *** [debian/rules:6: build] Error 255 [ 490s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 490s] [ 490s] lamb04 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 03:15:51 UTC 2019. [ 490s] [ 490s] ### VM INTERACTION START ### [ 493s] [ 472.772417] sysrq: SysRq : Power Off [ 493s] [ 472.781484] reboot: Power down [ 493s] ### VM INTERACTION END ### [ 493s] [ 493s] lamb04 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 03:15:54 UTC 2019. [ 493s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 22 23:19:33 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 22 Aug 2019 23:19:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d5f230fc1ee9_57a92abb14d2e5fc9716a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 652s] ar: `u' modifier ignored since `D' is the default (see `U') [ 652s] libtool: link: ranlib .libs/libtransceiver_common.a [ 652s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 652s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 653s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 653s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 653s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 653s] collect2: error: ld returned 1 exit status [ 653s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 653s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 653s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 653s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 653s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 653s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 653s] make[1]: *** [Makefile:444: all] Error 2 [ 653s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 653s] dh_auto_build: make -j1 returned exit code 2 [ 653s] make: *** [debian/rules:6: build] Error 255 [ 653s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 653s] [ 653s] lamb25 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 22 23:19:22 UTC 2019. [ 653s] [ 653s] ### VM INTERACTION START ### [ 656s] [ 633.536639] sysrq: SysRq : Power Off [ 656s] [ 633.559925] reboot: Power down [ 656s] ### VM INTERACTION END ### [ 656s] [ 656s] lamb25 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 22 23:19:25 UTC 2019. [ 656s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 23 01:56:42 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 01:56:42 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5d5f47df1e3ba_57a92abb14d2e5fc996830@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_18.10/i586 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 246s] | pdfdir='${docdir}' [ 246s] | prefix='/usr' [ 246s] | program_transform_name='s,x,x,' [ 246s] | psdir='${docdir}' [ 246s] | runstatedir='${localstatedir}/run' [ 246s] | sbindir='${exec_prefix}/sbin' [ 246s] | sharedstatedir='${prefix}/com' [ 246s] | sysconfdir='/etc' [ 246s] | target_alias='' [ 246s] | [ 246s] | ## ----------- ## [ 246s] | ## confdefs.h. ## [ 246s] | ## ----------- ## [ 246s] | [ 246s] | /* confdefs.h */ [ 246s] | #define PACKAGE_NAME "libosmo-netif" [ 246s] | #define PACKAGE_TARNAME "libosmo-netif" [ 246s] | #define PACKAGE_VERSION "0.6.0" [ 246s] | #define PACKAGE_STRING "libosmo-netif 0.6.0" [ 246s] | #define PACKAGE_BUGREPORT "openbsc-devel at lists.openbsc.org" [ 246s] | #define PACKAGE_URL "" [ 246s] | #define PACKAGE "libosmo-netif" [ 246s] | #define VERSION "0.6.0" [ 249s] | #define STDC_HEADER[ 221.235901] sysrq: SysRq : Power Off [ 249s] [ 221.250253] reboot: Power down [ 249s] ### VM INTERACTION END ### [ 249s] [ 249s] cloud115 failed "build libosmo-netif_0.6.0.dsc" at Fri Aug 23 01:56:40 UTC 2019. [ 249s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 23 11:58:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 11:58:13 +0000 Subject: Change in ...osmo-bts[master]: virtual: set link quality for GSMTAP_CHANNEL_RACH In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15271 ) Change subject: virtual: set link quality for GSMTAP_CHANNEL_RACH ...................................................................... virtual: set link quality for GSMTAP_CHANNEL_RACH Don't ignore all incoming RACH requests anymore: 000881/00/23/14/09 Ignoring RACH request: link quality (0) below the minimum (50) Related: OS#3925 Fixes: b777c0f3ecb8b770f032db449e947f0f9731de11 ("Move Access Burst link quality handling to L1SAP") Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 0e77651..acd8ea2 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -124,6 +124,7 @@ /* we don't really know which RACH burst type the virtual MS is using, as this field is not * part of information present in the GSMTAP header. So we simply report all of them as 0 */ l1sap.u.rach_ind.burst_type = GSM_L1_BURST_TYPE_ACCESS_0; + l1sap.u.rach_ind.lqual_cb = 10 * signal_dbm; /* Link quality in centiBel = 10 * dB. */ break; case GSMTAP_CHANNEL_TCH_F: case GSMTAP_CHANNEL_TCH_H: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcd576fed84346688e711a26a05c6d350588e83d Gerrit-Change-Number: 15271 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:07:39 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 23 Aug 2019 13:07:39 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 ) Change subject: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15259/1/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/#/c/15259/1/ggsn/ggsn.c at 389 PS1, Line 389: if (apn && apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { Why is this in the same patch? It seems like an unrelated fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Gerrit-Change-Number: 15259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 13:07:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:20:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:20:27 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 ) Change subject: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15259/1/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/#/c/15259/1/ggsn/ggsn.c at 389 PS1, Line 389: if (apn && apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { > Why is this in the same patch? It seems like an unrelated fix. It's not unrelated. Since now we free pdp contexts being rejected, it means they were never assigned an APN so apn is going to be NULL. I'm sure it happens, I had to fix it after I wrote the patch ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Gerrit-Change-Number: 15259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 13:20:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:37:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:37:56 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 to look at the new patch set (#2). Change subject: ggsn: Move PCO handling code into its own file ...................................................................... ggsn: Move PCO handling code into its own file This way ggsn.c is shrinked in size and get rid of a lot of code there, which is of no interest unless the reader is interested in that really specific part. Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/pco.c A ggsn/pco.h 5 files changed, 343 insertions(+), 312 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/46/15246/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:37:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:37:56 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Split application lifecycle related code into ggsn_main.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 to look at the new patch set (#2). Change subject: ggsn: Split application lifecycle related code into ggsn_main.c ...................................................................... ggsn: Split application lifecycle related code into ggsn_main.c This way we further shrink ggsn.c and leave there GGSN related code. Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/ggsn_main.c 4 files changed, 214 insertions(+), 176 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/49/15249/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 Gerrit-Change-Number: 15249 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:37:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:37:56 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 to look at the new patch set (#2). Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... ggsn: Implement echo req/resp and recovery This patch is quite big because implementing echo req/resp and recovery requires having knowledge and managing differntiated state for each GSN peer attached/connected to osmo-ggsn. This kind of information was not available in osmo-ggsn nor in libgtp. So osmo-ggsn is now able to track GSN peers connected to a ggsn_ctx (associated gsn_t from libgtp) by means of "sgsn_peer" data structure, and accessible from the ggsn through a list. The instances of sgsn_peer are currently allocated and destroyed dynamically based on discovered peer who have at least a pdp context attached to us (we are not interested in peers without pdp contexts because we don't need o send echo requests/responses and maintain state in that case). A new private pointer (pdp_t->priv) data structure struct pdp_priv_t is added to be able to relate a pdp_t to an sgsn as well as the already existing pointer to an apn. An "echo-interval <0-36000>" VTY command is added which allows configuring time wait between echo requests being sent to each sgsn_peer. Transmission of echo requests is disabled by default. Finally, a new "show sgsn" VTY command is introduced, and its output is also printed during "show ggsn". Related: OS#4165 Change-Id: Id2c84165dc59dff495106758146a701ca488834f --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c A ggsn/sgsn.c A ggsn/sgsn.h 6 files changed, 377 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/67/15267/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:52:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:52:42 +0000 Subject: Change in ...osmo-python-tests[master]: Add osmo_interact_exec.py Message-ID: Hello osmith, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 to review the following change. Change subject: Add osmo_interact_exec.py ...................................................................... Add osmo_interact_exec.py Change-Id: If38243171c94d8ce9d6cdc269da59c9ebc9942bb --- M osmopy/osmo_interact/common.py A osmopy/osmo_interact/exec.py A scripts/osmo_interact_exec.py 3 files changed, 132 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/73/15273/1 diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index 39163a2..bc2b461 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -374,7 +374,7 @@ return passed -def common_parser(doc=None): +def common_parser(doc=None, host=True): parser = argparse.ArgumentParser(description=doc, formatter_class=argparse.RawDescriptionHelpFormatter) parser.add_argument('-r', '--run', dest='run_app_str', @@ -383,8 +383,9 @@ ' application is launched.') parser.add_argument('-p', '--port', dest='port', help="Port to reach the application at.") - parser.add_argument('-H', '--host', dest='host', default='localhost', - help="Host to reach the application at.") + if host: + parser.add_argument('-H', '--host', dest='host', default='localhost', + help="Host to reach the application at.") return parser def parser_add_verify_args(parser): @@ -397,17 +398,30 @@ parser.add_argument('transcript_files', nargs='*', help='transcript file(s) to verify') return parser -def parser_add_run_args(parser): +def parser_add_run_args(parser, cmd_files=True): parser.add_argument('-O', '--output', dest='output_path', help="Write command results to a file instead of stdout." "('-O -' writes to stdout and is the default)") parser.add_argument('-c', '--command', dest='cmd_str', help="Run this command (before reading input files, if any)." " multiple commands may be separated by ';'") - parser.add_argument('cmd_files', nargs='*', help='file(s) with plain commands to run') + if cmd_files: + parser.add_argument('cmd_files', nargs='*', help='file(s) with plain commands to run') return parser -def main_run_commands(run_app_str, output_path, cmd_str, cmd_files, interact): +def parser_require_args(parser, dests): + for dest in dests: + found = False + for action in parser._actions: + if action.dest == dest: + action.required = True + found = True + break + if not found: + raise RuntimeError("Could not find argument with dest: " + dest) + +def main_run_commands(run_app_str, output_path, cmd_str, cmd_files, interact, + purge_output=True): to_stdout = False if not output_path or output_path == '-': to_stdout = True @@ -418,7 +432,7 @@ application = None if run_app_str: - application = Application(run_app_str, quiet=to_stdout) + application = Application(run_app_str, quiet=to_stdout, purge_output=purge_output) application.run() try: diff --git a/osmopy/osmo_interact/exec.py b/osmopy/osmo_interact/exec.py new file mode 100644 index 0000000..c2f2f08 --- /dev/null +++ b/osmopy/osmo_interact/exec.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +# +# (C) 2019 by sysmocom s.f.m.c. GmbH +# All rights reserved. +# +# Author: Oliver Smith +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# SPDX-License-Identifier: GPL-3.0-or-later + +''' +Wait until a given application listens for TCP connections, then run C tests or +other programs against it. +''' + +import subprocess +from .common import * + +class InteractExec(Interact): + def __init__(self, port, verbose=False, update=False): + super().__init__(Interact.StepBase, host="localhost", port=port, + verbose=verbose, update=update) + + def command(self, command): + print("Launching: " + command) + + try: + # Do not allow commands with arguments, as these would behave + # unexpectedly: the commands get split by ';', no matter if in + # quotes or not. + output = subprocess.check_output([command], + stderr=subprocess.STDOUT) + output = output.decode("utf-8") + except subprocess.CalledProcessError as e: + # Print output on error too + print(e.output.decode("utf-8")) + print("---") + sys.stdout.flush() + sys.stderr.flush() + raise + + print(output) + sys.stdout.flush() + sys.stderr.flush() + return ("$ " + command + "\n" + output).split("\n") + +def main_interact_exec(): + ''' +Wait until a given application listens for TCP connections, then run C tests or +other programs against it. + +Example: + osmo_interact_exec.py \\ + -r 'osmo-hlr -c /etc/osmocom/osmo-hlr.cfg -l /tmp/hlr.db' \\ + -p 4222 \\ + -c 'tests/gsup_client_session/gsup_client_session_test' +''' + parser = common_parser(main_interact_exec.__doc__, host=False) + parser_add_run_args(parser, cmd_files=False) + parser_require_args(parser, ("run_app_str", "port", "cmd_str")) + parser.add_argument('-v', '--verbose', action='store_true', + help='print run command (from -r) output') + args = parser.parse_args() + + interact = InteractExec(args.port, verbose=args.verbose, update=False) + + main_run_commands(args.run_app_str, args.output_path, args.cmd_str, + cmd_files=[], interact=interact, + purge_output=not args.verbose) + + +# vim: tabstop=4 shiftwidth=4 expandtab nocin ai diff --git a/scripts/osmo_interact_exec.py b/scripts/osmo_interact_exec.py new file mode 100755 index 0000000..af44e21 --- /dev/null +++ b/scripts/osmo_interact_exec.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python3 +# +# (C) 2019 by sysmocom s.f.m.c. GmbH +# All rights reserved. +# +# Author: Oliver Smith +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# SPDX-License-Identifier: GPL-3.0-or-later + +from osmopy.osmo_interact.exec import main_interact_exec + +main_interact_exec() + +# vim: tabstop=4 shiftwidth=4 expandtab nocin ai -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: If38243171c94d8ce9d6cdc269da59c9ebc9942bb Gerrit-Change-Number: 15273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:52:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:52:43 +0000 Subject: Change in ...osmo-python-tests[master]: vty.py: Fix endl removed when pkt buffer content ends exactly on a ne... Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15274 Change subject: vty.py: Fix endl removed when pkt buffer content ends exactly on a newline char ...................................................................... vty.py: Fix endl removed when pkt buffer content ends exactly on a newline char As a result, osmo_interact_vty.py was printing incorrect output: """ - - + Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:55:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:55:07 +0000 Subject: Change in ...osmo-python-tests[master]: Add osmo_interact_exec.py In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 ) Change subject: Add osmo_interact_exec.py ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: If38243171c94d8ce9d6cdc269da59c9ebc9942bb Gerrit-Change-Number: 15273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 13:55:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:55:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:55:27 +0000 Subject: Change in ...osmo-python-tests[master]: Add osmo_interact_exec.py In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 ) Change subject: Add osmo_interact_exec.py ...................................................................... Patch Set 1: Code-Review-2 This one was pushed by error by myself, probably needs to be abandonned. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: If38243171c94d8ce9d6cdc269da59c9ebc9942bb Gerrit-Change-Number: 15273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 13:55:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:59:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:59:30 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 to look at the new patch set (#3). Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... ggsn: Implement echo req/resp and recovery This patch is quite big because implementing echo req/resp and recovery requires having knowledge and managing differntiated state for each GSN peer attached/connected to osmo-ggsn. This kind of information was not available in osmo-ggsn nor in libgtp. So osmo-ggsn is now able to track GSN peers connected to a ggsn_ctx (associated gsn_t from libgtp) by means of "sgsn_peer" data structure, and accessible from the ggsn through a list. The instances of sgsn_peer are currently allocated and destroyed dynamically based on discovered peer who have at least a pdp context attached to us (we are not interested in peers without pdp contexts because we don't need o send echo requests/responses and maintain state in that case). A new private pointer (pdp_t->priv) data structure struct pdp_priv_t is added to be able to relate a pdp_t to an sgsn as well as the already existing pointer to an apn. An "echo-interval <0-36000>" VTY command is added which allows configuring time wait between echo requests being sent to each sgsn_peer. Transmission of echo requests is disabled by default. Finally, a new "show sgsn" VTY command is introduced, and its output is also printed during "show ggsn". Related: OS#4165 Change-Id: Id2c84165dc59dff495106758146a701ca488834f --- M doc/manuals/vty/ggsn_vty_reference.xml M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c A ggsn/sgsn.c A ggsn/sgsn.h 7 files changed, 389 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/67/15267/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 13:59:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 13:59:30 +0000 Subject: Change in ...osmo-ggsn[master]: doc: Update vty reference xml file Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 Change subject: doc: Update vty reference xml file ...................................................................... doc: Update vty reference xml file Change-Id: I49e7db4d0f5c7868b86a4947d8b5739c2068da46 --- M doc/manuals/vty/ggsn_vty_reference.xml 1 file changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/75/15275/1 diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml index a395b23..15128ed 100644 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ b/doc/manuals/vty/ggsn_vty_reference.xml @@ -254,6 +254,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -614,6 +649,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I49e7db4d0f5c7868b86a4947d8b5739c2068da46 Gerrit-Change-Number: 15275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 14:45:42 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 14:45:42 +0000 Subject: Change in ...osmo-bsc[master]: lchan_select.c: tune log level in lchan_select_by_type() Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15276 Change subject: lchan_select.c: tune log level in lchan_select_by_type() ...................................................................... lchan_select.c: tune log level in lchan_select_by_type() If lchan_select_by_type() fails to find a suitable logical channel, it would print a message using LOGL_ERROR. This can happen if all logical channels of the requested type are busy, thus it is not a error. Let's use LOGL_NOTICE for that. Change-Id: I9b45852116253e5237b779a91bed8b800758360e --- M src/osmo-bsc/lchan_select.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/15276/1 diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 6df3b4a..d63db22 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -234,7 +234,7 @@ lchan->type = type; LOG_LCHAN(lchan, LOGL_INFO, "Selected\n"); } else - LOG_BTS(bts, DRLL, LOGL_ERROR, "Failed to select %s channel\n", + LOG_BTS(bts, DRLL, LOGL_NOTICE, "Failed to select %s channel\n", gsm_lchant_name(type)); return lchan; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b45852116253e5237b779a91bed8b800758360e Gerrit-Change-Number: 15276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 14:45:42 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 14:45:42 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: handle_manufact_report(): use LOGP(), not LOGPC() Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 Change subject: abis_nm.c: handle_manufact_report(): use LOGP(), not LOGPC() ...................................................................... abis_nm.c: handle_manufact_report(): use LOGP(), not LOGPC() The LOGPC() is usually used for continuation when printing complex logging messages (e.g. where using format string is not enough). In this case, nothing is being printed before calling LOGPC(), so the logging messages appear without the meta info (time-stamp, level, category, etc.), for example: BTS 0 reported connected PCU version 0.7.0.1-2585-dirty Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/15277/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7d059b5..b12ba43 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -341,10 +341,10 @@ switch (cause) { case OSMO_EVT_PCU_VERS: if (text) { - LOGPC(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); + LOGP(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); osmo_strlcpy(bts->pcu_version, text, sizeof(bts->pcu_version)); } else { - LOGPC(DNM, LOGL_ERROR, "BTS %u reported PCU disconnection.\n", bts->nr); + LOGP(DNM, LOGL_ERROR, "BTS %u reported PCU disconnection.\n", bts->nr); bts->pcu_version[0] = '\0'; } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 14:46:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 14:46:27 +0000 Subject: Change in ...osmo-bsc[master]: lchan_select.c: tune log level in lchan_select_by_type() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15276 ) Change subject: lchan_select.c: tune log level in lchan_select_by_type() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b45852116253e5237b779a91bed8b800758360e Gerrit-Change-Number: 15276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Aug 2019 14:46:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 14:50:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 14:50:07 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: handle_manufact_report(): use LOGP(), not LOGPC() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 ) Change subject: abis_nm.c: handle_manufact_report(): use LOGP(), not LOGPC() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c at 314 PS1, Line 314: LOGPC(DNM, LOGL_ERROR, "BTS %u: Failure Event Report: ", bts->nr); The ones here look like they need fixing too. https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c at 344 PS1, Line 344: LOGP(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); Don't we have LOGBTS or something similar? Or even better, pass foh as parameter and use LOGPFOH. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 14:50:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 15:47:51 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 15:47:51 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: use LOGP() macro instead of LOGPC() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 to look at the new patch set (#2). Change subject: abis_nm.c: use LOGP() macro instead of LOGPC() ...................................................................... abis_nm.c: use LOGP() macro instead of LOGPC() The LOGPC() is usually used for continuation when printing complex logging messages (e.g. where using format string is not enough). In this case, nothing is being printed before calling LOGPC(), so the logging messages appear without the meta info (time-stamp, level, category, etc.), for example: BTS 0 reported connected PCU version 0.7.0.1-2585-dirty Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 --- M src/osmo-bsc/abis_nm.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/15277/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 15:49:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 15:49:00 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: use LOGP() macro instead of LOGPC() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 ) Change subject: abis_nm.c: use LOGP() macro instead of LOGPC() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 15:49:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 15:49:30 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 15:49:30 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: use LOGP() macro instead of LOGPC() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 ) Change subject: abis_nm.c: use LOGP() macro instead of LOGPC() ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c at 314 PS1, Line 314: LOGPC(DNM, LOGL_ERROR, "BTS %u: Failure Event Report: ", bts->nr); > The ones here look like they need fixing too. Done. https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c at 344 PS1, Line 344: LOGP(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); > Don't we have LOGBTS or something similar? Or even better, pass foh as parameter and use LOGPFOH. This is an idea for a separate change. Unfortunately there is no such macro. And... do we really need to know more than the BTS number? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 15:49:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 15:50:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 15:50:00 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15278 Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 --- M src/osmobts_sock.cpp 1 file changed, 9 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/78/15278/1 diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 6b49347..1072229 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -239,9 +239,6 @@ int pcu_l1if_open(void) { struct pcu_sock_state *state; - struct osmo_fd *bfd; - struct sockaddr_un local; - unsigned int namelen; int rc; struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -255,60 +252,21 @@ INIT_LLIST_HEAD(&state->upqueue); } - bfd = &state->conn_bfd; - - bfd->fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); - if (bfd->fd < 0) { - LOGP(DL1IF, LOGL_ERROR, "Failed to create PCU socket.\n"); - talloc_free(state); - return -1; - } - - local.sun_family = AF_UNIX; - if (osmo_strlcpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { - LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", - sizeof(local.sun_path), bts->pcu_sock_path); - return -ENOSPC; - } - - /* we use the same magic that X11 uses in Xtranssock.c for - * calculating the proper length of the sockaddr */ -#if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); -#endif -#if defined(BSD44SOCKETS) || defined(SUN_LEN) - namelen = SUN_LEN(&local); -#else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); -#endif - rc = connect(bfd->fd, (struct sockaddr *) &local, namelen); - if (rc != 0) { - LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the osmo-bts" - " PCU socket (%s), delaying... '%s'\n", - strerror(errno), local.sun_path); - pcu_sock_state = state; - close(bfd->fd); - bfd->fd = -1; + rc = osmo_sock_unix_init_ofd(&state->conn_bfd, SOCK_SEQPACKET, 0, + bts->pcu_sock_path, OSMO_SOCK_F_CONNECT); + if (rc < 0) { + LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the BTS (%s). " + "Retrying...\n", bts->pcu_sock_path); osmo_timer_setup(&state->timer, pcu_sock_timeout, NULL); osmo_timer_schedule(&state->timer, 5, 0); - return 0; + return -EAGAIN; } - bfd->when = BSC_FD_READ; - bfd->cb = pcu_sock_cb; - bfd->data = state; - - rc = osmo_fd_register(bfd); - if (rc < 0) { - LOGP(DL1IF, LOGL_ERROR, "Could not register PCU fd: %d\n", rc); - close(bfd->fd); - talloc_free(state); - return rc; - } + state->conn_bfd.cb = pcu_sock_cb; + state->conn_bfd.data = state; LOGP(DL1IF, LOGL_NOTICE, "osmo-bts PCU socket %s has been connected\n", - local.sun_path); + bts->pcu_sock_path); pcu_sock_state = state; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 15:50:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 15:50:00 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15279 Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap We don't really need to use the message buffer (on heap), because it's never getting passed to pcu_rx(). Let's use a buffer on stack. Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 --- M src/osmobts_sock.cpp 1 file changed, 3 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/79/15279/1 diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 1072229..3fa6d15 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -139,17 +139,10 @@ static int pcu_sock_read(struct osmo_fd *bfd) { struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data; - struct gsm_pcu_if *pcu_prim; - struct msgb *msg; + struct gsm_pcu_if pcu_prim; int rc; - msg = msgb_alloc(sizeof(*pcu_prim), "pcu_sock_rx"); - if (!msg) - return -ENOMEM; - - pcu_prim = (struct gsm_pcu_if *) msg->tail; - - rc = recv(bfd->fd, msg->tail, msgb_tailroom(msg), 0); + rc = recv(bfd->fd, &pcu_prim, sizeof(pcu_prim), 0); if (rc == 0) goto close; @@ -159,16 +152,11 @@ goto close; } - rc = pcu_rx(pcu_prim->msg_type, pcu_prim); - - /* as we always synchronously process the message in pcu_rx() and - * its callbacks, we can free the message here. */ - msgb_free(msg); + rc = pcu_rx(pcu_prim.msg_type, &pcu_prim); return rc; close: - msgb_free(msg); pcu_sock_close(state, 1); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 15:54:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 15:54:31 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 to look at the new patch set (#2). Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 --- M src/osmobts_sock.cpp 1 file changed, 8 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/78/15278/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:08:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 16:08:07 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15278 ) Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15278/2/src/osmobts_sock.cpp File src/osmobts_sock.cpp: https://gerrit.osmocom.org/#/c/15278/2/src/osmobts_sock.cpp at 265 PS2, Line 265: state->conn_bfd.cb = pcu_sock_cb; I think these 2 lines should be set before calling osmo_sock_unix_init_ofd()? Or is it fine this way? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 16:08:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:17:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 16:17:18 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15279 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... Patch Set 2: Are you sure msgb is not retrieved somehow (hacky way) later on in pcu_rx() and its callees? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 16:17:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:17:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 16:17:22 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15279 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Aug 2019 16:17:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:30:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 16:30:28 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 to look at the new patch set (#3). Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 --- M src/osmobts_sock.cpp 1 file changed, 8 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/78/15278/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:30:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 16:30:28 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 to look at the new patch set (#3). Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap We don't really need to use the message buffer (on heap), because it's never getting passed to pcu_rx(). Let's use a buffer on stack. Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 --- M src/osmobts_sock.cpp 1 file changed, 3 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/79/15279/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:30:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 16:30:31 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): further simplify the code Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15280 Change subject: osmobts_sock.cpp: pcu_sock_read(): further simplify the code ...................................................................... osmobts_sock.cpp: pcu_sock_read(): further simplify the code Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 --- M src/osmobts_sock.cpp 1 file changed, 6 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/80/15280/1 diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index a3e9d63..95f8710 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -143,22 +143,15 @@ int rc; rc = recv(bfd->fd, &pcu_prim, sizeof(pcu_prim), 0); - if (rc == 0) - goto close; - - if (rc < 0) { - if (errno == EAGAIN) + if (rc <= 0) { + /* Try again later */ + if (rc < 0 && errno == EAGAIN) return 0; - goto close; + pcu_sock_close(state, 1); + return -EIO; } - rc = pcu_rx(pcu_prim.msg_type, &pcu_prim); - - return rc; - -close: - pcu_sock_close(state, 1); - return -1; + return pcu_rx(pcu_prim.msg_type, &pcu_prim); } static int pcu_sock_write(struct osmo_fd *bfd) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 Gerrit-Change-Number: 15280 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:30:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 16:30:31 +0000 Subject: Change in ...osmo-pcu[master]: gprs_bssgp_destroy(): fix NULL-pointer dereference Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15281 Change subject: gprs_bssgp_destroy(): fix NULL-pointer dereference ...................................................................... gprs_bssgp_destroy(): fix NULL-pointer dereference The 'gprs_bssgp_pcu' may not be initialized in some cases, e.g. when OsmoPCU is terminated before connecting to the SGSN. Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/81/15281/1 diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index ddf5174..ade9879 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -975,7 +975,8 @@ gprs_ns_destroy(nsi); /* FIXME: move this to libgb: btsctx_free() */ - llist_del(&the_pcu.bctx->list); + if (the_pcu.bctx != NULL) + llist_del(&the_pcu.bctx->list); #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" #if 0 talloc_free(the_pcu.bctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 Gerrit-Change-Number: 15281 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:32:26 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 16:32:26 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15278 ) Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15278/2/src/osmobts_sock.cpp File src/osmobts_sock.cpp: https://gerrit.osmocom.org/#/c/15278/2/src/osmobts_sock.cpp at 265 PS2, Line 265: state->conn_bfd.cb = pcu_sock_cb; > I think these 2 lines should be set before calling osmo_sock_unix_init_ofd()? Or is it fine this way [?] I think it's fine to do it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 16:32:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 16:33:47 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 23 Aug 2019 16:33:47 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15279 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... Patch Set 3: > Patch Set 2: > > Are you sure msgb is not retrieved somehow (hacky way) later on in pcu_rx() and its callees? Doing that would be quite stupid IMHO. Let's see ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 16:33:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:02:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:02:11 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15278 ) Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 17:02:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:04:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:04:29 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): further simplify the code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15280 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): further simplify the code ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15280/1/src/osmobts_sock.cpp File src/osmobts_sock.cpp: https://gerrit.osmocom.org/#/c/15280/1/src/osmobts_sock.cpp at 146 PS1, Line 146: if (rc <= 0) { This looks a lot simpler: if (rc < 0 && errno == EAGAIN) return 0; if (rc <= 0) { pcu_sock_close(state, 1); return -EIO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 Gerrit-Change-Number: 15280 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 17:04:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:07:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:07:48 +0000 Subject: Change in ...osmo-pcu[master]: gprs_bssgp_destroy(): fix NULL-pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15281 ) Change subject: gprs_bssgp_destroy(): fix NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15281/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/#/c/15281/1/src/gprs_bssgp_pcu.cpp at 980 PS1, Line 980: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" Would be great to check with git log if this warning is related to same thing (bctx being NULL). You are missing putting everything inside the same block: if (the_pcu.bctx != NULL) { llist_del(&the_pcu.bctx->list); #warning "..." #if 0 talloc_free(the_pcu.bctx); #endif the_pcu.bctx = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 Gerrit-Change-Number: 15281 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 17:07:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:14:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:14:45 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp_act2_recovery Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283 Change subject: ggsn: Introduce test TC_pdp_act2_recovery ...................................................................... ggsn: Introduce test TC_pdp_act2_recovery Some code is moved out of f_pdp_ctx_act() into f_handle_create_req() in order to re-use it in the test. Related: OS#4165 Change-Id: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml 2 files changed, 111 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/15283/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index e294fb7..4a53fa1 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -267,6 +267,51 @@ } } + function f_handle_create_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { + var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; + if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { + /* Check if EUA type corresponds to requested type */ + if (match(ctx.eua, t_EuaIPv4(?)) and + not match(cpr.endUserAddress, tr_EuaIPv4(?))){ + setverdict(fail); + } + if (match(ctx.eua, t_EuaIPv6(?)) and + not match(cpr.endUserAddress, tr_EuaIPv6(?))) { + setverdict(fail); + } + if (match(ctx.eua, t_EuaIPv4v6(?, ?)) and + not match(cpr.endUserAddress, tr_EuaIPv4v6(?, ?))) { + setverdict(fail); + } + /* Check if PCO response corresponds to request */ + if (ispresent(ctx.pco_req)) { + if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and + not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) { + log("IPv4 DNS Container requested, but missing"); + setverdict(fail); + } + if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and + not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) { + log("IPv6 DNS Container requested, but missing"); + setverdict(fail); + } + } + ctx.teid_remote := cpr.teidDataI.teidDataI; + ctx.teic_remote := cpr.teidControlPlane.teidControlPlane; + ctx.eua := cpr.endUserAddress; + ctx.pco_neg := cpr.protConfigOptions; + setverdict(pass); + } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { + if (ispresent(cpr.endUserAddress)) { + log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); + setverdict(fail); + } + setverdict(pass); + } else { + setverdict(fail); + } + } + /* send a PDP context activation */ function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; @@ -280,48 +325,7 @@ d := activate(pingpong()); alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { - var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; - if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { - /* Check if EUA type corresponds to requested type */ - if (match(ctx.eua, t_EuaIPv4(?)) and - not match(cpr.endUserAddress, tr_EuaIPv4(?))){ - setverdict(fail); - } - if (match(ctx.eua, t_EuaIPv6(?)) and - not match(cpr.endUserAddress, tr_EuaIPv6(?))) { - setverdict(fail); - } - if (match(ctx.eua, t_EuaIPv4v6(?, ?)) and - not match(cpr.endUserAddress, tr_EuaIPv4v6(?, ?))) { - setverdict(fail); - } - /* Check if PCO response corresponds to request */ - if (ispresent(ctx.pco_req)) { - if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and - not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) { - log("IPv4 DNS Container requested, but missing"); - setverdict(fail); - } - if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and - not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) { - log("IPv6 DNS Container requested, but missing"); - setverdict(fail); - } - } - ctx.teid_remote := cpr.teidDataI.teidDataI; - ctx.teic_remote := cpr.teidControlPlane.teidControlPlane; - ctx.eua := cpr.endUserAddress; - ctx.pco_neg := cpr.protConfigOptions; - setverdict(pass); - } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { - if (ispresent(cpr.endUserAddress)) { - log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); - setverdict(fail); - } - setverdict(pass); - } else { - setverdict(fail); - } + f_handle_create_req(ctx, ud, exp_cause); } } deactivate(d); @@ -1359,6 +1363,69 @@ f_pdp_ctx_del(ctx4, '1'B); } + /* Validate if 2nd CtxCreateReq with increased Recovery IE causes ggsn to drop 1st one (while keeping 2nd one). */ + testcase TC_pdp_act2_recovery() runs on GT_CT { + var Gtp1cUnitdata ud; + var default d; + var boolean ctxA_deleted := false; + var boolean ctxB_created := false; + + f_init(); + var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctxA); + + g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + + log("sending 2nd CreatePDP (recovery increased)"); + f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctxB.imsi, g_restart_ctr, + ctxB.teid, ctxB.teic, ctxB.nsapi, ctxB.eua, ctxB.apn, + g_sgsn_ip_c, g_sgsn_ip_u, ctxB.msisdn, ctxB.pco_req)); + T_default.start; + d := activate(pingpong()); + alt { + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctxB.teic)) -> value ud { + f_handle_create_req(ctxB, ud); + if (not ctxB_created) { + ctxB_created := true; + setverdict(pass); + } else { + setverdict(fail, "Repeated createPDPContextResponse(ctxB)"); + } + + if (not ctxA_deleted) { + repeat; + } + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctxA.teic)) -> value ud { + if (ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.tearDownIndicator)) { + setverdict(pass); + } else { + setverdict(fail); + } + + if (not ctxA_deleted) { + ctxA_deleted := true; + setverdict(pass); + } else { + setverdict(fail, "Repeated deletePDPContextRequest(ctxA)"); + } + + if (not ctxB_created) { + repeat; + } + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctxB.teic)) -> value ud { + setverdict(fail, "GGSN dropping still valid pdp ctx"); + } + } + deactivate(d); + T_default.stop; + + f_pdp_ctx_del(ctxB, '1'B); + } + + /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent responses (60 seconds): If same delete req is sent and duplicate is detected, saved duplicate response should be sent back. */ @@ -1433,6 +1500,7 @@ execute(TC_pdp46_act_deact_apn4()); execute(TC_echo_req_resp()); + execute(TC_pdp_act2_recovery()); execute(TC_act_deact_retrans_duplicate()); if (m_ggsn_supports_echo_interval) { diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index c31c14a..baa5b1f 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -23,6 +23,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283 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: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7 Gerrit-Change-Number: 15283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:14:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:14:44 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp_act_restart_ctr_echo Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15282 Change subject: ggsn: Introduce test TC_pdp_act_restart_ctr_echo ...................................................................... ggsn: Introduce test TC_pdp_act_restart_ctr_echo VTY functionalities to enable and disable echo requests in osmo-ggsn are added too as part of the test. Depends: osmo-ggsn.git Id2c84165dc59dff495106758146a701ca488834f Related: OS#4165 Change-Id: Ia37e48e7ff9ad063f9eabf447f8a6a0a3fc380d9 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml 2 files changed, 86 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/15282/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index ae92626..e294fb7 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -64,6 +64,13 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ + + /* + * Whether ggsn supports "(no) echo-interval" VTY command + * (osmo-ggsn.git Id2c84165dc59dff495106758146a701ca488834f). + * This option can be dropped after osmo-ggsn release > 1.4.0 exists. + */ + boolean m_ggsn_supports_echo_interval := true; } type set PdpContext { @@ -107,6 +114,7 @@ port TELNETasp_PT GGSNVTY; var boolean use_gtpu_txseq := false; + var boolean g_use_echo := false; } private function f_init_vty() runs on GT_CT { @@ -159,6 +167,17 @@ return true; } + private function f_vty_enable_echo_interval(boolean enable) runs on GT_CT { + f_vty_enter_config(GGSNVTY); + f_vty_transceive(GGSNVTY, "ggsn ggsn0"); + if (enable) { + f_vty_transceive(GGSNVTY, "echo-interval 5"); + } else { + f_vty_transceive(GGSNVTY, "no echo-interval"); + } + f_vty_transceive(GGSNVTY, "end"); + } + function f_init() runs on GT_CT { if (g_initialized == true) { return; @@ -184,20 +203,22 @@ f_init_vty(); f_vty_set_gpdu_txseq(use_gtpu_txseq); + if (m_ggsn_supports_echo_interval) { + f_vty_enable_echo_interval(g_use_echo); + } } /* Altstep implementing responses to any incoming echo requests */ altstep pingpong() runs on GT_CT { var Gtp1cUnitdata ud; var Gtp1uUnitdata udu; - [] GTPC.receive(tr_GTPC_PING(?)) -> value ud { + [g_use_echo] GTPC.receive(tr_GTPC_PING(?)) -> value ud { var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); - GTPC.send(ts_GTPC_PONG(ud.peer, seq, '00'O)); + GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); repeat; }; - [] GTPU.receive(tr_GTPU_PING(?)) -> value udu { - var uint16_t seq := oct2int(udu.gtpu.opt_part.sequenceNumber); - GTPU.send(ts_GTPU_PONG(udu.peer, seq, '00'O)); + [not g_use_echo] GTPC.receive(tr_GTPC_PING(?)) { + setverdict(fail, "GTP Echo Req rceived but not enabled in VTY"); }; [] T_default.timeout { setverdict(fail); }; } @@ -307,6 +328,35 @@ T_default.stop; } + function f_pdp_ctx_exp_del_req(PdpContext ctx, template (omit) OCT1 expect_cause := omit, boolean expect_teardown := false) runs on GT_CT { + var Gtp1cUnitdata ud; + var default d; + + T_default.start; + d := activate(pingpong()); + alt { + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctx.teic)) -> value ud { + if (istemplatekind(expect_cause, "omit") and not ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.cause.causevalue)) { + setverdict(pass); + } else if (not istemplatekind(expect_cause, "omit") and + ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.cause.causevalue) and + ud.gtpc.gtpc_pdu.deletePDPContextRequest.cause.causevalue == valueof(expect_cause)) { + setverdict(pass); + } else { + setverdict(fail); + } + + if (expect_teardown == ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.tearDownIndicator)) { + setverdict(pass); + } else { + setverdict(fail); + } + } + } + deactivate(d); + T_default.stop; + } + function f_pdp_ctx_del(PdpContext ctx, template BIT1 teardown_ind, OCT1 expect_causevalue := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; var default d; @@ -1330,6 +1380,32 @@ f_pdp_ctx_del(ctx, '1'B, cause_nonexistent); } + /* Activate PDP context + trigger Recovery procedure through EchoResp */ + testcase TC_pdp_act_restart_ctr_echo() runs on GT_CT { + var Gtp1cUnitdata ud; + g_use_echo := true; + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctx); + + /* Wait to receive echo request and send initial Restart counter */ + GTPC.receive(tr_GTPC_PING(?)) -> value ud { + var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); + GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); + }; + + /* Wait to receive second echo request and send incremented Restart + counter. This will fake a restarted SGSN, and pdp ctx allocated + should be released by GGSN */ + g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + GTPC.receive(tr_GTPC_PING(?)) -> value ud { + var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); + GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); + }; + f_pdp_ctx_exp_del_req(ctx, omit, true); + setverdict(pass); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -1358,5 +1434,9 @@ execute(TC_echo_req_resp()); execute(TC_act_deact_retrans_duplicate()); + + if (m_ggsn_supports_echo_interval) { + execute(TC_pdp_act_restart_ctr_echo()); + } } } diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index 374cde0..c31c14a 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -24,4 +24,5 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15282 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: Ia37e48e7ff9ad063f9eabf447f8a6a0a3fc380d9 Gerrit-Change-Number: 15282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:20:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:20:41 +0000 Subject: Change in ...docker-playground[master]: ttcn3-ggsn: Disable echo-timer test when running against latest Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15284 Change subject: ttcn3-ggsn: Disable echo-timer test when running against latest ...................................................................... ttcn3-ggsn: Disable echo-timer test when running against latest Change-Id: I6657eefed00df96e3bcdca174a6ea0be1897b762 --- M ttcn3-ggsn-test/GGSN_Tests.cfg M ttcn3-ggsn-test/jenkins.sh 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/84/15284/1 diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg index 064bf37..11c22cb 100644 --- a/ttcn3-ggsn-test/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/GGSN_Tests.cfg @@ -18,5 +18,7 @@ # GGSN announced DNS address GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" +GGSN_Tests.m_ggsn_supports_echo_interval := true; + [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 4250e4d..c4fac9d 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -10,6 +10,10 @@ mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ +# VTY command "(no) echo-interval" must be disabled until osmo-ggsn.git release > 1.4.0 is available. +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/GGSN_Tests.m_ggsn_supports_echo_interval := true;/GGSN_Tests.m_ggsn_supports_echo_interval := false;/g" -i $VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg +fi mkdir $VOL_BASE_DIR/ggsn cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6657eefed00df96e3bcdca174a6ea0be1897b762 Gerrit-Change-Number: 15284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 23 17:22:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 23 Aug 2019 17:22:04 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... Patch Set 4: Tested now with TTCN3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 23 Aug 2019 17:22:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 23 21:03:11 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 21:03:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d60549b5eaa1_4f982b24709105f423105@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 395s] ar: `u' modifier ignored since `D' is the default (see `U') [ 395s] libtool: link: ranlib .libs/libtransceiver_common.a [ 395s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 395s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 395s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 395s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 395s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 395s] collect2: error: ld returned 1 exit status [ 395s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 395s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 395s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 395s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 395s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 395s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 395s] make[1]: *** [Makefile:444: all] Error 2 [ 395s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 395s] dh_auto_build: make -j1 returned exit code 2 [ 395s] make: *** [debian/rules:6: build] Error 255 [ 395s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 395s] [ 395s] lamb06 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 23 21:02:55 UTC 2019. [ 395s] [ 395s] ### VM INTERACTION START ### [ 398s] [ 380.493129] sysrq: SysRq : Power Off [ 398s] [ 380.499705] reboot: Power down [ 399s] ### VM INTERACTION END ### [ 399s] [ 399s] lamb06 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 23 21:02:58 UTC 2019. [ 399s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 23 21:04:54 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 23 Aug 2019 21:04:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6055109cf8c_4f982b24709105f42311f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 408s] ar: `u' modifier ignored since `D' is the default (see `U') [ 408s] libtool: link: ranlib .libs/libtransceiver_common.a [ 408s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 408s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 408s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 409s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 409s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 409s] collect2: error: ld returned 1 exit status [ 409s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 409s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 409s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 409s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 409s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 409s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 409s] make[1]: *** [Makefile:444: all] Error 2 [ 409s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 409s] dh_auto_build: make -j1 returned exit code 2 [ 409s] make: *** [debian/rules:6: build] Error 255 [ 409s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 409s] [ 409s] lamb57 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 21:04:40 UTC 2019. [ 409s] [ 409s] ### VM INTERACTION START ### [ 412s] [ 393.283075] sysrq: SysRq : Power Off [ 412s] [ 393.291269] reboot: Power down [ 412s] ### VM INTERACTION END ### [ 412s] [ 412s] lamb57 failed "build osmo-trx_1.1.1.1.3eed8.dsc" at Fri Aug 23 21:04:44 UTC 2019. [ 412s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 23 21:49:05 2019 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 23 Aug 2019 21:49:05 +0000 Subject: Change in ...osmo-msc[master]: smpp_openbsc.c: check acl before deref it Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15285 Change subject: smpp_openbsc.c: check acl before deref it ...................................................................... smpp_openbsc.c: check acl before deref it All other calls check acl before deref because in a setup with no access policy, there won't be any acl structure Change-Id: Ibe0256535b40351594d79baa05a0147a9f89dc26 --- M src/libmsc/smpp_openbsc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/85/15285/1 diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index bbfc500..e4c3891 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -326,7 +326,7 @@ "ESME is not (yet) bound, skipping alert\n"); continue; } - if (!esme->acl->alert_notifications) { + if (esme->acl && !esme->acl->alert_notifications) { LOGP(DSMPP, LOGL_DEBUG, "[%s] is not set to receive Alert Notifications\n", esme->system_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibe0256535b40351594d79baa05a0147a9f89dc26 Gerrit-Change-Number: 15285 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 24 00:05:46 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 24 Aug 2019 00:05:46 +0000 Subject: Change in ...osmo-msc[master]: smpp_openbsc.c: check acl before deref it In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15285 ) Change subject: smpp_openbsc.c: check acl before deref it ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibe0256535b40351594d79baa05a0147a9f89dc26 Gerrit-Change-Number: 15285 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 24 Aug 2019 00:05:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 24 01:51:28 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 01:51:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6098393af31_4f982b24709105f424852b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 419s] ar: `u' modifier ignored since `D' is the default (see `U') [ 419s] libtool: link: ranlib .libs/libtransceiver_common.a [ 419s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 419s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 419s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 419s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 419s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 419s] collect2: error: ld returned 1 exit status [ 419s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 419s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 419s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 419s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 419s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 419s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 419s] make[1]: *** [Makefile:444: all] Error 2 [ 419s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 419s] dh_auto_build: make -j1 returned exit code 2 [ 419s] make: *** [debian/rules:6: build] Error 255 [ 419s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 419s] [ 419s] lamb71 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 01:51:08 UTC 2019. [ 419s] [ 419s] ### VM INTERACTION START ### [ 422s] [ 403.835306] sysrq: SysRq : Power Off [ 422s] [ 403.845467] reboot: Power down [ 422s] ### VM INTERACTION END ### [ 422s] [ 422s] lamb71 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 01:51:11 UTC 2019. [ 422s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 04:01:45 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 04:01:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d60b6b1bdecf_4f982b24709105f425577a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 401s] ar: `u' modifier ignored since `D' is the default (see `U') [ 401s] libtool: link: ranlib .libs/libtransceiver_common.a [ 401s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 401s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 401s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 402s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 402s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 402s] collect2: error: ld returned 1 exit status [ 402s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 402s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 402s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 402s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 402s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 402s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 402s] make[1]: *** [Makefile:444: all] Error 2 [ 402s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 402s] dh_auto_build: make -j1 returned exit code 2 [ 402s] make: *** [debian/rules:6: build] Error 255 [ 402s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 402s] [ 402s] lamb03 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 04:01:25 UTC 2019. [ 402s] [ 402s] ### VM INTERACTION START ### [ 405s] [ 386.741424] sysrq: SysRq : Power Off [ 405s] [ 386.746532] reboot: Power down [ 405s] ### VM INTERACTION END ### [ 405s] [ 405s] lamb03 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 04:01:28 UTC 2019. [ 405s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 04:06:02 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 04:06:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d60b7bc6b27a_4f982b24709105f4255860@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 405s] ar: `u' modifier ignored since `D' is the default (see `U') [ 405s] libtool: link: ranlib .libs/libtransceiver_common.a [ 405s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 405s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 406s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 406s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 406s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 406s] collect2: error: ld returned 1 exit status [ 406s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 406s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 406s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 406s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 406s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 406s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 406s] make[1]: *** [Makefile:444: all] Error 2 [ 406s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 406s] dh_auto_build: make -j1 returned exit code 2 [ 406s] make: *** [debian/rules:6: build] Error 255 [ 406s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 406s] [ 406s] lamb11 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 04:05:54 UTC 2019. [ 406s] [ 406s] ### VM INTERACTION START ### [ 409s] [ 390.928865] sysrq: SysRq : Power Off [ 409s] [ 390.936888] reboot: Power down [ 409s] ### VM INTERACTION END ### [ 409s] [ 409s] lamb11 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 04:05:58 UTC 2019. [ 409s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 04:07:45 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 04:07:45 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d60b81a521c8_4f982b24709105f42559b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 436s] ar: `u' modifier ignored since `D' is the default (see `U') [ 436s] libtool: link: ranlib .libs/libtransceiver_common.a [ 436s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 436s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 436s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 436s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 436s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 436s] collect2: error: ld returned 1 exit status [ 436s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 436s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 436s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 436s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 436s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 436s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 436s] make[1]: *** [Makefile:444: all] Error 2 [ 436s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 436s] dh_auto_build: make -j1 returned exit code 2 [ 436s] make: *** [debian/rules:6: build] Error 255 [ 436s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 436s] [ 436s] lamb09 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 04:07:38 UTC 2019. [ 436s] [ 436s] ### VM INTERACTION START ### [ 439s] [ 420.320157] sysrq: SysRq : Power Off [ 440s] [ 420.333933] reboot: Power down [ 440s] ### VM INTERACTION END ### [ 440s] [ 440s] lamb09 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 04:07:42 UTC 2019. [ 440s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 04:33:45 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 04:33:45 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d60be31cbb3d_4f982b24709105f42567bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 415s] ar: `u' modifier ignored since `D' is the default (see `U') [ 415s] libtool: link: ranlib .libs/libtransceiver_common.a [ 415s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 415s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 416s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 416s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 416s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 416s] collect2: error: ld returned 1 exit status [ 416s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 416s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 416s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 416s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 416s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 416s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 416s] make[1]: *** [Makefile:444: all] Error 2 [ 416s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 416s] dh_auto_build: make -j1 returned exit code 2 [ 416s] make: *** [debian/rules:6: build] Error 255 [ 416s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 416s] [ 416s] lamb14 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 04:33:40 UTC 2019. [ 416s] [ 416s] ### VM INTERACTION START ### [ 419s] [ 399.314366] sysrq: SysRq : Power Off [ 419s] [ 399.320198] reboot: Power down [ 419s] ### VM INTERACTION END ### [ 419s] [ 419s] lamb14 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 04:33:44 UTC 2019. [ 419s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 10:00:20 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 10:00:20 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d610ad74a5df_4f982b24709105f43010e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 233s] ar: `u' modifier ignored since `D' is the default (see `U') [ 233s] libtool: link: ranlib .libs/libtransceiver_common.a [ 233s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 233s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 233s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 233s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 233s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 233s] collect2: error: ld returned 1 exit status [ 233s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 233s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 233s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 233s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 233s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 233s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 233s] make[1]: *** [Makefile:444: all] Error 2 [ 233s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 233s] dh_auto_build: make -j1 returned exit code 2 [ 233s] make: *** [debian/rules:6: build] Error 255 [ 233s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 233s] [ 233s] build82 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 10:00:15 UTC 2019. [ 233s] [ 233s] ### VM INTERACTION START ### [ 236s] [ 224.884121] sysrq: SysRq : Power Off [ 236s] [ 224.885994] reboot: Power down [ 236s] ### VM INTERACTION END ### [ 236s] [ 236s] build82 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 10:00:18 UTC 2019. [ 236s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 10:00:54 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 10:00:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d610ad7b1e1f_4f982b24709105f430116a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 252s] ar: `u' modifier ignored since `D' is the default (see `U') [ 252s] libtool: link: ranlib .libs/libtransceiver_common.a [ 252s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 252s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 252s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 252s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 252s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 252s] collect2: error: ld returned 1 exit status [ 252s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 252s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 252s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 252s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 252s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 252s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 252s] make[1]: *** [Makefile:444: all] Error 2 [ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 252s] dh_auto_build: make -j1 returned exit code 2 [ 252s] make: *** [debian/rules:6: build] Error 255 [ 252s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 252s] [ 252s] build70 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 10:00:35 UTC 2019. [ 252s] [ 252s] ### VM INTERACTION START ### [ 255s] [ 242.413518] sysrq: SysRq : Power Off [ 255s] [ 242.420443] reboot: Power down [ 255s] ### VM INTERACTION END ### [ 255s] [ 255s] build70 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 10:00:38 UTC 2019. [ 255s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 16:00:01 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 16:00:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d615f1c722bc_4f982b24709105f433588c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 294s] ar: `u' modifier ignored since `D' is the default (see `U') [ 294s] libtool: link: ranlib .libs/libtransceiver_common.a [ 294s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 294s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 294s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 294s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 294s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 294s] collect2: error: ld returned 1 exit status [ 294s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 294s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 294s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 294s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 294s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 294s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 294s] make[1]: *** [Makefile:444: all] Error 2 [ 294s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 294s] dh_auto_build: make -j1 returned exit code 2 [ 294s] make: *** [debian/rules:6: build] Error 255 [ 294s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 294s] [ 294s] sheep83 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 15:59:43 UTC 2019. [ 294s] [ 294s] ### VM INTERACTION START ### [ 297s] [ 284.612639] sysrq: SysRq : Power Off [ 297s] [ 284.618906] reboot: Power down [ 297s] ### VM INTERACTION END ### [ 297s] [ 297s] sheep83 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 15:59:47 UTC 2019. [ 297s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 16:02:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 16:02:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d615f9768cba_4f982b24709105f433599e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 459s] ar: `u' modifier ignored since `D' is the default (see `U') [ 459s] libtool: link: ranlib .libs/libtransceiver_common.a [ 459s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 459s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 460s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 460s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 460s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 460s] collect2: error: ld returned 1 exit status [ 460s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 460s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 460s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 460s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 460s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 460s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 460s] make[1]: *** [Makefile:444: all] Error 2 [ 460s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 460s] dh_auto_build: make -j1 returned exit code 2 [ 460s] make: *** [debian/rules:6: build] Error 255 [ 460s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 460s] [ 460s] morla3 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 16:02:03 UTC 2019. [ 460s] [ 460s] ### VM INTERACTION START ### [ 463s] [ 438.899792] sysrq: SysRq : Power Off [ 463s] [ 438.909409] reboot: Power down [ 463s] ### VM INTERACTION END ### [ 463s] [ 463s] morla3 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 16:02:06 UTC 2019. [ 463s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 16:03:27 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 16:03:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d615fd1ad293_4f982b24709105f4336375@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 414s] ar: `u' modifier ignored since `D' is the default (see `U') [ 414s] libtool: link: ranlib .libs/libtransceiver_common.a [ 414s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 414s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 415s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 415s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 415s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 415s] collect2: error: ld returned 1 exit status [ 415s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 415s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 415s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 415s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 415s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 415s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 415s] make[1]: *** [Makefile:444: all] Error 2 [ 415s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 415s] dh_auto_build: make -j1 returned exit code 2 [ 415s] make: *** [debian/rules:6: build] Error 255 [ 415s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 415s] [ 415s] lamb23 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 16:03:11 UTC 2019. [ 415s] [ 415s] ### VM INTERACTION START ### [ 418s] [ 399.449401] sysrq: SysRq : Power Off [ 418s] [ 399.457757] reboot: Power down [ 418s] ### VM INTERACTION END ### [ 418s] [ 418s] lamb23 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 16:03:15 UTC 2019. [ 418s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 16:03:27 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 16:03:27 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d615fd1f3535_4f982b24709105f433642d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 488s] ar: `u' modifier ignored since `D' is the default (see `U') [ 488s] libtool: link: ranlib .libs/libtransceiver_common.a [ 488s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 488s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 488s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 488s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 488s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 488s] collect2: error: ld returned 1 exit status [ 488s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 488s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 488s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 488s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 488s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 488s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 488s] make[1]: *** [Makefile:444: all] Error 2 [ 488s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 488s] dh_auto_build: make -j1 returned exit code 2 [ 488s] make: *** [debian/rules:6: build] Error 255 [ 488s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 488s] [ 488s] cloud101 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 16:03:14 UTC 2019. [ 488s] [ 488s] ### VM INTERACTION START ### [ 492s] [ 466.779979] sysrq: SysRq : Power Off [ 492s] [ 466.784676] reboot: Power down [ 492s] ### VM INTERACTION END ### [ 492s] [ 492s] cloud101 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 16:03:18 UTC 2019. [ 492s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 22:10:04 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 22:10:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d61b5c4bc9ef_4f982b24709105f4394087@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 435s] ar: `u' modifier ignored since `D' is the default (see `U') [ 435s] libtool: link: ranlib .libs/libtransceiver_common.a [ 435s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 435s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 436s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 436s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 436s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 436s] collect2: error: ld returned 1 exit status [ 436s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 436s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 436s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 436s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 436s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 436s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 436s] make[1]: *** [Makefile:444: all] Error 2 [ 436s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 436s] dh_auto_build: make -j1 returned exit code 2 [ 436s] make: *** [debian/rules:6: build] Error 255 [ 436s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 436s] [ 436s] lamb21 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 22:09:52 UTC 2019. [ 436s] [ 436s] ### VM INTERACTION START ### [ 439s] [ 419.619038] sysrq: SysRq : Power Off [ 439s] [ 419.636352] reboot: Power down [ 439s] ### VM INTERACTION END ### [ 439s] [ 439s] lamb21 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 24 22:09:55 UTC 2019. [ 439s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 24 22:13:13 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 24 Aug 2019 22:13:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d61b693cf5eb_4f982b24709105f43944cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 563s] ar: `u' modifier ignored since `D' is the default (see `U') [ 563s] libtool: link: ranlib .libs/libtransceiver_common.a [ 563s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 563s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 563s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 563s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 563s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 563s] collect2: error: ld returned 1 exit status [ 563s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 563s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 563s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 563s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 563s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 563s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 563s] make[1]: *** [Makefile:444: all] Error 2 [ 563s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 563s] dh_auto_build: make -j1 returned exit code 2 [ 563s] make: *** [debian/rules:6: build] Error 255 [ 563s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 563s] [ 564s] lamb04 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 22:12:57 UTC 2019. [ 564s] [ 564s] ### VM INTERACTION START ### [ 567s] [ 542.101971] sysrq: SysRq : Power Off [ 567s] [ 542.115514] reboot: Power down [ 567s] ### VM INTERACTION END ### [ 567s] [ 567s] lamb04 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sat Aug 24 22:13:01 UTC 2019. [ 567s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 25 01:45:47 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 25 Aug 2019 01:45:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d61e863342dc_4f982b24709105f442257f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 415s] ar: `u' modifier ignored since `D' is the default (see `U') [ 415s] libtool: link: ranlib .libs/libtransceiver_common.a [ 415s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 415s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 415s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 416s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 416s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 416s] collect2: error: ld returned 1 exit status [ 416s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 416s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 416s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 416s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 416s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 416s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 416s] make[1]: *** [Makefile:444: all] Error 2 [ 416s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 416s] dh_auto_build: make -j1 returned exit code 2 [ 416s] make: *** [debian/rules:6: build] Error 255 [ 416s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 416s] [ 416s] lamb12 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 01:45:40 UTC 2019. [ 416s] [ 416s] ### VM INTERACTION START ### [ 419s] [ 399.520427] sysrq: SysRq : Power Off [ 419s] [ 399.528165] reboot: Power down [ 419s] ### VM INTERACTION END ### [ 419s] [ 419s] lamb12 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 01:45:43 UTC 2019. [ 419s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 25 01:47:30 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 25 Aug 2019 01:47:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d61e8bf7c21d_4f982b24709105f44226e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 467s] ar: `u' modifier ignored since `D' is the default (see `U') [ 467s] libtool: link: ranlib .libs/libtransceiver_common.a [ 467s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 467s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 467s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 468s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 468s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 468s] collect2: error: ld returned 1 exit status [ 468s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 468s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 468s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 468s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 468s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 468s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 468s] make[1]: *** [Makefile:444: all] Error 2 [ 468s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 468s] dh_auto_build: make -j1 returned exit code 2 [ 468s] make: *** [debian/rules:6: build] Error 255 [ 468s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 468s] [ 468s] build34 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 01:47:10 UTC 2019. [ 468s] [ 468s] ### VM INTERACTION START ### [ 471s] [ 447.247761] sysrq: SysRq : Power Off [ 471s] [ 447.252332] reboot: Power down [ 471s] ### VM INTERACTION END ### [ 471s] [ 471s] build34 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 01:47:14 UTC 2019. [ 471s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 25 04:02:39 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 25 Aug 2019 04:02:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d62087dd9eda_4f982b24709105f4426030@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 389s] ar: `u' modifier ignored since `D' is the default (see `U') [ 389s] libtool: link: ranlib .libs/libtransceiver_common.a [ 389s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 390s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 390s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 390s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 390s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 390s] collect2: error: ld returned 1 exit status [ 390s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 390s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 390s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 390s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 390s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 390s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 390s] make[1]: *** [Makefile:444: all] Error 2 [ 390s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 390s] dh_auto_build: make -j1 returned exit code 2 [ 390s] make: *** [debian/rules:6: build] Error 255 [ 390s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 390s] [ 390s] lamb52 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 04:02:33 UTC 2019. [ 390s] [ 390s] ### VM INTERACTION START ### [ 393s] [ 374.381329] sysrq: SysRq : Power Off [ 393s] [ 374.388650] reboot: Power down [ 393s] ### VM INTERACTION END ### [ 393s] [ 393s] lamb52 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 04:02:37 UTC 2019. [ 393s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 25 04:10:21 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 25 Aug 2019 04:10:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d620a3f434d1_4f982b24709105f44261fd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 393s] ar: `u' modifier ignored since `D' is the default (see `U') [ 393s] libtool: link: ranlib .libs/libtransceiver_common.a [ 393s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 393s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 393s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 393s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 393s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 393s] collect2: error: ld returned 1 exit status [ 394s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 394s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 394s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 394s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 394s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 394s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 394s] make[1]: *** [Makefile:444: all] Error 2 [ 394s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 394s] dh_auto_build: make -j1 returned exit code 2 [ 394s] make: *** [debian/rules:6: build] Error 255 [ 394s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 394s] [ 394s] lamb02 failed "build osmo-trx_1.1.1.dsc" at Sun Aug 25 04:10:03 UTC 2019. [ 394s] [ 394s] ### VM INTERACTION START ### [ 397s] [ 378.910607] sysrq: SysRq : Power Off [ 397s] [ 378.919245] reboot: Power down [ 397s] ### VM INTERACTION END ### [ 397s] [ 397s] lamb02 failed "build osmo-trx_1.1.1.dsc" at Sun Aug 25 04:10:07 UTC 2019. [ 397s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Aug 25 16:28:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 25 Aug 2019 16:28:47 +0000 Subject: Change in ...osmo-msc[master]: smpp_openbsc.c: check acl before deref it In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15285 ) Change subject: smpp_openbsc.c: check acl before deref it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibe0256535b40351594d79baa05a0147a9f89dc26 Gerrit-Change-Number: 15285 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 25 Aug 2019 16:28:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 25 16:33:39 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 25 Aug 2019 16:33:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d62b86a7798d_4f982b24709105f450241d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 610s] ar: `u' modifier ignored since `D' is the default (see `U') [ 610s] libtool: link: ranlib .libs/libtransceiver_common.a [ 610s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 610s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 610s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 611s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 611s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 611s] collect2: error: ld returned 1 exit status [ 611s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 611s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 611s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 611s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 611s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 611s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 611s] make[1]: *** [Makefile:444: all] Error 2 [ 611s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 611s] dh_auto_build: make -j1 returned exit code 2 [ 611s] make: *** [debian/rules:6: build] Error 255 [ 611s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 611s] [ 611s] build34 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 16:33:25 UTC 2019. [ 611s] [ 611s] ### VM INTERACTION START ### [ 614s] [ 591.999020] sysrq: SysRq : Power Off [ 614s] [ 592.010039] reboot: Power down [ 615s] ### VM INTERACTION END ### [ 615s] [ 615s] build34 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Sun Aug 25 16:33:30 UTC 2019. [ 615s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 26 01:44:06 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Aug 2019 01:44:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6339844175b_4f982b24709105f4551389@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 391s] ar: `u' modifier ignored since `D' is the default (see `U') [ 391s] libtool: link: ranlib .libs/libtransceiver_common.a [ 391s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 391s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 391s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 391s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 391s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 391s] collect2: error: ld returned 1 exit status [ 391s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 391s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 392s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 392s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 392s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 392s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 392s] make[1]: *** [Makefile:444: all] Error 2 [ 392s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 392s] dh_auto_build: make -j1 returned exit code 2 [ 392s] make: *** [debian/rules:6: build] Error 255 [ 392s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 392s] [ 392s] lamb56 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 01:43:54 UTC 2019. [ 392s] [ 392s] ### VM INTERACTION START ### [ 395s] [ 376.867095] sysrq: SysRq : Power Off [ 395s] [ 376.874853] reboot: Power down [ 395s] ### VM INTERACTION END ### [ 395s] [ 395s] lamb56 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 01:43:58 UTC 2019. [ 395s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 26 01:46:40 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Aug 2019 01:46:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d633a1da3a30_4f982b24709105f45514ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 417s] ar: `u' modifier ignored since `D' is the default (see `U') [ 417s] libtool: link: ranlib .libs/libtransceiver_common.a [ 417s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 417s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 417s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 417s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 417s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 417s] collect2: error: ld returned 1 exit status [ 417s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 417s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 417s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 417s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 417s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 417s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 417s] make[1]: *** [Makefile:444: all] Error 2 [ 417s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 417s] dh_auto_build: make -j1 returned exit code 2 [ 418s] make: *** [debian/rules:6: build] Error 255 [ 418s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 418s] [ 418s] lamb52 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 01:46:27 UTC 2019. [ 418s] [ 418s] ### VM INTERACTION START ### [ 421s] [ 402.686971] sysrq: SysRq : Power Off [ 421s] [ 402.694742] reboot: Power down [ 421s] ### VM INTERACTION END ### [ 421s] [ 421s] lamb52 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 01:46:30 UTC 2019. [ 421s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 26 06:12:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 26 Aug 2019 06:12:44 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 ) Change subject: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Gerrit-Change-Number: 15259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 06:12:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 06:14:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 26 Aug 2019 06:14:14 +0000 Subject: Change in ...osmo-python-tests[master]: Add osmo_interact_exec.py In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 ) Change subject: Add osmo_interact_exec.py ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: If38243171c94d8ce9d6cdc269da59c9ebc9942bb Gerrit-Change-Number: 15273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 06:17:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 26 Aug 2019 06:17:56 +0000 Subject: Change in ...docker-playground[master]: ttcn3-ggsn: Disable echo-timer test when running against latest In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15284 ) Change subject: ttcn3-ggsn: Disable echo-timer test when running against latest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6657eefed00df96e3bcdca174a6ea0be1897b762 Gerrit-Change-Number: 15284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 26 Aug 2019 06:17:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 06:25:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 26 Aug 2019 06:25:00 +0000 Subject: Change in ...osmo-python-tests[master]: vty.py: Fix endl removed when pkt buffer content ends exactly on a ne... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15274 ) Change subject: vty.py: Fix endl removed when pkt buffer content ends exactly on a newline char ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ib1dbf39db1b27331ea4c39051e550a87780d9f76 Gerrit-Change-Number: 15274 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 26 Aug 2019 06:25:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 08:55:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 08:55:35 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: fix segfault during init if IP addr binding fails Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15286 Change subject: Transceiver: fix segfault during init if IP addr binding fails ...................................................................... Transceiver: fix segfault during init if IP addr binding fails If osmo-trx is started and IP addr binding fails (ie because the IP address is not assigned in the system), it will try to access a heap-allocated Thread instance which was not initialized (because init() function returned earlier). Fixes: OS#4147 Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d --- M Transceiver52M/Transceiver.cpp 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/86/15286/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 2d5c04e..e946aac 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -151,9 +151,11 @@ close(mClockSocket); for (size_t i = 0; i < mChans; i++) { - mControlServiceLoopThreads[i]->cancel(); - mControlServiceLoopThreads[i]->join(); - delete mControlServiceLoopThreads[i]; + if (mControlServiceLoopThreads[i]) { + mControlServiceLoopThreads[i]->cancel(); + mControlServiceLoopThreads[i]->join(); + delete mControlServiceLoopThreads[i]; + } mTxPriorityQueues[i].clear(); if (mCtrlSockets[i] >= 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d Gerrit-Change-Number: 15286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 08:55:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 08:55:36 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Check return value when binding IP addr for clock socket Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15287 Change subject: Transceiver: Check return value when binding IP addr for clock socket ...................................................................... Transceiver: Check return value when binding IP addr for clock socket No need to continue further since anyway we'll end up exiting. Change-Id: Id8b38b40df5744beb705d560defb06532cf0fd44 --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/15287/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index e946aac..244f372 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -212,6 +212,8 @@ mLocalAddr.c_str(), mBasePort, mRemoteAddr.c_str(), mBasePort + 100, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + if (mClockSocket < 0) + return false; for (size_t i = 0; i < mChans; i++) { c_srcport = mBasePort + 2 * i + 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id8b38b40df5744beb705d560defb06532cf0fd44 Gerrit-Change-Number: 15287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 09:23:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 09:23:16 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15288 Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Transceiver: Clean up receival of downlink bursts Use a packed structure to clearly indicate what is contained in the received buffer. Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d --- M Transceiver52M/Transceiver.cpp M Transceiver52M/proto_trxd.h 2 files changed, 28 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/15288/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 244f372..ab87b68 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -930,7 +930,7 @@ int msgLen; int burstLen; char buffer[EDGE_BURST_NBITS + 50]; - struct trxd_hdr_common *chdr; + struct trxd_hdr_v01_dl *dl; uint32_t fn; // check data socket @@ -940,54 +940,51 @@ return false; } - if (msgLen == gSlotLen + 1 + 4 + 1) { - burstLen = gSlotLen; - } else if (msgLen == EDGE_BURST_NBITS + 1 + 4 + 1) { - if (mSPSTx != 4) + switch (msgLen) { + case sizeof(struct trxd_hdr_v01_dl) + gSlotLen: /* GSM burst */ + burstLen = gSlotLen; + break; + case sizeof(struct trxd_hdr_v01_dl) + EDGE_BURST_NBITS: /* EDGE burst */ + if (mSPSTx != 4) + return false; + burstLen = EDGE_BURST_NBITS; + break; + default: + LOG(ERR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")"; return false; - - burstLen = EDGE_BURST_NBITS; - } else { - LOG(ERR) << "badly formatted packet on GSM->TRX interface"; - return false; } - /* Common header part: HDR version, TDMA TN & FN */ - chdr = (struct trxd_hdr_common *) buffer; + dl = (struct trxd_hdr_v01_dl *) buffer; /* Convert TDMA FN to the host endianness */ - fn = osmo_load32be(&chdr->fn); + fn = osmo_load32be(&dl->common.fn); /* Make sure we support the received header format */ - switch (chdr->version) { + switch (dl->common.version) { case 0: /* Version 1 has the same format */ case 1: break; - default: - LOG(ERR) << "Rx TRXD message with unknown header version " << chdr->version; + LOG(ERR) << "Rx TRXD message with unknown header version " << dl->common.version; return false; } - LOG(DEBUG) << "Rx TRXD message (hdr_ver=" << chdr->version << "): " - << "fn=" << fn << ", tn=" << chdr->tn << ", " + LOG(DEBUG) << "Rx TRXD message (hdr_ver=" << dl->common.version << "): " + << "fn=" << fn << ", tn=" << dl->common.tn << ", " << "burst_len=" << burstLen; - int RSSI = (int) buffer[5]; BitVector newBurst(burstLen); BitVector::iterator itr = newBurst.begin(); - char *bufferItr = buffer+6; + uint8_t *bufferItr = dl->soft_bits; while (itr < newBurst.end()) *itr++ = *bufferItr++; - GSM::Time currTime = GSM::Time(fn, chdr->tn); + GSM::Time currTime = GSM::Time(fn, dl->common.tn); - addRadioVector(chan, newBurst, RSSI, currTime); + addRadioVector(chan, newBurst, dl->rssi, currTime); return true; - - } void Transceiver::driveReceiveRadio() diff --git a/Transceiver52M/proto_trxd.h b/Transceiver52M/proto_trxd.h index 7eb5dac..d006400 100644 --- a/Transceiver52M/proto_trxd.h +++ b/Transceiver52M/proto_trxd.h @@ -66,6 +66,13 @@ uint8_t soft_bits[0]; } __attribute__ ((packed)); +/* Downlink burst (BTS->TRX), v0 anf v1 use same format */ +struct trxd_hdr_v01_dl { + struct trxd_hdr_common common; + uint8_t rssi; + uint8_t soft_bits[0]; +} __attribute__ ((packed)); + #define TRXD_MODULATION_GMSK(ts_set) (0b0000 | (ts_set & 0b0011)) #define TRXD_MODULATION_8PSK(ts_set) (0b0100 | (ts_set & 0b0001)) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 09:34:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 09:34:54 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 to look at the new patch set (#2). Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Transceiver: Clean up receival of downlink bursts Use a packed structure to clearly indicate what is contained in the received buffer. Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d --- M Transceiver52M/Transceiver.cpp M Transceiver52M/proto_trxd.h 2 files changed, 30 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/15288/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 10:11:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 10:11:54 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Transceiver: exit process when BTS drops connection We don't want to keep osmo-trx running in a started state once the BTS controlling it becomes unavailable. If a socket towards the BTS fails, it means the BTS is gone and the best thing to do is to stop the process (alternatively we could go back to stopped state instead, and wait for BTS to re-connect, fur so far this action is good enough). Related: OS#4170 Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 58 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/15289/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 8ba4674..239f309 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -708,7 +708,7 @@ ret_idle: bi->idle = true; delete radio_burst; - return false; + return true; } void Transceiver::reset() @@ -749,7 +749,7 @@ return true; } -void Transceiver::driveControl(size_t chan) +bool Transceiver::driveControl(size_t chan) { char buffer[MAX_PACKET_LENGTH + 1]; char response[MAX_PACKET_LENGTH + 1]; @@ -760,7 +760,7 @@ msgLen = read(mCtrlSockets[chan], buffer, MAX_PACKET_LENGTH); if (msgLen <= 0) { LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; - return; + return false; } /* Zero-terminate received string */ @@ -769,7 +769,7 @@ /* Verify a command signature */ if (strncmp(buffer, "CMD ", 4)) { LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; - return; + return false; } /* Set command pointer */ @@ -888,7 +888,7 @@ if ((timeslot < 0) || (timeslot > 7)) { LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode); - return; + return true; } mStates[chan].chanType[timeslot] = (ChannelCombination) corrCode; setModulus(timeslot, chan); @@ -921,8 +921,11 @@ LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'"; msgLen = write(mCtrlSockets[chan], response, strlen(response) + 1); - if (msgLen <= 0) + if (msgLen <= 0) { LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen; + return false; + } + return true; } bool Transceiver::driveTxPriorityQueue(size_t chan) @@ -989,18 +992,21 @@ return true; } -void Transceiver::driveReceiveRadio() +bool Transceiver::driveReceiveRadio() { int rc = mRadioInterface->driveReceiveRadio(); if (rc == 0) { usleep(100000); - } else if (rc < 0) { - LOG(FATAL) << "radio Interface receive failed, requesting stop."; - osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); - } else if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) { - mForceClockInterface = false; - writeClockInterface(); + return true; } + if (rc < 0) + return false; + + if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) { + mForceClockInterface = false; + return writeClockInterface(); + } + return true; } void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi) @@ -1025,22 +1031,23 @@ << " bits: " << os; } -void Transceiver::driveReceiveFIFO(size_t chan) +bool Transceiver::driveReceiveFIFO(size_t chan) { struct trx_ul_burst_ind bi; if (!pullRadioVector(chan, &bi)) - return; - if (!bi.idle) - logRxBurst(chan, &bi); + return false; + + if (bi.idle) + return true; + + logRxBurst(chan, &bi); switch (mVersionTRXD[chan]) { case 0: - trxd_send_burst_ind_v0(chan, mDataSockets[chan], &bi); - break; + return trxd_send_burst_ind_v0(chan, mDataSockets[chan], &bi); case 1: - trxd_send_burst_ind_v1(chan, mDataSockets[chan], &bi); - break; + return trxd_send_burst_ind_v1(chan, mDataSockets[chan], &bi); default: OSMO_ASSERT(false); } @@ -1101,7 +1108,7 @@ -void Transceiver::writeClockInterface() +bool Transceiver::writeClockInterface() { int msgLen; char command[50]; @@ -1111,11 +1118,13 @@ LOG(INFO) << "ClockInterface: sending " << command; msgLen = write(mClockSocket, command, strlen(command) + 1); - if (msgLen <= 0) - LOG(WARNING) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; + if (msgLen <= 0) { + LOG(ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; + return false; + } mLastClockUpdateTime = mTransmitDeadlineClock; - + return true; } void *RxUpperLoopAdapter(TrxChanThParams *params) @@ -1130,7 +1139,11 @@ set_selfthread_name(thread_name); while (1) { - trx->driveReceiveFIFO(num); + if (!trx->driveReceiveFIFO(num)) { + LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; @@ -1141,7 +1154,11 @@ set_selfthread_name("RxLower"); while (1) { - transceiver->driveReceiveRadio(); + if (!transceiver->driveReceiveRadio()) { + LOG(FATAL) << "Something went wrong in thread RxLower, requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; @@ -1170,7 +1187,11 @@ set_selfthread_name(thread_name); while (1) { - trx->driveControl(num); + if (!trx->driveControl(num)) { + LOGCHAN(num, DTRXCTRL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; @@ -1188,7 +1209,11 @@ set_selfthread_name(thread_name); while (1) { - trx->driveTxPriorityQueue(num); + if (!trx->driveTxPriorityQueue(num)) { + LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 1a4d28f..0d09854 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -191,7 +191,7 @@ CorrType expectedCorrType(GSM::Time currTime, size_t chan); /** send messages over the clock socket */ - void writeClockInterface(void); + bool writeClockInterface(void); int mSPSTx; ///< number of samples per Tx symbol int mSPSRx; ///< number of samples per Rx symbol @@ -221,16 +221,16 @@ protected: /** drive lower receive I/O and burst generation */ - void driveReceiveRadio(); + bool driveReceiveRadio(); /** drive demodulation of GSM bursts */ - void driveReceiveFIFO(size_t chan); + bool driveReceiveFIFO(size_t chan); /** drive transmission of GSM bursts */ void driveTxFIFO(); /** drive handling of control messages from GSM core */ - void driveControl(size_t chan); + bool driveControl(size_t chan); /** drive modulation and sorting of GSM bursts from GSM core -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 10:29:45 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 10:29:45 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15288 ) Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Patch Set 2: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/Transceiver.cpp at 932 PS2, Line 932: EDGE_BURST_NBITS + 50 This size could be also corrected as a part of this change. https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/Transceiver.cpp at 944 PS2, Line 944: trxd_hdr_v01_dl Cosmetic (feel free to keep as is): sizeof(*dl). https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/proto_trxd.h File Transceiver52M/proto_trxd.h: https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/proto_trxd.h at 72 PS2, Line 72: rssi This is not RSSI. Either call it 'tx_att' (Tx Attenuation), or 'pwr'. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 10:29:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 10:30:43 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 10:30:43 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: fix segfault during init if IP addr binding fails In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15286 ) Change subject: Transceiver: fix segfault during init if IP addr binding fails ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d Gerrit-Change-Number: 15286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 10:30:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 10:31:33 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 10:31:33 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Check return value when binding IP addr for clock socket In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15287 ) Change subject: Transceiver: Check return value when binding IP addr for clock socket ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id8b38b40df5744beb705d560defb06532cf0fd44 Gerrit-Change-Number: 15287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 10:31:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 10:37:34 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 10:37:34 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15289/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15289/1/Transceiver52M/Transceiver.cpp at 711 PS1, Line 711: true If I understand correctly, any IDLE frame or clipping would stop the process? https://gerrit.osmocom.org/#/c/15289/1/Transceiver52M/Transceiver.cpp at 772 PS1, Line 772: false Same here, not sure if we should stop the process if an incorrect message was received. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 10:37:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 12:23:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 12:23:48 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15288 ) Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/Transceiver.cpp at 932 PS2, Line 932: EDGE_BURST_NBITS + 50 > This size could be also corrected as a part of this change. Agree. Not sure where the 50 come from though, probably just a "big-enough" value. https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/proto_trxd.h File Transceiver52M/proto_trxd.h: https://gerrit.osmocom.org/#/c/15288/2/Transceiver52M/proto_trxd.h at 72 PS2, Line 72: rssi > This is not RSSI. Either call it 'tx_att' (Tx Attenuation), or 'pwr'. The variable it was assigned to in the code was called RSSI. That's why it's good to have these structs :D -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 12:23:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 12:26:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 12:26:09 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15289/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15289/1/Transceiver52M/Transceiver.cpp at 711 PS1, Line 711: true > If I understand correctly, any IDLE frame or clipping would stop the process? No, true means success and false means failure everywhere. https://gerrit.osmocom.org/#/c/15289/1/Transceiver52M/Transceiver.cpp at 772 PS1, Line 772: false > Same here, not sure if we should stop the process if an incorrect message was received. I hesitated here (I first had it as true), but after thinking about it, if we receive something non CMD, it definetly makes sense to drop the connection because probably something unrelated is connecting here to this socket. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 12:26:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 12:35:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 12:35:15 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 to look at the new patch set (#3). Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Transceiver: Clean up receival of downlink bursts Use a packed structure to clearly indicate what is contained in the received buffer. Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d --- M Transceiver52M/Transceiver.cpp M Transceiver52M/proto_trxd.h 2 files changed, 31 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/15288/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 12:50:34 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 12:50:34 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15288 ) Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Patch Set 3: Code-Review+1 Fine by me now (I have no CR+2 permission for OsmoTRX) :) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 12:50:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 13:15:15 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 13:15:15 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 2: Code-Review-1 (1 comment) > No, true means success and false means failure everywhere. Ok, nevermind. I was reading too quickly. I know you don't like C++ and its specific features, but I still think it makes more sense to use exceptions here. You can just catch them in *LoopAdapter() calls and terminate the process instead of spamming the code with dozens of `return true / false`. https://gerrit.osmocom.org/#/c/15289/2/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15289/2/Transceiver52M/Transceiver.cpp at 1041 PS2, Line 1041: if (bi.idle) : return true; Here you're changing the logic, so the IDLE indications would never be passed to trxd_send_burst_ind_*(). Not sure if this is intended. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 13:15:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 13:53:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 13:53:53 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 2: (1 comment) > Patch Set 2: Code-Review-1 > > (1 comment) > > > No, true means success and false means failure everywhere. > > Ok, nevermind. I was reading too quickly. > > I know you don't like C++ and its specific features, but I still think it makes more sense to use exceptions here. You can just catch them in *LoopAdapter() calls and terminate the process instead of spamming the code with dozens of `return true / false`. No thanks, I'm not doing that. I already had to fix some nasty deadlocks related to pthreads, destructors and exception handlers (see 86be40b4eb762d5c12e8e3f7388ca9f254e77b36). https://gerrit.osmocom.org/#/c/15289/2/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15289/2/Transceiver52M/Transceiver.cpp at 1041 PS2, Line 1041: if (bi.idle) : return true; > Here you're changing the logic, so the IDLE indications would never be passed to trxd_send_burst_ind [?] Good catch. I was confused when doing the change because there was actually already a bug in return codes in pullRadioVector() when returning an idle frame. I'm fixing it in a commit prior to this one (pushing in a moment). -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 13:53:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:02:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 14:02:01 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 to look at the new patch set (#3). Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Transceiver: exit process when BTS drops connection We don't want to keep osmo-trx running in a started state once the BTS controlling it becomes unavailable. If a socket towards the BTS fails, it means the BTS is gone and the best thing to do is to stop the process (alternatively we could go back to stopped state instead, and wait for BTS to re-connect, fur so far this action is good enough). Related: OS#4170 Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 54 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/15289/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:02:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 14:02:04 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Fix idle ul burst indications being dropped Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15290 Change subject: Transceiver: Fix idle ul burst indications being dropped ...................................................................... Transceiver: Fix idle ul burst indications being dropped pullRadioVector() should return true on idle frames because those indications may be handled by upper layers (TRXDv1). Clarify return code in function documentation. Change-Id: If592ed1c04cf7e995f656b313f60edd4d40d1bfd --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/90/15290/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 0a78c11..9a1c446 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -587,6 +587,7 @@ /* * Pull bursts from the FIFO and handle according to the slot * and burst correlation type. Equalzation is currently disabled. + * returns true on success (bi filled), false on error (bi content undefined). */ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi) { @@ -708,7 +709,7 @@ ret_idle: bi->idle = true; delete radio_burst; - return false; + return true; } void Transceiver::reset() -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If592ed1c04cf7e995f656b313f60edd4d40d1bfd Gerrit-Change-Number: 15290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:20:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 14:20:00 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 3: > I already had to fix some nasty deadlocks related to pthreads, destructors and exception handlers [...] Well, I also fixed quite a lot of bugs in pure C code (e.g. in OsmoMSC, see release notes for 1.5.0) - does it mean we should stop using C and switch to something else (I vote for Erlang)? This is a common pattern: if (error) { LOGP(SS, LEVEL, "Error message\n"); return false; // or -ERRNO } where you basically print a error message and break the execution flow. Maybe I am missing something (given that my C++ experience is not that rich), but what's wrong with: if (error) throw "Error message"; and then: try { foo(); // ... } catch (const char *e) { LOGP(SS, LEVEL, "Terminating process due to: %s\n", e); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 14:20:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:26:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 14:26:42 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 3: I already explained why. I want to get away from C++ internals as much as possible in current code base, specially when multithread code and locks are involved. Feel free to submit yourself code using C++ exceptions, I'll call you whenever I find a new deadlock. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 14:26:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:35:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 14:35:09 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Transceiver: Enable EDGE detection only on PDCH timeslots Related: OS#3664 Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/91/15291/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 23aabdd..590101c 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -558,8 +558,8 @@ return mExtRACH ? EXT_RACH : RACH; else if ((mod52 == 25) || (mod52 == 51)) return IDLE; - else - return TSC; + else /* Enable 8-PSK burst detection if EDGE is enabled */ + return mEdge ? EDGE : TSC; break; } case LOOPBACK: @@ -610,10 +610,6 @@ burstTime = radio_burst->getTime(); CorrType type = expectedCorrType(burstTime, chan); - /* Enable 8-PSK burst detection if EDGE is enabled */ - if (mEdge && (type == TSC)) - type = EDGE; - /* Debug: dump bursts to disk */ /* bits 0-7 - chan 0 timeslots * bits 8-15 - chan 1 timeslots */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:56:42 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 14:56:42 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: (1 comment) Looks fine, but I am afraid it breaks EDGE burst detection on combined channel combinations. https://gerrit.osmocom.org/#/c/15291/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/#/c/15291/1/Transceiver52M/Transceiver.cpp at 557 PS1, Line 557: ((mod52 == 12) || (mod52 == 38)) Unrelated: glad to see that at least here RACH detection on PTCCH/U is implemented correctly. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 14:56:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 14:58:16 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 14:58:16 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: We actually need to clarify whether OsmoBTS sends SETSLOT command for combined channel combinations (TCH/F+PDCH, etc.) or not. As far as I remember - no, but I hope I am wrong. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 14:58:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 15:02:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 15:02:01 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: > Patch Set 1: > > We actually need to clarify whether OsmoBTS sends SETSLOT command for combined channel combinations (TCH/F+PDCH, etc.) or not. As far as I remember - no, but I hope I am wrong. I'll open a ticket about it. Can we test this kind of thing already in TTCN3? Like catching SETSLOT commands sent from osmo-bts-trx. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 15:02:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 15:11:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 15:11:26 +0000 Subject: Change in ...osmo-trx[master]: lms: Log available antennas if requested antenna fails Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15292 Change subject: lms: Log available antennas if requested antenna fails ...................................................................... lms: Log available antennas if requested antenna fails Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/15292/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index f55b555..b7cb31d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -431,6 +431,20 @@ return dB; } +void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os) +{ + lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */ + int num_names; + int i; + + num_names = LMS_GetAntennaList(m_lms_dev, dir_tx, chan, name_list); + for (i = 0; i < num_names; i++) { + if (i) + os << ", "; + os << "'" << name_list[i] << "'"; + } +} + int LMSDevice::get_ant_idx(const std::string & name, bool dir_tx, size_t chan) { lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */ @@ -484,7 +498,10 @@ idx = get_ant_idx(ant, LMS_CH_RX, chan); if (idx < 0) { - LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna"; + std::ostringstream os; + LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna: " << ant; + log_ant_list(LMS_CH_RX, chan, os); + LOGCHAN(chan, DDEV, NOTICE) << "Available Rx Antennas: " << os; return false; } @@ -530,7 +547,10 @@ idx = get_ant_idx(ant, LMS_CH_TX, chan); if (idx < 0) { - LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna"; + std::ostringstream os; + LOGCHAN(chan, DDEV, ERROR) << "Invalid Tx Antenna: " << ant; + log_ant_list(LMS_CH_TX, chan, os); + LOGCHAN(chan, DDEV, NOTICE) << "Available Tx Antennas: " << os; return false; } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 47bac94..ab45b08 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -63,6 +63,7 @@ bool do_calib(size_t chan); bool do_filters(size_t chan); + void log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os); int get_ant_idx(const std::string & name, bool dir_tx, size_t chan); bool flush_recv(size_t num_pkts); void update_stream_stats_rx(size_t chan, bool *overrun); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 Gerrit-Change-Number: 15292 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 15:11:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 15:11:27 +0000 Subject: Change in ...osmo-trx[master]: device: Use LOGCHAN in set_antennas() Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15293 Change subject: device: Use LOGCHAN in set_antennas() ...................................................................... device: Use LOGCHAN in set_antennas() Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a --- M Transceiver52M/device/common/radioDevice.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/93/15293/1 diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index e637611..b4928f2 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -187,9 +187,9 @@ for (i = 0; i < tx_paths.size(); i++) { if (tx_paths[i] == "") continue; - LOG(DEBUG) << "Configuring channel " << i << " with antenna " << tx_paths[i]; + LOGCHAN(i, DDEV, DEBUG) << "Configuring Tx antenna " << tx_paths[i]; if (!setTxAntenna(tx_paths[i], i)) { - LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << tx_paths[i]; + LOGCHAN(i, DDEV, ALERT) << "Failed configuring Tx antenna " << tx_paths[i]; return false; } } @@ -197,9 +197,9 @@ for (i = 0; i < rx_paths.size(); i++) { if (rx_paths[i] == "") continue; - LOG(DEBUG) << "Configuring channel " << i << " with antenna " << rx_paths[i]; + LOGCHAN(i, DDEV, DEBUG) << "Configuring Rx antenna " << rx_paths[i]; if (!setRxAntenna(rx_paths[i], i)) { - LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << rx_paths[i]; + LOGCHAN(i, DDEV, ALERT) << "Failed configuring Rx antenna " << rx_paths[i]; return false; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a Gerrit-Change-Number: 15293 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 15:13:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 15:13:26 +0000 Subject: Change in ...osmo-trx[master]: lms: Log available antennas if requested antenna fails In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/15292 ) Change subject: lms: Log available antennas if requested antenna fails ...................................................................... lms: Log available antennas if requested antenna fails Related: OS#3343 Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/15292/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 Gerrit-Change-Number: 15292 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 15:13:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 26 Aug 2019 15:13:26 +0000 Subject: Change in ...osmo-trx[master]: device: Use LOGCHAN in set_antennas() In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/15293 ) Change subject: device: Use LOGCHAN in set_antennas() ...................................................................... device: Use LOGCHAN in set_antennas() Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a --- M Transceiver52M/device/common/radioDevice.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/93/15293/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a Gerrit-Change-Number: 15293 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:13:46 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 18:13:46 +0000 Subject: Change in ...osmo-trx[master]: device: Use LOGCHAN in set_antennas() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15293 ) Change subject: device: Use LOGCHAN in set_antennas() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a Gerrit-Change-Number: 15293 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 18:13:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:30:07 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 18:30:07 +0000 Subject: Change in ...osmo-trx[master]: lms: Log available antennas if requested antenna fails In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15292 ) Change subject: lms: Log available antennas if requested antenna fails ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 Gerrit-Change-Number: 15292 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 18:30:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:30:34 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 26 Aug 2019 18:30:34 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Fix idle ul burst indications being dropped In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15290 ) Change subject: Transceiver: Fix idle ul burst indications being dropped ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If592ed1c04cf7e995f656b313f60edd4d40d1bfd Gerrit-Change-Number: 15290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 18:30:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:49:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:49:09 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: fix segfault during init if IP addr binding fails In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15286 ) Change subject: Transceiver: fix segfault during init if IP addr binding fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d Gerrit-Change-Number: 15286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 18:49:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:49:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:49:18 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Check return value when binding IP addr for clock socket In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15287 ) Change subject: Transceiver: Check return value when binding IP addr for clock socket ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id8b38b40df5744beb705d560defb06532cf0fd44 Gerrit-Change-Number: 15287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 18:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:50:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:50:01 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15288 ) Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 18:50:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:50:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:50:19 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Fix idle ul burst indications being dropped In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15290 ) Change subject: Transceiver: Fix idle ul burst indications being dropped ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If592ed1c04cf7e995f656b313f60edd4d40d1bfd Gerrit-Change-Number: 15290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 18:50:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:50:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:50:58 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: fix segfault during init if IP addr binding fails In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15286 ) Change subject: Transceiver: fix segfault during init if IP addr binding fails ...................................................................... Transceiver: fix segfault during init if IP addr binding fails If osmo-trx is started and IP addr binding fails (ie because the IP address is not assigned in the system), it will try to access a heap-allocated Thread instance which was not initialized (because init() function returned earlier). Fixes: OS#4147 Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d --- M Transceiver52M/Transceiver.cpp 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 2d5c04e..e946aac 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -151,9 +151,11 @@ close(mClockSocket); for (size_t i = 0; i < mChans; i++) { - mControlServiceLoopThreads[i]->cancel(); - mControlServiceLoopThreads[i]->join(); - delete mControlServiceLoopThreads[i]; + if (mControlServiceLoopThreads[i]) { + mControlServiceLoopThreads[i]->cancel(); + mControlServiceLoopThreads[i]->join(); + delete mControlServiceLoopThreads[i]; + } mTxPriorityQueues[i].clear(); if (mCtrlSockets[i] >= 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d Gerrit-Change-Number: 15286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:50:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:50:58 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Check return value when binding IP addr for clock socket In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15287 ) Change subject: Transceiver: Check return value when binding IP addr for clock socket ...................................................................... Transceiver: Check return value when binding IP addr for clock socket No need to continue further since anyway we'll end up exiting. Change-Id: Id8b38b40df5744beb705d560defb06532cf0fd44 --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index e946aac..244f372 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -212,6 +212,8 @@ mLocalAddr.c_str(), mBasePort, mRemoteAddr.c_str(), mBasePort + 100, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + if (mClockSocket < 0) + return false; for (size_t i = 0; i < mChans; i++) { c_srcport = mBasePort + 2 * i + 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id8b38b40df5744beb705d560defb06532cf0fd44 Gerrit-Change-Number: 15287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:50:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:50:59 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Clean up receival of downlink bursts In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15288 ) Change subject: Transceiver: Clean up receival of downlink bursts ...................................................................... Transceiver: Clean up receival of downlink bursts Use a packed structure to clearly indicate what is contained in the received buffer. Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d --- M Transceiver52M/Transceiver.cpp M Transceiver52M/proto_trxd.h 2 files changed, 31 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 244f372..0a78c11 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -929,8 +929,8 @@ { int msgLen; int burstLen; - char buffer[EDGE_BURST_NBITS + 50]; - struct trxd_hdr_common *chdr; + struct trxd_hdr_v01_dl *dl; + char buffer[sizeof(*dl) + EDGE_BURST_NBITS]; uint32_t fn; // check data socket @@ -940,54 +940,53 @@ return false; } - if (msgLen == gSlotLen + 1 + 4 + 1) { - burstLen = gSlotLen; - } else if (msgLen == EDGE_BURST_NBITS + 1 + 4 + 1) { - if (mSPSTx != 4) + switch (msgLen) { + case sizeof(*dl) + gSlotLen: /* GSM burst */ + burstLen = gSlotLen; + break; + case sizeof(*dl) + EDGE_BURST_NBITS: /* EDGE burst */ + if (mSPSTx != 4) { + LOG(ERR) << "EDGE burst received but SPS is set to " << mSPSTx; + return false; + } + burstLen = EDGE_BURST_NBITS; + break; + default: + LOG(ERR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")"; return false; - - burstLen = EDGE_BURST_NBITS; - } else { - LOG(ERR) << "badly formatted packet on GSM->TRX interface"; - return false; } - /* Common header part: HDR version, TDMA TN & FN */ - chdr = (struct trxd_hdr_common *) buffer; + dl = (struct trxd_hdr_v01_dl *) buffer; /* Convert TDMA FN to the host endianness */ - fn = osmo_load32be(&chdr->fn); + fn = osmo_load32be(&dl->common.fn); /* Make sure we support the received header format */ - switch (chdr->version) { + switch (dl->common.version) { case 0: /* Version 1 has the same format */ case 1: break; - default: - LOG(ERR) << "Rx TRXD message with unknown header version " << chdr->version; + LOG(ERR) << "Rx TRXD message with unknown header version " << dl->common.version; return false; } - LOG(DEBUG) << "Rx TRXD message (hdr_ver=" << chdr->version << "): " - << "fn=" << fn << ", tn=" << chdr->tn << ", " + LOG(DEBUG) << "Rx TRXD message (hdr_ver=" << dl->common.version << "): " + << "fn=" << fn << ", tn=" << dl->common.tn << ", " << "burst_len=" << burstLen; - int RSSI = (int) buffer[5]; BitVector newBurst(burstLen); BitVector::iterator itr = newBurst.begin(); - char *bufferItr = buffer+6; + uint8_t *bufferItr = dl->soft_bits; while (itr < newBurst.end()) *itr++ = *bufferItr++; - GSM::Time currTime = GSM::Time(fn, chdr->tn); + GSM::Time currTime = GSM::Time(fn, dl->common.tn); - addRadioVector(chan, newBurst, RSSI, currTime); + addRadioVector(chan, newBurst, dl->tx_att, currTime); return true; - - } void Transceiver::driveReceiveRadio() diff --git a/Transceiver52M/proto_trxd.h b/Transceiver52M/proto_trxd.h index 7eb5dac..d72cfdd 100644 --- a/Transceiver52M/proto_trxd.h +++ b/Transceiver52M/proto_trxd.h @@ -66,6 +66,13 @@ uint8_t soft_bits[0]; } __attribute__ ((packed)); +/* Downlink burst (BTS->TRX), v0 anf v1 use same format */ +struct trxd_hdr_v01_dl { + struct trxd_hdr_common common; + uint8_t tx_att; /* Tx Attentuation */ + uint8_t soft_bits[0]; +} __attribute__ ((packed)); + #define TRXD_MODULATION_GMSK(ts_set) (0b0000 | (ts_set & 0b0011)) #define TRXD_MODULATION_8PSK(ts_set) (0b0100 | (ts_set & 0b0001)) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4d8c0e3c0c717699889f79e50c778d14b6058f2d Gerrit-Change-Number: 15288 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:50:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:50:59 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Fix idle ul burst indications being dropped In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15290 ) Change subject: Transceiver: Fix idle ul burst indications being dropped ...................................................................... Transceiver: Fix idle ul burst indications being dropped pullRadioVector() should return true on idle frames because those indications may be handled by upper layers (TRXDv1). Clarify return code in function documentation. Change-Id: If592ed1c04cf7e995f656b313f60edd4d40d1bfd --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 0a78c11..9a1c446 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -587,6 +587,7 @@ /* * Pull bursts from the FIFO and handle according to the slot * and burst correlation type. Equalzation is currently disabled. + * returns true on success (bi filled), false on error (bi content undefined). */ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi) { @@ -708,7 +709,7 @@ ret_idle: bi->idle = true; delete radio_burst; - return false; + return true; } void Transceiver::reset() -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If592ed1c04cf7e995f656b313f60edd4d40d1bfd Gerrit-Change-Number: 15290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:51:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:51:40 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 26 Aug 2019 18:51:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:51:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:51:55 +0000 Subject: Change in ...osmo-trx[master]: lms: Log available antennas if requested antenna fails In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15292 ) Change subject: lms: Log available antennas if requested antenna fails ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 Gerrit-Change-Number: 15292 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 18:51:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:52:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:52:09 +0000 Subject: Change in ...osmo-trx[master]: device: Use LOGCHAN in set_antennas() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15293 ) Change subject: device: Use LOGCHAN in set_antennas() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a Gerrit-Change-Number: 15293 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 18:52:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:52:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:52:25 +0000 Subject: Change in ...osmo-python-tests[master]: vty.py: Fix endl removed when pkt buffer content ends exactly on a ne... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15274 ) Change subject: vty.py: Fix endl removed when pkt buffer content ends exactly on a newline char ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ib1dbf39db1b27331ea4c39051e550a87780d9f76 Gerrit-Change-Number: 15274 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 26 Aug 2019 18:52:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:52:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:52:27 +0000 Subject: Change in ...osmo-python-tests[master]: vty.py: Fix endl removed when pkt buffer content ends exactly on a ne... In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/15274 ) Change subject: vty.py: Fix endl removed when pkt buffer content ends exactly on a newline char ...................................................................... vty.py: Fix endl removed when pkt buffer content ends exactly on a newline char As a result, osmo_interact_vty.py was printing incorrect output: """ - - + Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:53:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:53:05 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 ) Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 18:53:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:53:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:53:07 +0000 Subject: Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15242 ) Change subject: fix crashes: don't assert on incoming RTP packet size ...................................................................... fix crashes: don't assert on incoming RTP packet size Remove various OSMO_ASSERT() on size of incoming packets. Doing an assert on incoming data is a DoS attack vector, absolute no-go. Instead, return -EINVAL and keep running. Change some return values to be able to distinguish successful operation from invalid RTP sizes. In rtp_data_net(), make sure to return negative if the RTP packet was invalid. Some of the error return codes implemented here will only be used in upcoming patch Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c. Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 32 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index bb29d2b..e163d23 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -475,7 +475,9 @@ uint8_t pt_in; int pt_out; - OSMO_ASSERT(len >= sizeof(struct rtp_hdr)); + if (len < sizeof(struct rtp_hdr)) + return -EINVAL; + rtp_hdr = (struct rtp_hdr *)data; pt_in = rtp_hdr->payload_type; @@ -640,8 +642,9 @@ /* There are different dialects used to format and transfer voice data. When * the receiving end expects GSM-HR data to be formated after RFC 5993, this * function is used to convert between RFC 5993 and TS 101318, which we normally - * use. */ -static void rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len) + * use. + * Return 0 on sucess, negative on errors like invalid data length. */ +static int rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len) { /* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is * plenty of space available to store the slightly larger, converted @@ -649,7 +652,12 @@ struct rtp_hdr *rtp_hdr; - OSMO_ASSERT(*len >= sizeof(struct rtp_hdr)); + if (*len < sizeof(struct rtp_hdr)) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", + *len, sizeof(struct rtp_hdr)); + return -EINVAL; + } + rtp_hdr = (struct rtp_hdr *)data; if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr)) { @@ -667,7 +675,9 @@ * packet. This is not supported yet. */ LOGPENDP(endp, DRTP, LOGL_ERROR, "cannot figure out how to convert RTP packet\n"); + return -ENOTSUP; } + return 0; } /* For AMR RTP two framing modes are defined RFC3267. There is a bandwith @@ -685,7 +695,11 @@ unsigned int payload_len; int rc; - OSMO_ASSERT(*len >= sizeof(struct rtp_hdr)); + if (*len < sizeof(struct rtp_hdr)) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", *len, sizeof(struct rtp_hdr)); + return -EINVAL; + } + rtp_hdr = (struct rtp_hdr *)data; payload_len = *len - sizeof(struct rtp_hdr); @@ -735,18 +749,23 @@ } -/* Check if a given RTP with AMR payload for octet-aligned mode */ -static bool amr_oa_check(char *data, int len) +/* Return whether an RTP packet with AMR payload is in octet-aligned mode. + * Return 0 if in bandwidth-efficient mode, 1 for octet-aligned mode, and negative if the RTP data is invalid. */ +static int amr_oa_check(char *data, int len) { struct rtp_hdr *rtp_hdr; unsigned int payload_len; - OSMO_ASSERT(len >= sizeof(struct rtp_hdr)); + if (len < sizeof(struct rtp_hdr)) + return -EINVAL; + rtp_hdr = (struct rtp_hdr *)data; payload_len = len - sizeof(struct rtp_hdr); + if (payload_len < sizeof(struct amr_hdr)) + return -EINVAL; - return osmo_amr_is_oa(rtp_hdr->data, payload_len); + return osmo_amr_is_oa(rtp_hdr->data, payload_len) ? 1 : 0; } /* Forward data to a debug tap. This is debug function that is intended for @@ -1340,7 +1359,10 @@ * define, then we check if the incoming payload matches that * expectation. */ if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) { - if (amr_oa_check(buf, len) != conn_src->end.codec->param.amr_octet_aligned) + int oa = amr_oa_check(buf, len); + if (oa < 0) + return -1; + if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned) return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 18:53:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 18:53:11 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15243 ) Change subject: mgcp_send(): stop looping on conversion error ...................................................................... mgcp_send(): stop looping on conversion error If mgcp_send() runs a transcoder loop, break the loop if rfc5993_hr_convert() or amr_oa_bwe_convert() return with error. Possibly fixes an infinite loop situation for erratic packets? (Didn't check for that in detail.) Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved osmith: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index e163d23..53cdc06 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -870,13 +870,23 @@ addr, buf, buflen); if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) { - amr_oa_bwe_convert(endp, buf, &buflen, - conn_dst->end.codec->param.amr_octet_aligned); + rc = amr_oa_bwe_convert(endp, buf, &buflen, + conn_dst->end.codec->param.amr_octet_aligned); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, + "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion\n"); + break; + } } else if (rtp_end->rfc5993_hr_convert && strcmp(conn_src->end.codec->subtype_name, - "GSM-HR-08") == 0) - rfc5993_hr_convert(endp, buf, &buflen); + "GSM-HR-08") == 0) { + rc = rfc5993_hr_convert(endp, buf, &buflen); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n"); + break; + } + } LOGPENDP(endp, DRTP, LOGL_DEBUG, "process/send to %s %s " -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 26 20:22:32 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Aug 2019 20:22:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d643f975e138_77392abf4ff625f017733b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 266s] ar: `u' modifier ignored since `D' is the default (see `U') [ 266s] libtool: link: ranlib .libs/libtransceiver_common.a [ 266s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 266s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 267s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 267s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 267s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 267s] collect2: error: ld returned 1 exit status [ 267s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 267s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 267s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 267s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 267s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 267s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 267s] make[1]: *** [Makefile:444: all] Error 2 [ 267s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 267s] dh_auto_build: make -j1 returned exit code 2 [ 267s] make: *** [debian/rules:6: build] Error 255 [ 267s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 267s] [ 267s] build73 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 26 20:22:18 UTC 2019. [ 267s] [ 267s] ### VM INTERACTION START ### [ 270s] [ 257.535053] sysrq: SysRq : Power Off [ 270s] [ 257.537555] reboot: Power down [ 270s] ### VM INTERACTION END ### [ 270s] [ 270s] build73 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 26 20:22:22 UTC 2019. [ 270s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 26 20:27:23 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Aug 2019 20:27:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6440c33eb24_77392abf4ff625f01774eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 434s] ar: `u' modifier ignored since `D' is the default (see `U') [ 434s] libtool: link: ranlib .libs/libtransceiver_common.a [ 434s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 434s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 435s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 435s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 435s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 435s] collect2: error: ld returned 1 exit status [ 435s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 435s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 435s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 435s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 435s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 435s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 435s] make[1]: *** [Makefile:444: all] Error 2 [ 435s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 435s] dh_auto_build: make -j1 returned exit code 2 [ 435s] make: *** [debian/rules:6: build] Error 255 [ 435s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 435s] [ 435s] lamb23 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 20:27:17 UTC 2019. [ 435s] [ 435s] ### VM INTERACTION START ### [ 438s] [ 419.879176] sysrq: SysRq : Power Off [ 438s] [ 419.887994] reboot: Power down [ 438s] ### VM INTERACTION END ### [ 438s] [ 438s] lamb23 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 20:27:20 UTC 2019. [ 438s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:34:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:34:33 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp_act_restart_ctr_echo In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15282 ) Change subject: ggsn: Introduce test TC_pdp_act_restart_ctr_echo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15282 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: Ia37e48e7ff9ad063f9eabf447f8a6a0a3fc380d9 Gerrit-Change-Number: 15282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 20:34:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:35:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:35:26 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp_act2_recovery In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283 ) Change subject: ggsn: Introduce test TC_pdp_act2_recovery ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283 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: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7 Gerrit-Change-Number: 15283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 26 Aug 2019 20:35:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:36:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:36:36 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15278 ) Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 20:36:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:37:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:37:05 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15279 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 20:37:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:37:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:37:18 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15278 ) Change subject: osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API ...................................................................... osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 --- M src/osmobts_sock.cpp 1 file changed, 8 insertions(+), 50 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 6b49347..9fcd99d 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -239,9 +239,6 @@ int pcu_l1if_open(void) { struct pcu_sock_state *state; - struct osmo_fd *bfd; - struct sockaddr_un local; - unsigned int namelen; int rc; struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -255,60 +252,21 @@ INIT_LLIST_HEAD(&state->upqueue); } - bfd = &state->conn_bfd; - - bfd->fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); - if (bfd->fd < 0) { - LOGP(DL1IF, LOGL_ERROR, "Failed to create PCU socket.\n"); - talloc_free(state); - return -1; - } - - local.sun_family = AF_UNIX; - if (osmo_strlcpy(local.sun_path, bts->pcu_sock_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { - LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", - sizeof(local.sun_path), bts->pcu_sock_path); - return -ENOSPC; - } - - /* we use the same magic that X11 uses in Xtranssock.c for - * calculating the proper length of the sockaddr */ -#if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); -#endif -#if defined(BSD44SOCKETS) || defined(SUN_LEN) - namelen = SUN_LEN(&local); -#else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); -#endif - rc = connect(bfd->fd, (struct sockaddr *) &local, namelen); - if (rc != 0) { - LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the osmo-bts" - " PCU socket (%s), delaying... '%s'\n", - strerror(errno), local.sun_path); - pcu_sock_state = state; - close(bfd->fd); - bfd->fd = -1; + rc = osmo_sock_unix_init_ofd(&state->conn_bfd, SOCK_SEQPACKET, 0, + bts->pcu_sock_path, OSMO_SOCK_F_CONNECT); + if (rc < 0) { + LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the BTS (%s). " + "Retrying...\n", bts->pcu_sock_path); osmo_timer_setup(&state->timer, pcu_sock_timeout, NULL); osmo_timer_schedule(&state->timer, 5, 0); return 0; } - bfd->when = BSC_FD_READ; - bfd->cb = pcu_sock_cb; - bfd->data = state; - - rc = osmo_fd_register(bfd); - if (rc < 0) { - LOGP(DL1IF, LOGL_ERROR, "Could not register PCU fd: %d\n", rc); - close(bfd->fd); - talloc_free(state); - return rc; - } + state->conn_bfd.cb = pcu_sock_cb; + state->conn_bfd.data = state; LOGP(DL1IF, LOGL_NOTICE, "osmo-bts PCU socket %s has been connected\n", - local.sun_path); + bts->pcu_sock_path); pcu_sock_state = state; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f5c7f5744ab14f36f46cf7941e91352eca8d2b9 Gerrit-Change-Number: 15278 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:37:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:37:18 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15279 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap ...................................................................... osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap We don't really need to use the message buffer (on heap), because it's never getting passed to pcu_rx(). Let's use a buffer on stack. Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 --- M src/osmobts_sock.cpp 1 file changed, 3 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 9fcd99d..a3e9d63 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -139,17 +139,10 @@ static int pcu_sock_read(struct osmo_fd *bfd) { struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data; - struct gsm_pcu_if *pcu_prim; - struct msgb *msg; + struct gsm_pcu_if pcu_prim; int rc; - msg = msgb_alloc(sizeof(*pcu_prim), "pcu_sock_rx"); - if (!msg) - return -ENOMEM; - - pcu_prim = (struct gsm_pcu_if *) msg->tail; - - rc = recv(bfd->fd, msg->tail, msgb_tailroom(msg), 0); + rc = recv(bfd->fd, &pcu_prim, sizeof(pcu_prim), 0); if (rc == 0) goto close; @@ -159,16 +152,11 @@ goto close; } - rc = pcu_rx(pcu_prim->msg_type, pcu_prim); - - /* as we always synchronously process the message in pcu_rx() and - * its callbacks, we can free the message here. */ - msgb_free(msg); + rc = pcu_rx(pcu_prim.msg_type, &pcu_prim); return rc; close: - msgb_free(msg); pcu_sock_close(state, 1); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 Gerrit-Change-Number: 15279 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 26 20:38:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 26 Aug 2019 20:38:33 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 26 Aug 2019 20:38:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 26 22:11:06 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Aug 2019 22:11:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d645906792da_77392abf4ff625f0193878@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 506s] ar: `u' modifier ignored since `D' is the default (see `U') [ 506s] libtool: link: ranlib .libs/libtransceiver_common.a [ 506s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 506s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 507s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 507s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 507s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 507s] collect2: error: ld returned 1 exit status [ 507s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 507s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 507s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 507s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 507s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 507s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 507s] make[1]: *** [Makefile:444: all] Error 2 [ 507s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 507s] dh_auto_build: make -j1 returned exit code 2 [ 507s] make: *** [debian/rules:6: build] Error 255 [ 507s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 507s] [ 507s] cloud125 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 26 22:10:57 UTC 2019. [ 507s] [ 507s] ### VM INTERACTION START ### [ 510s] [ 459.876166] sysrq: SysRq : Power Off [ 510s] [ 459.886270] reboot: Power down [ 512s] ### VM INTERACTION END ### [ 512s] [ 512s] cloud125 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 26 22:11:02 UTC 2019. [ 512s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 26 22:11:57 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Aug 2019 22:11:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6459437d9e2_77392abf4ff625f0193965@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 412s] ar: `u' modifier ignored since `D' is the default (see `U') [ 412s] libtool: link: ranlib .libs/libtransceiver_common.a [ 412s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 412s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 412s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 412s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 412s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 412s] collect2: error: ld returned 1 exit status [ 412s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 412s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 412s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 412s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 412s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 412s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 412s] make[1]: *** [Makefile:444: all] Error 2 [ 412s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 412s] dh_auto_build: make -j1 returned exit code 2 [ 413s] make: *** [debian/rules:6: build] Error 255 [ 413s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 413s] [ 413s] lamb28 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 22:11:45 UTC 2019. [ 413s] [ 413s] ### VM INTERACTION START ### [ 416s] [ 397.843836] sysrq: SysRq : Power Off [ 416s] [ 397.851450] reboot: Power down [ 416s] ### VM INTERACTION END ### [ 416s] [ 416s] lamb28 failed "build osmo-trx_1.1.1.2.67aa9.dsc" at Mon Aug 26 22:11:49 UTC 2019. [ 416s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 27 01:48:15 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 27 Aug 2019 01:48:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d648be1f2909_77392abf4ff625f0217472@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 410s] ar: `u' modifier ignored since `D' is the default (see `U') [ 410s] libtool: link: ranlib .libs/libtransceiver_common.a [ 410s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 410s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 410s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 410s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 410s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 410s] collect2: error: ld returned 1 exit status [ 410s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 410s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 410s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 410s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 410s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 410s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 410s] make[1]: *** [Makefile:444: all] Error 2 [ 410s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 410s] dh_auto_build: make -j1 returned exit code 2 [ 410s] make: *** [debian/rules:6: build] Error 255 [ 411s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 411s] [ 411s] lamb52 failed "build osmo-trx_1.1.1.6.4e6e.dsc" at Tue Aug 27 01:47:54 UTC 2019. [ 411s] [ 411s] ### VM INTERACTION START ### [ 414s] [ 395.263027] sysrq: SysRq : Power Off [ 414s] [ 395.271079] reboot: Power down [ 414s] ### VM INTERACTION END ### [ 414s] [ 414s] lamb52 failed "build osmo-trx_1.1.1.6.4e6e.dsc" at Tue Aug 27 01:47:58 UTC 2019. [ 414s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Aug 27 09:06:56 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 09:06:56 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): further simplify the code In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15280 to look at the new patch set (#2). Change subject: osmobts_sock.cpp: pcu_sock_read(): further simplify the code ...................................................................... osmobts_sock.cpp: pcu_sock_read(): further simplify the code Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 --- M src/osmobts_sock.cpp 1 file changed, 6 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/80/15280/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 Gerrit-Change-Number: 15280 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 09:06:56 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 09:06:56 +0000 Subject: Change in ...osmo-pcu[master]: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15281 to look at the new patch set (#2). Change subject: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference ...................................................................... WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference The 'gprs_bssgp_pcu' may not be initialized in some cases, e.g. when OsmoPCU is terminated before connecting to the SGSN. Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/81/15281/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 Gerrit-Change-Number: 15281 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 09:06:57 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 09:06:57 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: do not print the same debug message twice Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15294 Change subject: osmobts_sock.cpp: do not print the same debug message twice ...................................................................... osmobts_sock.cpp: do not print the same debug message twice The following message is printed by the pcu_tx_txt_ind(): DL1IF INFO pcu_l1_if.cpp:113 Sending XXX TXT as PCU_VERSION to BTS There is no need to print it twice: DL1IF INFO osmobts_sock.cpp:74 Sending version XXX to BTS. DL1IF INFO pcu_l1_if.cpp:113 Sending XXX TXT as PCU_VERSION to BTS Change-Id: Ic2793f20cf9df2fa08c45070a8f81ef1c08b925a --- M src/osmobts_sock.cpp 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/15294/1 diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 4321696..20fb174 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -71,7 +71,6 @@ if (bts->active) return; - LOGP(DL1IF, LOGL_INFO, "Sending version %s to BTS.\n", PACKAGE_VERSION); pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION); osmo_timer_schedule(&state->timer, 5, 0); } @@ -250,7 +249,6 @@ pcu_sock_state = state; - LOGP(DL1IF, LOGL_INFO, "Sending version %s to BTS.\n", PACKAGE_VERSION); pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION); /* Schedule a timer so we keep trying until the BTS becomes active. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic2793f20cf9df2fa08c45070a8f81ef1c08b925a Gerrit-Change-Number: 15294 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 09:15:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 09:15:06 +0000 Subject: Change in ...osmo-pcu[master]: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15281 ) Change subject: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15281/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15281/2//COMMIT_MSG at 7 PS2, Line 7: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference You probably want to get rid of the WIP here. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 Gerrit-Change-Number: 15281 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 09:15:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 09:16:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 09:16:10 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): further simplify the code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15280 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): further simplify the code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 Gerrit-Change-Number: 15280 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 09:16:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 09:17:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 09:17:01 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: do not print the same debug message twice In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15294 ) Change subject: osmobts_sock.cpp: do not print the same debug message twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic2793f20cf9df2fa08c45070a8f81ef1c08b925a Gerrit-Change-Number: 15294 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 09:17:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 11:32:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 11:32:42 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: pcu_sock_read(): further simplify the code In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15280 ) Change subject: osmobts_sock.cpp: pcu_sock_read(): further simplify the code ...................................................................... osmobts_sock.cpp: pcu_sock_read(): further simplify the code Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 --- M src/osmobts_sock.cpp 1 file changed, 6 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index a3e9d63..4321696 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -143,22 +143,14 @@ int rc; rc = recv(bfd->fd, &pcu_prim, sizeof(pcu_prim), 0); - if (rc == 0) - goto close; - - if (rc < 0) { - if (errno == EAGAIN) - return 0; - goto close; + if (rc < 0 && errno == EAGAIN) + return 0; /* Try again later */ + if (rc <= 0) { + pcu_sock_close(state, 1); + return -EIO; } - rc = pcu_rx(pcu_prim.msg_type, &pcu_prim); - - return rc; - -close: - pcu_sock_close(state, 1); - return -1; + return pcu_rx(pcu_prim.msg_type, &pcu_prim); } static int pcu_sock_write(struct osmo_fd *bfd) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie7c0ca8baf0ae5beadda60bda0bc76a44664d439 Gerrit-Change-Number: 15280 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 11:32:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 11:32:42 +0000 Subject: Change in ...osmo-pcu[master]: osmobts_sock.cpp: do not print the same debug message twice In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15294 ) Change subject: osmobts_sock.cpp: do not print the same debug message twice ...................................................................... osmobts_sock.cpp: do not print the same debug message twice The following message is printed by the pcu_tx_txt_ind(): DL1IF INFO pcu_l1_if.cpp:113 Sending XXX TXT as PCU_VERSION to BTS There is no need to print it twice: DL1IF INFO osmobts_sock.cpp:74 Sending version XXX to BTS. DL1IF INFO pcu_l1_if.cpp:113 Sending XXX TXT as PCU_VERSION to BTS Change-Id: Ic2793f20cf9df2fa08c45070a8f81ef1c08b925a --- M src/osmobts_sock.cpp 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 4321696..20fb174 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -71,7 +71,6 @@ if (bts->active) return; - LOGP(DL1IF, LOGL_INFO, "Sending version %s to BTS.\n", PACKAGE_VERSION); pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION); osmo_timer_schedule(&state->timer, 5, 0); } @@ -250,7 +249,6 @@ pcu_sock_state = state; - LOGP(DL1IF, LOGL_INFO, "Sending version %s to BTS.\n", PACKAGE_VERSION); pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION); /* Schedule a timer so we keep trying until the BTS becomes active. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic2793f20cf9df2fa08c45070a8f81ef1c08b925a Gerrit-Change-Number: 15294 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 11:34:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 11:34:08 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 11:34:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 11:43:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 11:43:24 +0000 Subject: Change in ...libosmocore[master]: context: Add support for [per-thread] global talloc contexts In-Reply-To: References: Message-ID: Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/13312 to look at the new patch set (#18). Change subject: context: Add support for [per-thread] global talloc contexts ...................................................................... context: Add support for [per-thread] global talloc contexts Rather than having applications maintain their own talloc cotexts, let's offer some root talloc contexts in libosmocore. Let's also make them per thread right from the beginning. This will help some multi-threaded applications to use talloc in a thread-safe way. Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 --- M include/osmocom/core/select.h M include/osmocom/core/talloc.h M src/Makefile.am A src/context.c M src/select.c M tests/Makefile.am A tests/context/context_test.c A tests/context/context_test.ok M tests/testsuite.at 9 files changed, 214 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/13312/18 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 Gerrit-Change-Number: 13312 Gerrit-PatchSet: 18 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Max Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 11:43:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 11:43:51 +0000 Subject: Change in ...libosmocore[master]: context: Add support for [per-thread] global talloc contexts In-Reply-To: References: Message-ID: Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/13312 to look at the new patch set (#19). Change subject: context: Add support for [per-thread] global talloc contexts ...................................................................... context: Add support for [per-thread] global talloc contexts Rather than having applications maintain their own talloc cotexts, let's offer some root talloc contexts in libosmocore. Let's also make them per thread right from the beginning. This will help some multi-threaded applications to use talloc in a thread-safe way. Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 --- M include/osmocom/core/select.h M include/osmocom/core/talloc.h M src/Makefile.am A src/context.c M src/select.c M tests/Makefile.am A tests/context/context_test.c A tests/context/context_test.ok M tests/testsuite.at 9 files changed, 213 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/13312/19 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 Gerrit-Change-Number: 13312 Gerrit-PatchSet: 19 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Max Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:01:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:01:33 +0000 Subject: Change in ...libosmocore[master]: context: Add support for [per-thread] global talloc contexts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/13312 ) Change subject: context: Add support for [per-thread] global talloc contexts ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 Gerrit-Change-Number: 13312 Gerrit-PatchSet: 19 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Max Gerrit-Comment-Date: Tue, 27 Aug 2019 12:01:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:01:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:01:35 +0000 Subject: Change in ...libosmocore[master]: context: Add support for [per-thread] global talloc contexts In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/13312 ) Change subject: context: Add support for [per-thread] global talloc contexts ...................................................................... context: Add support for [per-thread] global talloc contexts Rather than having applications maintain their own talloc cotexts, let's offer some root talloc contexts in libosmocore. Let's also make them per thread right from the beginning. This will help some multi-threaded applications to use talloc in a thread-safe way. Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 --- M include/osmocom/core/select.h M include/osmocom/core/talloc.h M src/Makefile.am A src/context.c M src/select.c M tests/Makefile.am A tests/context/context_test.c A tests/context/context_test.ok M tests/testsuite.at 9 files changed, 213 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index e4787b0..a200b6f 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -51,6 +51,7 @@ void osmo_fd_unregister(struct osmo_fd *fd); void osmo_fd_close(struct osmo_fd *fd); int osmo_select_main(int polling); +int osmo_select_main_ctx(int polling); struct osmo_fd *osmo_fd_get_by_fd(int fd); diff --git a/include/osmocom/core/talloc.h b/include/osmocom/core/talloc.h index 191a463..c68a56c 100644 --- a/include/osmocom/core/talloc.h +++ b/include/osmocom/core/talloc.h @@ -1,5 +1,27 @@ -/*! \file talloc.h - * Convenience wrapper. libosmocore used to ship its own internal copy of - * talloc, before libtalloc became a standard component on most systems */ +/*! \file talloc.h */ #pragma once #include + +/*! per-thread talloc contexts. This works around the problem that talloc is not + * thread-safe. However, one can simply have a different set of talloc contexts for each + * thread, and ensure that allocations made on one thread are always only free'd on that + * very same thread. + * WARNING: Users must make sure they free() on the same thread as they allocate!! */ +struct osmo_talloc_contexts { + /*! global per-thread talloc context. */ + void *global; + /*! volatile select-dispatch context. This context is completely free'd and + * re-created every time the main select loop in osmo_select_main() returns from + * select(2) and calls per-fd callback functions. This allows users of this + * facility to allocate temporary objects like string buffers, message buffers + * and the like which are automatically free'd when going into the next select() + * system call */ + void *select; +}; + +extern __thread struct osmo_talloc_contexts *osmo_ctx; + +/* short-hand #defines for the osmo talloc contexts (OTC) that can be used to pass + * to the various _c functions like msgb_alloc_c() */ +#define OTC_GLOBAL (osmo_ctx->global) +#define OTC_SELECT (osmo_ctx->select) diff --git a/src/Makefile.am b/src/Makefile.am index f937810..245eb6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ lib_LTLIBRARIES = libosmocore.la libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) -libosmocore_la_SOURCES = timer.c timer_gettimeofday.c timer_clockgettime.c \ +libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \ select.c signal.c msgb.c bits.c \ bitvec.c bitcomp.c counter.c fsm.c \ write_queue.c utils.c socket.c \ diff --git a/src/context.c b/src/context.c new file mode 100644 index 0000000..bad012b --- /dev/null +++ b/src/context.c @@ -0,0 +1,52 @@ +/*! \file context.c + * talloc context handling. + * + * (C) 2019 by Harald Welte + * All Rights Reserverd. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +#include +#include +#include +#include + +__thread struct osmo_talloc_contexts *osmo_ctx; + +int osmo_ctx_init(const char *id) +{ + osmo_ctx = talloc_named(NULL, sizeof(*osmo_ctx), "global-%s", id); + if (!osmo_ctx) + return -ENOMEM; + memset(osmo_ctx, 0, sizeof(*osmo_ctx)); + osmo_ctx->global = osmo_ctx; + osmo_ctx->select = talloc_named_const(osmo_ctx->global, 0, "select"); + if (!osmo_ctx->select) { + talloc_free(osmo_ctx); + return -ENOMEM; + } + return 0; +} + +/* initialize osmo_ctx on main tread */ +static __attribute__((constructor)) void on_dso_load_ctx(void) +{ + OSMO_ASSERT(osmo_ctx_init("main") == 0); +} + +/*! @} */ diff --git a/src/select.c b/src/select.c index 7ce135f..394a59d 100644 --- a/src/select.c +++ b/src/select.c @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include "../config.h" @@ -233,11 +235,7 @@ return work; } -/*! select main loop integration - * \param[in] polling should we pollonly (1) or block on select (0) - * \returns 0 if no fd handled; 1 if fd handled; negative in case of error - */ -int osmo_select_main(int polling) +static int _osmo_select_main(int polling) { fd_set readset, writeset, exceptset; int rc; @@ -259,10 +257,42 @@ /* fire timers */ osmo_timers_update(); + OSMO_ASSERT(osmo_ctx->select); + /* call registered callback functions */ return osmo_fd_disp_fds(&readset, &writeset, &exceptset); } +/*! select main loop integration + * \param[in] polling should we pollonly (1) or block on select (0) + * \returns 0 if no fd handled; 1 if fd handled; negative in case of error + */ +int osmo_select_main(int polling) +{ + int rc = _osmo_select_main(polling); +#ifndef EMBEDDED + if (talloc_total_size(osmo_ctx->select) != 0) { + osmo_panic("You cannot use the 'select' volatile " + "context if you don't use osmo_select_main_ctx()!\n"); + } +#endif + return rc; +} + +#ifndef EMBEDDED +/*! select main loop integration with temporary select-dispatch talloc context + * \param[in] polling should we pollonly (1) or block on select (0) + * \returns 0 if no fd handled; 1 if fd handled; negative in case of error + */ +int osmo_select_main_ctx(int polling) +{ + int rc = _osmo_select_main(polling); + /* free all the children of the volatile 'select' scope context */ + talloc_free_children(osmo_ctx->select); + return rc; +} +#endif + /*! find an osmo_fd based on the integer fd * \param[in] fd file descriptor to use as search key * \returns \ref osmo_fd for \ref fd; NULL in case it doesn't exist */ diff --git a/tests/Makefile.am b/tests/Makefile.am index a8a06c5..92edf75 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,6 +32,7 @@ tdef/tdef_vty_test_dynamic \ sockaddr_str/sockaddr_str_test \ use_count/use_count_test \ + context/context_test \ $(NULL) if ENABLE_MSGFILE @@ -251,6 +252,9 @@ use_count_use_count_test_SOURCES = use_count/use_count_test.c use_count_use_count_test_LDADD = $(LDADD) +context_context_test_SOURCES = context/context_test.c +context_context_test_LDADD = $(LDADD) + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac :;{ \ @@ -322,6 +326,7 @@ tdef/tdef_vty_test_dynamic.vty \ sockaddr_str/sockaddr_str_test.ok \ use_count/use_count_test.ok use_count/use_count_test.err \ + context/context_test.ok \ $(NULL) DISTCLEANFILES = atconfig atlocal conv/gsm0503_test_vectors.c diff --git a/tests/context/context_test.c b/tests/context/context_test.c new file mode 100644 index 0000000..e9a5559 --- /dev/null +++ b/tests/context/context_test.c @@ -0,0 +1,84 @@ +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +static struct osmo_fd g_evfd; + +static void *alloc_res_select; +static void *alloc_res_global; + +static int destructor_called; + +static int talloc_destructor(void *ptr) +{ + printf("destructor was called automatically\n"); + /* ensure the destructor is only called for the chunk allocated from the + * volatile select context */ + OSMO_ASSERT(ptr == alloc_res_select); + destructor_called += 1; + return 0; +} + +static int evfd_cb(struct osmo_fd *ofd, unsigned int what) +{ + uint64_t rval; + int rc; + + rc = read(ofd->fd, &rval, sizeof(rval)); + OSMO_ASSERT(rc == sizeof(rval)); + + printf("allocating from select context\n"); + alloc_res_select = talloc_named_const(OTC_SELECT, 23, "alloc_select"); + OSMO_ASSERT(alloc_res_select); + talloc_set_destructor(alloc_res_select, talloc_destructor); + + printf("allocating from global context\n"); + alloc_res_global = talloc_named_const(OTC_GLOBAL, 42, "alloc_global"); + OSMO_ASSERT(alloc_res_global); + talloc_set_destructor(alloc_res_global, talloc_destructor); + return 0; +} + +const struct log_info_cat default_categories[] = { +}; + +static struct log_info info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +int main(int argc, char **argv) +{ + int rc; + + osmo_init_logging2(OTC_GLOBAL, &info); + + rc = eventfd(0, 0); + OSMO_ASSERT(rc >= 0); + osmo_fd_setup(&g_evfd, rc, OSMO_FD_READ, evfd_cb, NULL, 0); + osmo_fd_register(&g_evfd); + + /* make sure the select loop will immediately call the callback */ + uint64_t val = 1; + rc = write(g_evfd.fd, &val, sizeof(val)); + OSMO_ASSERT(rc == sizeof(val)); + + /* enter osmo_select_main_ctx() once */ + printf("entering osmo_select_main\n"); + osmo_select_main_ctx(1); + + /* the allocation must have happened, and the destructor must have been called + * automatically exactly once */ + OSMO_ASSERT(destructor_called == 1); + + exit(0); +} diff --git a/tests/context/context_test.ok b/tests/context/context_test.ok new file mode 100644 index 0000000..3984a39 --- /dev/null +++ b/tests/context/context_test.ok @@ -0,0 +1,4 @@ +entering osmo_select_main +allocating from select context +allocating from global context +destructor was called automatically diff --git a/tests/testsuite.at b/tests/testsuite.at index 0fc9646..a043f0c 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -350,3 +350,9 @@ cat $abs_srcdir/use_count/use_count_test.err > experr AT_CHECK([$abs_top_builddir/tests/use_count/use_count_test], [0], [expout], [experr]) AT_CLEANUP + +AT_SETUP([context]) +AT_KEYWORDS([context]) +cat $abs_srcdir/context/context_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/context/context_test], [0], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae39cd57274bf6753ecaf186f229e582b42662e3 Gerrit-Change-Number: 13312 Gerrit-PatchSet: 19 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Max Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:07:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:07:58 +0000 Subject: Change in ...osmocom-bb[master]: fw/abb/twl3025: Add function to query PWON state In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15149 ) Change subject: fw/abb/twl3025: Add function to query PWON state ...................................................................... fw/abb/twl3025: Add function to query PWON state This allows us to detect power button presses on the Pirelli DP-L10 and the Huawei GTM900-B module. Polling will only be activated once the power button has been pressed and we received the interrupt. The goal is to reduce the required amount of TWL3025 register accesses to a minimum. Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770 --- M src/target/firmware/abb/twl3025.c M src/target/firmware/include/abb/twl3025.h 2 files changed, 30 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/abb/twl3025.c b/src/target/firmware/abb/twl3025.c index e4fcf4f..ad2b01f 100644 --- a/src/target/firmware/abb/twl3025.c +++ b/src/target/firmware/abb/twl3025.c @@ -60,8 +60,15 @@ ABB_RAMP_VAL( 0, 0), }; +typedef enum pwon_state { + PWON_IDLE, + PWON_DETECTED, + PWON_REPORTED, +} pwon_state_t; + struct twl3025 { uint8_t page; + pwon_state_t pwon; }; static struct twl3025 twl3025_state; @@ -106,6 +113,8 @@ case IRQ_EXTERNAL: // charger in/out, pwrbtn, adc done src = twl3025_reg_read(ITSTATREG); // printd("itstatreg 0x%02x\n", src); + if ((src & 0x04) && twl3025_state.pwon == PWON_IDLE) + twl3025_state.pwon = PWON_DETECTED; if (src & 0x08) handle_charger(); if (src & 0x20) @@ -127,6 +136,7 @@ twl3025_clk13m(1); twl3025_reg_write(AFCCTLADD, 0x01); /* AFCCK(1:0) must not be zero! */ twl3025_unit_enable(TWL3025_UNIT_AFC, 1); + twl3025_state.pwon = PWON_IDLE; irq_register_handler(IRQ_EXTERNAL, &twl3025_irq); irq_config(IRQ_EXTERNAL, 0, 0, 0); @@ -185,6 +195,24 @@ delay_ms(1); } +int twl3025_get_pwon(void) +{ + switch (twl3025_state.pwon) { + case PWON_DETECTED: + twl3025_state.pwon = PWON_REPORTED; + break; + case PWON_REPORTED: + if (twl3025_reg_read(VRPCSTS) & 0x10) + twl3025_state.pwon = PWON_IDLE; + break; + case PWON_IDLE: + default: + break; + } + + return (twl3025_state.pwon != PWON_IDLE); +} + void twl3025_power_off(void) { unsigned long flags; diff --git a/src/target/firmware/include/abb/twl3025.h b/src/target/firmware/include/abb/twl3025.h index 3640644..938a425 100755 --- a/src/target/firmware/include/abb/twl3025.h +++ b/src/target/firmware/include/abb/twl3025.h @@ -144,6 +144,8 @@ void twl3025_reg_write(uint8_t reg, uint16_t data); uint16_t twl3025_reg_read(uint8_t reg); +int twl3025_get_pwon(void); + void twl3025_power_off(void); void twl3025_clk13m(int enable); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770 Gerrit-Change-Number: 15149 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:00 +0000 Subject: Change in ...osmocom-bb[master]: fw/keypad: Poll Iota powerbutton if required In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15150 ) Change subject: fw/keypad: Poll Iota powerbutton if required ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 Gerrit-Change-Number: 15150 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 27 Aug 2019 12:08:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:02 +0000 Subject: Change in ...osmocom-bb[master]: fw/flash: Read extended ID, expose API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15151 ) Change subject: fw/flash: Read extended ID, expose API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3bcd71c84c8931bcd574953063737b51a41738a3 Gerrit-Change-Number: 15151 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 27 Aug 2019 12:08:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:04 +0000 Subject: Change in ...osmocom-bb[master]: fw: Add support for Huawei GTM900-B modules In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15152 ) Change subject: fw: Add support for Huawei GTM900-B modules ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a770ea93fc72c4e9b63078e253602f204b5be23 Gerrit-Change-Number: 15152 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 27 Aug 2019 12:08:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:05 +0000 Subject: Change in ...osmocom-bb[master]: fw/keypad: Poll Iota powerbutton if required In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15150 ) Change subject: fw/keypad: Poll Iota powerbutton if required ...................................................................... fw/keypad: Poll Iota powerbutton if required This commit adds polling of the TWL3025 PWON signal. If the powerbutton is pressed on targets that use it (Pirelli DP-L10, Huawei GTM900-B), a normal keypad scanning cycle is started in order to preserve the timing, required for the 500ms power off press duration for example. Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 --- M src/target/firmware/board/compal/keymap.h M src/target/firmware/board/pirelli_dpl10/keymap.h M src/target/firmware/calypso/keypad.c M src/target/firmware/include/keypad.h 4 files changed, 27 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/board/compal/keymap.h b/src/target/firmware/board/compal/keymap.h index ce8f9c2..fe0e303 100644 --- a/src/target/firmware/board/compal/keymap.h +++ b/src/target/firmware/board/compal/keymap.h @@ -23,5 +23,6 @@ [KEY_OK] = 0, [KEY_POWER] = 24, [KEY_MINUS] = 30, /* not existent */ - [KEY_PLUS] = 31, /* not existent */ + [KEY_PLUS] = 30, /* not existent */ + [KEY_CAMERA] = 30, /* not existent */ }; diff --git a/src/target/firmware/board/pirelli_dpl10/keymap.h b/src/target/firmware/board/pirelli_dpl10/keymap.h index b85621b..b06f17d 100644 --- a/src/target/firmware/board/pirelli_dpl10/keymap.h +++ b/src/target/firmware/board/pirelli_dpl10/keymap.h @@ -21,8 +21,9 @@ [KEY_LEFT] = 5, [KEY_RIGHT] = 10, [KEY_OK] = 11, -/* power button is not connected, we use the camera button instead */ - [KEY_POWER] = 23, +/* power button is not connected to keypad scan matrix but to TWL3025 */ + [KEY_POWER] = 31, [KEY_MINUS] = 22, [KEY_PLUS] = 21, + [KEY_CAMERA] = 23, }; diff --git a/src/target/firmware/calypso/keypad.c b/src/target/firmware/calypso/keypad.c index 937f8bd..c3c1810 100644 --- a/src/target/firmware/calypso/keypad.c +++ b/src/target/firmware/calypso/keypad.c @@ -1,7 +1,7 @@ /* Driver for the keypad attached to the TI Calypso */ /* (C) 2010 by roh - * (C) 2013 by Steve Markgraf + * (C) 2013-19 by Steve Markgraf * * All Rights Reserved * @@ -119,6 +119,15 @@ static uint16_t reg; static uint16_t col; static uint32_t buttons = 0, debounce1 = 0, debounce2 = 0; + uint8_t use_iota_pwrbtn = (btn_map[KEY_POWER] == 31); + uint32_t pwr_mask = (1 << btn_map[KEY_POWER]); + + /* only read Iota powerbutton if it was not yet pressed */ + if (use_iota_pwrbtn && !(buttons & pwr_mask) && twl3025_get_pwon()) { + buttons |= pwr_mask; + if (!polling) + polling = 1; + } if (with_interrupts && !polling) return; @@ -154,7 +163,6 @@ col++; if (col > 5) { - uint32_t pwr_mask = (1 << btn_map[KEY_POWER]); col = 0; /* if power button, ignore other states */ if (buttons & pwr_mask) @@ -162,6 +170,16 @@ else if (lastbuttons & pwr_mask) buttons = lastbuttons & ~pwr_mask; dispatch_buttons(buttons); + + /* check if powerbutton connected to Iota was released */ + if (use_iota_pwrbtn && (buttons & pwr_mask) && !twl3025_get_pwon()) { + buttons &= ~pwr_mask; + + /* dispatch buttons again so we do not loose + * very short powerbutton presses */ + dispatch_buttons(buttons); + } + if (buttons == 0) { writew(0x0, KBC_REG); polling = 3; @@ -172,5 +190,4 @@ writew(0xff, KBC_REG); else writew(0x1f & ~(0x1 << col ), KBC_REG); - } diff --git a/src/target/firmware/include/keypad.h b/src/target/firmware/include/keypad.h index 9e9acfe..2ad9889 100644 --- a/src/target/firmware/include/keypad.h +++ b/src/target/firmware/include/keypad.h @@ -25,11 +25,11 @@ KEY_POWER, //red on-hook KEY_MINUS, KEY_PLUS, + KEY_CAMERA, + BUTTON_CNT, KEY_INV = 0xFF }; -#define BUTTON_CNT 23 - enum key_states { PRESSED, RELEASED, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 Gerrit-Change-Number: 15150 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:05 +0000 Subject: Change in ...osmocom-bb[master]: fw/flash: Read extended ID, expose API In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15151 ) Change subject: fw/flash: Read extended ID, expose API ...................................................................... fw/flash: Read extended ID, expose API We now unlock the flash before reading the extended ID (required for Spansion and Samsung flash chips). These commands will be ignored by Intel/ST flash chips, and this change has been verified with all flash chips we support. Furthermore, expose the API for reading the flash ID. Change-Id: I3bcd71c84c8931bcd574953063737b51a41738a3 --- M src/target/firmware/flash/cfi_flash.c M src/target/firmware/include/flash/cfi_flash.h 2 files changed, 36 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/flash/cfi_flash.c b/src/target/firmware/flash/cfi_flash.c index 974165d..2f8cde0 100644 --- a/src/target/firmware/flash/cfi_flash.c +++ b/src/target/firmware/flash/cfi_flash.c @@ -69,12 +69,6 @@ struct cfi_region erase_regions[CFI_FLASH_MAX_ERASE_REGIONS]; } __attribute__ ((packed)); -/* manufacturer ids */ -enum cfi_manuf { - CFI_MANUF_ST = 0x0020, - CFI_MANUF_INTEL = 0x0089, -}; - /* algorithm ids */ enum cfi_algo { CFI_ALGO_INTEL_3 = 0x03 @@ -83,6 +77,7 @@ /* various command bytes */ enum cfi_flash_cmd { CFI_CMD_RESET = 0xff, + CFI_CMD_RESET_TO_READ_MODE = 0xF0, CFI_CMD_READ_ID = 0x90, CFI_CMD_CFI = 0x98, CFI_CMD_READ_STATUS = 0x70, @@ -91,6 +86,8 @@ CFI_CMD_BLOCK_ERASE = 0x20, CFI_CMD_ERASE_CONFIRM = 0xD0, CFI_CMD_PROTECT = 0x60, + CFI_CMD_UNLOCK1 = 0xAA, + CFI_CMD_UNLOCK2 = 0x55, }; /* protection commands */ @@ -104,6 +101,8 @@ enum flash_offset { CFI_OFFSET_MANUFACTURER_ID = 0x00, CFI_OFFSET_DEVICE_ID = 0x01, + CFI_OFFSET_EXT_DEVICE_ID1 = 0x0E, + CFI_OFFSET_EXT_DEVICE_ID2 = 0x0F, CFI_OFFSET_INTEL_PROTECTION = 0x81, CFI_OFFSET_CFI_RESP = 0x10 }; @@ -125,6 +124,9 @@ CFI_STATUS_RESERVED = 0x01 }; +#define CFI_CMD_ADDR1 0xAAA +#define CFI_CMD_ADDR2 0x555 + __ramtext static inline void flash_write_cmd(const void *base_addr, uint16_t cmd) { @@ -379,17 +381,27 @@ return res; } -/* Internal: retrieve manufacturer and device id from id space */ +/* retrieve manufacturer and extended device id from id space */ __ramtext -static int get_id(void *base_addr, +int flash_get_id(void *base_addr, uint16_t * manufacturer_id, uint16_t * device_id) { - flash_write_cmd(base_addr, CFI_CMD_READ_ID); + flash_write_cmd(base_addr, CFI_CMD_RESET_TO_READ_MODE); - *manufacturer_id = flash_read16(base_addr, CFI_OFFSET_MANUFACTURER_ID); - *device_id = flash_read16(base_addr, CFI_OFFSET_DEVICE_ID); + flash_write_cmd(base_addr + CFI_CMD_ADDR1, CFI_CMD_UNLOCK1); + flash_write_cmd(base_addr + CFI_CMD_ADDR2, CFI_CMD_UNLOCK2); + flash_write_cmd(base_addr + CFI_CMD_ADDR1, CFI_CMD_READ_ID); - flash_write_cmd(base_addr, CFI_CMD_RESET); + if (manufacturer_id) + *manufacturer_id = flash_read16(base_addr, CFI_OFFSET_MANUFACTURER_ID); + + if (device_id) { + device_id[0] = flash_read16(base_addr, CFI_OFFSET_DEVICE_ID); + device_id[1] = flash_read16(base_addr, CFI_OFFSET_EXT_DEVICE_ID1); + device_id[2] = flash_read16(base_addr, CFI_OFFSET_EXT_DEVICE_ID2); + } + + flash_write_cmd(base_addr, CFI_CMD_RESET_TO_READ_MODE); return 0; } @@ -524,12 +536,12 @@ { int res; unsigned u; - uint16_t m_id, d_id; + uint16_t m_id, d_id[3]; uint32_t base; struct cfi_query qry; /* retrieve and check manufacturer and device id */ - res = get_id(base_addr, &m_id, &d_id); + res = flash_get_id(base_addr, &m_id, d_id); if (res) { return res; } diff --git a/src/target/firmware/include/flash/cfi_flash.h b/src/target/firmware/include/flash/cfi_flash.h index 9d8b33a..8589fb6 100644 --- a/src/target/firmware/include/flash/cfi_flash.h +++ b/src/target/firmware/include/flash/cfi_flash.h @@ -26,6 +26,14 @@ FLASH_LOCKED_DOWN } flash_lock_t; +/* manufacturer ids */ +enum cfi_manuf { + CFI_MANUF_ST = 0x0020, + CFI_MANUF_INTEL = 0x0089, + CFI_MANUF_SPANSION = 0x0001, + CFI_MANUF_SAMSUNG = 0x00EC, +}; + int flash_init(flash_t *flash, void *base_addr); flash_lock_t flash_block_getlock(flash_t *flash, uint32_t block_offset); @@ -38,4 +46,6 @@ int flash_program(flash_t *flash, uint32_t dst_offset, void *src, uint32_t nbytes); +int flash_get_id(void *base_addr, uint16_t * manufacturer_id, uint16_t * device_id); + #endif -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3bcd71c84c8931bcd574953063737b51a41738a3 Gerrit-Change-Number: 15151 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:06 +0000 Subject: Change in ...osmocom-bb[master]: fw: Add support for Huawei GTM900-B modules In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15152 ) Change subject: fw: Add support for Huawei GTM900-B modules ...................................................................... fw: Add support for Huawei GTM900-B modules Both MG01GSMT and MG01GSMT hardware variants are supported and automatically detected based on the flash manufacturer. Change-Id: I3a770ea93fc72c4e9b63078e253602f204b5be23 --- M src/target/firmware/Makefile A src/target/firmware/board/gtm900b/init.c A src/target/firmware/board/gtm900b/keymap.h A src/target/firmware/board/gtm900b/rf_power.c A src/target/firmware/board/gtm900b/rffe_gtm900b.c 5 files changed, 464 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 2f44a20..f7235ac 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -24,7 +24,7 @@ # # List of all supported boards (meant to be overridden on command line) -BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 gta0x fcdev3b pirelli_dpl10 +BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 gta0x gtm900b fcdev3b pirelli_dpl10 # Framebuffer support, board specific drivers FB_OBJS=fb/framebuffer.o fb/font.o fb/helvR08.o fb/helvB14.o fb/c64.o \ @@ -46,6 +46,12 @@ battery/dummy.o $(FB_dummy_OBJS) BOARD_gta0x_ENVIRONMENTS=highram +# Huawei GTM900-B +BOARD_gtm900b_OBJS=$(calypso_COMMON_OBJS) board/gtm900b/init.o \ + board/gtm900b/rffe_gtm900b.o board/gtm900b/rf_power.o \ + battery/dummy.o $(FB_dummy_OBJS) +BOARD_gtm900b_ENVIRONMENTS=highram + # FreeCalypso FCDEV3B BOARD_fcdev3b_OBJS=$(calypso_COMMON_OBJS) board/fcdev3b/init.o \ board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_power.o \ diff --git a/src/target/firmware/board/gtm900b/init.c b/src/target/firmware/board/gtm900b/init.c new file mode 100644 index 0000000..38ede10 --- /dev/null +++ b/src/target/firmware/board/gtm900b/init.c @@ -0,0 +1,140 @@ +/* Initialization for the Huawei GTM900-B modem */ + +/* (C) 2010 by Harald Welte + * (C) 2010-19 by Steve Markgraf + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include "keymap.h" + +#define ARMIO_LATCH_OUT 0xfffe4802 +#define IO_CNTL_REG 0xfffe4804 +#define ASIC_CONF_REG 0xfffef008 +#define IO_CONF_REG 0xfffef00a +#define LPG_LCR_REG 0xfffe7800 +#define LPG_PM_REG 0xfffe7801 + +static void board_io_init(void) +{ + uint16_t reg; + + reg = readw(ASIC_CONF_REG); + /* Set LPG pin mux for power LED */ + reg |= (1 << 6); + /* TWL3025: Set SPI+RIF RX clock to rising edge */ + reg |= (1 << 13) | (1 << 14); + writew(reg, ASIC_CONF_REG); + + /* + * Most Calypso peripheral interface signals are unconnected + * on this modem. We configure them to be GPIOs in IO_CONF_REG, + * then configure them to be outputs in IO_CNTL_REG, then set + * the outputs to 0 in ARMIO_LATCH_OUT. + */ + writew(0x03F5, IO_CONF_REG); + writew(0xC000, IO_CNTL_REG); + writew(0x0000, ARMIO_LATCH_OUT); + + /* Set LPG output permanently on (power LED) */ + writew(1, LPG_PM_REG); + writew((1 << 7), LPG_LCR_REG); +} + +void board_init(int with_irq) +{ + /* Configure the memory interface */ + calypso_mem_cfg(CALYPSO_nCS0, 3, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS1, 3, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS2, 5, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS3, 5, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_CS4, 0, CALYPSO_MEM_8bit, 1); + calypso_mem_cfg(CALYPSO_nCS6, 0, CALYPSO_MEM_32bit, 1); + calypso_mem_cfg(CALYPSO_nCS7, 0, CALYPSO_MEM_32bit, 0); + + /* Set VTCXO_DIV2 = 1, configure PLL for 104 MHz and give ARM half of that */ + calypso_clock_set(2, CALYPSO_PLL13_104_MHZ, ARM_MCLK_DIV_2); + + /* Configure the RHEA bridge with some sane default values */ + calypso_rhea_cfg(0, 0, 0xff, 0, 1, 0, 0); + + /* Initialize board-specific GPIO */ + board_io_init(); + + /* Enable bootrom mapping to route exception vectors to RAM */ + calypso_bootrom(with_irq); + calypso_exceptions_install(); + + /* Initialize interrupt controller */ + if (with_irq) + irq_init(); + + sercomm_bind_uart(UART_IRDA); + cons_bind_uart(UART_MODEM); + + /* initialize IRDA UART to be used for sercomm */ + uart_init(UART_IRDA, with_irq); + uart_baudrate(UART_IRDA, UART_115200); + + /* Initialize MODEM UART to be used for old-school console code. */ + uart_init(UART_MODEM, with_irq); + uart_baudrate(UART_MODEM, UART_115200); + + /* Initialize hardware timers */ + hwtimer_init(); + + /* Initialize DMA controller */ + dma_init(); + + /* Initialize real time clock */ + rtc_init(); + + /* Initialize system timers (uses hwtimer 2) */ + timer_init(); + + /* Initialize keypad driver */ + keypad_init(keymap, with_irq); + + /* Initialize ABB driver (uses SPI) */ + twl3025_init(); +} diff --git a/src/target/firmware/board/gtm900b/keymap.h b/src/target/firmware/board/gtm900b/keymap.h new file mode 100644 index 0000000..07a19e0 --- /dev/null +++ b/src/target/firmware/board/gtm900b/keymap.h @@ -0,0 +1,29 @@ +/* keymap for the Huawei GTM900-B */ + +static const uint8_t keymap[] = { + [KEY_0] = 0, + [KEY_1] = 0, + [KEY_2] = 0, + [KEY_3] = 0, + [KEY_4] = 0, + [KEY_5] = 0, + [KEY_6] = 0, + [KEY_7] = 0, + [KEY_8] = 0, + [KEY_9] = 0, + [KEY_STAR] = 0, + [KEY_HASH] = 0, + [KEY_MENU] = 0, + [KEY_LEFT_SB] = 0, + [KEY_RIGHT_SB] = 0, + [KEY_UP] = 0, + [KEY_DOWN] = 0, + [KEY_LEFT] = 0, + [KEY_RIGHT] = 0, + [KEY_OK] = 0, +/* power button is not connected to keypad scan matrix but to TWL3025 */ + [KEY_POWER] = 31, + [KEY_MINUS] = 0, + [KEY_PLUS] = 0, + [KEY_CAMERA] = 0, +}; diff --git a/src/target/firmware/board/gtm900b/rf_power.c b/src/target/firmware/board/gtm900b/rf_power.c new file mode 100644 index 0000000..cd47ddf --- /dev/null +++ b/src/target/firmware/board/gtm900b/rf_power.c @@ -0,0 +1,63 @@ +/* Tx RF power calibration for the Huawei GTM900-B */ + +/* (C) 2010 by Harald Welte + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include + +/* GSM900 ARFCN 33, Measurements by Steve Markgraf / May 2010 */ +/* FIXME those are from the Compal phones, do measurements with the GTM900-B */ +const int16_t dbm2apc_gsm900[] = { + [0] = 151, + [1] = 152, + [2] = 153, + [3] = 155, + [4] = 156, + [5] = 158, + [6] = 160, + [7] = 162, + [8] = 164, + [9] = 167, + [10] = 170, + [11] = 173, + [12] = 177, + [13] = 182, + [14] = 187, + [15] = 192, + [16] = 199, + [17] = 206, + [18] = 214, + [19] = 223, + [20] = 233, + [21] = 244, + [22] = 260, + [23] = 271, + [24] = 288, + [25] = 307, + [26] = 327, + [27] = 350, + [28] = 376, + [29] = 407, + [30] = 456, + [31] = 575, +}; + +const int dbm2apc_gsm900_max = ARRAY_SIZE(dbm2apc_gsm900) - 1; diff --git a/src/target/firmware/board/gtm900b/rffe_gtm900b.c b/src/target/firmware/board/gtm900b/rffe_gtm900b.c new file mode 100644 index 0000000..633c637 --- /dev/null +++ b/src/target/firmware/board/gtm900b/rffe_gtm900b.c @@ -0,0 +1,225 @@ +/* RF frontend driver for Huawei GTM900-B modems, supporting both + * MG01GSMT and MG01GSMT hardware variants */ + +/* (C) 2019 by Steve Markgraf + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* This is a value that has been measured for the GTM900-B: 74dBm, + it is the difference between the input level at the antenna and what + the DSP reports, subtracted by the total gain of the TRF6151 */ +#define SYSTEM_INHERENT_GAIN 74 + +/* describe how the RF frontend is wired on the Huawei GTM900-B */ +#define IOTA_STROBE TSPEN(0) /* Strobe for the Iota TSP */ +#define RITA_STROBE TSPEN(2) /* Strobe for the Rita TSP */ + +#define RITA_RESET TSPACT(0) /* Reset of the Rita TRF6151 */ +#define PA_BAND_SELECT TSPACT(3) /* Low: 850/900, High: 1800/1900 */ +#define PA_TX_ENABLE TSPACT(9) /* Enable the Power Amplifier */ + +/* MGC2GSMT Ver. BRF specific antenna switch signals, low active */ +#define ASM_VC1 TSPACT(1) /* low on GSM900 TX */ +#define ASM_VC2 TSPACT(2) /* low on DCS1800 TX */ + +/* MG01GSMT Ver. C specific antenna switch signals, low active */ +#define CXG_CTLA TSPACT(4) /* CXG1192UR CTLA input */ +#define CXG_CTLB TSPACT(1) /* CXG1192UR CTLB input */ +#define CXG_CTLC TSPACT(2) /* CXG1192UR CTLC input */ + +/* + * The Sony CXG1192UR switch is wired as follows on the MG01GSMT Ver. C: + * + * Rx1: GSM850 RX filter (Epcos B5013) + * Rx2: GSM900 RX filter (Epcos B7710) + * Rx3: DCS1800 RX filter (Epcos 7714) + * Rx4: PCS1900 RX filter (not populated) + * Tx1: low band PA output + * Tx2: high band PA output + */ + +typedef enum rffe_var { + RFFE_MGC2GSMT, + RFFE_MG01GSMT +} rffe_var_t; + +static rffe_var_t rffe_variant = RFFE_MGC2GSMT; + +static inline void rffe_mode_mgc2gsmt(enum gsm_band band, int tx) +{ + uint16_t tspact = tsp_act_state(); + + /* First we mask off all bits from the state cache */ + tspact &= ~(PA_BAND_SELECT | PA_TX_ENABLE); + tspact |= (ASM_VC1 | ASM_VC2); /* low-active */ + +#ifdef CONFIG_TX_ENABLE + /* Then we selectively set the bits on, if required */ + if (tx) { + tspact |= PA_TX_ENABLE; + tspact &= ~CXG_CTLA; + + if (band == GSM_BAND_1800 || band == GSM_BAND_1900) { + tspact |= PA_BAND_SELECT; + tspact &= ~ASM_VC2; + } else { + tspact &= ~ASM_VC1; + } + } +#endif /* TRANSMIT_SUPPORT */ + + tsp_act_update(tspact); +} + +static inline void rffe_mode_mg01gsmt(enum gsm_band band, int tx) +{ + uint16_t tspact = tsp_act_state(); + + /* First we mask off all bits from the state cache */ + tspact &= ~(PA_BAND_SELECT | PA_TX_ENABLE); + tspact |= (CXG_CTLA | CXG_CTLB | CXG_CTLC); /* low-active */ + + switch (band) { + case GSM_BAND_850: + tspact &= ~CXG_CTLB; /* select Ant1 - Rx1 */ + break; + case GSM_BAND_900: + tspact &= ~CXG_CTLC; /* select Ant1 - Rx2 */ + break; + case GSM_BAND_1800: /* select Ant2 - Rx3 */ + break; + case GSM_BAND_1900: + tspact &= ~(CXG_CTLB | CXG_CTLC); /* select Ant2 - Rx4 */ + break; + default: + break; + } + +#ifdef CONFIG_TX_ENABLE + /* Then we selectively set the bits on, if required */ + if (tx) { + tspact |= PA_TX_ENABLE; + tspact &= ~CXG_CTLA; + + if (band == GSM_BAND_1800 || band == GSM_BAND_1900) { + tspact |= PA_BAND_SELECT; + tspact &= ~CXG_CTLB; + } + } +#endif /* TRANSMIT_SUPPORT */ + + tsp_act_update(tspact); +} + +/* switch RF Frontend Mode */ +void rffe_mode(enum gsm_band band, int tx) +{ + if (rffe_variant == RFFE_MGC2GSMT) + rffe_mode_mgc2gsmt(band, tx); + else + rffe_mode_mg01gsmt(band, tx); +} + +uint32_t rffe_get_rx_ports(void) +{ + return (1 << PORT_LO) | (1 << PORT_DCS1800) | (1 << PORT_PCS1900); +} + +uint32_t rffe_get_tx_ports(void) +{ + return (1 << PORT_LO) | (1 << PORT_HI); +} + +/* Returns need for IQ swap */ +int rffe_iq_swapped(uint16_t band_arfcn, int tx) +{ + return trf6151_iq_swapped(band_arfcn, tx); +} + +#define ARM_CONF_REG 0xfffef006 + +void rffe_init(void) +{ + uint16_t reg; + uint16_t manufacturer_id = 0; + + reg = readw(ARM_CONF_REG); + reg &= ~ (1 << 7); /* TSPACT4 I/O function, not nRDYMEM */ + writew(reg, ARM_CONF_REG); + + /* Configure the TSPEN which is connected to the TWL3025 */ + tsp_setup(IOTA_STROBE, 1, 0, 0); + + trf6151_init(RITA_STROBE, RITA_RESET); + + /* Detect the used RFFE variant based on the used flash chip. + * The MGC2GSMT uses a Samsung flash, whereas the MG01GSMT uses + * a Spansion flash. We use an address above the Calpso bootrom + * so we do not need to unmap it to access the flash. */ + flash_get_id((void *)0x40000, &manufacturer_id, NULL); + + switch (manufacturer_id) { + case CFI_MANUF_SPANSION: + printf("Detected MG01GSMT module\n\n"); + rffe_variant = RFFE_MG01GSMT; + break; + case CFI_MANUF_SAMSUNG: + printf("Detected MGC2GSMT module\n\n"); + rffe_variant = RFFE_MGC2GSMT; + break; + default: + printf("Unknown module detected, flash ID 0x%4.4x\n" + "Please contact mailing list!\n\n", manufacturer_id); + rffe_variant = RFFE_MGC2GSMT; + break; + } +} + +uint8_t rffe_get_gain(void) +{ + return trf6151_get_gain(); +} + +void rffe_set_gain(uint8_t dbm) +{ + trf6151_set_gain(dbm); +} + +const uint8_t system_inherent_gain = SYSTEM_INHERENT_GAIN; + +/* Given the expected input level of exp_inp dBm/8 and the target of target_bb + * dBm8, configure the RF Frontend with the respective gain */ +void rffe_compute_gain(int16_t exp_inp, int16_t target_bb) +{ + trf6151_compute_gain(exp_inp, target_bb); +} + +void rffe_rx_win_ctrl(int16_t exp_inp, int16_t target_bb) +{ + /* FIXME */ +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a770ea93fc72c4e9b63078e253602f204b5be23 Gerrit-Change-Number: 15152 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:08:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:08:43 +0000 Subject: Change in ...osmo-bsc[master]: lchan_select.c: tune log level in lchan_select_by_type() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15276 ) Change subject: lchan_select.c: tune log level in lchan_select_by_type() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b45852116253e5237b779a91bed8b800758360e Gerrit-Change-Number: 15276 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 12:08:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:07 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: use LOGP() macro instead of LOGPC() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 ) Change subject: abis_nm.c: use LOGP() macro instead of LOGPC() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 12:10:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:40 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: use LOGP() macro instead of LOGPC() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 ) Change subject: abis_nm.c: use LOGP() macro instead of LOGPC() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/15277/1/src/osmo-bsc/abis_nm.c at 344 PS1, Line 344: LOGP(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); > This is an idea for a separate change. Unfortunately there is no such macro. And... [?] LOGPFOH exists, probably only in osmo-bts. I agree it's sufficient to print the BTS number here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 12:10:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:46 +0000 Subject: Change in ...osmo-bsc[master]: abis_nm.c: use LOGP() macro instead of LOGPC() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15277 ) Change subject: abis_nm.c: use LOGP() macro instead of LOGPC() ...................................................................... abis_nm.c: use LOGP() macro instead of LOGPC() The LOGPC() is usually used for continuation when printing complex logging messages (e.g. where using format string is not enough). In this case, nothing is being printed before calling LOGPC(), so the logging messages appear without the meta info (time-stamp, level, category, etc.), for example: BTS 0 reported connected PCU version 0.7.0.1-2585-dirty Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 --- M src/osmo-bsc/abis_nm.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7d059b5..48e9183 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -311,7 +311,7 @@ enum abis_nm_pcause_type pcause = p_val[0]; enum abis_mm_event_causes cause = osmo_load16be(p_val + 1); - LOGPC(DNM, LOGL_ERROR, "BTS %u: Failure Event Report: ", bts->nr); + LOGP(DNM, LOGL_ERROR, "BTS %u: Failure Event Report: ", bts->nr); if (type) LOGPC(DNM, LOGL_ERROR, "Type=%s, ", type); if (severity) @@ -341,10 +341,10 @@ switch (cause) { case OSMO_EVT_PCU_VERS: if (text) { - LOGPC(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); + LOGP(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); osmo_strlcpy(bts->pcu_version, text, sizeof(bts->pcu_version)); } else { - LOGPC(DNM, LOGL_ERROR, "BTS %u reported PCU disconnection.\n", bts->nr); + LOGP(DNM, LOGL_ERROR, "BTS %u reported PCU disconnection.\n", bts->nr); bts->pcu_version[0] = '\0'; } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I868633ad3e50f2cb3ebfb2c566d16c4710f17563 Gerrit-Change-Number: 15277 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:47 +0000 Subject: Change in ...osmo-bsc[master]: lchan_select.c: tune log level in lchan_select_by_type() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15276 ) Change subject: lchan_select.c: tune log level in lchan_select_by_type() ...................................................................... lchan_select.c: tune log level in lchan_select_by_type() If lchan_select_by_type() fails to find a suitable logical channel, it would print a message using LOGL_ERROR. This can happen if all logical channels of the requested type are busy, thus it is not a error. Let's use LOGL_NOTICE for that. Change-Id: I9b45852116253e5237b779a91bed8b800758360e --- M src/osmo-bsc/lchan_select.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 6df3b4a..d63db22 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -234,7 +234,7 @@ lchan->type = type; LOG_LCHAN(lchan, LOGL_INFO, "Selected\n"); } else - LOG_BTS(bts, DRLL, LOGL_ERROR, "Failed to select %s channel\n", + LOG_BTS(bts, DRLL, LOGL_NOTICE, "Failed to select %s channel\n", gsm_lchant_name(type)); return lchan; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b45852116253e5237b779a91bed8b800758360e Gerrit-Change-Number: 15276 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:57 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 12:10:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:59 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: exit process when BTS drops connection In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15289 ) Change subject: Transceiver: exit process when BTS drops connection ...................................................................... Transceiver: exit process when BTS drops connection We don't want to keep osmo-trx running in a started state once the BTS controlling it becomes unavailable. If a socket towards the BTS fails, it means the BTS is gone and the best thing to do is to stop the process (alternatively we could go back to stopped state instead, and wait for BTS to re-connect, fur so far this action is good enough). Related: OS#4170 Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 54 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 9a1c446..23aabdd 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -750,7 +750,7 @@ return true; } -void Transceiver::driveControl(size_t chan) +bool Transceiver::driveControl(size_t chan) { char buffer[MAX_PACKET_LENGTH + 1]; char response[MAX_PACKET_LENGTH + 1]; @@ -761,7 +761,7 @@ msgLen = read(mCtrlSockets[chan], buffer, MAX_PACKET_LENGTH); if (msgLen <= 0) { LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; - return; + return false; } /* Zero-terminate received string */ @@ -770,7 +770,7 @@ /* Verify a command signature */ if (strncmp(buffer, "CMD ", 4)) { LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; - return; + return false; } /* Set command pointer */ @@ -889,7 +889,7 @@ if ((timeslot < 0) || (timeslot > 7)) { LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode); - return; + return true; } mStates[chan].chanType[timeslot] = (ChannelCombination) corrCode; setModulus(timeslot, chan); @@ -922,8 +922,11 @@ LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'"; msgLen = write(mCtrlSockets[chan], response, strlen(response) + 1); - if (msgLen <= 0) + if (msgLen <= 0) { LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen; + return false; + } + return true; } bool Transceiver::driveTxPriorityQueue(size_t chan) @@ -990,18 +993,21 @@ return true; } -void Transceiver::driveReceiveRadio() +bool Transceiver::driveReceiveRadio() { int rc = mRadioInterface->driveReceiveRadio(); if (rc == 0) { usleep(100000); - } else if (rc < 0) { - LOG(FATAL) << "radio Interface receive failed, requesting stop."; - osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); - } else if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) { - mForceClockInterface = false; - writeClockInterface(); + return true; } + if (rc < 0) + return false; + + if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) { + mForceClockInterface = false; + return writeClockInterface(); + } + return true; } void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi) @@ -1026,22 +1032,21 @@ << " bits: " << os; } -void Transceiver::driveReceiveFIFO(size_t chan) +bool Transceiver::driveReceiveFIFO(size_t chan) { struct trx_ul_burst_ind bi; if (!pullRadioVector(chan, &bi)) - return; + return false; + if (!bi.idle) - logRxBurst(chan, &bi); + logRxBurst(chan, &bi); switch (mVersionTRXD[chan]) { case 0: - trxd_send_burst_ind_v0(chan, mDataSockets[chan], &bi); - break; + return trxd_send_burst_ind_v0(chan, mDataSockets[chan], &bi); case 1: - trxd_send_burst_ind_v1(chan, mDataSockets[chan], &bi); - break; + return trxd_send_burst_ind_v1(chan, mDataSockets[chan], &bi); default: OSMO_ASSERT(false); } @@ -1102,7 +1107,7 @@ -void Transceiver::writeClockInterface() +bool Transceiver::writeClockInterface() { int msgLen; char command[50]; @@ -1112,11 +1117,13 @@ LOG(INFO) << "ClockInterface: sending " << command; msgLen = write(mClockSocket, command, strlen(command) + 1); - if (msgLen <= 0) - LOG(WARNING) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; + if (msgLen <= 0) { + LOG(ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; + return false; + } mLastClockUpdateTime = mTransmitDeadlineClock; - + return true; } void *RxUpperLoopAdapter(TrxChanThParams *params) @@ -1131,7 +1138,11 @@ set_selfthread_name(thread_name); while (1) { - trx->driveReceiveFIFO(num); + if (!trx->driveReceiveFIFO(num)) { + LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; @@ -1142,7 +1153,11 @@ set_selfthread_name("RxLower"); while (1) { - transceiver->driveReceiveRadio(); + if (!transceiver->driveReceiveRadio()) { + LOG(FATAL) << "Something went wrong in thread RxLower, requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; @@ -1171,7 +1186,11 @@ set_selfthread_name(thread_name); while (1) { - trx->driveControl(num); + if (!trx->driveControl(num)) { + LOGCHAN(num, DTRXCTRL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; @@ -1189,7 +1208,11 @@ set_selfthread_name(thread_name); while (1) { - trx->driveTxPriorityQueue(num); + if (!trx->driveTxPriorityQueue(num)) { + LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); + break; + } pthread_testcancel(); } return NULL; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 1a4d28f..0d09854 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -191,7 +191,7 @@ CorrType expectedCorrType(GSM::Time currTime, size_t chan); /** send messages over the clock socket */ - void writeClockInterface(void); + bool writeClockInterface(void); int mSPSTx; ///< number of samples per Tx symbol int mSPSRx; ///< number of samples per Rx symbol @@ -221,16 +221,16 @@ protected: /** drive lower receive I/O and burst generation */ - void driveReceiveRadio(); + bool driveReceiveRadio(); /** drive demodulation of GSM bursts */ - void driveReceiveFIFO(size_t chan); + bool driveReceiveFIFO(size_t chan); /** drive transmission of GSM bursts */ void driveTxFIFO(); /** drive handling of control messages from GSM core */ - void driveControl(size_t chan); + bool driveControl(size_t chan); /** drive modulation and sorting of GSM bursts from GSM core -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccbe3c17b39fb792ea7810f840235c348054d66 Gerrit-Change-Number: 15289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:59 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Transceiver: Enable EDGE detection only on PDCH timeslots Related: OS#3664 Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 23aabdd..590101c 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -558,8 +558,8 @@ return mExtRACH ? EXT_RACH : RACH; else if ((mod52 == 25) || (mod52 == 51)) return IDLE; - else - return TSC; + else /* Enable 8-PSK burst detection if EDGE is enabled */ + return mEdge ? EDGE : TSC; break; } case LOOPBACK: @@ -610,10 +610,6 @@ burstTime = radio_burst->getTime(); CorrType type = expectedCorrType(burstTime, chan); - /* Enable 8-PSK burst detection if EDGE is enabled */ - if (mEdge && (type == TSC)) - type = EDGE; - /* Debug: dump bursts to disk */ /* bits 0-7 - chan 0 timeslots * bits 8-15 - chan 1 timeslots */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:59 +0000 Subject: Change in ...osmo-trx[master]: lms: Log available antennas if requested antenna fails In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15292 ) Change subject: lms: Log available antennas if requested antenna fails ...................................................................... lms: Log available antennas if requested antenna fails Related: OS#3343 Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index f55b555..b7cb31d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -431,6 +431,20 @@ return dB; } +void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os) +{ + lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */ + int num_names; + int i; + + num_names = LMS_GetAntennaList(m_lms_dev, dir_tx, chan, name_list); + for (i = 0; i < num_names; i++) { + if (i) + os << ", "; + os << "'" << name_list[i] << "'"; + } +} + int LMSDevice::get_ant_idx(const std::string & name, bool dir_tx, size_t chan) { lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */ @@ -484,7 +498,10 @@ idx = get_ant_idx(ant, LMS_CH_RX, chan); if (idx < 0) { - LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna"; + std::ostringstream os; + LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna: " << ant; + log_ant_list(LMS_CH_RX, chan, os); + LOGCHAN(chan, DDEV, NOTICE) << "Available Rx Antennas: " << os; return false; } @@ -530,7 +547,10 @@ idx = get_ant_idx(ant, LMS_CH_TX, chan); if (idx < 0) { - LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna"; + std::ostringstream os; + LOGCHAN(chan, DDEV, ERROR) << "Invalid Tx Antenna: " << ant; + log_ant_list(LMS_CH_TX, chan, os); + LOGCHAN(chan, DDEV, NOTICE) << "Available Tx Antennas: " << os; return false; } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 47bac94..ab45b08 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -63,6 +63,7 @@ bool do_calib(size_t chan); bool do_filters(size_t chan); + void log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os); int get_ant_idx(const std::string & name, bool dir_tx, size_t chan); bool flush_recv(size_t num_pkts); void update_stream_stats_rx(size_t chan, bool *overrun); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9 Gerrit-Change-Number: 15292 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:10:59 +0000 Subject: Change in ...osmo-trx[master]: device: Use LOGCHAN in set_antennas() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15293 ) Change subject: device: Use LOGCHAN in set_antennas() ...................................................................... device: Use LOGCHAN in set_antennas() Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a --- M Transceiver52M/device/common/radioDevice.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index e637611..b4928f2 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -187,9 +187,9 @@ for (i = 0; i < tx_paths.size(); i++) { if (tx_paths[i] == "") continue; - LOG(DEBUG) << "Configuring channel " << i << " with antenna " << tx_paths[i]; + LOGCHAN(i, DDEV, DEBUG) << "Configuring Tx antenna " << tx_paths[i]; if (!setTxAntenna(tx_paths[i], i)) { - LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << tx_paths[i]; + LOGCHAN(i, DDEV, ALERT) << "Failed configuring Tx antenna " << tx_paths[i]; return false; } } @@ -197,9 +197,9 @@ for (i = 0; i < rx_paths.size(); i++) { if (rx_paths[i] == "") continue; - LOG(DEBUG) << "Configuring channel " << i << " with antenna " << rx_paths[i]; + LOGCHAN(i, DDEV, DEBUG) << "Configuring Rx antenna " << rx_paths[i]; if (!setRxAntenna(rx_paths[i], i)) { - LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << rx_paths[i]; + LOGCHAN(i, DDEV, ALERT) << "Failed configuring Rx antenna " << rx_paths[i]; return false; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3099498e3a3f26b53d55a96a36cc056f7b25b27a Gerrit-Change-Number: 15293 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:11:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:11:08 +0000 Subject: Change in ...osmo-msc[master]: smpp_openbsc.c: check acl before deref it In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15285 ) Change subject: smpp_openbsc.c: check acl before deref it ...................................................................... smpp_openbsc.c: check acl before deref it All other calls check acl before deref because in a setup with no access policy, there won't be any acl structure Change-Id: Ibe0256535b40351594d79baa05a0147a9f89dc26 --- M src/libmsc/smpp_openbsc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index bbfc500..e4c3891 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -326,7 +326,7 @@ "ESME is not (yet) bound, skipping alert\n"); continue; } - if (!esme->acl->alert_notifications) { + if (esme->acl && !esme->acl->alert_notifications) { LOGP(DSMPP, LOGL_DEBUG, "[%s] is not set to receive Alert Notifications\n", esme->system_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibe0256535b40351594d79baa05a0147a9f89dc26 Gerrit-Change-Number: 15285 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:11:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:11:19 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 ) Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 12:11:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:11:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:11:24 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Remove packets in tx queue belonging pdp being freed In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 ) Change subject: libgtp: Remove packets in tx queue belonging pdp being freed ...................................................................... libgtp: Remove packets in tx queue belonging pdp being freed Doing so should avoid the crash seen in OS#3956, where a message is received in osmo-sgsn gtp iface after having received a DeleteCtxAccept message where pdp and associated cbp is freed. As a result, when new confirmation arrives, it can still be matched against an old request and be sent to upper layers providing an already freed cbp. With this patch, since all queued messages belonging to that pdp are dropped, confirmation won't find a match and be discarded in libgtp. In order to be able to drop all req messages belonging to a pdp, a new list is added to pdp_t and qmsg_t are added to that list when inserted into the per-gsn req transmit queue. This way upon pdp free time it's simply a matter of iterating over that list to remove all messages. There's no need to do same for resp queue, and it'd be actually counter-productive, because it wouldn't be possible to detect and discard duplicates anymore after pdp ctx has been freed. Related: OS#3956 Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a --- M TODO-RELEASE M gtp/gtp.c M gtp/pdp.c M gtp/pdp.h M gtp/queue.c M gtp/queue.h 6 files changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..73e3189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libgtp queue.h struct qmsg_t got a new field: entry +libgtp pdp.h struct pdp_t got a new field: qmsg_list_req diff --git a/gtp/gtp.c b/gtp/gtp.c index 94c3245..799f8a7 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -513,6 +513,8 @@ qmsg->cbp = cbp; qmsg->type = ntoh8(packet->gtp0.h.type); qmsg->fd = fd; + if (pdp) /* echo requests are not pdp-bound */ + llist_add(&qmsg->entry, &pdp->qmsg_list_req); } gsn->seq_next++; /* Count up this time */ return 0; @@ -697,6 +699,9 @@ qmsg->cbp = NULL; qmsg->type = 0; qmsg->fd = fd; + /* No need to add to pdp list here, because even on pdp ctx free + we want to leave messages in queue_resp until timeout to + detect duplicates */ } return 0; } diff --git a/gtp/pdp.c b/gtp/pdp.c index d745916..eaef545 100644 --- a/gtp/pdp.c +++ b/gtp/pdp.c @@ -31,6 +31,7 @@ #include "pdp.h" #include "gtp.h" #include "lookupa.h" +#include "queue.h" /* *********************************************************** * Functions related to PDP storage @@ -156,7 +157,7 @@ } /* Default: Generate G-PDU sequence numbers on Tx */ (*pdp)->tx_gpdu_seq = true; - + INIT_LLIST_HEAD(&(*pdp)->qmsg_list_req); return 0; } } @@ -165,7 +166,17 @@ int pdp_freepdp(struct pdp_t *pdp) { + struct qmsg_t *qmsg, *qmsg2; struct pdp_t *pdpa = pdp->gsn->pdpa; + int rc; + + /* Remove all enqueued messages belonging to this pdp from req tx transmit + queue. queue_freemsg will call llist_del(). */ + llist_for_each_entry_safe(qmsg, qmsg2, &pdp->qmsg_list_req, entry) { + if ((rc = queue_freemsg(pdp->gsn->queue_req, qmsg))) + LOGP(DLGTP, LOGL_ERROR, + "Failed freeing qmsg from qmsg_list_req during pdp_freepdp()! %d\n", rc); + } pdp_tiddel(pdp); diff --git a/gtp/pdp.h b/gtp/pdp.h index d64d394..fdfa824 100644 --- a/gtp/pdp.h +++ b/gtp/pdp.h @@ -17,6 +17,7 @@ #include #include +#include struct gsn_t; @@ -241,6 +242,8 @@ struct gsn_t *gsn; /* Back pointer to GSN where this pdp ctx belongs to */ bool tx_gpdu_seq; /* Transmit (true) or suppress G-PDU sequence numbers */ + + struct llist_head qmsg_list_req; /* list of req qmsg_t in retrans queue belonging this pdp ctx */ }; /* functions related to pdp_t management */ diff --git a/gtp/queue.c b/gtp/queue.c index ce4713e..4c25913 100644 --- a/gtp/queue.c +++ b/gtp/queue.c @@ -172,6 +172,7 @@ } else { *qmsg = &queue->qmsga[queue->next]; queue_seqset(queue, *qmsg, peer, seq); + INIT_LLIST_HEAD(&(*qmsg)->entry); (*qmsg)->state = 1; /* Space taken */ (*qmsg)->this = queue->next; (*qmsg)->next = -1; /* End of the queue */ @@ -206,6 +207,8 @@ return EOF; /* Not in queue */ } + llist_del(&qmsg->entry); + queue_seqdel(queue, qmsg); if (qmsg->next == -1) /* Are we the last in queue? */ diff --git a/gtp/queue.h b/gtp/queue.h index 76cb7be..9b0367b 100644 --- a/gtp/queue.h +++ b/gtp/queue.h @@ -17,6 +17,8 @@ #ifndef _QUEUE_H #define _QUEUE_H +#include + #include "gtp.h" #define QUEUE_DEBUG 0 /* Print debug information */ @@ -39,6 +41,7 @@ int this; /* Pointer to myself */ time_t timeout; /* When do we retransmit this packet? */ int retrans; /* How many times did we retransmit this? */ + struct llist_head entry; /* Listed with other qmsg_t belonging to a pdp_t->qmsg_list_req */ }; struct queue_t { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id86d0b241454d3ad49c64c28087fd2710fa2d17a Gerrit-Change-Number: 15228 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 12:11:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 27 Aug 2019 12:11:24 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 ) Change subject: libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected ...................................................................... libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected The libgtp application may have already allocated related resources associated to the pdp context, so we need to signal its deletion in order to let the application free the resources. This should fix the duplication of pdp contexts seen in osmo-ggsn when "show pdp-context" related VTY commands are used. It was spotted due to some MS requesting a v4v6 context on a v4-only APN, where first v4 address was allocated, and then upon v6 allocation create_context_ind() called gtp_create_context_resp(GTPCAUSE_MISSING_APN) but the first address was not freed. Upon receiving the callback, osmo-ggsn should now free the related resources. Related: OS#4154 Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 --- M ggsn/ggsn.c M gtp/gtp.c 2 files changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 95371a2..d71855d 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -386,7 +386,7 @@ LOGPPDP(LOGL_ERROR, pdp, "Cannot find/free IP Pool member\n"); } - if (apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { + if (apn && apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { if (gtp_kernel_tunnel_del(pdp, apn->tun.cfg.dev_name)) { LOGPPDP(LOGL_ERROR, pdp, "Cannot delete tunnel from kernel:%s\n", strerror(errno)); diff --git a/gtp/gtp.c b/gtp/gtp.c index 799f8a7..f0318f7 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1301,9 +1301,8 @@ /* Now send off a reply to the peer */ gtp_create_pdp_resp(gsn, pdp->version, pdp, cause); - if (cause != GTPCAUSE_ACC_REQ) { - pdp_freepdp(pdp); - } + if (cause != GTPCAUSE_ACC_REQ) + gtp_freepdp(gsn, pdp); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226 Gerrit-Change-Number: 15259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 13:05:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 13:05:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 ) Change subject: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 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: Ie1cc9fdf91b18b0b7fb3d5fb33b6dcf6f46a393f Gerrit-Change-Number: 15225 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 13:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 13:05:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 13:05:36 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp_act_restart_ctr_echo In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15282 ) Change subject: ggsn: Introduce test TC_pdp_act_restart_ctr_echo ...................................................................... ggsn: Introduce test TC_pdp_act_restart_ctr_echo VTY functionalities to enable and disable echo requests in osmo-ggsn are added too as part of the test. Depends: osmo-ggsn.git Id2c84165dc59dff495106758146a701ca488834f Related: OS#4165 Change-Id: Ia37e48e7ff9ad063f9eabf447f8a6a0a3fc380d9 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml 2 files changed, 86 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index ae92626..e294fb7 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -64,6 +64,13 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ + + /* + * Whether ggsn supports "(no) echo-interval" VTY command + * (osmo-ggsn.git Id2c84165dc59dff495106758146a701ca488834f). + * This option can be dropped after osmo-ggsn release > 1.4.0 exists. + */ + boolean m_ggsn_supports_echo_interval := true; } type set PdpContext { @@ -107,6 +114,7 @@ port TELNETasp_PT GGSNVTY; var boolean use_gtpu_txseq := false; + var boolean g_use_echo := false; } private function f_init_vty() runs on GT_CT { @@ -159,6 +167,17 @@ return true; } + private function f_vty_enable_echo_interval(boolean enable) runs on GT_CT { + f_vty_enter_config(GGSNVTY); + f_vty_transceive(GGSNVTY, "ggsn ggsn0"); + if (enable) { + f_vty_transceive(GGSNVTY, "echo-interval 5"); + } else { + f_vty_transceive(GGSNVTY, "no echo-interval"); + } + f_vty_transceive(GGSNVTY, "end"); + } + function f_init() runs on GT_CT { if (g_initialized == true) { return; @@ -184,20 +203,22 @@ f_init_vty(); f_vty_set_gpdu_txseq(use_gtpu_txseq); + if (m_ggsn_supports_echo_interval) { + f_vty_enable_echo_interval(g_use_echo); + } } /* Altstep implementing responses to any incoming echo requests */ altstep pingpong() runs on GT_CT { var Gtp1cUnitdata ud; var Gtp1uUnitdata udu; - [] GTPC.receive(tr_GTPC_PING(?)) -> value ud { + [g_use_echo] GTPC.receive(tr_GTPC_PING(?)) -> value ud { var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); - GTPC.send(ts_GTPC_PONG(ud.peer, seq, '00'O)); + GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); repeat; }; - [] GTPU.receive(tr_GTPU_PING(?)) -> value udu { - var uint16_t seq := oct2int(udu.gtpu.opt_part.sequenceNumber); - GTPU.send(ts_GTPU_PONG(udu.peer, seq, '00'O)); + [not g_use_echo] GTPC.receive(tr_GTPC_PING(?)) { + setverdict(fail, "GTP Echo Req rceived but not enabled in VTY"); }; [] T_default.timeout { setverdict(fail); }; } @@ -307,6 +328,35 @@ T_default.stop; } + function f_pdp_ctx_exp_del_req(PdpContext ctx, template (omit) OCT1 expect_cause := omit, boolean expect_teardown := false) runs on GT_CT { + var Gtp1cUnitdata ud; + var default d; + + T_default.start; + d := activate(pingpong()); + alt { + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctx.teic)) -> value ud { + if (istemplatekind(expect_cause, "omit") and not ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.cause.causevalue)) { + setverdict(pass); + } else if (not istemplatekind(expect_cause, "omit") and + ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.cause.causevalue) and + ud.gtpc.gtpc_pdu.deletePDPContextRequest.cause.causevalue == valueof(expect_cause)) { + setverdict(pass); + } else { + setverdict(fail); + } + + if (expect_teardown == ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.tearDownIndicator)) { + setverdict(pass); + } else { + setverdict(fail); + } + } + } + deactivate(d); + T_default.stop; + } + function f_pdp_ctx_del(PdpContext ctx, template BIT1 teardown_ind, OCT1 expect_causevalue := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; var default d; @@ -1330,6 +1380,32 @@ f_pdp_ctx_del(ctx, '1'B, cause_nonexistent); } + /* Activate PDP context + trigger Recovery procedure through EchoResp */ + testcase TC_pdp_act_restart_ctr_echo() runs on GT_CT { + var Gtp1cUnitdata ud; + g_use_echo := true; + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctx); + + /* Wait to receive echo request and send initial Restart counter */ + GTPC.receive(tr_GTPC_PING(?)) -> value ud { + var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); + GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); + }; + + /* Wait to receive second echo request and send incremented Restart + counter. This will fake a restarted SGSN, and pdp ctx allocated + should be released by GGSN */ + g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + GTPC.receive(tr_GTPC_PING(?)) -> value ud { + var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); + GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); + }; + f_pdp_ctx_exp_del_req(ctx, omit, true); + setverdict(pass); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -1358,5 +1434,9 @@ execute(TC_echo_req_resp()); execute(TC_act_deact_retrans_duplicate()); + + if (m_ggsn_supports_echo_interval) { + execute(TC_pdp_act_restart_ctr_echo()); + } } } diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index 374cde0..c31c14a 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -24,4 +24,5 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15282 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: Ia37e48e7ff9ad063f9eabf447f8a6a0a3fc380d9 Gerrit-Change-Number: 15282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 13:05:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 13:05:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 ) Change subject: sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn ...................................................................... sgsn: Add test to verify duplicate DeactPDPCtx crashing osmo-sgsn osmo-sgsn sends 2 DeletePdpCtxReq on gtp, Confirmation received on first one frees cbp associatd to pdp and the second one accesses the already freed cbp. Related: OS#3956 Change-Id: Ie1cc9fdf91b18b0b7fb3d5fb33b6dcf6f46a393f --- M sgsn/SGSN_Tests.ttcn M sgsn/expected-results.xml 2 files changed, 52 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index a7cc57f..b146046 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1470,6 +1470,56 @@ vc_conn.done; } +/* Test MS sending a duplicate Deact PDP Ctx (OS#3956). */ +private function f_TC_attach_pdp_act_deact_dup(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var Gtp1cUnitdata g_ud; + var integer i; + var OCT1 cause_regular_deact := '24'O; + + /* first perform regular attach + PDP context act */ + f_TC_attach(id); + f_pdp_ctx_act(apars); + + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause_regular_deact, false, omit), 0); + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause_regular_deact, false, omit), 0); + + for (i := 0; i < 2; i := i+1) { + GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + log("Received deletePDPContextResponse " & int2str(i) & ", seq_nr=" & int2str(seq_nr)); + GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + } + } + + alt { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { + setverdict(pass); + } + [] as_xid(apars, 0); + } + + /* Make sure second DeactPdpAccept is sent: */ + timer T := 2.0; + T.start; + alt { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { + setverdict(fail, "Second SM_DEACT_PDP_ACCEPT_MT received"); + } + [] T.timeout { + setverdict(pass); + } + } + + setverdict(pass); +} +testcase TC_attach_pdp_act_deact_dup() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_dup), testcasename(), g_gb, 46); + vc_conn.done; +} + /* ATTACH + ATTACH (2nd) */ private function f_TC_attach_forget_tlli_attach(charstring id) runs on BSSGP_ConnHdlr { g_pars.t_guard := 5.0; @@ -2545,6 +2595,7 @@ execute( TC_attach_pdp_act_ggsn_reject() ); execute( TC_attach_pdp_act_user_deact_mo() ); execute( TC_attach_pdp_act_user_deact_mt() ); + execute( TC_attach_pdp_act_deact_dup() ); execute( TC_attach_second_attempt() ); execute( TC_attach_restart_ctr_echo() ); execute( TC_attach_restart_ctr_create() ); diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 0b477d1..d9c3706 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -47,6 +47,7 @@ + Tguard timeout SGSN_Tests.ttcn:MASKED SGSN_Tests control part -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15225 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: Ie1cc9fdf91b18b0b7fb3d5fb33b6dcf6f46a393f Gerrit-Change-Number: 15225 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 13:05:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 13:05:37 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp_act2_recovery In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283 ) Change subject: ggsn: Introduce test TC_pdp_act2_recovery ...................................................................... ggsn: Introduce test TC_pdp_act2_recovery Some code is moved out of f_pdp_ctx_act() into f_handle_create_req() in order to re-use it in the test. Related: OS#4165 Change-Id: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml 2 files changed, 111 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index e294fb7..4a53fa1 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -267,6 +267,51 @@ } } + function f_handle_create_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { + var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; + if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { + /* Check if EUA type corresponds to requested type */ + if (match(ctx.eua, t_EuaIPv4(?)) and + not match(cpr.endUserAddress, tr_EuaIPv4(?))){ + setverdict(fail); + } + if (match(ctx.eua, t_EuaIPv6(?)) and + not match(cpr.endUserAddress, tr_EuaIPv6(?))) { + setverdict(fail); + } + if (match(ctx.eua, t_EuaIPv4v6(?, ?)) and + not match(cpr.endUserAddress, tr_EuaIPv4v6(?, ?))) { + setverdict(fail); + } + /* Check if PCO response corresponds to request */ + if (ispresent(ctx.pco_req)) { + if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and + not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) { + log("IPv4 DNS Container requested, but missing"); + setverdict(fail); + } + if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and + not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) { + log("IPv6 DNS Container requested, but missing"); + setverdict(fail); + } + } + ctx.teid_remote := cpr.teidDataI.teidDataI; + ctx.teic_remote := cpr.teidControlPlane.teidControlPlane; + ctx.eua := cpr.endUserAddress; + ctx.pco_neg := cpr.protConfigOptions; + setverdict(pass); + } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { + if (ispresent(cpr.endUserAddress)) { + log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); + setverdict(fail); + } + setverdict(pass); + } else { + setverdict(fail); + } + } + /* send a PDP context activation */ function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; @@ -280,48 +325,7 @@ d := activate(pingpong()); alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { - var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; - if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { - /* Check if EUA type corresponds to requested type */ - if (match(ctx.eua, t_EuaIPv4(?)) and - not match(cpr.endUserAddress, tr_EuaIPv4(?))){ - setverdict(fail); - } - if (match(ctx.eua, t_EuaIPv6(?)) and - not match(cpr.endUserAddress, tr_EuaIPv6(?))) { - setverdict(fail); - } - if (match(ctx.eua, t_EuaIPv4v6(?, ?)) and - not match(cpr.endUserAddress, tr_EuaIPv4v6(?, ?))) { - setverdict(fail); - } - /* Check if PCO response corresponds to request */ - if (ispresent(ctx.pco_req)) { - if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and - not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) { - log("IPv4 DNS Container requested, but missing"); - setverdict(fail); - } - if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and - not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) { - log("IPv6 DNS Container requested, but missing"); - setverdict(fail); - } - } - ctx.teid_remote := cpr.teidDataI.teidDataI; - ctx.teic_remote := cpr.teidControlPlane.teidControlPlane; - ctx.eua := cpr.endUserAddress; - ctx.pco_neg := cpr.protConfigOptions; - setverdict(pass); - } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { - if (ispresent(cpr.endUserAddress)) { - log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); - setverdict(fail); - } - setverdict(pass); - } else { - setverdict(fail); - } + f_handle_create_req(ctx, ud, exp_cause); } } deactivate(d); @@ -1359,6 +1363,69 @@ f_pdp_ctx_del(ctx4, '1'B); } + /* Validate if 2nd CtxCreateReq with increased Recovery IE causes ggsn to drop 1st one (while keeping 2nd one). */ + testcase TC_pdp_act2_recovery() runs on GT_CT { + var Gtp1cUnitdata ud; + var default d; + var boolean ctxA_deleted := false; + var boolean ctxB_created := false; + + f_init(); + var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctxA); + + g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + + log("sending 2nd CreatePDP (recovery increased)"); + f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctxB.imsi, g_restart_ctr, + ctxB.teid, ctxB.teic, ctxB.nsapi, ctxB.eua, ctxB.apn, + g_sgsn_ip_c, g_sgsn_ip_u, ctxB.msisdn, ctxB.pco_req)); + T_default.start; + d := activate(pingpong()); + alt { + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctxB.teic)) -> value ud { + f_handle_create_req(ctxB, ud); + if (not ctxB_created) { + ctxB_created := true; + setverdict(pass); + } else { + setverdict(fail, "Repeated createPDPContextResponse(ctxB)"); + } + + if (not ctxA_deleted) { + repeat; + } + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctxA.teic)) -> value ud { + if (ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.tearDownIndicator)) { + setverdict(pass); + } else { + setverdict(fail); + } + + if (not ctxA_deleted) { + ctxA_deleted := true; + setverdict(pass); + } else { + setverdict(fail, "Repeated deletePDPContextRequest(ctxA)"); + } + + if (not ctxB_created) { + repeat; + } + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctxB.teic)) -> value ud { + setverdict(fail, "GGSN dropping still valid pdp ctx"); + } + } + deactivate(d); + T_default.stop; + + f_pdp_ctx_del(ctxB, '1'B); + } + + /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent responses (60 seconds): If same delete req is sent and duplicate is detected, saved duplicate response should be sent back. */ @@ -1433,6 +1500,7 @@ execute(TC_pdp46_act_deact_apn4()); execute(TC_echo_req_resp()); + execute(TC_pdp_act2_recovery()); execute(TC_act_deact_retrans_duplicate()); if (m_ggsn_supports_echo_interval) { diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index c31c14a..baa5b1f 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -23,6 +23,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283 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: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7 Gerrit-Change-Number: 15283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 13:48:21 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 13:48:21 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: Oh no! This one should have been marked as WIP! I guess EDGE is now broken on dynamic time-slots. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 27 Aug 2019 13:48:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 13:51:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 13:51:11 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: > Patch Set 1: > > Oh no! This one should have been marked as WIP! > I guess EDGE is now broken on dynamic time-slots. It was then broken before too (broken in osmo-bts). I already opened a ticket to check and fix it in osmo-bts if needed: https://osmocom.org/issues/4175 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 27 Aug 2019 13:51:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 14:08:11 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 14:08:11 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: > It was then broken before too [...] Why do you think so? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 27 Aug 2019 14:08:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 15:40:57 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 27 Aug 2019 15:40:57 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: fix: vty crash by logging to killed telnet session ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 11 PS1, Line 11: segfaults: the vty->obuf is already NULL. > Why do we try to send a message to a killed session first of all? That seems to be the route of the [?] I want to make sure that we cannot ever crash by writing to a NULL ofd. Whatever the reasons for the NULL ofd, and whatever the reasons for wanting to log to it. Fixing the higher level fail would be: close down the logging target before taking down the ofd. I care about that only secondarily. This is only one cause for logging to NULL that we found now. Fair enough, if we ensure closed telnets always close down log targets safely the issue would not exist, but I am not willing to verify that now. That is why I want these NULL checks at the buffer API level. It makes all other calling code bugs non-fatal in a trivial way, without the need to fully audit the ancient vty code. Can we please get over this and not make a huge thing of it? https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 16 PS1, Line 16: Also guard all buffer_*() functions against a NULL buffer argument, which > this looks like a hack to fix other parts of the code which may be wrong, and looks like it should b [?] If the calling code paths are not trivially clear, it is good practise to guard against NULL pointers. Rather drop a log line than crashing the entire program. https://gerrit.osmocom.org/#/c/15265/1//COMMIT_MSG at 20 PS1, Line 20: Related: OS#4164 > This ticket doesn't look related to me. this one is correct, the one in the comment has a typo https://gerrit.osmocom.org/#/c/15265/1/src/vty/vty.c File src/vty/vty.c: https://gerrit.osmocom.org/#/c/15265/1/src/vty/vty.c at 266 PS1, Line 266: * of this same (killed) telnet session. See OS#4146. */ > OS#4146 (https://osmocom. [?] aha, the commit log has the correct one: #4164. Here there is a number swap. thx -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 15:40:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 15:49:40 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 27 Aug 2019 15:49:40 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15265 to look at the new patch set (#2). Change subject: fix: vty crash by logging to killed telnet session ...................................................................... fix: vty crash by logging to killed telnet session When a telnet session dies (e.g. killall telnet) and also has logging enabled, the closing of the telnet session logs to the killed telnet session and segfaults: the vty->obuf is already NULL. In vty_out(), guard against this situation by not composing an output if vty->obuf is NULL. Also guard all buffer_*() functions against a NULL buffer argument, which should catch all other hypothetical code paths trying to add to a closed vty->obuf. Related: OS#4164 Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 --- M src/vty/buffer.c M src/vty/vty.c 2 files changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/15265/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 16:09:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 16:09:44 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Enable EDGE detection only on PDCH timeslots In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15291 ) Change subject: Transceiver: Enable EDGE detection only on PDCH timeslots ...................................................................... Patch Set 1: > Patch Set 1: > > > It was then broken before too [...] > > Why do you think so? Well, if SETSLOT is allegedly not send on dynamic PDCH timestlos, then it was broken too in osmo-bts regardless of this patch (or maybe it worked due to this bug in osmo-trx making it work), but in any case it's an issue of osmo-bts. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id16248a1c03f9bc9f323c707857cdf3bf34c4e3e Gerrit-Change-Number: 15291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 27 Aug 2019 16:09:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 16:24:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 16:24:52 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: fix: vty crash by logging to killed telnet session ...................................................................... Patch Set 2: I'm sorry but I don't agree here. I don't think adding lots of checks against null pointers all around the code to make sure we don't crash on situation that shouldn't happen is good practice. It makes code harder to follow and make people infer bad assumptions, and masks bugs. I'm not making a huge thing of it, that's why I think these checks shouldn't be there. If someone else agrees to merge this one go on, but I don't like it. I expect the correct fix for this issue (that is, as you said, removing the conn from the target list before printing in telnet_close_client()). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 16:24:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 17:31:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 17:31:23 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... sgsn: Proper shutdown of RAN_Adapter components Otherwise TTCN3 errors sproadically during shutdown: """" SCCP_Emulation.ttcn:5661 Receive operation on port SCCP_SP_PORT succeeded, message from SGSN_Test_0-RAN(414) ... SCCP_Emulation.ttcn:5293 Sent on MTP3_SCCP_PORT to SGSN_Test_0-M3UA(415) @SCCP_Types.ASP_MTP3_TRANSFERreq_sccp SCCP_Emulation.ttcn:5293 Outgoing message was mapped to @MTP3asp_Types.ASP_MTP3_TRANSFERreq SCCP_Emulation.ttcn:5293 Dynamic test case error: Sending data on the connection of port MTP3_SCCP_PORT to 415:MTP3_SP_PORT failed. (Broken pipe) SCCP_Emulation.ttcn:5293 setverdict(error): none -> error """ Similar shutdown is already done in f_cleanup() of SCCP_Tests.ttcn. Related: OS#4176 Change-Id: I471eb851e5d41de5d8d974ec81be27024d7d313a --- M library/RAN_Adapter.ttcnpp M sgsn/SGSN_Tests.ttcn 2 files changed, 89 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/15295/1 diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index e995e8d..9ed1be1 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -47,9 +47,11 @@ MSC_SCCP_MTP3_parameters sccp_pars, SCCP_PAR_Address sccp_addr_own, SCCP_PAR_Address sccp_addr_peer, + RAN_Transport transport, /* handler mode */ - RAN_Emulation_CT vc_RAN + RAN_Emulation_CT vc_RAN, + boolean vc_RAN_started } type record RAN_Configuration { @@ -79,6 +81,7 @@ }; ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, cfg.sio, cfg.sccp_service_type)); ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, cfg.peer_ssn, cfg.sio, cfg.sccp_service_type)); + ba.transport := cfg.transport; } @@ -177,6 +180,9 @@ } log("Starting RAN_Emulation"); ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), "")); + ba.vc_RAN_started := true; + } else { + ba.vc_RAN_started := false; } @@ -186,5 +192,27 @@ ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); } +function f_ran_adapter_cleanup(inout RAN_Adapter ba) { + if (ba.vc_RAN_started) { + if (ba.transport == RANAP_TRANSPORT_IuCS) { +#ifdef RAN_EMULATION_RANAP + disconnect(ba.vc_RAN:RANAP, ba.vc_SCCP:SCCP_SP_PORT); +#endif + } else { +#ifdef RAN_EMULATION_BSSAP + disconnect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); +#endif + } + ba.vc_RAN.stop; + } + if (ba.transport == BSSAP_TRANSPORT_AoIP or + ba.transport == RANAP_TRANSPORT_IuCS) { + unmap(ba.vc_M3UA:SCTP_PORT, system:sctp); + disconnect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + ba.vc_M3UA.stop; + } + ba.vc_SCCP.stop; +} + } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index a7cc57f..a7b3490 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -328,6 +328,14 @@ f_vty_enable_echo_interval(g_use_echo); } +function f_cleanup() runs on test_CT { + var integer i; + for (i := 0; i < NUM_RNC; i := i+1) { + f_ran_adapter_cleanup(g_ranap[i]); + } + self.stop; +} + private function RncUnitdataCallback(RANAP_PDU ranap) runs on RAN_Emulation_CT return template RANAP_PDU { var template RANAP_PDU resp := omit; @@ -454,6 +462,7 @@ testcase TC_wait_ns_up() runs on test_CT { f_init(); f_sleep(20.0); + f_cleanup(); } function f_send_llc(template (value) PDU_LLC llc_pdu, integer gb_index := 0) runs on BSSGP_ConnHdlr { @@ -684,6 +693,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 1); vc_conn.done; + f_cleanup(); } testcase TC_attach_mnc3() runs on test_CT { @@ -692,6 +702,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 1001); vc_conn.done; + f_cleanup(); } private function f_TC_attach_umts_aka_umts_res(charstring id) runs on BSSGP_ConnHdlr { @@ -704,6 +715,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb, 1002); vc_conn.done; + f_cleanup(); } private function f_TC_attach_umts_aka_gsm_sres(charstring id) runs on BSSGP_ConnHdlr { @@ -716,6 +728,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb, 1003); vc_conn.done; + f_cleanup(); } /* MS never responds to ID REQ, expect ATTACH REJECT */ @@ -742,6 +755,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_auth_id_timeout), testcasename(), g_gb, 2, 40.0); vc_conn.done; + f_cleanup(); } /* HLR never responds to SAI REQ, expect ATTACH REJECT */ @@ -762,6 +776,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_timeout), testcasename(), g_gb, 3); vc_conn.done; + f_cleanup(); } /* HLR rejects SAI, expect ATTACH REJECT */ @@ -783,6 +798,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_reject), testcasename(), g_gb, 4); vc_conn.done; + f_cleanup(); } /* HLR never responds to UL REQ, expect ATTACH REJECT */ @@ -812,6 +828,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_timeout), testcasename(), g_gb, 5); vc_conn.done; + f_cleanup(); } /* HLR rejects UL REQ, expect ATTACH REJECT */ @@ -842,6 +859,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_reject), testcasename(), g_gb, 6); vc_conn.done; + f_cleanup(); } @@ -867,6 +885,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_combined), testcasename(), g_gb, 7); vc_conn.done; + f_cleanup(); } /* Attempt of GPRS ATTACH in 'accept all' mode */ @@ -891,6 +910,7 @@ f_vty_config(SGSNVTY, "sgsn", "auth-policy accept-all"); vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb, 8); vc_conn.done; + f_cleanup(); } /* Attempt of GPRS ATTACH in 'accept all' mode */ @@ -929,6 +949,7 @@ /* test with home IMSI: Must Accept */ vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb, 10); vc_conn.done; + f_cleanup(); } /* Routing Area Update from Unknown TLLI -> REJECT */ @@ -950,6 +971,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_rau_unknown), testcasename(), g_gb, 11); vc_conn.done; + f_cleanup(); } private function f_TC_attach_rau(charstring id) runs on BSSGP_ConnHdlr { @@ -965,6 +987,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_rau), testcasename(), g_gb, 12); vc_conn.done; + f_cleanup(); } /* general GPRS DETACH helper */ @@ -1018,6 +1041,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_detach_unknown_nopoweroff), testcasename(), g_gb, 13); vc_conn.done; + f_cleanup(); } /* IMSI DETACH (power-off) for unknown TLLI */ @@ -1030,6 +1054,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_detach_unknown_poweroff), testcasename(), g_gb, 14); vc_conn.done; + f_cleanup(); } /* IMSI DETACH (non-power-off) for known TLLI */ @@ -1045,6 +1070,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_detach_nopoweroff), testcasename(), g_gb, 15); vc_conn.done; + f_cleanup(); } /* IMSI DETACH (power-off) for known TLLI */ @@ -1060,6 +1086,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_detach_poweroff), testcasename(), g_gb, 16); vc_conn.done; + f_cleanup(); } type record PdpActPars { @@ -1360,6 +1387,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act), testcasename(), g_gb, 17); vc_conn.done; + f_cleanup(); } /* PDP Context activation for not-attached subscriber; expect fail */ @@ -1388,6 +1416,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_pdp_act_unattached), testcasename(), g_gb, 18); vc_conn.done; + f_cleanup(); } /* ATTACH + PDP CTX ACT + user plane traffic */ @@ -1407,6 +1436,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user), testcasename(), g_gb, 19); vc_conn.done; + f_cleanup(); } /* ATTACH + PDP CTX ACT; reject from GGSN */ @@ -1426,6 +1456,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_ggsn_reject), testcasename(), g_gb, 20); vc_conn.done; + f_cleanup(); } /* ATTACH + PDP CTX ACT + user plane traffic + PDP CTX DEACT in MO direction */ @@ -1447,6 +1478,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mo), testcasename(), g_gb, 21); vc_conn.done; + f_cleanup(); } /* ATTACH + PDP CTX ACT + user plane traffic + PDP CTX DEACT in MT direction */ @@ -1468,6 +1500,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mt), testcasename(), g_gb, 22); vc_conn.done; + f_cleanup(); } /* ATTACH + ATTACH (2nd) */ @@ -1487,6 +1520,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb, 22); vc_conn.done; + f_cleanup(); } private function f_TC_attach_restart_ctr_echo(charstring id) runs on BSSGP_ConnHdlr { @@ -1528,6 +1562,7 @@ vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_echo), testcasename(), g_gb, 23, 30.0); vc_conn.done; g_use_echo := false + f_cleanup(); } private function f_TC_attach_restart_ctr_create(charstring id) runs on BSSGP_ConnHdlr { @@ -1567,6 +1602,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_create), testcasename(), g_gb, 24, 30.0); vc_conn.done; + f_cleanup(); } /* ATTACH + PDP CTX ACT + user plane traffic + PDP CTX DEACT in MT direction + trigger T3395 */ @@ -1603,6 +1639,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_mt_t3395_expire), testcasename(), g_gb, 25, 60.0); vc_conn.done; + f_cleanup(); } /* ATTACH + PDP CTX ACT dropped + retrans */ @@ -1661,6 +1698,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_gtp_retrans), testcasename(), g_gb, 27); vc_conn.done; + f_cleanup(); } /* Test that SGSN GTP response retransmit queue works fine */ @@ -1720,6 +1758,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_gtp_retrans_resp), testcasename(), g_gb, 28); vc_conn.done; + f_cleanup(); } private function f_TC_hlr_location_cancel_request_update(charstring id) runs on BSSGP_ConnHdlr { @@ -1768,6 +1807,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_error_ind_ggsn), testcasename(), g_gb, 26); vc_conn.done; + f_cleanup(); } testcase TC_hlr_location_cancel_request_update() runs on test_CT { @@ -1780,6 +1820,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb, 31); vc_conn.done; + f_cleanup(); } @@ -1811,6 +1852,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb, 29); vc_conn.done; + f_cleanup(); } @@ -1841,6 +1883,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb, 30); vc_conn.done; + f_cleanup(); } private function f_TC_hlr_location_cancel_request_unknown_subscriber_update(charstring id) runs on BSSGP_ConnHdlr { @@ -1857,6 +1900,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb, 30); vc_conn.done; + f_cleanup(); } private function f_TC_attach_detach_check_subscriber_list(charstring id) runs on BSSGP_ConnHdlr { @@ -1878,6 +1922,7 @@ vc_conn.done; f_vty_transceive_not_match(SGSNVTY, "show subscriber cache", pattern "* IMSI: {imsi}*"); + f_cleanup(); } /* Attempt an attach, but loose the Identification Request (IMEI) */ @@ -1923,6 +1968,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_no_imei_response), testcasename(), g_gb, 32, 60.0); vc_conn.done; + f_cleanup(); } /* Attempt an attach, but loose the Identification Request (IMSI) */ @@ -1971,6 +2017,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_no_imsi_response), testcasename(), g_gb, 35, 60.0); vc_conn.done; + f_cleanup(); } private function f_sgsn_vty_destroy_subscriber_imsi(TELNETasp_PT pt, charstring imsi) { @@ -1992,6 +2039,7 @@ f_vty_transceive_match(SGSNVTY, "show subscriber cache", pattern "* IMSI: {imsi}*"); f_sgsn_vty_destroy_subscriber_imsi(SGSNVTY, imsi); + f_cleanup(); } private function f_TC_attach_closed_imsi_added(charstring id) runs on BSSGP_ConnHdlr { @@ -2054,6 +2102,7 @@ /* test with foreign IMSI: Must Reject */ vc_conn := f_start_handler(refers(f_TC_attach_closed_add_vty), testcasename(), g_gb, 9); vc_conn.done; + f_cleanup(); } /* Attempt an attach, but never answer a Attach Complete */ @@ -2094,6 +2143,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_check_complete_resend), testcasename(), g_gb, 36, 60.0); vc_conn.done; + f_cleanup(); } private function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr { @@ -2141,6 +2191,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_rau_a_a), testcasename(), g_gb, 37); vc_conn.done; + f_cleanup(); } private function f_TC_attach_rau_a_b(charstring id) runs on BSSGP_ConnHdlr { @@ -2172,6 +2223,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_rau_a_b), testcasename(), g_gb, 38); vc_conn.done; + f_cleanup(); } private function f_TC_attach_gmm_attach_req_while_gmm_attach(charstring id) runs on BSSGP_ConnHdlr { @@ -2244,6 +2296,7 @@ f_vty_config(SGSNVTY, "sgsn", "auth-policy accept-all"); vc_conn := f_start_handler(refers(f_TC_attach_gmm_attach_req_while_gmm_attach), testcasename(), g_gb, 39); vc_conn.done; + f_cleanup(); } private function f_TC_attach_usim_resync(charstring id) runs on BSSGP_ConnHdlr { @@ -2372,6 +2425,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach_usim_resync), testcasename(), g_gb, 40); vc_conn.done; + f_cleanup(); } @@ -2389,6 +2443,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_llc_null), testcasename(), g_gb, 41); vc_conn.done; + f_cleanup(); } /* Send LLC SABM to see if the SGSN rejects it properly with DM */ @@ -2405,6 +2460,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_llc_sabm_dm_llgmm), testcasename(), g_gb, 42); vc_conn.done; + f_cleanup(); } /* Send LLC SABM to see if the SGSN rejects it properly with DM */ @@ -2421,6 +2477,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_llc_sabm_dm_ll5), testcasename(), g_gb, 43); vc_conn.done; + f_cleanup(); } /* test XID handshake with empty L3 info: expect empty return (some phones require that, OS#3426 */ @@ -2450,6 +2507,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_xid_empty_l3), testcasename(), g_gb, 44); vc_conn.done; + f_cleanup(); } private function f_TC_xid_n201u(charstring id) runs on BSSGP_ConnHdlr { @@ -2478,6 +2536,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_xid_n201u), testcasename(), g_gb, 45); vc_conn.done; + f_cleanup(); } private function f_TC_attach_pdp_act_gmm_detach(charstring id) runs on BSSGP_ConnHdlr { @@ -2504,6 +2563,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_gmm_detach), testcasename(), g_gb, 26); vc_conn.done; + f_cleanup(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 17:40:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 27 Aug 2019 17:40:32 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 to look at the new patch set (#2). Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... sgsn: Proper shutdown of RAN_Adapter components Otherwise TTCN3 errors sproadically during shutdown: """" SCCP_Emulation.ttcn:5661 Receive operation on port SCCP_SP_PORT succeeded, message from SGSN_Test_0-RAN(414) ... SCCP_Emulation.ttcn:5293 Sent on MTP3_SCCP_PORT to SGSN_Test_0-M3UA(415) @SCCP_Types.ASP_MTP3_TRANSFERreq_sccp SCCP_Emulation.ttcn:5293 Outgoing message was mapped to @MTP3asp_Types.ASP_MTP3_TRANSFERreq SCCP_Emulation.ttcn:5293 Dynamic test case error: Sending data on the connection of port MTP3_SCCP_PORT to 415:MTP3_SP_PORT failed. (Broken pipe) SCCP_Emulation.ttcn:5293 setverdict(error): none -> error """ Similar shutdown is already done in f_cleanup() of SCCP_Tests.ttcn. Related: OS#4176 Change-Id: I471eb851e5d41de5d8d974ec81be27024d7d313a --- M library/RAN_Adapter.ttcnpp M sgsn/SGSN_Tests.ttcn 2 files changed, 90 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/15295/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:05:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 21:05:40 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: print exact message parsing error Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15297 Change subject: trx_toolkit/trx_sniff.py: print exact message parsing error ...................................................................... trx_toolkit/trx_sniff.py: print exact message parsing error For sure, the following message is much more informative: Ignoring an incorrect message: Unhandled version 12 than: Failed to parse message, dropping... NOTE: since the way of printing exceptions is different in both Python versions, I had to drop Python 2 support. Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062 --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/97/15297/1 diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 0323e85..72976f7 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -1,10 +1,10 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit # Scapy-based TRX interface sniffer # -# (C) 2018 by Vadim Yanitskiy +# (C) 2018-2019 by Vadim Yanitskiy # # All Rights Reserved # @@ -22,7 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2018-2019", "Vadim Yanitskiy ")] import logging as log import argparse @@ -109,8 +109,8 @@ # Attempt to parse the payload as a DATA message try: msg.parse_msg(msg_raw) - except: - log.warning("Failed to parse message, dropping...") + except ValueError as e: + log.warning("Ignoring an incorrect message: %s" % e) self.cnt_burst_dropped_num += 1 return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062 Gerrit-Change-Number: 15297 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:05:39 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 21:05:39 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: raise exceptions from validate() methods Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15296 Change subject: trx_toolkit/data_msg.py: raise exceptions from validate() methods ...................................................................... trx_toolkit/data_msg.py: raise exceptions from validate() methods Raising exceptions is a Pythonic way to handle errors, which in this particular case will help us to know *why* exactly a given message is incorrect or incomplete. Change-Id: Ia961f83c717066af61699c80536468392b8ce064 --- M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/data_msg.py 3 files changed, 74 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/15296/1 diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index 97518bd..da42023 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -296,7 +296,7 @@ assert(messages_check[i].tn == messages_ref[i].tn) # Validate a message - assert(messages_check[i].validate()) + messages_check[i].validate() log.info("Check append_msg(): OK") @@ -318,7 +318,7 @@ assert(messages_check[i].tn == messages_ref[i].tn) # Validate a message - assert(messages_check[i].validate()) + messages_check[i].validate() log.info("Check append_all(): OK") @@ -340,8 +340,8 @@ assert(msg10.tn == messages_ref[10].tn) # Validate both messages - assert(msg0.validate()) - assert(msg10.validate()) + msg0.validate() + msg10.validate() log.info("Check parse_msg(): OK") @@ -362,6 +362,6 @@ assert(messages_check[i].tn == messages_ref[i + 10].tn) # Validate a message - assert(messages_check[i].validate()) + messages_check[i].validate() log.info("Check parse_all(): OK") diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index e43b388..418c3f8 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -107,8 +107,7 @@ def send_msg(self, msg, legacy = False): # Validate a message - if not msg.validate(): - raise ValueError("Message incomplete or incorrect") + msg.validate() # Generate TRX message payload = msg.gen_msg(legacy) diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index de5f908..a1046ec 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -227,30 +227,27 @@ return buf - # Validates the message fields + # Validates the message fields (throws ValueError) def validate(self): if not self.ver in self.known_versions: - return False + raise ValueError("Unknown TRXD header version") if self.fn is None: - return False + raise ValueError("TDMA frame-number is not set") if self.fn < 0 or self.fn > GSM_HYPERFRAME: - return False + raise ValueError("TDMA frame-number %d is out of range" % self.fn) if self.tn is None: - return False + raise ValueError("TDMA time-slot is not set") if self.tn < 0 or self.tn > 7: - return False - - return True + raise ValueError("TDMA time-slot %d is out of range" % self.tn) # Generates a TRX DATA message def gen_msg(self, legacy = False): # Validate all the fields - if not self.validate(): - raise ValueError("Message incomplete or incorrect") + self.validate() # Allocate an empty byte-array buf = bytearray() @@ -342,27 +339,24 @@ return length - # Validates the message fields + # Validates the message fields (throws ValueError) def validate(self): # Validate common fields - if not DATAMSG.validate(self): - return False + DATAMSG.validate(self) if self.pwr is None: - return False + raise ValueError("Tx Attenuation level is not set") if self.pwr < self.PWR_MIN or self.pwr > self.PWR_MAX: - return False + raise ValueError("Tx Attenuation %d is out of range" % self.pwr) # FIXME: properly handle IDLE / NOPE indications if self.burst is None: - return False + raise ValueError("Tx burst bits are not set") # FIXME: properly handle IDLE / NOPE indications if len(self.burst) not in (GSM_BURST_LEN, EDGE_BURST_LEN): - return False - - return True + raise ValueError("Tx burst has odd length %u" % len(self.burst)) # Generates a random power level def rand_pwr(self, min = None, max = None): @@ -582,85 +576,77 @@ def _validate_burst_v0(self): # Burst is mandatory if self.burst is None: - return False + raise ValueError("Rx burst bits are not set") # ... and can be either of GSM (GMSK) or EDGE (8-PSK) if len(self.burst) not in (GSM_BURST_LEN, EDGE_BURST_LEN): - return False - - return True + raise ValueError("Rx burst has odd length %u" % len(self.burst)) def _validate_burst_v1(self): # Burst is omitted in case of an IDLE / NOPE indication if self.nope_ind and self.burst is None: - return True - if self.nope_ind and self.burst is not None: - return False + return + if self.nope_ind and self.burst is not None: + raise ValueError("NOPE.ind comes with burst?!?") if self.burst is None: - return False + raise ValueError("Rx burst bits are not set") # Burst length depends on modulation type if len(self.burst) != self.mod_type.bl: - return False + raise ValueError("Rx burst has odd length %u" % len(self.burst)) - return True - - # Validates the burst + # Validates the burst (throws ValueError) def validate_burst(self): if self.ver == 0x00: - return self._validate_burst_v0() + self._validate_burst_v0() elif self.ver >= 0x01: - return self._validate_burst_v1() + self._validate_burst_v1() - # Validates the message header fields + # Validates the message header fields (throws ValueError) def validate(self): # Validate common fields - if not DATAMSG.validate(self): - return False + DATAMSG.validate(self) if self.rssi is None: - return False + raise ValueError("RSSI is not set") if self.rssi < self.RSSI_MIN or self.rssi > self.RSSI_MAX: - return False + raise ValueError("RSSI %d is out of range" % self.rssi) if self.toa256 is None: - return False + raise ValueError("ToA256 is not set") if self.toa256 < self.TOA256_MIN or self.toa256 > self.TOA256_MAX: - return False + raise ValueError("ToA256 %d is out of range" % self.toa256) if self.ver >= 0x01: if type(self.mod_type) is not Modulation: - return False + raise ValueError("Unknown Rx modulation type") if self.tsc_set is None: - return False + raise ValueError("TSC set is not set") if self.mod_type is Modulation.ModGMSK: if self.tsc_set not in range(0, 4): - return False + raise ValueError("TSC set %d is out of range" % self.tsc_set) else: if self.tsc_set not in range(0, 2): - return False + raise ValueError("TSC set %d is out of range" % self.tsc_set) if self.tsc is None: - return False + raise ValueError("TSC is not set") if self.tsc not in self.TSC_RANGE: - return False + raise ValueError("TSC %d is out of range" % self.tsc) if self.ci is None: - return False + raise ValueError("C/I is not set") if self.ci < self.CI_MIN or self.ci > self.CI_MAX: - return False + raise ValueError("C/I %d is out of range" % self.ci) - if not self.validate_burst(): - return False - - return True + self.validate_burst() # Generates a random RSSI value def rand_rssi(self, min = None, max = None): @@ -886,11 +872,39 @@ msg_l12trx_ref.rand_burst() msg_trx2l1_ref.rand_burst() - assert(msg_l12trx_ref.validate()) - assert(msg_trx2l1_ref.validate()) + msg_l12trx_ref.validate() + msg_trx2l1_ref.validate() log.info("Validate header randomization: OK") + # Test error handling for common fields + msg = DATAMSG() + + # Make sure that message validation throws a ValueError + def validate_throw(msg): + try: + msg.validate() + return False + except ValueError: + return True + + # Unknown version + msg.rand_hdr() + msg.ver = 100 + assert(validate_throw(msg)) + + # Uninitialized field + msg.rand_hdr() + msg.fn = None + assert(validate_throw(msg)) + + # Out-of-range value + msg.rand_hdr() + msg.tn = 10 + assert(validate_throw(msg)) + + log.info("Check incorrect message validation: OK") + log.info("Encoding the reference messages") # Encode DATA messages -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia961f83c717066af61699c80536468392b8ce064 Gerrit-Change-Number: 15296 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:05:41 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 21:05:41 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: properly handle unknown header version error Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15300 Change subject: trx_toolkit/trx_sniff.py: properly handle unknown header version error ...................................................................... trx_toolkit/trx_sniff.py: properly handle unknown header version error Change-Id: Ie04782ced1fab7bc363549bfa37528f5a124e99d --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/15300/1 diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 7e5c2bd..13c31e7 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -110,6 +110,10 @@ try: msg.parse_msg(msg_raw) msg.validate() + except IndexError as e: + log.warning("Ignoring message: %s" % e) + self.cnt_burst_dropped_num += 1 + return except ValueError as e: desc = msg.desc_hdr() if desc is "": -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie04782ced1fab7bc363549bfa37528f5a124e99d Gerrit-Change-Number: 15300 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:05:41 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 21:05:41 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: also validate() sniffed messages Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15298 Change subject: trx_toolkit/trx_sniff.py: also validate() sniffed messages ...................................................................... trx_toolkit/trx_sniff.py: also validate() sniffed messages Change-Id: Ica3e4702fdabfdae0c1025b650ff32c8e85a6edf --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/15298/1 diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 72976f7..f4b7662 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -109,6 +109,7 @@ # Attempt to parse the payload as a DATA message try: msg.parse_msg(msg_raw) + msg.validate() except ValueError as e: log.warning("Ignoring an incorrect message: %s" % e) self.cnt_burst_dropped_num += 1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica3e4702fdabfdae0c1025b650ff32c8e85a6edf Gerrit-Change-Number: 15298 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:05:41 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 27 Aug 2019 21:05:41 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: also print header for incorrect messages Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15299 Change subject: trx_toolkit/trx_sniff.py: also print header for incorrect messages ...................................................................... trx_toolkit/trx_sniff.py: also print header for incorrect messages Change-Id: I376f1e7af46750e53305109cf4a9f64427b9960c --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/99/15299/1 diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index f4b7662..7e5c2bd 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -111,7 +111,10 @@ msg.parse_msg(msg_raw) msg.validate() except ValueError as e: - log.warning("Ignoring an incorrect message: %s" % e) + desc = msg.desc_hdr() + if desc is "": + desc = "parsing error" + log.warning("Ignoring an incorrect message (%s): %s" % (desc, e)) self.cnt_burst_dropped_num += 1 return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I376f1e7af46750e53305109cf4a9f64427b9960c Gerrit-Change-Number: 15299 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:52:50 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 27 Aug 2019 21:52:50 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... Patch Set 2: Code-Review+2 now I notice there are actually two +1s I can combine -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 27 Aug 2019 21:52:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:53:18 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 27 Aug 2019 21:53:18 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init() In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15132 ) Change subject: mgcp_codec: split codec_free() off of codec_init() ...................................................................... mgcp_codec: split codec_free() off of codec_init() Both are used only in the same .c file, so make them static. Move codec_set() guts into codec_add(): codec_set is only called by codec_add. If codec_set were left separate, it'd look like the codec_init() is a bug and lacks a codec_free() first. When looking at the entire context in codec_add(), it becomes obvious that codec_init() should be called, not codec_free(), because it is populating a previously unused entry. Preparation to fix a memleak in a conn's codec list. Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 35 insertions(+), 39 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index d5b99e8..30c185c 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -76,18 +76,24 @@ } /* Initalize or reset codec information with default data. */ -void codec_init(struct mgcp_rtp_codec *codec) +static void codec_init(struct mgcp_rtp_codec *codec) +{ + *codec = (struct mgcp_rtp_codec){ + .payload_type = -1, + .frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM, + .frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN, + .rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE, + .channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS, + }; +} + +static void codec_free(struct mgcp_rtp_codec *codec) { if (codec->subtype_name) talloc_free(codec->subtype_name); if (codec->audio_name) talloc_free(codec->audio_name); - memset(codec, 0, sizeof(*codec)); - codec->payload_type = -1; - codec->frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM; - codec->frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN; - codec->rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE; - codec->channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS; + *codec = (struct mgcp_rtp_codec){}; } /*! Initalize or reset codec information with default data. @@ -99,13 +105,30 @@ conn->end.codec = NULL; } -/* Set members of struct mgcp_rtp_codec, extrapolate in missing information. Param audio_name is expected in uppercase. */ -static int codec_set(void *ctx, struct mgcp_rtp_codec *codec, int payload_type, const char *audio_name, - unsigned int pt_offset, const struct mgcp_codec_param *param) +/*! Add codec configuration depending on payload type and/or codec name. This + * function uses the input parameters to extrapolate the full codec information. + * \param[out] codec configuration (caller provided memory). + * \param[out] conn related rtp-connection. + * \param[in] payload_type codec type id (e.g. 3 for GSM, -1 when undefined). + * \param[in] audio_name audio codec name, in uppercase (e.g. "GSM/8000/1"). + * \param[in] param optional codec parameters (set to NULL when unused). + * \returns 0 on success, -EINVAL on failure. */ +int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param) { int rate; int channels; char audio_codec[64]; + struct mgcp_rtp_codec *codec; + unsigned int pt_offset = conn->end.codecs_assigned; + void *ctx = conn->conn; + + /* The amount of codecs we can store is limited, make sure we do not + * overrun this limit. */ + if (conn->end.codecs_assigned >= MGCP_MAX_CODECS) + return -EINVAL; + + /* First unused entry */ + codec = &conn->end.codecs[conn->end.codecs_assigned]; /* Initalize the codec struct with some default data to begin with */ codec_init(codec); @@ -226,41 +249,14 @@ } else codec->param_present = false; + conn->end.codecs_assigned++; return 0; error: /* Make sure we leave a clean codec entry on error. */ - codec_init(codec); - memset(codec, 0, sizeof(*codec)); + codec_free(codec); return -EINVAL; } -/*! Add codec configuration depending on payload type and/or codec name. This - * function uses the input parameters to extrapolate the full codec information. - * \param[out] codec configuration (caller provided memory). - * \param[out] conn related rtp-connection. - * \param[in] payload_type codec type id (e.g. 3 for GSM, -1 when undefined). - * \param[in] audio_name audio codec name, in uppercase (e.g. "GSM/8000/1"). - * \param[in] param optional codec parameters (set to NULL when unused). - * \returns 0 on success, -EINVAL on failure. */ -int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param) -{ - int rc; - - /* The amount of codecs we can store is limited, make sure we do not - * overrun this limit. */ - if (conn->end.codecs_assigned >= MGCP_MAX_CODECS) - return -EINVAL; - - rc = codec_set(conn->conn, &conn->end.codecs[conn->end.codecs_assigned], payload_type, audio_name, - conn->end.codecs_assigned, param); - if (rc != 0) - return -EINVAL; - - conn->end.codecs_assigned++; - - return 0; -} - /* Check if the given codec is applicable on the specified endpoint * Helper function for mgcp_codec_decide() */ static bool is_codec_compatible(const struct mgcp_endpoint *endp, const struct mgcp_rtp_codec *codec) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7 Gerrit-Change-Number: 15132 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 27 21:53:18 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 27 Aug 2019 21:53:18 +0000 Subject: Change in ...osmo-mgw[master]: fix memleak: actually free strings in mgcp_codec_reset_all() In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15133 ) Change subject: fix memleak: actually free strings in mgcp_codec_reset_all() ...................................................................... fix memleak: actually free strings in mgcp_codec_reset_all() The audio_name and subtype_name are allocated from talloc, so they need to be freed before resetting the codec array. Use mgcp_codec_free() to ensure this. Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 30c185c..7f1a6d1 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -100,7 +100,9 @@ * \param[out] conn related rtp-connection. */ void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn) { - memset(conn->end.codecs, 0, sizeof(conn->end.codecs)); + int i; + for (i = 0; i < conn->end.codecs_assigned; i++) + codec_free(&conn->end.codecs[i]); conn->end.codecs_assigned = 0; conn->end.codec = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f Gerrit-Change-Number: 15133 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 28 01:38:09 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 01:38:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5d65db2143040_3f0e2ae8e2cd05f0301730@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 346s] pdflatex -interaction=batchmode test-usermanual.tex [ 346s] pdflatex failed [ 346s] test-usermanual.tex:3788: pdfTeX error (ext4): \pdfendlink ended up in different nesting level than \pdfstartlink. [ 346s] test-usermanual.tex:3788: leading text: \end{longtable} [ 346s] [ 346s] A possible reason for transformation failure is invalid DocBook [ 346s] (as reported by xmllint) [ 346s] [ 346s] Error: pdflatex compilation failed [ 346s] [ 346s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 346s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 346s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 346s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 346s] make[1]: *** [Makefile:362: all] Error 2 [ 346s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 346s] dh_auto_build: make -j1 returned exit code 2 [ 346s] make: *** [debian/rules:5: binary] Error 2 [ 346s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 346s] [ 346s] lamb08 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Wed Aug 28 01:38:02 UTC 2019. [ 346s] [ 346s] ### VM INTERACTION START ### [ 349s] [ 334.900705] sysrq: SysRq : Power Off [ 349s] [ 334.910679] reboot: Power down [ 349s] ### VM INTERACTION END ### [ 349s] [ 349s] lamb08 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Wed Aug 28 01:38:06 UTC 2019. [ 349s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 28 01:53:51 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 01:53:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d65dec318d72_3f0e2ae8e2cd05f0304146@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 297s] ar: `u' modifier ignored since `D' is the default (see `U') [ 297s] libtool: link: ranlib .libs/libtransceiver_common.a [ 297s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 297s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 298s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 298s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 298s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 298s] collect2: error: ld returned 1 exit status [ 298s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 298s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 298s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 298s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 298s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 298s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 298s] make[1]: *** [Makefile:444: all] Error 2 [ 298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 298s] dh_auto_build: make -j1 returned exit code 2 [ 298s] make: *** [debian/rules:6: build] Error 255 [ 298s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 298s] [ 298s] sheep83 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 01:53:40 UTC 2019. [ 298s] [ 298s] ### VM INTERACTION START ### [ 301s] [ 288.143363] sysrq: SysRq : Power Off [ 301s] [ 288.149436] reboot: Power down [ 301s] ### VM INTERACTION END ### [ 301s] [ 301s] sheep83 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 01:53:45 UTC 2019. [ 301s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 28 02:08:26 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 02:08:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d65e22a9455c_3f0e2ae8e2cd05f0305721@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 991s] ar: `u' modifier ignored since `D' is the default (see `U') [ 991s] libtool: link: ranlib .libs/libtransceiver_common.a [ 991s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 991s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 992s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 992s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 992s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 992s] collect2: error: ld returned 1 exit status [ 992s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 992s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 992s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 992s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 992s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 992s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 992s] make[1]: *** [Makefile:444: all] Error 2 [ 992s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 992s] dh_auto_build: make -j1 returned exit code 2 [ 992s] make: *** [debian/rules:6: build] Error 255 [ 992s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 992s] [ 992s] lamb01 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 02:08:20 UTC 2019. [ 992s] [ 992s] ### VM INTERACTION START ### [ 996s] [ 929.512958] sysrq: SysRq : Power Off [ 996s] [ 929.529151] reboot: Power down [ 996s] ### VM INTERACTION END ### [ 996s] [ 996s] lamb01 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 02:08:25 UTC 2019. [ 996s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 28 02:53:09 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 02:53:09 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15137 ) Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... Patch Set 4: Code-Review+2 combining votes -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 02:53:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 02:55:42 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 02:55:42 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/15138/4/src/libosmo-mgcp/mgcp_codec.c File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/#/c/15138/4/src/libosmo-mgcp/mgcp_codec.c at 182 PS4, Line 182: if (strlen(audio_name) > sizeof(audio_codec)) { > this should probably be >= unrelated to this patch, which is just about logging. fixing separately. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 02:55:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 02:57:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 02:57:53 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec_add: fix audio_name size check Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15301 Change subject: mgcp_codec_add: fix audio_name size check ...................................................................... mgcp_codec_add: fix audio_name size check Needs to account for terminating '\0'. Change-Id: I27896beef6ffcc1cb6207daaba6c8b2b03eb513d --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/01/15301/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 704b7e6..9e55ab0 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -179,7 +179,7 @@ /* Now we extract the codec subtype name, rate and channels. The latter * two are optional. If they are not present we use the safe defaults * above. */ - if (strlen(audio_name) > sizeof(audio_codec)) { + if (strlen(audio_name) >= sizeof(audio_codec)) { LOGP(DLMGCP, LOGL_ERROR, "Audio codec too long: %s\n", osmo_quote_str(audio_name, -1)); goto error; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27896beef6ffcc1cb6207daaba6c8b2b03eb513d Gerrit-Change-Number: 15301 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 03:01:40 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 03:01:40 +0000 Subject: Change in ...osmo-mgw[master]: SDP: store all ptmap entries In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15141 ) Change subject: SDP: store all ptmap entries ...................................................................... Patch Set 5: Code-Review+2 combining votes -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b Gerrit-Change-Number: 15141 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 03:01:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 05:56:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 05:56:47 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 ) Change subject: ggsn: Move PCO handling code into its own file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 28 Aug 2019 05:56:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 05:58:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 05:58:30 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 ) Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15247/2/lib/in46_addr.c File lib/in46_addr.c: https://gerrit.osmocom.org/#/c/15247/2/lib/in46_addr.c at 67 PS2, Line 67: dston "dst on" -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 05:58:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:00:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:00:44 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 ) Change subject: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia34939957bb7856388cb52a741cec0c015a08c70 Gerrit-Change-Number: 15248 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:04:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:04:30 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Split application lifecycle related code into ggsn_main.c In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 ) Change subject: ggsn: Split application lifecycle related code into ggsn_main.c ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 Gerrit-Change-Number: 15249 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 28 Aug 2019 06:04:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:07:52 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:07:52 +0000 Subject: Change in ...osmo-ggsn[master]: Move pdp_get_peer_ipv() to lib/util.* In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 ) Change subject: Move pdp_get_peer_ipv() to lib/util.* ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 Gerrit-Change-Number: 15250 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:07:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:10:16 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:10:16 +0000 Subject: Change in ...osmo-ggsn[master]: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 ) Change subject: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7e164f40f50de43027bcd4464aa879450d2fb10e Gerrit-Change-Number: 15251 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:10:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:14:50 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce LOGTUN log helper In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 ) Change subject: Introduce LOGTUN log helper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I237acdee0be19498804e0d509c610f4e0454ba72 Gerrit-Change-Number: 15252 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:14:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:17:52 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:17:52 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 ) Change subject: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I98db39a710a72a1438d71aabaf4f8227984643e3 Gerrit-Change-Number: 15253 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:17:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:18:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:18:14 +0000 Subject: Change in ...osmo-ggsn[master]: pdp: constify param in pdp_count_secondary() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 ) Change subject: pdp: constify param in pdp_count_secondary() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie772f2c54264c8bc91f50d9030479861dd8868b7 Gerrit-Change-Number: 15255 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:18:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:26:54 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:26:54 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 ) Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/15256/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15256/2//COMMIT_MSG at 8 PS2, Line 8: I'd describe here what changed in the output. https://gerrit.osmocom.org/#/c/15256/2/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/#/c/15256/2/ggsn/ggsn_vty.c at 762 PS2, Line 762: if (!pdp->secondary) { (consider writing the non-inverted condition first) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:26:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:27:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:27:14 +0000 Subject: Change in ...osmo-ggsn[master]: doc: Update vty reference xml file In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 ) Change subject: doc: Update vty reference xml file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I49e7db4d0f5c7868b86a4947d8b5739c2068da46 Gerrit-Change-Number: 15275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:27:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 06:32:31 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 06:32:31 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 ) Change subject: libgtp: Introduce cb_recovery3 ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15266/3/gtp/gtp.c File gtp/gtp.c: https://gerrit.osmocom.org/#/c/15266/3/gtp/gtp.c at 255 PS3, Line 255: int (*cb_recovery3) (struct gsn_t * gsn, struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery)) * line is longer than 100 characters * "struct gsn_t * gsn" -> "struct gsn_t *gsn" etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 06:32:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:08:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:08:09 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... Patch Set 4: (10 comments) https://gerrit.osmocom.org/#/c/15267/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15267/4//COMMIT_MSG at 10 PS4, Line 10: differntiated differ_e_ntiated https://gerrit.osmocom.org/#/c/15267/4//COMMIT_MSG at 19 PS4, Line 19: o to https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn.h File ggsn/ggsn.h: https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn.h at 96 PS4, Line 96: //struct ggsn_ctx *ggsn; can be reached through pdp->gsn->priv * isn't it lib->gsn->priv? * AFAIK we are only using /* ... */ style comments https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn.c at 766 PS4, Line 766: * " *" https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn.c at 789 PS4, Line 789: r* (missing space) https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn.c at 796 PS4, Line 796: struct gsn_t* gsn struct gsn_t *gsn https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn_vty.c at 372 PS4, Line 372: inteval interval https://gerrit.osmocom.org/#/c/15267/4/ggsn/ggsn_vty.c at 798 PS4, Line 798: vty_out(vty, " no echo-interval%s", VTY_NEWLINE); This is the default, so why print the "no echo-interval" line? https://gerrit.osmocom.org/#/c/15267/4/ggsn/sgsn.h File ggsn/sgsn.h: https://gerrit.osmocom.org/#/c/15267/4/ggsn/sgsn.h at 34 PS4, Line 34: * " *" https://gerrit.osmocom.org/#/c/15267/4/ggsn/sgsn.c File ggsn/sgsn.c: https://gerrit.osmocom.org/#/c/15267/4/ggsn/sgsn.c at 9 PS4, Line 9: idnication indication -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 07:08:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:17:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:17:14 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 ) Change subject: libgtp: Introduce cb_recovery3 ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15266/3/gtp/gtp.c File gtp/gtp.c: https://gerrit.osmocom.org/#/c/15266/3/gtp/gtp.c at 255 PS3, Line 255: int (*cb_recovery3) (struct gsn_t * gsn, struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery)) > * line is longer than 100 characters [?] *longer than 120 characters -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 07:17:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:19:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:19:57 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15134 ) Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() ...................................................................... Patch Set 4: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15134/4/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/#/c/15134/4/tests/mgcp/mgcp_test.c at 1834 PS4, Line 1834: rc = mgcp_codec_add(&conn[conn_i], codec->payload_type, codec->audio_name, codec->param); (line > 120 characters) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb Gerrit-Change-Number: 15134 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 07:19:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:22:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:22:53 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135 ) Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 07:22:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:28:41 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:28:41 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 07:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:29:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:29:19 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec_add: fix audio_name size check In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15301 ) Change subject: mgcp_codec_add: fix audio_name size check ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27896beef6ffcc1cb6207daaba6c8b2b03eb513d Gerrit-Change-Number: 15301 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 07:29:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:30:40 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:30:40 +0000 Subject: Change in ...osmo-mgw[master]: explicitly free codecs in mgcp_rtp_conn_cleanup() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15139 ) Change subject: explicitly free codecs in mgcp_rtp_conn_cleanup() ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 Gerrit-Change-Number: 15139 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 07:30:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 07:33:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 07:33:14 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 ) Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 07:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:00:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:00:08 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: raise exceptions from validate() methods In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15296 ) Change subject: trx_toolkit/data_msg.py: raise exceptions from validate() methods ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15296/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/15296/1/src/target/trx_toolkit/data_msg.py at 233 PS1, Line 233: raise ValueError("Unknown TRXD header version") You probabli want to print self.ver here -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia961f83c717066af61699c80536468392b8ce064 Gerrit-Change-Number: 15296 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:00:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:01:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:01:09 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: print exact message parsing error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15297 ) Change subject: trx_toolkit/trx_sniff.py: print exact message parsing error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062 Gerrit-Change-Number: 15297 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:01:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 28 09:01:07 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 09:01:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6642d9d4b19_e2a2aabfaa785fc53077@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 439s] ar: `u' modifier ignored since `D' is the default (see `U') [ 439s] libtool: link: ranlib .libs/libtransceiver_common.a [ 439s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 439s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 439s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 439s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 439s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 439s] collect2: error: ld returned 1 exit status [ 439s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 439s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 439s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 439s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 439s] make[1]: *** [Makefile:444: all] Error 2 [ 439s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 439s] dh_auto_build: make -j1 returned exit code 2 [ 439s] make: *** [debian/rules:6: build] Error 255 [ 439s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 439s] [ 439s] lamb17 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 09:00:58 UTC 2019. [ 439s] [ 439s] ### VM INTERACTION START ### [ 442s] [ 424.455468] sysrq: SysRq : Power Off [ 442s] [ 424.470318] reboot: Power down [ 442s] ### VM INTERACTION END ### [ 442s] [ 442s] lamb17 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 09:01:02 UTC 2019. [ 442s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:01:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:01:27 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: also validate() sniffed messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15298 ) Change subject: trx_toolkit/trx_sniff.py: also validate() sniffed messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica3e4702fdabfdae0c1025b650ff32c8e85a6edf Gerrit-Change-Number: 15298 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:01:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 28 09:01:24 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 09:01:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6642f520656_e2a2aabfaa785fc53228@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 404s] ar: `u' modifier ignored since `D' is the default (see `U') [ 404s] libtool: link: ranlib .libs/libtransceiver_common.a [ 404s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 405s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 405s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 405s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 405s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 405s] collect2: error: ld returned 1 exit status [ 405s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 405s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 405s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 405s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 405s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 405s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 405s] make[1]: *** [Makefile:444: all] Error 2 [ 405s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 405s] dh_auto_build: make -j1 returned exit code 2 [ 405s] make: *** [debian/rules:6: build] Error 255 [ 405s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 405s] [ 405s] lamb15 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 28 09:01:06 UTC 2019. [ 405s] [ 405s] ### VM INTERACTION START ### [ 408s] [ 389.428466] sysrq: SysRq : Power Off [ 408s] [ 389.435962] reboot: Power down [ 408s] ### VM INTERACTION END ### [ 408s] [ 408s] lamb15 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 28 09:01:10 UTC 2019. [ 408s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:02:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:02:15 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: also print header for incorrect messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15299 ) Change subject: trx_toolkit/trx_sniff.py: also print header for incorrect messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I376f1e7af46750e53305109cf4a9f64427b9960c Gerrit-Change-Number: 15299 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:02:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 28 09:02:15 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 09:02:15 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d664332ed27b_e2a2aabfaa785fc53915@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 516s] ar: `u' modifier ignored since `D' is the default (see `U') [ 516s] libtool: link: ranlib .libs/libtransceiver_common.a [ 516s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 516s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 517s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 517s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 517s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 517s] collect2: error: ld returned 1 exit status [ 517s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 517s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 517s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 517s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 517s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 517s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 517s] make[1]: *** [Makefile:444: all] Error 2 [ 517s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 517s] dh_auto_build: make -j1 returned exit code 2 [ 517s] make: *** [debian/rules:6: build] Error 255 [ 517s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 517s] [ 517s] lamb06 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 28 09:02:01 UTC 2019. [ 517s] [ 517s] ### VM INTERACTION START ### [ 520s] [ 501.045065] sysrq: SysRq : Power Off [ 520s] [ 501.051133] reboot: Power down [ 520s] ### VM INTERACTION END ### [ 520s] [ 520s] lamb06 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 28 09:02:04 UTC 2019. [ 520s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:04:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:04:08 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: properly handle unknown header version error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15300 ) Change subject: trx_toolkit/trx_sniff.py: properly handle unknown header version error ...................................................................... Patch Set 1: so IndexError is thrown on non-critical errors? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie04782ced1fab7bc363549bfa37528f5a124e99d Gerrit-Change-Number: 15300 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:04:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:07:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:07:25 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 ) Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15256/2/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/#/c/15256/2/ggsn/ggsn_vty.c at 762 PS2, Line 762: if (!pdp->secondary) { > (consider writing the non-inverted condition first) I'd prefer keeping it this way since it's the "main" branch, since pdp contexts are mostly primary. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 09:07:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:09:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:09:08 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:09:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:09:30 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec_add: fix audio_name size check In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15301 ) Change subject: mgcp_codec_add: fix audio_name size check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27896beef6ffcc1cb6207daaba6c8b2b03eb513d Gerrit-Change-Number: 15301 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:09:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 28 09:12:32 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 09:12:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d66458d6505c_e2a2aabfaa785fc550cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 706s] ar: `u' modifier ignored since `D' is the default (see `U') [ 706s] libtool: link: ranlib .libs/libtransceiver_common.a [ 706s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 706s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 707s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 707s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 707s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 707s] collect2: error: ld returned 1 exit status [ 707s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 707s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 707s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 707s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 707s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 707s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 707s] make[1]: *** [Makefile:444: all] Error 2 [ 707s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 707s] dh_auto_build: make -j1 returned exit code 2 [ 707s] make: *** [debian/rules:6: build] Error 255 [ 707s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 707s] [ 707s] cloud109 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 09:12:24 UTC 2019. [ 707s] [ 707s] ### VM INTERACTION START ### [ 711s] [ 668.305197] sysrq: SysRq : Power Off [ 711s] [ 668.319450] reboot: Power down [ 711s] ### VM INTERACTION END ### [ 711s] [ 711s] cloud109 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 09:12:28 UTC 2019. [ 711s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:04 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce in46a_is_v{4,6}() helpers In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 to look at the new patch set (#3). Change subject: Introduce in46a_is_v{4,6}() helpers ...................................................................... Introduce in46a_is_v{4,6}() helpers It's clearer having size-related checks in one place for a data structure in46_addr, instead of spread around the code. Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb --- M ggsn/ggsn.c M lib/in46_addr.h 2 files changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/45/15245/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb Gerrit-Change-Number: 15245 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:04 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file In-Reply-To: References: Message-ID: Hello daniel, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 to look at the new patch set (#3). Change subject: ggsn: Move PCO handling code into its own file ...................................................................... ggsn: Move PCO handling code into its own file This way ggsn.c is shrinked in size and get rid of a lot of code there, which is of no interest unless the reader is interested in that really specific part. Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/pco.c A ggsn/pco.h 5 files changed, 343 insertions(+), 312 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/46/15246/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:04 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 to look at the new patch set (#3). Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... in46_addr: Improve in46a_ntop documentation Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 --- M lib/in46_addr.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/47/15247/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:04 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 to look at the new patch set (#3). Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... ggsn_vty.c: Improve output of VTY show pdp-context GTP version and primary/secondary information is printed now for each pdp context. Related: OS#4154 Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 --- M ggsn/ggsn_vty.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/56/15256/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:04 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 to look at the new patch set (#4). Change subject: libgtp: Introduce cb_recovery3 ...................................................................... libgtp: Introduce cb_recovery3 Since osmo-ggsn can manage several GSN structures simultaneously, it needs the gsn_t pointer to know the ggsn it should forward the call to. Related: OS#4165 Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/66/15266/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:04 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 to look at the new patch set (#5). Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... ggsn: Implement echo req/resp and recovery This patch is quite big because implementing echo req/resp and recovery requires having knowledge and managing differentiated state for each GSN peer attached/connected to osmo-ggsn. This kind of information was not available in osmo-ggsn nor in libgtp. So osmo-ggsn is now able to track GSN peers connected to a ggsn_ctx (associated gsn_t from libgtp) by means of "sgsn_peer" data structure, and accessible from the ggsn through a list. The instances of sgsn_peer are currently allocated and destroyed dynamically based on discovered peer who have at least a pdp context attached to us (we are not interested in peers without pdp contexts because we don't need to send echo requests/responses and maintain state in that case). A new private pointer (pdp_t->priv) data structure struct pdp_priv_t is added to be able to relate a pdp_t to an sgsn as well as the already existing pointer to an apn. An "echo-interval <0-36000>" VTY command is added which allows configuring time wait between echo requests being sent to each sgsn_peer. Transmission of echo requests is disabled by default. Finally, a new "show sgsn" VTY command is introduced, and its output is also printed during "show ggsn". Related: OS#4165 Change-Id: Id2c84165dc59dff495106758146a701ca488834f --- M doc/manuals/vty/ggsn_vty_reference.xml M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c A ggsn/sgsn.c A ggsn/sgsn.h 7 files changed, 406 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/67/15267/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:35:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 09:35:10 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: fix formatting in if line Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 Change subject: cosmetic: fix formatting in if line ...................................................................... cosmetic: fix formatting in if line Fixes: eefa30dce8fa8e0ae16a3108e23041f92ea6ab21 Fixes: 2d6a69e69a4b4cb2b8cc63c4810dae44e5a4d8f6 Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 --- M ggsn/ggsn.c M gtp/pdp.c 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/02/15302/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 89b183f..7b32bde 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -358,8 +358,9 @@ member = pdp->peer[i]; send_trap(gsn, pdp, member, "imsi-rem-ip"); /* TRAP with IP removal */ ippool_freeip(member->pool, member); - } else if(i == 0) + } else if (i == 0) { LOGPPDP(LOGL_ERROR, pdp, "Cannot find/free IP Pool member\n"); + } } if (!pdp_priv) { diff --git a/gtp/pdp.c b/gtp/pdp.c index 739cf73..518f5d4 100644 --- a/gtp/pdp.c +++ b/gtp/pdp.c @@ -109,7 +109,7 @@ int pdp_init(struct gsn_t *gsn) { - if(!g_gsn) { + if (!g_gsn) { g_gsn = gsn; } else { LOGP(DLGTP, LOGL_FATAL, "This interface is depreacted and doesn't support multiple GGSN!"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 Gerrit-Change-Number: 15302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:48:49 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 28 Aug 2019 09:48:49 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: raise exceptions from validate() methods In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15296 ) Change subject: trx_toolkit/data_msg.py: raise exceptions from validate() methods ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15296/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/15296/1/src/target/trx_toolkit/data_msg.py at 233 PS1, Line 233: raise ValueError("Unknown TRXD header version") > You probabli want to print self. [?] ACK. I will do this in a separate change. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia961f83c717066af61699c80536468392b8ce064 Gerrit-Change-Number: 15296 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 09:48:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:49:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 28 Aug 2019 09:49:28 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: raise exceptions from validate() methods In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15296 ) Change subject: trx_toolkit/data_msg.py: raise exceptions from validate() methods ...................................................................... trx_toolkit/data_msg.py: raise exceptions from validate() methods Raising exceptions is a Pythonic way to handle errors, which in this particular case will help us to know *why* exactly a given message is incorrect or incomplete. Change-Id: Ia961f83c717066af61699c80536468392b8ce064 --- M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/data_msg.py 3 files changed, 74 insertions(+), 61 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index 97518bd..da42023 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -296,7 +296,7 @@ assert(messages_check[i].tn == messages_ref[i].tn) # Validate a message - assert(messages_check[i].validate()) + messages_check[i].validate() log.info("Check append_msg(): OK") @@ -318,7 +318,7 @@ assert(messages_check[i].tn == messages_ref[i].tn) # Validate a message - assert(messages_check[i].validate()) + messages_check[i].validate() log.info("Check append_all(): OK") @@ -340,8 +340,8 @@ assert(msg10.tn == messages_ref[10].tn) # Validate both messages - assert(msg0.validate()) - assert(msg10.validate()) + msg0.validate() + msg10.validate() log.info("Check parse_msg(): OK") @@ -362,6 +362,6 @@ assert(messages_check[i].tn == messages_ref[i + 10].tn) # Validate a message - assert(messages_check[i].validate()) + messages_check[i].validate() log.info("Check parse_all(): OK") diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index e43b388..418c3f8 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -107,8 +107,7 @@ def send_msg(self, msg, legacy = False): # Validate a message - if not msg.validate(): - raise ValueError("Message incomplete or incorrect") + msg.validate() # Generate TRX message payload = msg.gen_msg(legacy) diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index de5f908..a1046ec 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -227,30 +227,27 @@ return buf - # Validates the message fields + # Validates the message fields (throws ValueError) def validate(self): if not self.ver in self.known_versions: - return False + raise ValueError("Unknown TRXD header version") if self.fn is None: - return False + raise ValueError("TDMA frame-number is not set") if self.fn < 0 or self.fn > GSM_HYPERFRAME: - return False + raise ValueError("TDMA frame-number %d is out of range" % self.fn) if self.tn is None: - return False + raise ValueError("TDMA time-slot is not set") if self.tn < 0 or self.tn > 7: - return False - - return True + raise ValueError("TDMA time-slot %d is out of range" % self.tn) # Generates a TRX DATA message def gen_msg(self, legacy = False): # Validate all the fields - if not self.validate(): - raise ValueError("Message incomplete or incorrect") + self.validate() # Allocate an empty byte-array buf = bytearray() @@ -342,27 +339,24 @@ return length - # Validates the message fields + # Validates the message fields (throws ValueError) def validate(self): # Validate common fields - if not DATAMSG.validate(self): - return False + DATAMSG.validate(self) if self.pwr is None: - return False + raise ValueError("Tx Attenuation level is not set") if self.pwr < self.PWR_MIN or self.pwr > self.PWR_MAX: - return False + raise ValueError("Tx Attenuation %d is out of range" % self.pwr) # FIXME: properly handle IDLE / NOPE indications if self.burst is None: - return False + raise ValueError("Tx burst bits are not set") # FIXME: properly handle IDLE / NOPE indications if len(self.burst) not in (GSM_BURST_LEN, EDGE_BURST_LEN): - return False - - return True + raise ValueError("Tx burst has odd length %u" % len(self.burst)) # Generates a random power level def rand_pwr(self, min = None, max = None): @@ -582,85 +576,77 @@ def _validate_burst_v0(self): # Burst is mandatory if self.burst is None: - return False + raise ValueError("Rx burst bits are not set") # ... and can be either of GSM (GMSK) or EDGE (8-PSK) if len(self.burst) not in (GSM_BURST_LEN, EDGE_BURST_LEN): - return False - - return True + raise ValueError("Rx burst has odd length %u" % len(self.burst)) def _validate_burst_v1(self): # Burst is omitted in case of an IDLE / NOPE indication if self.nope_ind and self.burst is None: - return True - if self.nope_ind and self.burst is not None: - return False + return + if self.nope_ind and self.burst is not None: + raise ValueError("NOPE.ind comes with burst?!?") if self.burst is None: - return False + raise ValueError("Rx burst bits are not set") # Burst length depends on modulation type if len(self.burst) != self.mod_type.bl: - return False + raise ValueError("Rx burst has odd length %u" % len(self.burst)) - return True - - # Validates the burst + # Validates the burst (throws ValueError) def validate_burst(self): if self.ver == 0x00: - return self._validate_burst_v0() + self._validate_burst_v0() elif self.ver >= 0x01: - return self._validate_burst_v1() + self._validate_burst_v1() - # Validates the message header fields + # Validates the message header fields (throws ValueError) def validate(self): # Validate common fields - if not DATAMSG.validate(self): - return False + DATAMSG.validate(self) if self.rssi is None: - return False + raise ValueError("RSSI is not set") if self.rssi < self.RSSI_MIN or self.rssi > self.RSSI_MAX: - return False + raise ValueError("RSSI %d is out of range" % self.rssi) if self.toa256 is None: - return False + raise ValueError("ToA256 is not set") if self.toa256 < self.TOA256_MIN or self.toa256 > self.TOA256_MAX: - return False + raise ValueError("ToA256 %d is out of range" % self.toa256) if self.ver >= 0x01: if type(self.mod_type) is not Modulation: - return False + raise ValueError("Unknown Rx modulation type") if self.tsc_set is None: - return False + raise ValueError("TSC set is not set") if self.mod_type is Modulation.ModGMSK: if self.tsc_set not in range(0, 4): - return False + raise ValueError("TSC set %d is out of range" % self.tsc_set) else: if self.tsc_set not in range(0, 2): - return False + raise ValueError("TSC set %d is out of range" % self.tsc_set) if self.tsc is None: - return False + raise ValueError("TSC is not set") if self.tsc not in self.TSC_RANGE: - return False + raise ValueError("TSC %d is out of range" % self.tsc) if self.ci is None: - return False + raise ValueError("C/I is not set") if self.ci < self.CI_MIN or self.ci > self.CI_MAX: - return False + raise ValueError("C/I %d is out of range" % self.ci) - if not self.validate_burst(): - return False - - return True + self.validate_burst() # Generates a random RSSI value def rand_rssi(self, min = None, max = None): @@ -886,11 +872,39 @@ msg_l12trx_ref.rand_burst() msg_trx2l1_ref.rand_burst() - assert(msg_l12trx_ref.validate()) - assert(msg_trx2l1_ref.validate()) + msg_l12trx_ref.validate() + msg_trx2l1_ref.validate() log.info("Validate header randomization: OK") + # Test error handling for common fields + msg = DATAMSG() + + # Make sure that message validation throws a ValueError + def validate_throw(msg): + try: + msg.validate() + return False + except ValueError: + return True + + # Unknown version + msg.rand_hdr() + msg.ver = 100 + assert(validate_throw(msg)) + + # Uninitialized field + msg.rand_hdr() + msg.fn = None + assert(validate_throw(msg)) + + # Out-of-range value + msg.rand_hdr() + msg.tn = 10 + assert(validate_throw(msg)) + + log.info("Check incorrect message validation: OK") + log.info("Encoding the reference messages") # Encode DATA messages -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia961f83c717066af61699c80536468392b8ce064 Gerrit-Change-Number: 15296 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:49:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 28 Aug 2019 09:49:28 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: print exact message parsing error In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15297 ) Change subject: trx_toolkit/trx_sniff.py: print exact message parsing error ...................................................................... trx_toolkit/trx_sniff.py: print exact message parsing error For sure, the following message is much more informative: Ignoring an incorrect message: Unhandled version 12 than: Failed to parse message, dropping... NOTE: since the way of printing exceptions is different in both Python versions, I had to drop Python 2 support. Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062 --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 0323e85..72976f7 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -1,10 +1,10 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit # Scapy-based TRX interface sniffer # -# (C) 2018 by Vadim Yanitskiy +# (C) 2018-2019 by Vadim Yanitskiy # # All Rights Reserved # @@ -22,7 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2018-2019", "Vadim Yanitskiy ")] import logging as log import argparse @@ -109,8 +109,8 @@ # Attempt to parse the payload as a DATA message try: msg.parse_msg(msg_raw) - except: - log.warning("Failed to parse message, dropping...") + except ValueError as e: + log.warning("Ignoring an incorrect message: %s" % e) self.cnt_burst_dropped_num += 1 return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062 Gerrit-Change-Number: 15297 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:49:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 28 Aug 2019 09:49:28 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: also validate() sniffed messages In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15298 ) Change subject: trx_toolkit/trx_sniff.py: also validate() sniffed messages ...................................................................... trx_toolkit/trx_sniff.py: also validate() sniffed messages Change-Id: Ica3e4702fdabfdae0c1025b650ff32c8e85a6edf --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 72976f7..f4b7662 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -109,6 +109,7 @@ # Attempt to parse the payload as a DATA message try: msg.parse_msg(msg_raw) + msg.validate() except ValueError as e: log.warning("Ignoring an incorrect message: %s" % e) self.cnt_burst_dropped_num += 1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica3e4702fdabfdae0c1025b650ff32c8e85a6edf Gerrit-Change-Number: 15298 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 09:49:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 28 Aug 2019 09:49:28 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: also print header for incorrect messages In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15299 ) Change subject: trx_toolkit/trx_sniff.py: also print header for incorrect messages ...................................................................... trx_toolkit/trx_sniff.py: also print header for incorrect messages Change-Id: I376f1e7af46750e53305109cf4a9f64427b9960c --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index f4b7662..7e5c2bd 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -111,7 +111,10 @@ msg.parse_msg(msg_raw) msg.validate() except ValueError as e: - log.warning("Ignoring an incorrect message: %s" % e) + desc = msg.desc_hdr() + if desc is "": + desc = "parsing error" + log.warning("Ignoring an incorrect message (%s): %s" % (desc, e)) self.cnt_burst_dropped_num += 1 return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I376f1e7af46750e53305109cf4a9f64427b9960c Gerrit-Change-Number: 15299 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 10:30:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 10:30:07 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 ) Change subject: libgtp: Introduce cb_recovery3 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 10:30:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 10:30:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 10:30:53 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 ) Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Aug 2019 10:30:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 10:33:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 10:33:46 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 10:33:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 10:34:55 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Aug 2019 10:34:55 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 ) Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 10:34:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 10:53:46 2019 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 28 Aug 2019 10:53:46 +0000 Subject: Change in ...osmo-sgsn[master]: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp In-Reply-To: References: Message-ID: keith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 ) Change subject: libgtp: don't call sgsn_pdp_ctx_free() with NULL pdp ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I184dcce27b26104c61d80b2d910388d5d3323def Gerrit-Change-Number: 13929 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 11:57:12 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 28 Aug 2019 11:57:12 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 to look at the new patch set (#2). Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... gsm_08_08.c: always pick first msc for unsolicit paging responses When osmo-bsc receives a paging response via the A-bis interface it tries to find the MSC which is in charge for the paging. This is due to the fact that osmo-bsc supports multiple msc connections, which is not specified by 3gpp specs. In an MT-CSFB call the MSC pages the UE via the SGs interface. Then the UE falls back to 2G. It then reports back as MS on the A-Bis interface with the paging response directly. In those cases osmo-bsc will not be able to determine an MSC in charge, so we will forward the paging response to the first configured MSC. Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Related: SYS#4624 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/15209/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 11:58:40 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 28 Aug 2019 11:58:40 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15227 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Abandoned This is duplicate -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I633870030fad35d0a29dfafd6d118e2caa4ec3c9 Gerrit-Change-Number: 15227 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 13:13:13 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 28 Aug 2019 13:13:13 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... mncc: do not unregister unregistered osmo fds The function close_connection() calls osmo_fd_unregister() without checking if the osmo_fd is registered at all. Lets make sure the osmo_fs is registered by checking it using osmo_fd_unregister() Related: OS#4159 Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e --- M src/mncc.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/03/15303/1 diff --git a/src/mncc.c b/src/mncc.c index e23bd6f..63e4faa 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -324,7 +324,8 @@ /* Close the MNCC connection/socket */ static void close_connection(struct mncc_connection *conn) { - osmo_fd_unregister(&conn->fd); + if (osmo_fd_is_registered(&conn->fd)) + osmo_fd_unregister(&conn->fd); close(conn->fd.fd); osmo_timer_schedule(&conn->reconnect, 5, 0); conn->state = MNCC_DISCONNECTED; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 13:15:17 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 28 Aug 2019 13:15:17 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 to look at the new patch set (#2). Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... mncc: do not unregister unregistered osmo fds The function close_connection() calls osmo_fd_unregister() without checking if the osmo_fd is registered at all. Lets make sure the osmo_fs is registered by checking it using osmo_fd_is_registered() Related: OS#4159 Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e --- M src/mncc.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/03/15303/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 13:41:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 13:41:13 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 ) Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c at 327 PS2, Line 327: if (osmo_fd_is_registered(&conn->fd)) Just wondering, we are also unconditionally closing conn->fd.fd. Can it happen that fd.fd exists but fd is not registered? Probably not. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 28 Aug 2019 13:41:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 14:10:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 14:10:21 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: make echo_interval unsigned Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 Change subject: gtp: make echo_interval unsigned ...................................................................... gtp: make echo_interval unsigned There's no real need to use -1 to indicate echo timer as disabled, since 0 can also be used (it doesn't make sense to have a timer timeout of 0). This way code is simplified. Change-Id: I689034887188a53590eddeffda781629694eb5ed --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c 3 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/15304/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 336155c..48c063d 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -392,7 +392,7 @@ struct gsn_t *gsn; struct llist_head pdp_list; /* list of associated pdp ctx (struct sgsn_pdp_ctx*) */ struct osmo_timer_list echo_timer; - int echo_interval; + unsigned int echo_interval; }; struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id); void sgsn_ggsn_ctx_free(struct sgsn_ggsn_ctx *ggc); diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 9f02d54..7174bd5 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -500,7 +500,7 @@ bool pending = osmo_timer_pending(&ggc->echo_timer); /* Only enable if allowed by policy and at least 1 pdp ctx exists against ggsn */ - if (!llist_empty(&ggc->pdp_list) && ggc->echo_interval > 0) { + if (!llist_empty(&ggc->pdp_list) && ggc->echo_interval) { if (!pending) osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); } else { @@ -528,7 +528,6 @@ ggc->id = id; ggc->gtp_version = 1; ggc->remote_restart_ctr = -1; - ggc->echo_interval = -1; /* if we are called from config file parse, this gsn doesn't exist yet */ ggc->gsn = sgsn->gsn; INIT_LLIST_HEAD(&ggc->pdp_list); diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 68d3a77..42b5121 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -190,8 +190,8 @@ inet_ntoa(gctx->remote_addr), VTY_NEWLINE); vty_out(vty, " ggsn %u gtp-version %u%s", gctx->id, gctx->gtp_version, VTY_NEWLINE); - if (gctx->echo_interval != -1) - vty_out(vty, " ggsn %u echo-interval %"PRId32"%s", + if (gctx->echo_interval) + vty_out(vty, " ggsn %u echo-interval %u%s", gctx->id, gctx->echo_interval, VTY_NEWLINE); else vty_out(vty, " ggsn %u no echo-interval%s", @@ -395,7 +395,7 @@ uint32_t id = atoi(argv[0]); struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id); - ggc->echo_interval = -1; + ggc->echo_interval = 0; sgsn_ggsn_ctx_check_echo_timer(ggc); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I689034887188a53590eddeffda781629694eb5ed Gerrit-Change-Number: 15304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 17:06:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 17:06:17 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Log msg retransmits and timeouts Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 Change subject: gtp: Log msg retransmits and timeouts ...................................................................... gtp: Log msg retransmits and timeouts Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 --- M gtp/gtp.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/05/15305/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index f70f534..2ea949d 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -600,10 +600,14 @@ (qmsg->timeout <= now)) { /*printf("Retrans timeout found: %d\n", (int) time(NULL)); */ if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */ + LOGP(DLGTP, LOGL_NOTICE, "Timeout of seq %" PRIu16 "\n", + qmsg->seq); if (gsn->cb_conf) gsn->cb_conf(qmsg->type, EOF, NULL, qmsg->cbp); queue_freemsg(gsn->queue_req, qmsg); } else { + LOGP(DLGTP, LOGL_INFO, "Retransmit (%d) of seq %" PRIu16 "\n", + qmsg->retrans, qmsg->seq); if (sendto(qmsg->fd, &qmsg->p, qmsg->l, 0, (struct sockaddr *)&qmsg->peer, sizeof(struct sockaddr_in)) < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 Gerrit-Change-Number: 15305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 17:25:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 17:25:25 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_echo_timeout Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 Change subject: sgsn: Introduce test TC_attach_echo_timeout ...................................................................... sgsn: Introduce test TC_attach_echo_timeout This test verifies sgsn drops all GGSN related pdp context when that GGSN stops answering echo requests. Change-Id: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 --- M sgsn/SGSN_Tests.ttcn M sgsn/expected-results.xml 2 files changed, 63 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/15306/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index b146046..db7d54b 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -61,6 +61,7 @@ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_port := 4222; charstring mp_ggsn_ip := "127.0.0.2"; + integer mp_echo_interval := 5; /* in seconds. Only used in test enabling g_use_echo */ NSConfigurations mp_nsconfig := { { @@ -259,7 +260,7 @@ private function f_vty_enable_echo_interval(boolean enable) runs on test_CT { if (enable) { - f_vty_config(SGSNVTY, "sgsn", "ggsn 0 echo-interval 5"); + f_vty_config(SGSNVTY, "sgsn", "ggsn 0 echo-interval " & int2str(mp_echo_interval)); } else { f_vty_config(SGSNVTY, "sgsn", "ggsn 0 no echo-interval"); } @@ -1539,6 +1540,65 @@ vc_conn.done; } +private function f_TC_attach_echo_timeout(charstring id) runs on BSSGP_ConnHdlr { + var Gtp1cUnitdata g_ud; + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var integer seq_nr; + + /* first perform regular attach */ + f_TC_attach(id); + /* then activate PDP context */ + f_pdp_ctx_act(apars); + + /* Wait to receive first echo request and send initial Restart counter */ + GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + BSSGP[0].clear; + seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); + f_sleep(int2float(mp_echo_interval)); /* wait until around next echo is expected */ + } + + /* At some point next echo request not answered will timeout and SGSN + should drop the pdp ctx. Around T3 (3secs) * 6 (+ extra, a lot due to OS#4178): */ + timer T := 3.0 * 6.0 + 16.0; + T.start; + alt { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + setverdict(pass); + } + [] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + /* SGSN currently doesn't send this message because it expects GGSN to be non-reachable anyway */ + seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + log("Received deletePDPContextRequest seq_nr=" & int2str(seq_nr)); + GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + repeat; + } + [] GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + log("Received EchoRequest seq_nr=" & int2str(seq_nr)); + repeat; + } + [] T.timeout { + setverdict(fail, "BSSGP DeactPdpReq not received"); + mtc.stop; + } + [] as_xid(apars); + } + T.stop + + setverdict(pass); +} +/* ATTACH + trigger Recovery procedure through CreatePdpResp */ +testcase TC_attach_echo_timeout() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + g_use_echo := true; + f_init(); + vc_conn := f_start_handler(refers(f_TC_attach_echo_timeout), testcasename(), g_gb, 67, 50.0); + vc_conn.done; + g_use_echo := false; +} + private function f_TC_attach_restart_ctr_echo(charstring id) runs on BSSGP_ConnHdlr { var Gtp1cUnitdata g_ud; var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); @@ -2597,6 +2657,7 @@ execute( TC_attach_pdp_act_user_deact_mt() ); execute( TC_attach_pdp_act_deact_dup() ); execute( TC_attach_second_attempt() ); + execute( TC_attach_echo_timeout() ); execute( TC_attach_restart_ctr_echo() ); execute( TC_attach_restart_ctr_create() ); execute( TC_attach_pdp_act_deact_mt_t3395_expire() ); diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index d9c3706..fc8856a 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -54,6 +54,7 @@ SGSN_Tests.ttcn:MASKED TC_attach_second_attempt testcase + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 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: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 Gerrit-Change-Number: 15306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 17:26:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 17:26:26 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 Change subject: Introduce log helper LOGGGSN ...................................................................... Introduce log helper LOGGGSN It will be used in forthcoming commits. Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c --- M include/osmocom/sgsn/debug.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_main.c 3 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/15307/1 diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h index 4d0fc69..29d500d 100644 --- a/include/osmocom/sgsn/debug.h +++ b/include/osmocom/sgsn/debug.h @@ -39,6 +39,7 @@ DVLR, DIUCS, DSIGTRAN, + DGTP, Debug_LastEntry, }; diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 48c063d..55aae86 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -405,6 +405,11 @@ void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc); +#define LOGGGSN(ggc, level, fmt, args...) { \ + char _buf[INET_ADDRSTRLEN]; \ + LOGP(DGTP, level, "GGSN(%" PRIu32 ":%s): " fmt, ggc->id, inet_ntop(AF_INET, &(ggc)->remote_addr, _buf, sizeof(_buf)), ## args); \ + } while (0) + struct apn_ctx { struct llist_head list; struct sgsn_ggsn_ctx *ggsn; diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 4232e23..fe6823e 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -340,6 +340,11 @@ .name = "DV42BIS", .description = "V.42bis data compression (SNDCP)", .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DGTP] = { + .name = "DGTP", + .description = "GPRS Tunnelling Protocol (GTP)", + .enabled = 1, .loglevel = LOGL_NOTICE, } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c Gerrit-Change-Number: 15307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 17:26:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 17:26:26 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 Change subject: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN ...................................................................... sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_libgtp.c 3 files changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/08/15308/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 55aae86..44aeace 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -401,6 +401,7 @@ struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_find_alloc(uint32_t id); void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx); int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct sgsn_pdp_ctx *except); +int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn); void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp); void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc); diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 7174bd5..829204e 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -759,6 +759,11 @@ return num; } +int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn) +{ + return sgsn_ggsn_ctx_drop_all_pdp_except(ggsn, NULL); +} + void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp) { llist_add(&pdp->ggsn_list, &ggc->pdp_list); diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 88b8d04..ac4b7b1 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -469,7 +469,8 @@ void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc) { - gtp_echo_req(ggc->gsn, ggc->gtp_version, NULL, &ggc->remote_addr); + LOGGGSN(ggc, LOGL_INFO, "GTP Tx Echo Request\n"); + gtp_echo_req(ggc->gsn, ggc->gtp_version, ggc, &ggc->remote_addr); } #ifdef BUILD_IU @@ -579,13 +580,15 @@ } /* Confirmation of an GTP ECHO request */ -static int echo_conf(struct pdp_t *pdp, void *cbp, int recovery) +static int echo_conf(void *cbp, bool timeout) { - if (recovery < 0) { - LOGP(DGPRS, LOGL_NOTICE, "GTP Echo Request timed out\n"); + struct sgsn_ggsn_ctx *ggc = (struct sgsn_ggsn_ctx *)cbp; + if (timeout) { + LOGGGSN(ggc, LOGL_NOTICE, "GTP Echo Request timed out\n"); /* FIXME: if version == 1, retry with version 0 */ + sgsn_ggsn_ctx_drop_all_pdp(ggc); } else { - DEBUGP(DGPRS, "GTP Rx Echo Response\n"); + LOGGGSN(ggc, LOGL_INFO, "GTP Rx Echo Response\n"); } return 0; } @@ -630,8 +633,8 @@ switch (type) { case GTP_ECHO_REQ: - /* libgtp hands us the RECOVERY number instead of a cause */ - return echo_conf(pdp, cbp, cause); + /* libgtp hands us the RECOVERY number instead of a cause (EOF on timeout) */ + return echo_conf(cbp, cause == EOF); case GTP_CREATE_PDP_REQ: return create_pdp_conf(pdp, cbp, cause); case GTP_DELETE_PDP_REQ: -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd Gerrit-Change-Number: 15308 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 17:48:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 17:48:08 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 to look at the new patch set (#2). Change subject: Introduce log helper LOGGGSN ...................................................................... Introduce log helper LOGGGSN It will be used in forthcoming commits. Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c --- M include/osmocom/sgsn/debug.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_main.c 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/15307/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c Gerrit-Change-Number: 15307 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 18:09:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 18:09:41 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Manage queue timers internally Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15309 Change subject: gtp: Manage queue timers internally ...................................................................... gtp: Manage queue timers internally Currently each user (application) of libgtp needs to manage its own timers in order to call gtp_retrans_timeout() and gtp_retrans() and maintain retransmit and duplicate queues working correctly. This adds unnecesary complexity to applications since nowadays, as a libosmocore user, libgtp can handle this internally in an easy way. Furthermore, keeping the timers internal to the library allows for easier extension of features as well as re-implementation of related code in the future. Last but not least, it was detected that existing known applications (osmo-sgsn, osmo-ggsn, sgsnemu) are not using correctly the API, since they should be updating their timers through gtp_retrans_timeout() everytime a message is enqueued/transmitted, otherwise they may fire gtp_retrans() for retransmition too late in some cases. Related: OS#4178 Change-Id: Ife7cfd66d6356f413263fe5bda9e43091f5c9e98 --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 128 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/09/15309/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 2ea949d..66aedb8 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -386,6 +386,109 @@ } } +static int queue_timer_retrans(struct gsn_t *gsn) +{ + /* Retransmit any outstanding packets */ + /* Remove from queue if maxretrans exceeded */ + time_t now; + struct qmsg_t *qmsg; + now = time(NULL); + /*printf("Retrans: New beginning %d\n", (int) now); */ + + /* get first element in queue, as long as the timeout of that + * element has expired */ + while ((!queue_getfirst(gsn->queue_req, &qmsg)) && + (qmsg->timeout <= now)) { + /*printf("Retrans timeout found: %d\n", (int) time(NULL)); */ + if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */ + LOGP(DLGTP, LOGL_NOTICE, "Timeout of seq %" PRIu16 "\n", + qmsg->seq); + if (gsn->cb_conf) + gsn->cb_conf(qmsg->type, EOF, NULL, qmsg->cbp); + queue_freemsg(gsn->queue_req, qmsg); + } else { + LOGP(DLGTP, LOGL_INFO, "Retransmit (%d) of seq %" PRIu16 "\n", + qmsg->retrans, qmsg->seq); + if (sendto(qmsg->fd, &qmsg->p, qmsg->l, 0, + (struct sockaddr *)&qmsg->peer, + sizeof(struct sockaddr_in)) < 0) { + gsn->err_sendto++; + LOGP(DLGTP, LOGL_ERROR, + "Sendto(fd0=%d, msg=%lx, len=%d) failed: Error = %s\n", + gsn->fd0, (unsigned long)&qmsg->p, + qmsg->l, strerror(errno)); + } + queue_back(gsn->queue_req, qmsg); + qmsg->timeout = now + T3_REQUEST; + qmsg->retrans++; + } + } + + /* Also clean up reply timeouts */ + while ((!queue_getfirst(gsn->queue_resp, &qmsg)) && + (qmsg->timeout < now)) { + /*printf("Retrans (reply) timeout found: %d\n", (int) time(NULL)); */ + queue_freemsg(gsn->queue_resp, qmsg); + } + + return 0; +} + +static int queue_timer_retranstimeout(struct gsn_t *gsn, struct timeval *timeout) +{ + time_t now, later, diff; + struct qmsg_t *qmsg; + timeout->tv_usec = 0; + + if (queue_getfirst(gsn->queue_req, &qmsg)) { + timeout->tv_sec = 10; + } else { + now = time(NULL); + later = qmsg->timeout; + timeout->tv_sec = later - now; + if (timeout->tv_sec < 0) + timeout->tv_sec = 0; /* No negative allowed */ + if (timeout->tv_sec > 10) + timeout->tv_sec = 10; /* Max sleep for 10 sec */ + } + + if (queue_getfirst(gsn->queue_resp, &qmsg)) { + /* already set by queue_req, do nothing */ + } else { /* trigger faster if earlier timeout exists in queue_resp */ + now = time(NULL); + later = qmsg->timeout; + diff = later - now; + if (diff < 0) + diff = 0; + if (diff < timeout->tv_sec) + timeout->tv_sec = diff; + } + + return 0; +} + +static void queue_timer_start(struct gsn_t *gsn) +{ + struct timeval next; + + /* Retrieve next retransmission as timeval */ + queue_timer_retranstimeout(gsn, &next); + + /* re-schedule the timer */ + osmo_timer_schedule(&gsn->queue_timer, next.tv_sec, next.tv_usec/1000); +} + +/* timer callback for libgtp retransmission and ping */ +static void queue_timer_cb(void *data) +{ + struct gsn_t *gsn = data; + + /* do all the retransmissions as needed */ + queue_timer_retrans(gsn); + + queue_timer_start(gsn); +} + /* *********************************************************** * Reliable delivery of signalling messages * @@ -532,6 +635,10 @@ qmsg->fd = fd; if (pdp) /* echo requests are not pdp-bound */ llist_add(&qmsg->entry, &pdp->qmsg_list_req); + + /* Rearm timer: Retrans time for qmsg just queued may be required + before an existing one (for instance a gtp echo req) */ + queue_timer_start(gsn); } gsn->seq_next++; /* Count up this time */ return 0; @@ -587,82 +694,15 @@ int gtp_retrans(struct gsn_t *gsn) { - /* Retransmit any outstanding packets */ - /* Remove from queue if maxretrans exceeded */ - time_t now; - struct qmsg_t *qmsg; - now = time(NULL); - /*printf("Retrans: New beginning %d\n", (int) now); */ - - /* get first element in queue, as long as the timeout of that - * element has expired */ - while ((!queue_getfirst(gsn->queue_req, &qmsg)) && - (qmsg->timeout <= now)) { - /*printf("Retrans timeout found: %d\n", (int) time(NULL)); */ - if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */ - LOGP(DLGTP, LOGL_NOTICE, "Timeout of seq %" PRIu16 "\n", - qmsg->seq); - if (gsn->cb_conf) - gsn->cb_conf(qmsg->type, EOF, NULL, qmsg->cbp); - queue_freemsg(gsn->queue_req, qmsg); - } else { - LOGP(DLGTP, LOGL_INFO, "Retransmit (%d) of seq %" PRIu16 "\n", - qmsg->retrans, qmsg->seq); - if (sendto(qmsg->fd, &qmsg->p, qmsg->l, 0, - (struct sockaddr *)&qmsg->peer, - sizeof(struct sockaddr_in)) < 0) { - gsn->err_sendto++; - LOGP(DLGTP, LOGL_ERROR, - "Sendto(fd0=%d, msg=%lx, len=%d) failed: Error = %s\n", - gsn->fd0, (unsigned long)&qmsg->p, - qmsg->l, strerror(errno)); - } - queue_back(gsn->queue_req, qmsg); - qmsg->timeout = now + T3_REQUEST; - qmsg->retrans++; - } - } - - /* Also clean up reply timeouts */ - while ((!queue_getfirst(gsn->queue_resp, &qmsg)) && - (qmsg->timeout < now)) { - /*printf("Retrans (reply) timeout found: %d\n", (int) time(NULL)); */ - queue_freemsg(gsn->queue_resp, qmsg); - } - + /* dummy API, deprecated. */ return 0; } int gtp_retranstimeout(struct gsn_t *gsn, struct timeval *timeout) { - time_t now, later, diff; - struct qmsg_t *qmsg; + timeout->tv_sec = 24*60*60; timeout->tv_usec = 0; - - if (queue_getfirst(gsn->queue_req, &qmsg)) { - timeout->tv_sec = 10; - } else { - now = time(NULL); - later = qmsg->timeout; - timeout->tv_sec = later - now; - if (timeout->tv_sec < 0) - timeout->tv_sec = 0; /* No negative allowed */ - if (timeout->tv_sec > 10) - timeout->tv_sec = 10; /* Max sleep for 10 sec */ - } - - if (queue_getfirst(gsn->queue_resp, &qmsg)) { - /* already set by queue_req, do nothing */ - } else { /* trigger faster if earlier timeout exists in queue_resp */ - now = time(NULL); - later = qmsg->timeout; - diff = later - now; - if (diff < 0) - diff = 0; - if (diff < timeout->tv_sec) - timeout->tv_sec = diff; - } - + /* dummy API, deprecated. Return a huge timer to do nothing */ return 0; } @@ -723,6 +763,10 @@ /* No need to add to pdp list here, because even on pdp ctx free we want to leave messages in queue_resp until timeout to detect duplicates */ + + /* Rearm timer: Retrans time for qmsg just queued may be required + before an existing one (for instance a gtp echo req) */ + queue_timer_start(gsn); } return 0; } @@ -872,6 +916,9 @@ /* Initialise pdp table */ pdp_init(*gsn); + /* Initialize internal queue timer */ + osmo_timer_setup(&(*gsn)->queue_timer, queue_timer_cb, *gsn); + /* Initialise call back functions */ (*gsn)->cb_create_context_ind = 0; (*gsn)->cb_delete_context = 0; @@ -959,12 +1006,18 @@ return -errno; } + /* Start internal queue timer */ + queue_timer_start(*gsn); + return 0; } int gtp_free(struct gsn_t *gsn) { + /* Cleanup internal queue timer */ + osmo_timer_del(&gsn->queue_timer); + /* Clean up retransmit queues */ queue_free(gsn->queue_req); queue_free(gsn->queue_resp); diff --git a/gtp/gtp.h b/gtp/gtp.h index f2a4e1d..e03d77d 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -14,6 +14,7 @@ #include #include +#include #include "pdp.h" @@ -268,6 +269,8 @@ struct pdp_t pdpa[PDP_MAX]; /* PDP storage */ struct pdp_t *hashtid[PDP_MAX]; /* Hash table for IMSI + NSAPI */ + struct osmo_timer_list queue_timer; /* internal queue_{req,resp} timer */ + /* Call back functions */ int (*cb_delete_context) (struct pdp_t *); int (*cb_create_context_ind) (struct pdp_t *); @@ -348,8 +351,8 @@ extern int gtp_decaps0(struct gsn_t *gsn); extern int gtp_decaps1c(struct gsn_t *gsn); extern int gtp_decaps1u(struct gsn_t *gsn); -extern int gtp_retrans(struct gsn_t *gsn); -extern int gtp_retranstimeout(struct gsn_t *gsn, struct timeval *timeout); +extern int gtp_retrans(struct gsn_t *gsn) OSMO_DEPRECATED("This API is a no-op, libgtp already does the job internally"); +extern int gtp_retranstimeout(struct gsn_t *gsn, struct timeval *timeout) OSMO_DEPRECATED("This API is a no-op and will return a 1 day timeout"); extern int gtp_set_cb_delete_context(struct gsn_t *gsn, int (*cb_delete_context) (struct pdp_t * -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ife7cfd66d6356f413263fe5bda9e43091f5c9e98 Gerrit-Change-Number: 15309 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 18:09:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 28 Aug 2019 18:09:41 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15310 Change subject: ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs ...................................................................... ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs Related: OS#4178 Change-Id: I295b89ee493d230c2550d461fca9602c589d38b5 --- M ggsn/ggsn.c M ggsn/ggsn.h M sgsnemu/sgsnemu.c 3 files changed, 2 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/10/15310/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 7b32bde..27f3b51 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -739,28 +739,6 @@ return rc; } -static void ggsn_gtp_tmr_start(struct ggsn_ctx *ggsn) -{ - struct timeval next; - - /* Retrieve next retransmission as timeval */ - gtp_retranstimeout(ggsn->gsn, &next); - - /* re-schedule the timer */ - osmo_timer_schedule(&ggsn->gtp_timer, next.tv_sec, next.tv_usec/1000); -} - -/* timer callback for libgtp retransmission and ping */ -static void ggsn_gtp_tmr_cb(void *data) -{ - struct ggsn_ctx *ggsn = data; - - /* do all the retransmissions as needed */ - gtp_retrans(ggsn->gsn); - - ggsn_gtp_tmr_start(ggsn); -} - /* libgtp callback for confirmations */ static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp) { @@ -847,10 +825,6 @@ rc = osmo_fd_register(&ggsn->gtp_fd1u); OSMO_ASSERT(rc == 0); - /* Start GTP re-transmission timer */ - osmo_timer_setup(&ggsn->gtp_timer, ggsn_gtp_tmr_cb, ggsn); - ggsn_gtp_tmr_start(ggsn); - gtp_set_cb_data_ind(ggsn->gsn, encaps_tun); gtp_set_cb_delete_context(ggsn->gsn, delete_context); gtp_set_cb_create_context_ind(ggsn->gsn, create_context_ind); @@ -878,8 +852,6 @@ llist_for_each_entry(apn, &ggsn->apn_list, list) apn_stop(apn); - osmo_timer_del(&ggsn->gtp_timer); - osmo_fd_unregister(&ggsn->gtp_fd1u); osmo_fd_unregister(&ggsn->gtp_fd1c); osmo_fd_unregister(&ggsn->gtp_fd0); diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index f23df54..82984a0 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -138,8 +138,6 @@ struct osmo_fd gtp_fd0; struct osmo_fd gtp_fd1c; struct osmo_fd gtp_fd1u; - - struct osmo_timer_list gtp_timer; }; /* ggsn_vty.c */ diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 4f1f844..863ea51 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -1801,7 +1801,8 @@ FD_SET(gsn->fd1c, &fds); FD_SET(gsn->fd1u, &fds); - gtp_retranstimeout(gsn, &idleTime); + idleTime.tv_sec = 10; + idleTime.tv_usec = 0; ping_timeout(&idleTime); if (options.debug) @@ -1817,9 +1818,6 @@ SYS_ERR(DSGSN, LOGL_ERROR, 0, "Select returned -1"); break; - case 0: - gtp_retrans(gsn); /* Only retransmit if nothing else */ - break; default: break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I295b89ee493d230c2550d461fca9602c589d38b5 Gerrit-Change-Number: 15310 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:20:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 28 Aug 2019 21:20:53 +0000 Subject: Change in ...pysim[master]: make writing SMSP optional Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/15312 Change subject: make writing SMSP optional ...................................................................... make writing SMSP optional Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4 --- M pySim/cards.py 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/15312/1 diff --git a/pySim/cards.py b/pySim/cards.py index cb42d83..55282aa 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -394,8 +394,9 @@ data, sw = self._scc.update_binary('6f78', lpad(p['acc'], 4)) # EF.SMSP - r = self._scc.select_file(['3f00', '7f10', '6f42']) - data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80)) + if p.get('smsp'): + r = self._scc.select_file(['3f00', '7f10', '6f42']) + data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80)) # Set the Ki using proprietary command pdu = '80d4020010' + p['ki'] @@ -535,7 +536,8 @@ r = self._scc.select_file(['3f00', '7f10']) # write EF.SMSP - data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80)) + if p.get('smsp'): + data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80)) def erase(self): return @@ -614,8 +616,9 @@ print("Programming AD failed with code %s"%sw) # EF.SMSP - r = self._scc.select_file(['3f00', '7f10']) - data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True) + if p.get('smsp'): + r = self._scc.select_file(['3f00', '7f10']) + data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True) def erase(self): return -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4 Gerrit-Change-Number: 15312 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:20:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 28 Aug 2019 21:20:53 +0000 Subject: Change in ...pysim[master]: Make programming OPC optional Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/15311 Change subject: Make programming OPC optional ...................................................................... Make programming OPC optional Change-Id: Ic600c325557918cb7d5b1fb179c01936a078c96c --- M pySim/cards.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/11/15311/1 diff --git a/pySim/cards.py b/pySim/cards.py index a341b71..cb42d83 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -582,9 +582,9 @@ data, sw = self._scc.update_binary('00FF', p['ki']) # set OPc in proprietary file - content = "01" + p['opc'] - data, sw = self._scc.update_binary('00F7', content) - + if 'opc' in p: + content = "01" + p['opc'] + data, sw = self._scc.update_binary('00F7', content) # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic600c325557918cb7d5b1fb179c01936a078c96c Gerrit-Change-Number: 15311 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:22:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 28 Aug 2019 21:22:26 +0000 Subject: Change in ...pysim[master]: pySim-prog: Use CSV format with headers Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/15313 Change subject: pySim-prog: Use CSV format with headers ...................................................................... pySim-prog: Use CSV format with headers This way we can have optional fields like adm1 in the file Also require iccid as identifier for the SIM card Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236 --- M pySim-prog.py M pySim/cards.py 2 files changed, 22 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/15313/1 diff --git a/pySim-prog.py b/pySim-prog.py index 2638eef..dde9194 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -399,7 +399,7 @@ 'ki' : ki, 'opc' : opc, 'acc' : acc, - 'pin_adm' : pin_adm, + 'adm1' : pin_adm, } @@ -414,6 +414,7 @@ > Ki : %(ki)s > OPC : %(opc)s > ACC : %(acc)s + > ADM1 : %(adm1)s """ % params @@ -427,18 +428,23 @@ cw.writerow([params[x] for x in row]) f.close() -def _read_params_csv(opts, imsi): +def _read_params_csv(opts, iccid=None, imsi=None): import csv - row = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'smsp', 'ki', 'opc'] f = open(opts.read_csv, 'r') - cr = csv.DictReader(f, row) + cr = csv.DictReader(f) i = 0 + if not 'iccid' in cr.fieldnames: + raise Exception("CSV file in wrong format!") for row in cr: if opts.num is not None and opts.read_imsi is False: if opts.num == i: f.close() return row; i += 1 + if row['iccid'] == iccid: + f.close() + return row; + if row['imsi'] == imsi: f.close() return row; @@ -446,8 +452,8 @@ f.close() return None -def read_params_csv(opts, imsi): - row = _read_params_csv(opts, imsi) +def read_params_csv(opts, imsi=None, iccid=None): + row = _read_params_csv(opts, iccid=iccid, imsi=imsi) if row is not None: row['mcc'] = int(row['mcc']) row['mnc'] = int(row['mnc']) @@ -628,7 +634,9 @@ if opts.source == 'cmdline': cp = gen_parameters(opts) elif opts.source == 'csv': - if opts.read_imsi: + imsi = None + iccid = None + if opts.read_imsi: if opts.dry_run: # Connect transport print "Insert card now (or CTRL-C to cancel)" @@ -637,7 +645,7 @@ imsi = swap_nibbles(res)[3:] else: imsi = opts.imsi - cp = read_params_csv(opts, imsi) + cp = read_params_csv(opts, imsi=imsi, iccid=iccid) if cp is None: print "Error reading parameters\n" sys.exit(2) diff --git a/pySim/cards.py b/pySim/cards.py index 55282aa..a850e5a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -375,8 +375,8 @@ #self._scc.verify_chv(4, h2b("4444444444444444")) # Authenticate using ADM PIN 5 - if p['pin_adm']: - pin = h2b(p['pin_adm']) + if p['adm1']: + pin = h2b(p['adm1']) else: pin = h2b("4444444444444444") self._scc.verify_chv(5, pin) @@ -495,8 +495,8 @@ # P1: 3A for PIN, 3B for PUK # P2: CHV number, as in VERIFY CHV for PIN, and as in UNBLOCK CHV for PUK # P3: 08, CHV length (curiously the PUK is also 08 length, instead of 10) - if p['pin_adm']: - pin = p['pin_adm'] + if p['adm1']: + pin = p['adm1'] else: pin = h2b("4444444444444444") @@ -567,9 +567,9 @@ def program(self, p): # authenticate as ADM using default key (written on the card..) - if not p['pin_adm']: + if not p['adm1']: raise ValueError("Please provide a PIN-ADM as there is no default one") - self._scc.verify_chv(0x0A, h2b(p['pin_adm'])) + self._scc.verify_chv(0x0A, p['adm1']) # select MF r = self._scc.select_file(['3f00']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236 Gerrit-Change-Number: 15313 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:22:30 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 21:22:30 +0000 Subject: Change in ...osmo-msc[master]: mncc: send payload type matching chosen codec In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15060 ) Change subject: mncc: send payload type matching chosen codec ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id32f32d77d24b753adb96b5393c0363439e312c2 Gerrit-Change-Number: 15060 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 28 Aug 2019 21:22:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:22:45 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 21:22:45 +0000 Subject: Change in ...osmo-msc[master]: mncc: send payload type matching chosen codec In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15060 ) Change subject: mncc: send payload type matching chosen codec ...................................................................... mncc: send payload type matching chosen codec Change-Id: Id32f32d77d24b753adb96b5393c0363439e312c2 --- M include/osmocom/msc/mncc_call.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 27 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved keith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/mncc_call.h b/include/osmocom/msc/mncc_call.h index ad0f0f8..e887cbe 100644 --- a/include/osmocom/msc/mncc_call.h +++ b/include/osmocom/msc/mncc_call.h @@ -22,6 +22,7 @@ */ #pragma once +#include #include #include @@ -138,3 +139,5 @@ struct mncc_call *mncc_call_find_by_callref(uint32_t callref); void mncc_call_release(struct mncc_call *mncc_call); + +uint32_t mgcp_codec_to_mncc_payload_msg_type(enum mgcp_codecs codec); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 34d95f6..f974e90 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -30,6 +30,8 @@ #include #include +#include + #include #include #include @@ -1667,18 +1669,28 @@ struct gsm_network *net = msc_a_net(msc_a); struct call_leg *cl = msc_a->cc.call_leg; struct osmo_sockaddr_str *rtp_cn_local; - /* FIXME: This has to be set to some meaningful value, - * before the MSC-Split, this value was pulled from - * lchan->abis_ip.rtp_payload */ - uint32_t payload_type = 0; - int msg_type; + struct rtp_stream *rtp_cn = cl ? cl->rtp[RTP_TO_CN] : NULL; + uint32_t payload_type; + int payload_msg_type; + const struct mgcp_conn_peer *mgcp_info; - /* FIXME This has to be set to some meaningful value. - * Possible options are: - * GSM_TCHF_FRAME, GSM_TCHF_FRAME_EFR, - * GSM_TCHH_FRAME, GSM_TCH_FRAME_AMR - * (0 if unknown) */ - msg_type = GSM_TCHF_FRAME; + if (!rtp_cn) { + LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "Cannot RTP CREATE to MNCC, no RTP set up for the CN side\n"); + return -EINVAL; + } + + if (!rtp_cn->codec_known) { + LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, + "Cannot RTP CREATE to MNCC, no codec set up for the RTP CN side\n"); + return -EINVAL; + } + + /* Codec */ + payload_msg_type = mgcp_codec_to_mncc_payload_msg_type(rtp_cn->codec); + + /* Payload Type number */ + mgcp_info = osmo_mgcpc_ep_ci_get_rtp_info(rtp_cn->ci); + payload_type = map_codec_to_pt(mgcp_info->ptmap, mgcp_info->ptmap_len, rtp_cn->codec); rtp_cn_local = call_leg_local_ip(cl, RTP_TO_CN); if (!rtp_cn_local) { @@ -1686,7 +1698,7 @@ return -EINVAL; } - return mncc_recv_rtp(net, trans, trans->callref, MNCC_RTP_CREATE, rtp_cn_local, payload_type, msg_type); + return mncc_recv_rtp(net, trans, trans->callref, MNCC_RTP_CREATE, rtp_cn_local, payload_type, payload_msg_type); } static int tch_rtp_connect(struct gsm_network *net, const struct gsm_mncc_rtp *rtp) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id32f32d77d24b753adb96b5393c0363439e312c2 Gerrit-Change-Number: 15060 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:25:01 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 21:25:01 +0000 Subject: Change in ...osmo-msc[master]: fix segfault: don't send CC REL on NULL msc_a Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15314 Change subject: fix segfault: don't send CC REL on NULL msc_a ...................................................................... fix segfault: don't send CC REL on NULL msc_a Apparently, if a conn disappears during an ongoing call, the CC code tried to send a CC REL on a NULL msc_a during cleanup, which lead to a crash (cccamp2019). Guard against that. Crash: #0 msc_a_tx_dtap_to_i (msc_a=0x0, dtap=0x55a4bf2fa0f0) at ../../../../src/osmo-msc/src/libmsc/msc_a.c:1565 #1 0x000055a4be1bb03c in trans_tx_gsm48 (trans=0x55a4bf2d52a0, trans=0x55a4bf2d52a0, trans=0x55a4bf2d52a0, msg=) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:82 #2 gsm48_cc_tx_release (trans=trans at entry=0x55a4bf2d52a0, arg=arg at entry=0x7ffdd731a0e0) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:1101 #3 0x000055a4be1bee65 in _gsm48_cc_trans_free (trans=trans at entry=0x55a4bf2d52a0) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:278 #4 0x000055a4be1ab654 in trans_free (trans=trans at entry=0x55a4bf2d52a0) at ../../../../src/osmo-msc/src/libmsc/transaction.c:170 #5 0x000055a4be1bd091 in mncc_tx_to_gsm_cc (net=, msg=msg at entry=0x55a4bf2d3b68) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:1971 #6 0x000055a4be1bf1e5 in mncc_tx_to_cc (net=, arg=arg at entry=0x55a4bf2d3b68) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:2049 #7 0x000055a4be18ed63 in mncc_sock_read (bfd=0x55a4bf2563b8, bfd=0x55a4bf2563b8) at ../../../../src/osmo-msc/src/libmsc/mncc_sock.c:121 #8 mncc_sock_cb (bfd=0x55a4bf2563b8, flags=1) at ../../../../src/osmo-msc/src/libmsc/mncc_sock.c:189 #9 0x00007fcfad607ce1 in osmo_fd_disp_fds (_eset=0x7ffdd731a9a0, _wset=0x7ffdd731a920, _rset=0x7ffdd731a8a0) at ../../../src/libosmocore/src/select.c:223 #10 osmo_select_main (polling=) at ../../../src/libosmocore/src/select.c:263 #11 0x000055a4be17dd56 in main (argc=3, argv=) at ../../../../src/osmo-msc/src/osmo-msc/msc_main.c:723 Change-Id: Ia1bb0410ad0618c182a5f6da06af342b6d483eff --- M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/15314/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f974e90..5217861 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1074,8 +1074,16 @@ static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg) { struct gsm_mncc *rel = arg; - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC REL"); - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + struct msgb *msg; + struct gsm48_hdr *gh; + + if (!trans->msc_a) { + LOG_TRANS(trans, LOGL_DEBUG, "Cannot send CC REL, there is no MSC-A connection\n"); + return -EINVAL; + } + + msg = gsm48_msgb_alloc_name("GSM 04.08 CC REL"); + gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_RELEASE; diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 553761f..b3e2e32 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1562,6 +1562,15 @@ { struct ran_msg ran_msg; + if (!msc_a) { + struct gsm48_hdr *gh = msgb_l3(dtap) ? : dtap->data; + uint8_t pdisc = gsm48_hdr_pdisc(gh); + LOGP(DMSC, LOGL_ERROR, "Attempt to send DTAP to NULL MSC-A, dropping message: %s %s\n", + gsm48_pdisc_name(pdisc), gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh))); + msgb_free(dtap); + return -EIO; + } + if (msc_a->c.ran->type == OSMO_RAT_EUTRAN_SGS) { /* The SGs connection to the MME always is at the MSC-A. */ return sgs_iface_tx_dtap_ud(msc_a, dtap); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia1bb0410ad0618c182a5f6da06af342b6d483eff Gerrit-Change-Number: 15314 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:25:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 21:25:02 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15315 Change subject: vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD ...................................................................... vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD Change-Id: I2ea4f46efa013671d93892cb07bf830393289150 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err 2 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/15315/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 454709f..2db5711 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1234,6 +1234,10 @@ } } break; + case VLR_ULA_E_ID_IMEI: + case VLR_ULA_E_ID_IMEISV: + /* Got the IMEI from ME, nothing to do right now though. */ + break; default: OSMO_ASSERT(0); break; @@ -1400,7 +1404,9 @@ }, [VLR_ULA_S_WAIT_HLR_UPD] = { .in_event_mask = S(VLR_ULA_E_HLR_LU_RES) | - S(VLR_ULA_E_UPD_HLR_COMPL), + S(VLR_ULA_E_UPD_HLR_COMPL) | + S(VLR_ULA_E_ID_IMEI) | + S(VLR_ULA_E_ID_IMEISV), .out_state_mask = S(VLR_ULA_S_WAIT_LU_COMPL) | S(VLR_ULA_S_WAIT_LU_COMPL_STANDALONE) | S(VLR_ULA_S_DONE), diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 893203e..7b9970d 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1789,7 +1789,6 @@ DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_ID_IMEISV -DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Event VLR_ULA_E_ID_IMEISV not permitted DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - ms_sends_ciphering_mode_complete: now used by 1 (lu) lu_result_sent == 0 - Subscriber has the IMEISV -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2ea4f46efa013671d93892cb07bf830393289150 Gerrit-Change-Number: 15315 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 21:25:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 21:25:02 +0000 Subject: Change in ...osmo-msc[master]: tweak CC cause for incoming call to unattached nr Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15316 Change subject: tweak CC cause for incoming call to unattached nr ...................................................................... tweak CC cause for incoming call to unattached nr So far we sent CC cause "Unassigned Number" But the MSC doesn't trivially know whether the HLR has the number assigned or not: any handset that is currently switched off would cause "Unassigned number" to be displayed on the caller's handset. Rather send a temporary failure cause code. Send this cause code for all cases, because claiming that an assigned number is unassigned is worse than rejecting an unassigned number with a temporary failure. Change-Id: Ia3d4f67b53fcc2654ff048fbc338e92cb763a095 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/15316/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5217861..c941a7a 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1890,7 +1890,7 @@ } if (!vsub) return mncc_release_ind(net, NULL, data->callref, GSM48_CAUSE_LOC_PRN_S_LU, - GSM48_CC_CAUSE_UNASSIGNED_NR); + GSM48_CC_CAUSE_USER_NOTRESPOND); /* update the subscriber we deal with */ log_set_context(LOG_CTX_VLR_SUBSCR, vsub); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia3d4f67b53fcc2654ff048fbc338e92cb763a095 Gerrit-Change-Number: 15316 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 22:37:50 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 22:37:50 +0000 Subject: Change in ...osmo-msc[master]: fix error on Ciphering Mode Complete L3 IE decoding Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15317 Change subject: fix error on Ciphering Mode Complete L3 IE decoding ...................................................................... fix error on Ciphering Mode Complete L3 IE decoding When an MS returns the IMEISV in the BSSMAP Ciphering Mode Complete message in the Layer 3 Message Contents IE, do not re-invoke the decode_cb() a second time, but instead point to it from the ran_msg.cipher_mode_complete struct. When the MSC-A decodes the Ciphering Mode Complete message, it always wants to also decode the enclosed DTAP from the Layer 3 Message Contents IE. However, when the MSC-I preliminarily decodes messages, it often just wants to identify specific messages without fully acting on them, let alone dispatching RAN_UP_L2 events more than once. So leave it up to the supplied decode_cb passed to ran_dec_l2() implementations to decide whether to decode the DTAP. In msc_a.c hence evaluate the DTAP by passing a non-allocated msgb instance to msc_a_up_l3(), which will evaluate the RR Ciphering Mode Complete message found in the BSSMAP Ciphering Mode Complete's Layer 3 Message Contents IE. Particularly, the previous choice of calling the decode_cb a second time for the enclosed DTAP caused a header/length parsing error: the second decode_cb call tried to mimick DTAP by overwriting the l3h pointer and truncating the length of the msgb, but subsequently ran_a_decode_l2() would again derive the l3h from the l2h, obliterating the intended re-interpretation as DTAP, and hence the previous truncation caused error messages on each and every Ciphering Mode Complete message, like: DBSSAP ERROR libmsc/ran_msg_a.c:764 msc_a(IMSI-26242340300XXXX:MSISDN-XXXX:TMSI-0xA73E055A:GERAN-A-77923:LU)[0x5563947521e0]{MSC_A_ST_AUTH_CIPH}: RAN decode: BSSMAP: BSSMAP data truncated, discarding message This error was seen a lot at CCCamp2019. Modifying the msgb was a bad idea to begin with, the approach taken in this patch is much cleaner. Note that apparently many phones include the IMEISV in the Cipher Mode Complete message even though the BSSMAP Cipher Mode Command did not include the Cipher Response Mode IE. So, even though we did not specifically ask for the Cipher Mode Complete to include any identity, many MS default to including the IMEISV of their own accord. Reproduce: attach to osmo-msc with Ciphering enabled using a Samsung Galaxy S4mini. Related: OS#4168 Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d --- M include/osmocom/msc/ran_msg.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M src/libmsc/ran_msg_a.c 4 files changed, 23 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/15317/1 diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index af0822b..081c7ad 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -210,6 +210,7 @@ * alg_id == 0 means no such IE was present. */ uint8_t alg_id; const char *imeisv; + const struct tlv_p_entry *l3_msg; } cipher_mode_complete; struct { enum gsm0808_cause bssap_cause; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 086116f..0bdc4fb 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1185,7 +1185,7 @@ if (!mi) return 0; - LOG_MSC_A(msc_a, LOGL_DEBUG, "Ciphering Mode Complete contains Mobile Identity: %s\n", + LOG_MSC_A(msc_a, LOGL_DEBUG, "RR Ciphering Mode Complete contains Mobile Identity: %s\n", osmo_mi_name(mi->val, mi->len)); if (!vsub) diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 553761f..44ef194 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1401,6 +1401,24 @@ }; vlr_subscr_rx_ciph_res(vsub, VLR_CIPH_COMPL); rc = 0; + + /* Evaluate enclosed L3 message, typically Identity Response (IMEISV) */ + if (msg->cipher_mode_complete.l3_msg) { + unsigned char *data = (unsigned char*)(msg->cipher_mode_complete.l3_msg->val); + uint16_t len = msg->cipher_mode_complete.l3_msg->len; + + /* All of the DTAP handling code expects a msgb argument pointing at the data. + * We could allocate a separate msgb, but this static msgb saves the extra allocation. */ + struct msgb dtap = { + .data_len = len, + .len = len, + .data = data, + .head = data, + .tail = data + len, + .l3h = data, + }; + rc = msc_a_up_l3(msc_a, &dtap); + } break; case RAN_MSG_CIPHER_MODE_REJECT: diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index fd8afdc..5b624a3 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -194,18 +194,10 @@ ran_dec_msg.cipher_mode_complete.alg_id = ie_chosen_encr_alg->val[0]; } - rc = ran_decoded(ran_dec, &ran_dec_msg); + if (ie_l3_msg) + ran_dec_msg.cipher_mode_complete.l3_msg = ie_l3_msg; - if (ie_l3_msg) { - msg->l3h = (uint8_t*)ie_l3_msg->val; - msgb_l3trim(msg, ie_l3_msg->len); - ran_dec_msg = (struct ran_msg){ - .msg_type = RAN_MSG_DTAP, - .msg_name = "BSSMAP Ciphering Mode Complete (L3 Message Contents)", - .dtap = msg, - }; - ran_decoded(ran_dec, &ran_dec_msg); - } + rc = ran_decoded(ran_dec, &ran_dec_msg); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d Gerrit-Change-Number: 15317 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 22:45:23 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 22:45:23 +0000 Subject: Change in ...osmo-msc[master]: fix error on Ciphering Mode Complete L3 IE decoding In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 to look at the new patch set (#2). Change subject: fix error on Ciphering Mode Complete L3 IE decoding ...................................................................... fix error on Ciphering Mode Complete L3 IE decoding When an MS returns the IMEISV in the BSSMAP Ciphering Mode Complete message in the Layer 3 Message Contents IE, do not re-invoke the decode_cb() a second time, but instead point to it from the ran_msg.cipher_mode_complete struct. When the MSC-A decodes the Ciphering Mode Complete message, it always wants to also decode the enclosed DTAP from the Layer 3 Message Contents IE. However, when the MSC-I preliminarily decodes messages, it often just wants to identify specific messages without fully acting on them, let alone dispatching RAN_UP_L2 events more than once. So leave it up to the supplied decode_cb passed to ran_dec_l2() implementations to decide whether to decode the DTAP. In msc_a.c hence evaluate the DTAP by passing a non-allocated msgb instance to msc_a_up_l3(), which will evaluate the RR Ciphering Mode Complete message found in the BSSMAP Ciphering Mode Complete's Layer 3 Message Contents IE. Particularly, the previous choice of calling the decode_cb a second time for the enclosed DTAP caused a header/length parsing error: the second decode_cb call tried to mimick DTAP by overwriting the l3h pointer and truncating the length of the msgb, but subsequently ran_a_decode_l2() would again derive the l3h from the l2h, obliterating the intended re-interpretation as DTAP, and hence the previous truncation caused error messages on each and every Ciphering Mode Complete message, like: DBSSAP ERROR libmsc/ran_msg_a.c:764 msc_a(IMSI-26242340300XXXX:MSISDN-XXXX:TMSI-0xA73E055A:GERAN-A-77923:LU)[0x5563947521e0]{MSC_A_ST_AUTH_CIPH}: RAN decode: BSSMAP: BSSMAP data truncated, discarding message This error was seen a lot at CCCamp2019. Modifying the msgb was a bad idea to begin with, the approach taken in this patch is much cleaner. Note that apparently many phones include the IMEISV in the Cipher Mode Complete message even though the BSSMAP Cipher Mode Command did not include the Cipher Response Mode IE. So, even though we did not specifically ask for the Cipher Mode Complete to include any identity, many MS default to including the IMEISV of their own accord. Reproduce: attach to osmo-msc with Ciphering enabled using a Samsung Galaxy S4mini. Related: OS#4168 Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_a.c 3 files changed, 22 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/15317/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d Gerrit-Change-Number: 15317 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 28 22:45:26 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 28 Aug 2019 22:45:26 +0000 Subject: Change in ...osmo-msc[master]: log, cosmetic: add "RR" to "Ciphering Mode Complete" Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15318 Change subject: log, cosmetic: add "RR" to "Ciphering Mode Complete" ...................................................................... log, cosmetic: add "RR" to "Ciphering Mode Complete" Distinguish the enclosed DTAP RR Ciphering Mode Complete message from the outer BSSMAP Cipher Mode Complete message in the DEBUG log. Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/15318/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 086116f..0bdc4fb 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1185,7 +1185,7 @@ if (!mi) return 0; - LOG_MSC_A(msc_a, LOGL_DEBUG, "Ciphering Mode Complete contains Mobile Identity: %s\n", + LOG_MSC_A(msc_a, LOGL_DEBUG, "RR Ciphering Mode Complete contains Mobile Identity: %s\n", osmo_mi_name(mi->val, mi->len)); if (!vsub) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 893203e..89455de 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1785,7 +1785,7 @@ DVLR upd_hlr_vlr_fsm(IMSI-901700000004620:GERAN-A:LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_CIPH_M_COMPL -DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ciphering Mode Complete contains Mobile Identity: IMEI-SV-4234234234234275F +DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RR Ciphering Mode Complete contains Mobile Identity: IMEI-SV-4234234234234275F DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_ID_IMEISV -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4 Gerrit-Change-Number: 15318 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Aug 28 23:07:34 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 23:07:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d670951700b0_e2a2aabfaa785fc2598c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 331s] ar: `u' modifier ignored since `D' is the default (see `U') [ 331s] libtool: link: ranlib .libs/libtransceiver_common.a [ 331s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 331s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 331s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 331s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 331s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 331s] collect2: error: ld returned 1 exit status [ 332s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 332s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 332s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 332s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 332s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 332s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 332s] make[1]: *** [Makefile:444: all] Error 2 [ 332s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 332s] dh_auto_build: make -j1 returned exit code 2 [ 332s] make: *** [debian/rules:6: build] Error 255 [ 332s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 332s] [ 332s] sheep83 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 23:07:29 UTC 2019. [ 332s] [ 332s] ### VM INTERACTION START ### [ 335s] [ 321.962951] sysrq: SysRq : Power Off [ 335s] [ 321.969205] reboot: Power down [ 335s] ### VM INTERACTION END ### [ 335s] [ 335s] sheep83 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Aug 28 23:07:33 UTC 2019. [ 335s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Aug 28 23:16:08 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 28 Aug 2019 23:16:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d670c0e91107_e2a2aabfaa785fc2621a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 521s] ar: `u' modifier ignored since `D' is the default (see `U') [ 521s] libtool: link: ranlib .libs/libtransceiver_common.a [ 522s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 522s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 522s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 522s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 522s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 522s] collect2: error: ld returned 1 exit status [ 522s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 522s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 522s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 522s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 522s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 522s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 522s] make[1]: *** [Makefile:444: all] Error 2 [ 522s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 522s] dh_auto_build: make -j1 returned exit code 2 [ 522s] make: *** [debian/rules:6: build] Error 255 [ 522s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 522s] [ 522s] lamb05 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 28 23:16:00 UTC 2019. [ 522s] [ 522s] ### VM INTERACTION START ### [ 525s] [ 507.083353] sysrq: SysRq : Power Off [ 525s] [ 507.088780] reboot: Power down [ 525s] ### VM INTERACTION END ### [ 525s] [ 525s] lamb05 failed "build osmo-trx_1.1.1.dsc" at Wed Aug 28 23:16:03 UTC 2019. [ 525s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 02:59:11 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 02:59:11 +0000 Subject: Change in ...osmo-msc[master]: memleak on cc setup errors Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15319 Change subject: memleak on cc setup errors ...................................................................... memleak on cc setup errors Change-Id: I3333b90064575b270627721ace7e07d085f4ad43 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/15319/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f974e90..a1fea9a 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -598,6 +598,7 @@ GSM48_CC_CAUSE_RESOURCE_UNAVAIL); trans->callref = 0; trans_free(trans); + msgb_free(msg); return rc; } @@ -610,6 +611,7 @@ GSM48_CC_CAUSE_RESOURCE_UNAVAIL); trans->callref = 0; trans_free(trans); + msgb_free(msg); return rc; } trans->transaction_id = trans_id; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3333b90064575b270627721ace7e07d085f4ad43 Gerrit-Change-Number: 15319 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 02:59:11 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 02:59:11 +0000 Subject: Change in ...osmo-msc[master]: cc trans: make sure bearer cap is empty Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15320 Change subject: cc trans: make sure bearer cap is empty ...................................................................... cc trans: make sure bearer cap is empty Change-Id: I147f10f9258fc8685f2f666878dd2a655b8e4583 --- M src/libmsc/transaction.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15320/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index ebdaced..11cde93 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -147,6 +147,10 @@ .transaction_id = trans_id, .callref = callref, .net = net, + /* empty bearer_cap: make sure the speech_ver array is empty */ + .bearer_cap = { + .speech_ver = { -1 }, + }, }; vlr_subscr_get(vsub, trans_vsub_use(type)); llist_add_tail(&trans->entry, &net->trans_list); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I147f10f9258fc8685f2f666878dd2a655b8e4583 Gerrit-Change-Number: 15320 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:06:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:06:15 +0000 Subject: Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 to look at the new patch set (#3). Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE ...................................................................... fix error on BSSMAP Cipher Mode Complete L3 msg IE When an MS returns the IMEISV in the BSSMAP Cipher Mode Complete message in the Layer 3 Message Contents IE, do not re-invoke the decode_cb() a second time, but instead point to it from the ran_msg.cipher_mode_complete struct. When the MSC-A decodes the Ciphering Mode Complete message, it always wants to also decode the enclosed DTAP from the Layer 3 Message Contents IE. However, when the MSC-I preliminarily decodes messages, it often just wants to identify specific messages without fully acting on them, let alone dispatching RAN_UP_L2 events more than once. So leave it up to the supplied decode_cb passed to ran_dec_l2() implementations to decide whether to decode the DTAP. In msc_a.c hence evaluate the DTAP by passing a non-allocated msgb instance to msc_a_up_l3(), which will evaluate the RR Ciphering Mode Complete message found in the BSSMAP Cipher Mode Complete's Layer 3 Message Contents IE. Particularly, the previous choice of calling the decode_cb a second time for the enclosed DTAP caused a header/length parsing error: the second decode_cb call tried to mimick DTAP by overwriting the l3h pointer and truncating the length of the msgb, but subsequently ran_a_decode_l2() would again derive the l3h from the l2h, obliterating the intended re-interpretation as DTAP, and hence the previous truncation caused error messages on each and every Cipher Mode Complete message, like: DBSSAP ERROR libmsc/ran_msg_a.c:764 msc_a(IMSI-26242340300XXXX:MSISDN-XXXX:TMSI-0xA73E055A:GERAN-A-77923:LU)[0x5563947521e0]{MSC_A_ST_AUTH_CIPH}: RAN decode: BSSMAP: BSSMAP data truncated, discarding message This error was seen a lot at CCCamp2019. Modifying the msgb was a bad idea to begin with, the approach taken in this patch is much cleaner. Note that apparently many phones include the IMEISV in the Cipher Mode Complete message even though the BSSMAP Cipher Mode Command did not include the Cipher Response Mode IE. So, even though we did not specifically ask for the Cipher Mode Complete to include any identity, many MS default to including the IMEISV of their own accord. Reproduce: attach to osmo-msc with ciphering enabled using a Samsung Galaxy S4mini. Related: OS#4168 Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_a.c 3 files changed, 22 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/15317/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d Gerrit-Change-Number: 15317 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:06:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:06:15 +0000 Subject: Change in ...osmo-msc[master]: log, cosmetic: add "RR" to "Ciphering Mode Complete" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15318 to look at the new patch set (#2). Change subject: log, cosmetic: add "RR" to "Ciphering Mode Complete" ...................................................................... log, cosmetic: add "RR" to "Ciphering Mode Complete" Distinguish the enclosed DTAP RR Ciphering Mode Complete message from the outer BSSMAP Cipher Mode Complete message in the DEBUG log. Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/15318/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4 Gerrit-Change-Number: 15318 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:31:30 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:31:30 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Even if multiple MSC were still a use case, it makes sense to send to the first one by default. If the user wanted to configure a different MSC as Paging Response target, she could just rearrange the ordering. https://gerrit.osmocom.org/#/c/15209/2/src/osmo-bsc/gsm_08_08.c File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/#/c/15209/2/src/osmo-bsc/gsm_08_08.c at 327 PS2, Line 327: goto blind; lol "go blind" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 03:31:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:34:13 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:34:13 +0000 Subject: Change in ...pysim[master]: Make programming OPC optional In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15311 ) Change subject: Make programming OPC optional ...................................................................... Patch Set 1: Code-Review+1 I was kind of expecting a cmdline switch to go along with this? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic600c325557918cb7d5b1fb179c01936a078c96c Gerrit-Change-Number: 15311 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 03:34:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:34:21 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:34:21 +0000 Subject: Change in ...pysim[master]: make writing SMSP optional In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15312 ) Change subject: make writing SMSP optional ...................................................................... Patch Set 1: Code-Review+1 I was kind of expecting a cmdline switch to go along with this? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4 Gerrit-Change-Number: 15312 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 03:34:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:36:01 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:36:01 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 ) Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... Patch Set 2: Code-Review+1 I don't fully understand, but looks sane to me -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 03:36:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:41:17 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:41:17 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_echo_timeout In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 ) Change subject: sgsn: Introduce test TC_attach_echo_timeout ...................................................................... Patch Set 1: Code-Review+1 (1 comment) I don't fully comprehend but looks sane enough https://gerrit.osmocom.org/#/c/15306/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/15306/1/sgsn/SGSN_Tests.ttcn at 1562 PS1, Line 1562: should drop the pdp ctx. Around T3 (3secs) * 6 (+ extra, a lot due to OS#4178): */ maybe could f_vty_transceive() to configure a shorter timeout? (to get a shorter test run) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 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: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 Gerrit-Change-Number: 15306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 03:41:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:45:30 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:45:30 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: fix formatting in if line In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 ) Change subject: cosmetic: fix formatting in if line ...................................................................... Patch Set 1: Code-Review+1 (1 comment) not really worth the trouble, but whatever https://gerrit.osmocom.org/#/c/15302/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15302/1//COMMIT_MSG at 10 PS1, Line 10: Fixes: 2d6a69e69a4b4cb2b8cc63c4810dae44e5a4d8f6 AFAIK the'Fixes:' tag should reference an issue number. I'd rather say "Introduced in eefa...". -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 Gerrit-Change-Number: 15302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 03:45:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:47:52 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:47:52 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Log msg retransmits and timeouts In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 ) Change subject: gtp: Log msg retransmits and timeouts ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15305/1/gtp/gtp.c File gtp/gtp.c: https://gerrit.osmocom.org/#/c/15305/1/gtp/gtp.c at 604 PS1, Line 604: qmsg->seq); (line width of 120?) (so far we just use '%u' for all kinds of unsigned types <= unsigned int, and it seems to work fine?) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 Gerrit-Change-Number: 15305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 03:47:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 29 03:54:43 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 03:54:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d674c9140647_e2a2aabfaa785fc3278bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 330s] ar: `u' modifier ignored since `D' is the default (see `U') [ 330s] libtool: link: ranlib .libs/libtransceiver_common.a [ 330s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 330s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 330s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 330s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 330s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 330s] collect2: error: ld returned 1 exit status [ 330s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 330s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 331s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 331s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 331s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 331s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 331s] make[1]: *** [Makefile:444: all] Error 2 [ 331s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 331s] dh_auto_build: make -j1 returned exit code 2 [ 331s] make: *** [debian/rules:6: build] Error 255 [ 331s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 331s] [ 331s] sheep82 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 03:54:32 UTC 2019. [ 331s] [ 331s] ### VM INTERACTION START ### [ 334s] [ 321.386962] sysrq: SysRq : Power Off [ 334s] [ 321.393013] reboot: Power down [ 334s] ### VM INTERACTION END ### [ 334s] [ 334s] sheep82 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 03:54:36 UTC 2019. [ 334s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:55:26 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:55:26 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 ) Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... Patch Set 2: Code-Review-1 (1 comment) plz explain... https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c at 329 PS2, Line 329: close(conn->fd.fd); I'm also wondering. Have you seen a scenario where an unregistered fd was unregistered again? Would that mean that close_connection() was called twice and this function should exit if the fd is not registered? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 03:55:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:19 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:19 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15134 ) Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() ...................................................................... mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() Instead of manually entering codec values, use mgcp_codec_add() to populate test conns with codecs. The idea is to better test what actually happens when parsing SDP codec strings. Rewrite current test_mgcp_codec_pt_translate() from procedural to a data model with human readable stdout logging. This prepares to enable interpreting codec strings like "FOO/8000/1" as equivalent with "FOO/8000": the SDP standard defines the final "/1", indicating the nr of channels, as optional for a single channel, but osmo-mgw currently is unable to match these two formats as identical. So prepare the test_mgcp_codec_pt_translate() so that upcoming patches can incorporate strings with and without the final "/1" by extending the struct arrays. Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 204 insertions(+), 86 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 39fe5d0..2c1e690 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1711,98 +1711,178 @@ OSMO_ASSERT(check_local_cx_options(ctx, ",,,") == -1); } -static void test_mgcp_codec_pt_translate_pars(struct mgcp_rtp_codec *c) -{ - c->rate = 8000; - c->channels = 1; - c->frame_duration_num = 23; - c->frame_duration_den = 42; -} +static const struct mgcp_codec_param amr_param_octet_aligned_true = { + .amr_octet_aligned_present = true, + .amr_octet_aligned = true, +}; + +#if 0 +static const struct mgcp_codec_param amr_param_octet_aligned_false = { + .amr_octet_aligned_present = true, + .amr_octet_aligned = false, +}; + +static const struct mgcp_codec_param amr_param_octet_aligned_unset = { + .amr_octet_aligned_present = false, +}; +#endif + +struct testcase_mgcp_codec_pt_translate_codec { + int payload_type; + const char *audio_name; + const struct mgcp_codec_param *param; + int expect_rc; +}; + +struct testcase_mgcp_codec_pt_translate_expect { + bool end; + int payload_type_map[2]; +}; + +struct testcase_mgcp_codec_pt_translate { + const char *descr; + /* two conns on an endpoint, each with N configured codecs */ + struct testcase_mgcp_codec_pt_translate_codec codecs[2][10]; + struct testcase_mgcp_codec_pt_translate_expect expect[32]; +}; + +static const struct testcase_mgcp_codec_pt_translate test_mgcp_codec_pt_translate_cases[] = { + { + .descr = "same order, but differing payload type numbers", + .codecs = { + { + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + }, + { + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 97, "GSM-HR-08/8000/1", NULL, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "conn0 has no codecs", + .codecs = { + { + /* no codecs */ + }, + { + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 97, "GSM-HR-08/8000/1", NULL, }, + }, + }, + .expect = { + { .payload_type_map = {112, -EINVAL}, }, + { .payload_type_map = {0, -EINVAL}, }, + { .payload_type_map = {111, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "conn1 has no codecs", + .codecs = { + { + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + }, + { + /* no codecs */ + }, + }, + .expect = { + { .payload_type_map = {112, -EINVAL}, }, + { .payload_type_map = {0, -EINVAL}, }, + { .payload_type_map = {111, -EINVAL} }, + { .end = true }, + }, + }, +}; static void test_mgcp_codec_pt_translate(void) { - struct mgcp_conn_rtp conn_src; - struct mgcp_conn_rtp conn_dst; - int pt_dst; + int i; + bool ok = true; + printf("\nTesting mgcp_codec_pt_translate()\n"); - /* Setup a realistic set of codec configurations on both - * ends. AMR and HR will use different payload types. PCMU - * must use 0 on both ends since this is not a dynamic payload - * type */ - test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[0]); - test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[0]); - test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[1]); - test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[1]); - test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[2]); - test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[2]); - conn_src.end.codecs[0].payload_type = 112; - conn_dst.end.codecs[0].payload_type = 96; - conn_src.end.codecs[1].payload_type = 0; - conn_dst.end.codecs[1].payload_type = 0; - conn_src.end.codecs[2].payload_type = 111; - conn_dst.end.codecs[2].payload_type = 97; - conn_src.end.codecs[0].audio_name = "AMR/8000/1"; - conn_dst.end.codecs[0].audio_name = "AMR/8000/1"; - conn_src.end.codecs[1].audio_name = "PCMU/8000/1"; - conn_dst.end.codecs[1].audio_name = "PCMU/8000/1"; - conn_src.end.codecs[2].audio_name = "GSM-HR-08/8000/1"; - conn_dst.end.codecs[2].audio_name = "GSM-HR-08/8000/1"; - conn_src.end.codecs[0].subtype_name = "AMR"; - conn_dst.end.codecs[0].subtype_name = "AMR"; - conn_src.end.codecs[1].subtype_name = "PCMU"; - conn_dst.end.codecs[1].subtype_name = "PCMU"; - conn_src.end.codecs[2].subtype_name = "GSM-HR-08"; - conn_dst.end.codecs[2].subtype_name = "GSM-HR-08"; - conn_src.end.codecs_assigned = 3; - conn_dst.end.codecs_assigned = 3; + for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_pt_translate_cases); i++) { + const struct testcase_mgcp_codec_pt_translate *t = &test_mgcp_codec_pt_translate_cases[i]; + struct mgcp_conn_rtp conn[2] = {}; + int rc; + int conn_i; + int c; - /* We expect the function to find the PT we must use when we send the - * packet out to the destination. All we know is the context for both - * connections and the payload type from the source packet */ - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[0].payload_type); - OSMO_ASSERT(pt_dst == conn_dst.end.codecs[0].payload_type); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[1].payload_type); - OSMO_ASSERT(pt_dst == conn_dst.end.codecs[1].payload_type); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[2].payload_type); - OSMO_ASSERT(pt_dst == conn_dst.end.codecs[2].payload_type); + printf("#%d: %s\n", i, t->descr); - /* Try some constellations that must fail */ - pt_dst = mgcp_codec_pt_translate(&conn_src, &conn_dst, 123); - OSMO_ASSERT(pt_dst == -EINVAL); - conn_src.end.codecs_assigned = 0; - conn_dst.end.codecs_assigned = 3; - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[0].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[1].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[2].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - conn_src.end.codecs_assigned = 3; - conn_dst.end.codecs_assigned = 0; - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[0].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[1].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); - pt_dst = - mgcp_codec_pt_translate(&conn_src, &conn_dst, - conn_src.end.codecs[2].payload_type); - OSMO_ASSERT(pt_dst == -EINVAL); + for (conn_i = 0; conn_i < 2; conn_i++) { + printf(" - add codecs on conn%d:\n", conn_i); + for (c = 0; c < ARRAY_SIZE(t->codecs[conn_i]); c++) { + const struct testcase_mgcp_codec_pt_translate_codec *codec = &t->codecs[conn_i][c]; + if (!codec->audio_name) + break; + + rc = mgcp_codec_add(&conn[conn_i], codec->payload_type, codec->audio_name, codec->param); + + printf(" %2d: %3d %s%s -> rc=%d\n", c, codec->payload_type, codec->audio_name, + codec->param ? + (codec->param->amr_octet_aligned_present? + (codec->param->amr_octet_aligned ? + " octet-aligned=1" : " octet-aligned=0") + : " octet-aligned=unset") + : "", + rc); + if (rc != codec->expect_rc) { + printf(" ERROR: expected rc=%d\n", codec->expect_rc); + ok = false; + } + } + if (!c) + printf(" (none)\n"); + } + + for (c = 0; c < ARRAY_SIZE(t->expect); c++) { + const struct testcase_mgcp_codec_pt_translate_expect *expect = &t->expect[c]; + int result; + + if (expect->end) + break; + + result = mgcp_codec_pt_translate(&conn[0], &conn[1], expect->payload_type_map[0]); + printf(" - mgcp_codec_pt_translate(conn0, conn1, %d) -> %d\n", + expect->payload_type_map[0], result); + if (result != expect->payload_type_map[1]) { + printf(" ERROR: expected -> %d\n", expect->payload_type_map[1]); + ok = false; + } + + /* If the expected result is an error, don't do reverse map test */ + if (expect->payload_type_map[1] < 0) + continue; + + result = mgcp_codec_pt_translate(&conn[1], &conn[0], expect->payload_type_map[1]); + printf(" - mgcp_codec_pt_translate(conn1, conn0, %d) -> %d\n", + expect->payload_type_map[1], result); + if (result != expect->payload_type_map[0]) { + printf(" ERROR: expected -> %d\n", expect->payload_type_map[0]); + ok = false; + } + } + + for (conn_i = 0; conn_i < 2; conn_i++) + mgcp_codec_reset_all(&conn[conn_i]); + } + + OSMO_ASSERT(ok); } void test_conn_id_matching() diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 6f4da10..677cdc8 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1218,6 +1218,44 @@ p10, aPCMU -> (null) '10,a :PCMU' -> '(null)' +Testing mgcp_codec_pt_translate() +#0: same order, but differing payload type numbers + - add codecs on conn0: + 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 111 GSM-HR-08/8000/1 -> rc=0 + - add codecs on conn1: + 0: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 97 GSM-HR-08/8000/1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#1: conn0 has no codecs + - add codecs on conn0: + (none) + - add codecs on conn1: + 0: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 97 GSM-HR-08/8000/1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 +#2: conn1 has no codecs + - add codecs on conn0: + 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 111 GSM-HR-08/8000/1 -> rc=0 + - add codecs on conn1: + (none) + - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 + Testing test_conn_id_matching needle='23AB' found '000023AB' needle='0023AB' found '000023AB' -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb Gerrit-Change-Number: 15134 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:20 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:20 +0000 Subject: Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15135 ) Change subject: test_mgcp_codec_pt_translate(): more tests ...................................................................... test_mgcp_codec_pt_translate(): more tests Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 76 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2c1e690..460ea9b 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1770,6 +1770,49 @@ }, }, { + .descr = "different order and different payload type numbers", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08/8000/1", NULL, }, + { 0, "PCMU/8000/1", NULL, }, + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "both sides have the same payload_type numbers assigned to differing codecs", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 96, "GSM-HR-08/8000/1", NULL, }, + { 97, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08/8000/1", NULL, }, + { 0, "PCMU/8000/1", NULL, }, + { 96, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {96, 97}, }, + { .payload_type_map = {97, 96}, }, + { .payload_type_map = {0, 0}, }, + { .end = true }, + }, + }, + { .descr = "conn0 has no codecs", .codecs = { { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 677cdc8..708e0c3 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1235,7 +1235,38 @@ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 -#1: conn0 has no codecs +#1: different order and different payload type numbers + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 111 GSM-HR-08/8000/1 -> rc=0 + 2: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08/8000/1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#2: both sides have the same payload_type numbers assigned to differing codecs + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 96 GSM-HR-08/8000/1 -> rc=0 + 2: 97 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08/8000/1 -> rc=0 + 1: 0 PCMU/8000/1 -> rc=0 + 2: 96 AMR/8000/1 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 96) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 96 + - mgcp_codec_pt_translate(conn0, conn1, 97) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 97 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 +#3: conn0 has no codecs - add codecs on conn0: (none) - add codecs on conn1: @@ -1245,7 +1276,7 @@ - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 -#2: conn1 has no codecs +#4: conn1 has no codecs - add codecs on conn0: 0: 112 AMR/8000/1 octet-aligned=1 -> rc=0 1: 0 PCMU/8000/1 -> rc=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1 Gerrit-Change-Number: 15135 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:21 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:21 +0000 Subject: Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1 In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15136 ) Change subject: differentiate AMR octet-aligned=0 vs =1 ...................................................................... differentiate AMR octet-aligned=0 vs =1 Add corresponding tests in mgcp_test.c Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 104 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved keith: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 7f1a6d1..5d7f840 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -348,6 +348,25 @@ return -EINVAL; } +/* Return true if octet-aligned is set in the given codec. Default to octet-aligned=0, i.e. bandwidth-efficient mode. + * See RFC4867 "RTP Payload Format for AMR and AMR-WB" sections "8.1. AMR Media Type Registration" and "8.2. AMR-WB + * Media Type Registration": + * + * octet-align: Permissible values are 0 and 1. If 1, octet-aligned + * operation SHALL be used. If 0 or if not present, + * bandwidth-efficient operation is employed. + * + * https://tools.ietf.org/html/rfc4867 + */ +static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec) +{ + if (!codec->param_present) + return false; + if (!codec->param.amr_octet_aligned_present) + return false; + return codec->param.amr_octet_aligned; +} + /* Compare two codecs, all parameters must match up, except for the payload type * number. */ static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b) @@ -364,6 +383,10 @@ return false; if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; + if (!strcmp(codec_a->subtype_name, "AMR")) { + if (amr_is_octet_aligned(codec_a) != amr_is_octet_aligned(codec_b)) + return false; + } return true; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 460ea9b..5ebe475 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1716,7 +1716,6 @@ .amr_octet_aligned = true, }; -#if 0 static const struct mgcp_codec_param amr_param_octet_aligned_false = { .amr_octet_aligned_present = true, .amr_octet_aligned = false, @@ -1725,7 +1724,6 @@ static const struct mgcp_codec_param amr_param_octet_aligned_unset = { .amr_octet_aligned_present = false, }; -#endif struct testcase_mgcp_codec_pt_translate_codec { int payload_type; @@ -1850,6 +1848,58 @@ { .end = true }, }, }, + { + .descr = "test AMR with differing octet-aligned settings", + .codecs = { + { + { 111, "AMR/8000", &amr_param_octet_aligned_true, }, + { 112, "AMR/8000", &amr_param_octet_aligned_false, }, + }, + { + { 122, "AMR/8000", &amr_param_octet_aligned_false, }, + { 121, "AMR/8000", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {111, 121}, }, + { .payload_type_map = {112, 122} }, + { .end = true }, + }, + }, + { + .descr = "test AMR with missing octet-aligned settings (defaults to 0)", + .codecs = { + { + { 111, "AMR/8000", &amr_param_octet_aligned_true, }, + { 112, "AMR/8000", &amr_param_octet_aligned_false, }, + }, + { + { 122, "AMR/8000", &amr_param_octet_aligned_unset, }, + }, + }, + .expect = { + { .payload_type_map = {111, -EINVAL}, }, + { .payload_type_map = {112, 122} }, + { .end = true }, + }, + }, + { + .descr = "test AMR with NULL param (defaults to 0)", + .codecs = { + { + { 111, "AMR/8000", &amr_param_octet_aligned_true, }, + { 112, "AMR/8000", &amr_param_octet_aligned_false, }, + }, + { + { 122, "AMR/8000", NULL, }, + }, + }, + .expect = { + { .payload_type_map = {111, -EINVAL}, }, + { .payload_type_map = {112, 122} }, + { .end = true }, + }, + }, }; static void test_mgcp_codec_pt_translate(void) diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 708e0c3..14d5d73 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1286,6 +1286,35 @@ - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 +#5: test AMR with differing octet-aligned settings + - add codecs on conn0: + 0: 111 AMR/8000 octet-aligned=1 -> rc=0 + 1: 112 AMR/8000 octet-aligned=0 -> rc=0 + - add codecs on conn1: + 0: 122 AMR/8000 octet-aligned=0 -> rc=0 + 1: 121 AMR/8000 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121 + - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 +#6: test AMR with missing octet-aligned settings (defaults to 0) + - add codecs on conn0: + 0: 111 AMR/8000 octet-aligned=1 -> rc=0 + 1: 112 AMR/8000 octet-aligned=0 -> rc=0 + - add codecs on conn1: + 0: 122 AMR/8000 octet-aligned=unset -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 +#7: test AMR with NULL param (defaults to 0) + - add codecs on conn0: + 0: 111 AMR/8000 octet-aligned=1 -> rc=0 + 1: 112 AMR/8000 octet-aligned=0 -> rc=0 + - add codecs on conn1: + 0: 122 AMR/8000 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 Testing test_conn_id_matching needle='23AB' found '000023AB' -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124 Gerrit-Change-Number: 15136 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:21 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:21 +0000 Subject: Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1' In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15137 ) Change subject: ptmap: implicitly match '/8000' and '/8000/1' ...................................................................... ptmap: implicitly match '/8000' and '/8000/1' In codecs_same(), do not compare the complete audio_name. The parts of it are already checked individually: - subtype_name ("AMR"), - rate ("8000"; defaults to 8000 if omitted) and - channels ("1"; defaults to 1 if omitted) So by also checking the complete audio_name, we brushed over the match of implicit "/8000" and "/8000/1", which otherwise works out fine. As a result, translating payload type numbers in RTP headers now also works if one conn of an endpoint set an rtpmap with "AMR/8000" and the other conn set "AMR/8000/1". It seems to me that most PBX out there generate ptmaps omitting the "/1", so fixing this should make us more interoperable with third party SDP. See IETF RFC4566 section 6. SDP Attributes: For audio streams, indicates the number of audio channels. This parameter is OPTIONAL and may be omitted if the number of channels is one, provided that no additional parameters are needed. Also allowing to omit the "/8000" is a mere side effect of this patch. Omitting the rate does not seem to be specified in an RFC, but is logical for audio codecs defined to require exactly 8000 set as rate (most GSM codecs). Add tests in mgcp_test.c. Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 108 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 5d7f840..7c8f6d5 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -379,8 +379,6 @@ return false; if (codec_a->frame_duration_den != codec_b->frame_duration_den) return false; - if (strcmp(codec_a->audio_name, codec_b->audio_name)) - return false; if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; if (!strcmp(codec_a->subtype_name, "AMR")) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 5ebe475..e5dec2a 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1900,6 +1900,70 @@ { .end = true }, }, }, + { + .descr = "match FOO/8000/1 and FOO/8000 as identical, single channel is implicit", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08/8000", NULL, }, + { 0, "PCMU/8000", NULL, }, + { 96, "AMR/8000", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "match FOO/8000/1 and FOO as identical, 8k and single channel are implicit", + .codecs = { + { + { 0, "PCMU/8000/1", NULL, }, + { 111, "GSM-HR-08/8000/1", NULL, }, + { 112, "AMR/8000/1", &amr_param_octet_aligned_true, }, + }, + { + { 97, "GSM-HR-08", NULL, }, + { 0, "PCMU", NULL, }, + { 96, "AMR", &amr_param_octet_aligned_true, }, + }, + }, + .expect = { + { .payload_type_map = {112, 96}, }, + { .payload_type_map = {0, 0}, }, + { .payload_type_map = {111, 97} }, + { .payload_type_map = {123, -EINVAL} }, + { .end = true }, + }, + }, + { + .descr = "test whether channel number matching is waterproof", + .codecs = { + { + { 111, "GSM-HR-08/8000", }, + { 112, "GSM-HR-08/8000/2", .expect_rc = -22}, + { 113, "GSM-HR-08/8000/3", .expect_rc = -22}, + }, + { + { 122, "GSM-HR-08/8000/2", .expect_rc = -22}, + { 121, "GSM-HR-08/8000/1", }, + }, + }, + .expect = { + { .payload_type_map = {111, 121}, }, + { .payload_type_map = {112, -EINVAL} }, + { .payload_type_map = {113, -EINVAL} }, + { .end = true }, + }, + }, }; static void test_mgcp_codec_pt_translate(void) diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 14d5d73..9c48147 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1315,6 +1315,50 @@ - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 +#8: match FOO/8000/1 and FOO/8000 as identical, single channel is implicit + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 111 GSM-HR-08/8000/1 -> rc=0 + 2: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08/8000 -> rc=0 + 1: 0 PCMU/8000 -> rc=0 + 2: 96 AMR/8000 octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#9: match FOO/8000/1 and FOO as identical, 8k and single channel are implicit + - add codecs on conn0: + 0: 0 PCMU/8000/1 -> rc=0 + 1: 111 GSM-HR-08/8000/1 -> rc=0 + 2: 112 AMR/8000/1 octet-aligned=1 -> rc=0 + - add codecs on conn1: + 0: 97 GSM-HR-08 -> rc=0 + 1: 0 PCMU -> rc=0 + 2: 96 AMR octet-aligned=1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96 + - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0 + - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97 + - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22 +#10: test whether channel number matching is waterproof + - add codecs on conn0: + 0: 111 GSM-HR-08/8000 -> rc=0 + 1: 112 GSM-HR-08/8000/2 -> rc=-22 + 2: 113 GSM-HR-08/8000/3 -> rc=-22 + - add codecs on conn1: + 0: 122 GSM-HR-08/8000/2 -> rc=-22 + 1: 121 GSM-HR-08/8000/1 -> rc=0 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121 + - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111 + - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22 + - mgcp_codec_pt_translate(conn0, conn1, 113) -> -22 Testing test_conn_id_matching needle='23AB' found '000023AB' -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2 Gerrit-Change-Number: 15137 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:22 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:22 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15138 ) Change subject: mgcp_codec: codec_set(): log about all possible errors ...................................................................... mgcp_codec: codec_set(): log about all possible errors In codec_set(), for each 'goto error', log the specific error cause. Also add a TODO and a FIXME comment about inventing dynamic payload type numbers. Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 25 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 7c8f6d5..704b7e6 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -138,12 +138,13 @@ if (payload_type != PTYPE_UNDEFINED) { /* Make sure we do not get any reserved or undefined type numbers */ /* See also: https://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ - if (payload_type == 1 || payload_type == 2 || payload_type == 19) + if ((payload_type == 1 || payload_type == 2 || payload_type == 19) + || (payload_type >= 72 && payload_type <= 76) + || (payload_type >= 127)) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot add codec, payload type number %d is reserved\n", + payload_type); goto error; - if (payload_type >= 72 && payload_type <= 76) - goto error; - if (payload_type >= 127) - goto error; + } codec->payload_type = payload_type; } @@ -169,6 +170,8 @@ /* The given payload type is not known to us, or it * it is a dynamic payload type for which we do not * know the audio name. We must give up here */ + LOGP(DLMGCP, LOGL_ERROR, "No audio codec name given, and payload type %d unknown\n", + payload_type); goto error; } } @@ -176,16 +179,23 @@ /* Now we extract the codec subtype name, rate and channels. The latter * two are optional. If they are not present we use the safe defaults * above. */ - if (strlen(audio_name) > sizeof(audio_codec)) + if (strlen(audio_name) > sizeof(audio_codec)) { + LOGP(DLMGCP, LOGL_ERROR, "Audio codec too long: %s\n", osmo_quote_str(audio_name, -1)); goto error; + } channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS; rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE; - if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, &rate, &channels) < 1) + if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, &rate, &channels) < 1) { + LOGP(DLMGCP, LOGL_ERROR, "Invalid audio codec: %s\n", osmo_quote_str(audio_name, -1)); goto error; + } /* Note: We only accept configurations with one audio channel! */ - if (channels != 1) + if (channels != 1) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot handle audio codec with more than one channel: %s\n", + osmo_quote_str(audio_name, -1)); goto error; + } codec->rate = rate; codec->channels = channels; @@ -203,6 +213,7 @@ /* Derive the payload type if it is unknown */ if (codec->payload_type == PTYPE_UNDEFINED) { + /* TODO: This is semi dead code, see OS#4150 */ /* For the known codecs from the static range we restore * the IANA or 3GPP assigned payload type number */ @@ -238,9 +249,14 @@ * 110 onwards 3gpp defines prefered codec types, which are * also fixed, see above) */ if (codec->payload_type < 0) { + /* FIXME: pt_offset is completely unrelated and useless here, any of those numbers may already + * have been added to the codecs. Instead, there should be an iterator checking for an actually + * unused dynamic payload type number. */ codec->payload_type = 96 + pt_offset; - if (codec->payload_type > 109) + if (codec->payload_type > 109) { + LOGP(DLMGCP, LOGL_ERROR, "Ran out of payload type numbers to assign dynamically\n"); goto error; + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd Gerrit-Change-Number: 15138 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:22 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:22 +0000 Subject: Change in ...osmo-mgw[master]: mgcp_codec_add: fix audio_name size check In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15301 ) Change subject: mgcp_codec_add: fix audio_name size check ...................................................................... mgcp_codec_add: fix audio_name size check Needs to account for terminating '\0'. Change-Id: I27896beef6ffcc1cb6207daaba6c8b2b03eb513d --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 704b7e6..9e55ab0 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -179,7 +179,7 @@ /* Now we extract the codec subtype name, rate and channels. The latter * two are optional. If they are not present we use the safe defaults * above. */ - if (strlen(audio_name) > sizeof(audio_codec)) { + if (strlen(audio_name) >= sizeof(audio_codec)) { LOGP(DLMGCP, LOGL_ERROR, "Audio codec too long: %s\n", osmo_quote_str(audio_name, -1)); goto error; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27896beef6ffcc1cb6207daaba6c8b2b03eb513d Gerrit-Change-Number: 15301 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:23 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:23 +0000 Subject: Change in ...osmo-mgw[master]: explicitly free codecs in mgcp_rtp_conn_cleanup() In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15139 ) Change subject: explicitly free codecs in mgcp_rtp_conn_cleanup() ...................................................................... explicitly free codecs in mgcp_rtp_conn_cleanup() There are allocated bits in conn->end.codecs[], free them. This is not fixing a memleak, since mgcp_rtp_conn_cleanup() is currently only called from mgcp_conn_free(), which soon after frees the conn; the conn serves as talloc parent for the codec strings freed in this patch. The rationale: it is better style to explicitly free them, to also guard against future callers of mgcp_rtp_conn_cleanup() which might expect complete cleanup. Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 --- M src/libosmo-mgcp/mgcp_conn.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 772584b..60a1700 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -129,6 +129,7 @@ conn_osmux_disable(conn_rtp); mgcp_free_rtp_port(&conn_rtp->end); rate_ctr_group_free(conn_rtp->rate_ctr_group); + mgcp_codec_reset_all(conn_rtp); } void mgcp_conn_watchdog_cb(void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 Gerrit-Change-Number: 15139 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:23 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:23 +0000 Subject: Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap() In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15140 ) Change subject: tweak mgcp_parse_audio_ptime_rtpmap() ...................................................................... tweak mgcp_parse_audio_ptime_rtpmap() - move the error logging up to the actual errors. Each appear only once, no goto labels needed. - instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more concisely trigger on the actual syntax of the audio parameters. Same for "a=ptime:". Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 33 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 3f8e780..6275385 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -339,46 +339,44 @@ char codec_resp[64]; unsigned int codec; +#define A_PTIME "a=ptime:" +#define A_RTPMAP "a=rtpmap:" - if (strstr(line, "ptime")) { - if (sscanf(line, "a=ptime:%u", &r->ptime) != 1) - goto response_parse_failure_ptime; - } else if (strstr(line, "rtpmap")) { - if (sscanf(line, "a=rtpmap:%d %63s", &pt, codec_resp) == 2) { - /* The MGW may assign an own payload type in the - * response if the choosen codec falls into the IANA - * assigned dynamic payload type range (96-127). - * Normally the MGW should obey the 3gpp payload type - * assignments, which are fixed, so we likely wont see - * anything unexpected here. In order to be sure that - * we will now check the codec string and if the result - * does not match to what is IANA / 3gpp assigned, we - * will create an entry in the ptmap table so we can - * lookup later what has been assigned. */ - codec = map_str_to_codec(codec_resp); - if (codec != pt) { - if (r->ptmap_len < ARRAY_SIZE(r->ptmap)) { - r->ptmap[r->ptmap_len].pt = pt; - r->ptmap[r->ptmap_len].codec = codec; - r->ptmap_len++; - } else - goto response_parse_failure_rtpmap; + if (osmo_str_startswith(line, A_PTIME)) { + if (sscanf(line, A_PTIME "%u", &r->ptime) != 1) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse SDP parameter, invalid ptime (%s)\n", line); + return -EINVAL; + } + } else if (osmo_str_startswith(line, A_RTPMAP)) { + if (sscanf(line, A_RTPMAP "%d %63s", &pt, codec_resp) != 2) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse SDP parameter, invalid rtpmap: %s\n", osmo_quote_str(line, -1)); + return -EINVAL; + } + /* The MGW may assign an own payload type in the + * response if the choosen codec falls into the IANA + * assigned dynamic payload type range (96-127). + * Normally the MGW should obey the 3gpp payload type + * assignments, which are fixed, so we likely wont see + * anything unexpected here. In order to be sure that + * we will now check the codec string and if the result + * does not match to what is IANA / 3gpp assigned, we + * will create an entry in the ptmap table so we can + * lookup later what has been assigned. */ + codec = map_str_to_codec(codec_resp); + if (codec != pt) { + if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { + LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); + return -ENOSPC; } - - } else - goto response_parse_failure_rtpmap; + r->ptmap[r->ptmap_len].pt = pt; + r->ptmap[r->ptmap_len].codec = codec; + r->ptmap_len++; + } } return 0; - -response_parse_failure_ptime: - LOGP(DLMGCP, LOGL_ERROR, - "Failed to parse SDP parameter, invalid ptime (%s)\n", line); - return -EINVAL; -response_parse_failure_rtpmap: - LOGP(DLMGCP, LOGL_ERROR, - "Failed to parse SDP parameter, invalid rtpmap (%s)\n", line); - return -EINVAL; } /* Parse a line like "c=IN IP4 10.11.12.13" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6 Gerrit-Change-Number: 15140 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:56:24 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:56:24 +0000 Subject: Change in ...osmo-mgw[master]: SDP: store all ptmap entries In-Reply-To: References: Message-ID: neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15141 ) Change subject: SDP: store all ptmap entries ...................................................................... SDP: store all ptmap entries If a ptmap appears in the SDP, always store it in the ptmap array. No longer attempt to drop entries if they match the conventional payload type number. - One reason is that the past code only matched full explicit "FOO/8000/1" strings, while the channel number "/1" can be omitted to imply 1; by simply storing everything received in the SDP, there is no need to add complexity to match both "FOO/8000" and "FOO/8000/1". - The other reason is to rather parse exactly what was received, instead of filtering entries, to take away a degree of implied magic. Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 8 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 6275385..5823e2b 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -337,7 +337,7 @@ { unsigned int pt; char codec_resp[64]; - unsigned int codec; + enum mgcp_codecs codec; #define A_PTIME "a=ptime:" #define A_RTPMAP "a=rtpmap:" @@ -354,26 +354,14 @@ "Failed to parse SDP parameter, invalid rtpmap: %s\n", osmo_quote_str(line, -1)); return -EINVAL; } - /* The MGW may assign an own payload type in the - * response if the choosen codec falls into the IANA - * assigned dynamic payload type range (96-127). - * Normally the MGW should obey the 3gpp payload type - * assignments, which are fixed, so we likely wont see - * anything unexpected here. In order to be sure that - * we will now check the codec string and if the result - * does not match to what is IANA / 3gpp assigned, we - * will create an entry in the ptmap table so we can - * lookup later what has been assigned. */ - codec = map_str_to_codec(codec_resp); - if (codec != pt) { - if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { - LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); - return -ENOSPC; - } - r->ptmap[r->ptmap_len].pt = pt; - r->ptmap[r->ptmap_len].codec = codec; - r->ptmap_len++; + if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { + LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len); + return -ENOSPC; } + codec = map_str_to_codec(codec_resp); + r->ptmap[r->ptmap_len].pt = pt; + r->ptmap[r->ptmap_len].codec = codec; + r->ptmap_len++; } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b Gerrit-Change-Number: 15141 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 03:58:51 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 03:58:51 +0000 Subject: Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 ) Change subject: avoid bogus error logs when no cmd_timer is set ...................................................................... Patch Set 1: let's put this on hold until I clarified the cause of the log message -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581 Gerrit-Change-Number: 15142 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: keith Gerrit-Comment-Date: Thu, 29 Aug 2019 03:58:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 29 04:00:43 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 04:00:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d674dfbcbdff_e2a2aabfaa785fc3291b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 421s] ar: `u' modifier ignored since `D' is the default (see `U') [ 421s] libtool: link: ranlib .libs/libtransceiver_common.a [ 421s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 421s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 421s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 422s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 422s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 422s] collect2: error: ld returned 1 exit status [ 422s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 422s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 422s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 422s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 422s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 422s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 422s] make[1]: *** [Makefile:444: all] Error 2 [ 422s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 422s] dh_auto_build: make -j1 returned exit code 2 [ 422s] make: *** [debian/rules:6: build] Error 255 [ 422s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 422s] [ 422s] lamb09 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 04:00:28 UTC 2019. [ 422s] [ 422s] ### VM INTERACTION START ### [ 425s] [ 405.729899] sysrq: SysRq : Power Off [ 425s] [ 405.735474] reboot: Power down [ 425s] ### VM INTERACTION END ### [ 425s] [ 425s] lamb09 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 04:00:32 UTC 2019. [ 425s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 29 04:01:51 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 04:01:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d674e38913a0_e2a2aabfaa785fc3295f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 574s] ar: `u' modifier ignored since `D' is the default (see `U') [ 574s] libtool: link: ranlib .libs/libtransceiver_common.a [ 574s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 574s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 575s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 575s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 575s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 575s] collect2: error: ld returned 1 exit status [ 575s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 575s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 575s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 575s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 575s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 575s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 575s] make[1]: *** [Makefile:444: all] Error 2 [ 575s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 575s] dh_auto_build: make -j1 returned exit code 2 [ 575s] make: *** [debian/rules:6: build] Error 255 [ 575s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 575s] [ 575s] cloud115 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 04:01:35 UTC 2019. [ 575s] [ 575s] ### VM INTERACTION START ### [ 578s] [ 521.945920] sysrq: SysRq : Power Off [ 578s] [ 521.949543] reboot: Power down [ 580s] ### VM INTERACTION END ### [ 580s] [ 580s] cloud115 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 04:01:40 UTC 2019. [ 580s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 04:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 04:05:16 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 ) Change subject: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 04:05:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 29 04:07:00 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 04:07:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d674f8043374_e2a2aabfaa785fc330291@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 414s] ar: `u' modifier ignored since `D' is the default (see `U') [ 414s] libtool: link: ranlib .libs/libtransceiver_common.a [ 414s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 414s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 415s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 415s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 415s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 415s] collect2: error: ld returned 1 exit status [ 415s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 415s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 415s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 415s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 415s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 415s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 415s] make[1]: *** [Makefile:444: all] Error 2 [ 415s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 415s] dh_auto_build: make -j1 returned exit code 2 [ 415s] make: *** [debian/rules:6: build] Error 255 [ 415s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 415s] [ 415s] lamb18 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 04:06:50 UTC 2019. [ 415s] [ 415s] ### VM INTERACTION START ### [ 418s] [ 398.502285] sysrq: SysRq : Power Off [ 418s] [ 398.527845] reboot: Power down [ 418s] ### VM INTERACTION END ### [ 418s] [ 418s] lamb18 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 04:06:54 UTC 2019. [ 418s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:25:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:25:50 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce in46a_is_v{4,6}() helpers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 ) Change subject: Introduce in46a_is_v{4,6}() helpers ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb Gerrit-Change-Number: 15245 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:25:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:14 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 ) Change subject: ggsn: Move PCO handling code into its own file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:26:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:29 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 ) Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Aug 2019 05:26:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:38 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce in46a_is_v{4,6}() helpers In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 ) Change subject: Introduce in46a_is_v{4,6}() helpers ...................................................................... Introduce in46a_is_v{4,6}() helpers It's clearer having size-related checks in one place for a data structure in46_addr, instead of spread around the code. Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb --- M ggsn/ggsn.c M lib/in46_addr.h 2 files changed, 16 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index d71855d..99eae75 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -482,19 +482,15 @@ * \returns The selected peer matching the given IP version. NULL if not present. */ static struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { - uint8_t len1, len2, i; - - if (is_ipv6) { - len1 = 8; - len2 = 16; - } else { - len1 = sizeof(struct in_addr); - len2 = len1; - } + uint8_t i; for (i = 0; i < 2; i++) { struct ippoolm_t * ippool = pdp->peer[i]; - if (ippool && (ippool->addr.len == len1 || ippool->addr.len == len2)) + if (!ippool) + continue; + if (is_ipv6 && in46a_is_v6(&ippool->addr)) + return ippool; + else if (!is_ipv6 && in46a_is_v4(&ippool->addr)) return ippool; } return NULL; @@ -798,7 +794,7 @@ /* Allocate dynamic addresses from the pool */ for (i = 0; i < num_addr; i++) { - if (addr[i].len == sizeof(struct in_addr)) { + if (in46a_is_v4(&addr[i])) { /* does this APN actually have an IPv4 pool? */ if (!apn_supports_ipv4(apn)) goto err_wrong_af; @@ -811,7 +807,7 @@ addrv4 = member; - } else if (addr[i].len == sizeof(struct in6_addr)) { + } else if (in46a_is_v6(&addr[i])) { /* does this APN actually have an IPv6 pool? */ if (!apn_supports_ipv6(apn)) diff --git a/lib/in46_addr.h b/lib/in46_addr.h index e4654cc..153df00 100644 --- a/lib/in46_addr.h +++ b/lib/in46_addr.h @@ -31,3 +31,11 @@ int in46a_to_eua(const struct in46_addr *src, unsigned int size, struct ul66_t *eua); int in46a_from_eua(const struct ul66_t *eua, struct in46_addr *dst); + +static inline bool in46a_is_v6(const struct in46_addr *addr) { + return addr->len == 8 || addr->len == 16; +} + +static inline bool in46a_is_v4(const struct in46_addr *addr) { + return addr->len == sizeof(struct in_addr); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idc94bf0c8c01bb5a30e36d3c284b99f66b972abb Gerrit-Change-Number: 15245 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:38 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Move PCO handling code into its own file In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 ) Change subject: ggsn: Move PCO handling code into its own file ...................................................................... ggsn: Move PCO handling code into its own file This way ggsn.c is shrinked in size and get rid of a lot of code there, which is of no interest unless the reader is interested in that really specific part. Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/pco.c A ggsn/pco.h 5 files changed, 343 insertions(+), 312 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index eca385f..022cdef 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -12,4 +12,4 @@ endif osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h +osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 99eae75..3c702c2 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -68,6 +68,7 @@ #include "../gtp/pdp.h" #include "../gtp/gtp.h" #include "icmpv6.h" +#include "pco.h" #include "ggsn.h" void *tall_ggsn_ctx; @@ -79,14 +80,6 @@ struct ul255_t qos; struct ul255_t apn; -#define LOGPAPN(level, apn, fmt, args...) \ - LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) - -#define LOGPGGSN(level, ggsn, fmt, args...) \ - LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args) - -#define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args) - static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what); static int cb_tun_ind(struct tun_t *tun, void *pack, unsigned len); @@ -396,92 +389,12 @@ return 0; } -#include - -/* RFC 1332 */ -enum ipcp_options { - IPCP_OPT_IPADDR = 3, - IPCP_OPT_PRIMARY_DNS = 129, - IPCP_OPT_SECONDARY_DNS = 131, -}; - -struct ipcp_option_hdr { - uint8_t type; - uint8_t len; - uint8_t data[0]; -} __attribute__ ((packed)); - -struct ipcp_hdr { - uint8_t code; - uint8_t id; - uint16_t len; - uint8_t options[0]; -} __attribute__ ((packed)); - -/* determine if IPCP contains given option */ -static const uint8_t *ipcp_contains_option(const struct ipcp_hdr *ipcp, size_t ipcp_len, - enum ipcp_options opt, size_t opt_minlen) -{ - const uint8_t *cur_opt = ipcp->options; - - /* iterate over Options and check if protocol contained */ - while (cur_opt + sizeof(struct ipcp_option_hdr) <= (uint8_t*)ipcp + ipcp_len) { - const struct ipcp_option_hdr *cur_opt_hdr = (const struct ipcp_option_hdr *)cur_opt; - /* length value includes 2 bytes type/length */ - if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr)) - return NULL; - if (cur_opt_hdr->type == opt && - cur_opt_hdr->len >= sizeof(struct ipcp_option_hdr) + opt_minlen) - return cur_opt; - cur_opt += cur_opt_hdr->len; - } - return NULL; -} - -/* 3GPP TS 24.008 10.6.5.3 */ -enum pco_protocols { - PCO_P_LCP = 0xC021, - PCO_P_PAP = 0xC023, - PCO_P_CHAP = 0xC223, - PCO_P_IPCP = 0x8021, - PCO_P_PCSCF_ADDR = 0x0001, - PCO_P_IM_CN_SS_F = 0x0002, - PCO_P_DNS_IPv6_ADDR = 0x0003, - PCO_P_POLICY_CTRL_REJ = 0x0004, /* only in Network->MS */ - PCO_P_MS_SUP_NETREQ_BCI = 0x0005, - /* reserved */ - PCO_P_DSMIPv6_HA_ADDR = 0x0007, - PCO_P_DSMIPv6_HN_PREF = 0x0008, - PCO_P_DSMIPv6_v4_HA_ADDR= 0x0009, - PCO_P_IP_ADDR_VIA_NAS = 0x000a, /* only MS->Network */ - PCO_P_IPv4_ADDR_VIA_DHCP= 0x000b, /* only MS->Netowrk */ - PCO_P_PCSCF_IPv4_ADDR = 0x000c, - PCO_P_DNS_IPv4_ADDR = 0x000d, - PCO_P_MSISDN = 0x000e, - PCO_P_IFOM_SUPPORT = 0x000f, - PCO_P_IPv4_LINK_MTU = 0x0010, - PCO_P_MS_SUPP_LOC_A_TFT = 0x0011, - PCO_P_PCSCF_RESEL_SUP = 0x0012, /* only MS->Network */ - PCO_P_NBIFOM_REQ = 0x0013, - PCO_P_NBIFOM_MODE = 0x0014, - PCO_P_NONIP_LINK_MTU = 0x0015, - PCO_P_APN_RATE_CTRL_SUP = 0x0016, - PCO_P_PS_DATA_OFF_UE = 0x0017, - PCO_P_REL_DATA_SVC = 0x0018, -}; - -struct pco_element { - uint16_t protocol_id; /* network byte order */ - uint8_t length; /* length of data below */ - uint8_t data[0]; -} __attribute__((packed)); - /*! Get the peer of pdp based on IP version used. * \param[in] pdp PDP context to select the peer from. * \param[in] v4v6 IP version to select. Valid values are 4 and 6. * \returns The selected peer matching the given IP version. NULL if not present. */ -static struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { +struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { uint8_t i; for (i = 0; i < 2; i++) { @@ -496,228 +409,6 @@ return NULL; } -/* RFC 1334, section 3.2. Packet Format */ -struct pap_element { - uint8_t code; - uint8_t id; - uint16_t len; /* length including header */ - uint8_t data[0]; -} __attribute__((packed)); - -enum pap_code { - PAP_CODE_AUTH_REQ = 1, - PAP_CODE_AUTH_ACK = 2, - PAP_CODE_AUTH_NAK = 3, -}; - -static const char *pap_welcome = "Welcome to OsmoGGSN " PACKAGE_VERSION; - -/* Handle PAP protocol according to RFC 1334 */ -static void process_pco_element_pap(const struct pco_element *pco_in, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - const struct pap_element *pap_in = (const struct pap_element *) pco_in->data; - uint16_t pap_in_len; - uint8_t peer_id_len; - const uint8_t *peer_id; - unsigned int pap_welcome_len; - uint8_t pap_out_size; - struct pap_element *pap_out; - - if (pco_in->length < sizeof(struct pap_element)) - goto ret_broken; - - pap_in_len = osmo_load16be(&pap_in->len); - if (pco_in->length < pap_in_len) - goto ret_broken; - /* "pco_in->length > pap_in_len" is allowed: RFC1334 2.2 states: - "Octets outside the range of the Length field should be treated as - Data Link Layer padding and should be ignored on reception." - */ - - switch (pap_in->code) { - case PAP_CODE_AUTH_REQ: - if (pap_in_len < sizeof(struct pap_element) + 1) - goto ret_broken_auth; - peer_id_len = pap_in->data[0]; - if (pap_in_len < sizeof(struct pap_element) + 1 + peer_id_len) - goto ret_broken_auth; - peer_id = &pap_in->data[1]; - LOGPPDP(LOGL_DEBUG, pdp, "PCO PAP PeerId = %s, ACKing\n", - osmo_quote_str((const char *)peer_id, peer_id_len)); - /* Password-Length + Password following here, but we don't care */ - - /* Prepare response, we ACK all of them: */ - pap_welcome_len = strlen(pap_welcome); - /* +1: Length field of pap_welcome Message */ - pap_out_size = sizeof(struct pap_element) + 1 + pap_welcome_len; - pap_out = alloca(pap_out_size); - pap_out->code = PAP_CODE_AUTH_ACK; - pap_out->id = pap_in->id; - pap_out->len = htons(pap_out_size); - pap_out->data[0] = pap_welcome_len; - memcpy(pap_out->data+1, pap_welcome, pap_welcome_len); - msgb_t16lv_put(resp, PCO_P_PAP, pap_out_size, (uint8_t *) pap_out); - break; - case PAP_CODE_AUTH_ACK: - case PAP_CODE_AUTH_NAK: - default: - LOGPPDP(LOGL_NOTICE, pdp, "Unsupported PAP PCO Code %u, ignoring\n", pap_in->code); - break; - } - return; - -ret_broken_auth: - LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP AuthenticateReq: %s, ignoring\n", - osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); - return; - -ret_broken: - LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP PCO Length: %s, ignoring\n", - osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); -} - -static void process_pco_element_ipcp(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - struct ippoolm_t *peer_v4 = pdp_get_peer_ipv(pdp, false); - const struct in46_addr *dns1 = &apn->v4.cfg.dns[0]; - const struct in46_addr *dns2 = &apn->v4.cfg.dns[1]; - uint8_t *start = resp->tail; - const struct ipcp_hdr *ipcp; - uint16_t ipcp_len; - uint8_t *len1, *len2; - unsigned int len_appended; - ptrdiff_t consumed; - size_t remain; - - if (!peer_v4) { - LOGPPDP(LOGL_ERROR, pdp, "IPCP but no IPv4 type ?!?\n"); - return; - } - - ipcp = (const struct ipcp_hdr *)pco_elem->data; - consumed = (pco_elem->data - &pdp->pco_req.v[0]); - remain = sizeof(pdp->pco_req.v) - consumed; - ipcp_len = osmo_load16be(&ipcp->len); - if (remain < 0 || remain < ipcp_len) { - LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n"); - return; - } - - /* Three byte T16L header */ - msgb_put_u16(resp, 0x8021); /* IPCP */ - len1 = msgb_put(resp, 1); /* Length of contents: delay */ - - msgb_put_u8(resp, 0x02); /* ACK */ - msgb_put_u8(resp, ipcp->id); /* ID: Needs to match request */ - msgb_put_u8(resp, 0x00); /* Length MSB */ - len2 = msgb_put(resp, 1); /* Length LSB: delay */ - - if (dns1->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_PRIMARY_DNS, 4)) { - msgb_put_u8(resp, 0x81); /* DNS1 Tag */ - msgb_put_u8(resp, 2 + dns1->len); /* DNS1 Length, incl. TL */ - msgb_put_u32(resp, ntohl(dns1->v4.s_addr)); - } - - if (dns2->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_SECONDARY_DNS, 4)) { - msgb_put_u8(resp, 0x83); /* DNS2 Tag */ - msgb_put_u8(resp, 2 + dns2->len); /* DNS2 Length, incl. TL */ - msgb_put_u32(resp, ntohl(dns2->v4.s_addr)); - } - - /* patch in length values */ - len_appended = resp->tail - start; - *len1 = len_appended - 3; - *len2 = len_appended - 3; -} - -static void process_pco_element_dns_ipv6(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - unsigned int i; - const uint8_t *tail = resp->tail; - - for (i = 0; i < ARRAY_SIZE(apn->v6.cfg.dns); i++) { - const struct in46_addr *i46a = &apn->v6.cfg.dns[i]; - if (i46a->len != 16) - continue; - msgb_t16lv_put(resp, PCO_P_DNS_IPv6_ADDR, i46a->len, i46a->v6.s6_addr); - } - if (resp->tail == tail) - LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv6 DNS, but APN has none configured\n"); -} - -static void process_pco_element_dns_ipv4(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - unsigned int i; - const uint8_t *tail = resp->tail; - - for (i = 0; i < ARRAY_SIZE(apn->v4.cfg.dns); i++) { - const struct in46_addr *i46a = &apn->v4.cfg.dns[i]; - if (i46a->len != 4) - continue; - msgb_t16lv_put(resp, PCO_P_DNS_IPv4_ADDR, i46a->len, (uint8_t *)&i46a->v4); - } - if (resp->tail == tail) - LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv4 DNS, but APN has none configured\n"); -} - -static void process_pco_element(const struct pco_element *pco_elem, struct msgb *resp, - const struct apn_ctx *apn, struct pdp_t *pdp) -{ - uint16_t protocol_id = osmo_load16be(&pco_elem->protocol_id); - - LOGPPDP(LOGL_DEBUG, pdp, "PCO Protocol 0x%04x\n", protocol_id); - switch (protocol_id) { - case PCO_P_PAP: - process_pco_element_pap(pco_elem, resp, apn, pdp); - break; - case PCO_P_IPCP: - process_pco_element_ipcp(pco_elem, resp, apn, pdp); - break; - case PCO_P_DNS_IPv6_ADDR: - process_pco_element_dns_ipv6(pco_elem, resp, apn, pdp); - break; - case PCO_P_DNS_IPv4_ADDR: - process_pco_element_dns_ipv4(pco_elem, resp, apn, pdp); - break; - default: - LOGPPDP(LOGL_INFO, pdp, "Unknown/Unimplemented PCO Protocol 0x%04x: %s\n", - protocol_id, osmo_hexdump_nospc(pco_elem->data, pco_elem->length)); - break; - } -} - -/* process one PCO request from a MS/UE, putting together the proper responses */ -static void process_pco(const struct apn_ctx *apn, struct pdp_t *pdp) -{ - struct msgb *resp = msgb_alloc(256, "PCO.resp"); - const struct ul255_t *pco = &pdp->pco_req; - const struct pco_element *pco_elem; - const uint8_t *cur; - - /* build the header of the PCO response */ - OSMO_ASSERT(resp); - msgb_put_u8(resp, 0x80); /* ext-bit + configuration protocol byte */ - - /* iterate over the PCO elements in the request; call process_pco_element() for each */ - for (cur = pco->v + 1, pco_elem = (const struct pco_element *) cur; - cur + sizeof(struct pco_element) <= pco->v + pco->l; - cur += pco_elem->length + sizeof(*pco_elem), pco_elem = (const struct pco_element *) cur) { - process_pco_element(pco_elem, resp, apn, pdp); - } - - /* copy the PCO response msgb and copy its contents over to the PDP context */ - if (msgb_length(resp) > 1) { - memcpy(pdp->pco_neg.v, msgb_data(resp), msgb_length(resp)); - pdp->pco_neg.l = msgb_length(resp); - } else - pdp->pco_neg.l = 0; - msgb_free(resp); -} - static bool apn_supports_ipv4(const struct apn_ctx *apn) { if (apn->v4.cfg.static_prefix.addr.len || apn->v4.cfg.dynamic_prefix.addr.len) diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 09cd0f6..a37381f 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -141,3 +141,12 @@ extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); extern int apn_stop(struct apn_ctx *apn); +extern struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6); + +#define LOGPAPN(level, apn, fmt, args...) \ + LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) + +#define LOGPGGSN(level, ggsn, fmt, args...) \ + LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args) + +#define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args) diff --git a/ggsn/pco.c b/ggsn/pco.c new file mode 100644 index 0000000..5715865 --- /dev/null +++ b/ggsn/pco.c @@ -0,0 +1,250 @@ +/* + * PCO parsing related code + * Copyright (C) 2002, 2003, 2004 Mondru AB. + * Copyright (C) 2017-2019 by Harald Welte + * Copyright (C) 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include +#include + +#include +#include + +#include "pco.h" +#include "ggsn.h" + +/* determine if IPCP contains given option */ +static const uint8_t *ipcp_contains_option(const struct ipcp_hdr *ipcp, size_t ipcp_len, + enum ipcp_options opt, size_t opt_minlen) +{ + const uint8_t *cur_opt = ipcp->options; + + /* iterate over Options and check if protocol contained */ + while (cur_opt + sizeof(struct ipcp_option_hdr) <= (uint8_t*)ipcp + ipcp_len) { + const struct ipcp_option_hdr *cur_opt_hdr = (const struct ipcp_option_hdr *)cur_opt; + /* length value includes 2 bytes type/length */ + if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr)) + return NULL; + if (cur_opt_hdr->type == opt && + cur_opt_hdr->len >= sizeof(struct ipcp_option_hdr) + opt_minlen) + return cur_opt; + cur_opt += cur_opt_hdr->len; + } + return NULL; +} + + +static const char *pap_welcome = "Welcome to OsmoGGSN " PACKAGE_VERSION; + +/* Handle PAP protocol according to RFC 1334 */ +static void process_pco_element_pap(const struct pco_element *pco_in, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + const struct pap_element *pap_in = (const struct pap_element *) pco_in->data; + uint16_t pap_in_len; + uint8_t peer_id_len; + const uint8_t *peer_id; + unsigned int pap_welcome_len; + uint8_t pap_out_size; + struct pap_element *pap_out; + + if (pco_in->length < sizeof(struct pap_element)) + goto ret_broken; + + pap_in_len = osmo_load16be(&pap_in->len); + if (pco_in->length < pap_in_len) + goto ret_broken; + /* "pco_in->length > pap_in_len" is allowed: RFC1334 2.2 states: + "Octets outside the range of the Length field should be treated as + Data Link Layer padding and should be ignored on reception." + */ + + switch (pap_in->code) { + case PAP_CODE_AUTH_REQ: + if (pap_in_len < sizeof(struct pap_element) + 1) + goto ret_broken_auth; + peer_id_len = pap_in->data[0]; + if (pap_in_len < sizeof(struct pap_element) + 1 + peer_id_len) + goto ret_broken_auth; + peer_id = &pap_in->data[1]; + LOGPPDP(LOGL_DEBUG, pdp, "PCO PAP PeerId = %s, ACKing\n", + osmo_quote_str((const char *)peer_id, peer_id_len)); + /* Password-Length + Password following here, but we don't care */ + + /* Prepare response, we ACK all of them: */ + pap_welcome_len = strlen(pap_welcome); + /* +1: Length field of pap_welcome Message */ + pap_out_size = sizeof(struct pap_element) + 1 + pap_welcome_len; + pap_out = alloca(pap_out_size); + pap_out->code = PAP_CODE_AUTH_ACK; + pap_out->id = pap_in->id; + pap_out->len = htons(pap_out_size); + pap_out->data[0] = pap_welcome_len; + memcpy(pap_out->data+1, pap_welcome, pap_welcome_len); + msgb_t16lv_put(resp, PCO_P_PAP, pap_out_size, (uint8_t *) pap_out); + break; + case PAP_CODE_AUTH_ACK: + case PAP_CODE_AUTH_NAK: + default: + LOGPPDP(LOGL_NOTICE, pdp, "Unsupported PAP PCO Code %u, ignoring\n", pap_in->code); + break; + } + return; + +ret_broken_auth: + LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP AuthenticateReq: %s, ignoring\n", + osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); + return; + +ret_broken: + LOGPPDP(LOGL_NOTICE, pdp, "Invalid PAP PCO Length: %s, ignoring\n", + osmo_hexdump_nospc((const uint8_t *)pco_in, pco_in->length)); +} + +static void process_pco_element_ipcp(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + struct ippoolm_t *peer_v4 = pdp_get_peer_ipv(pdp, false); + const struct in46_addr *dns1 = &apn->v4.cfg.dns[0]; + const struct in46_addr *dns2 = &apn->v4.cfg.dns[1]; + uint8_t *start = resp->tail; + const struct ipcp_hdr *ipcp; + uint16_t ipcp_len; + uint8_t *len1, *len2; + unsigned int len_appended; + ptrdiff_t consumed; + size_t remain; + + if (!peer_v4) { + LOGPPDP(LOGL_ERROR, pdp, "IPCP but no IPv4 type ?!?\n"); + return; + } + + ipcp = (const struct ipcp_hdr *)pco_elem->data; + consumed = (pco_elem->data - &pdp->pco_req.v[0]); + remain = sizeof(pdp->pco_req.v) - consumed; + ipcp_len = osmo_load16be(&ipcp->len); + if (remain < 0 || remain < ipcp_len) { + LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n"); + return; + } + + /* Three byte T16L header */ + msgb_put_u16(resp, 0x8021); /* IPCP */ + len1 = msgb_put(resp, 1); /* Length of contents: delay */ + + msgb_put_u8(resp, 0x02); /* ACK */ + msgb_put_u8(resp, ipcp->id); /* ID: Needs to match request */ + msgb_put_u8(resp, 0x00); /* Length MSB */ + len2 = msgb_put(resp, 1); /* Length LSB: delay */ + + if (dns1->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_PRIMARY_DNS, 4)) { + msgb_put_u8(resp, 0x81); /* DNS1 Tag */ + msgb_put_u8(resp, 2 + dns1->len); /* DNS1 Length, incl. TL */ + msgb_put_u32(resp, ntohl(dns1->v4.s_addr)); + } + + if (dns2->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_SECONDARY_DNS, 4)) { + msgb_put_u8(resp, 0x83); /* DNS2 Tag */ + msgb_put_u8(resp, 2 + dns2->len); /* DNS2 Length, incl. TL */ + msgb_put_u32(resp, ntohl(dns2->v4.s_addr)); + } + + /* patch in length values */ + len_appended = resp->tail - start; + *len1 = len_appended - 3; + *len2 = len_appended - 3; +} + +static void process_pco_element_dns_ipv6(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + unsigned int i; + const uint8_t *tail = resp->tail; + + for (i = 0; i < ARRAY_SIZE(apn->v6.cfg.dns); i++) { + const struct in46_addr *i46a = &apn->v6.cfg.dns[i]; + if (i46a->len != 16) + continue; + msgb_t16lv_put(resp, PCO_P_DNS_IPv6_ADDR, i46a->len, i46a->v6.s6_addr); + } + if (resp->tail == tail) + LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv6 DNS, but APN has none configured\n"); +} + +static void process_pco_element_dns_ipv4(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + unsigned int i; + const uint8_t *tail = resp->tail; + + for (i = 0; i < ARRAY_SIZE(apn->v4.cfg.dns); i++) { + const struct in46_addr *i46a = &apn->v4.cfg.dns[i]; + if (i46a->len != 4) + continue; + msgb_t16lv_put(resp, PCO_P_DNS_IPv4_ADDR, i46a->len, (uint8_t *)&i46a->v4); + } + if (resp->tail == tail) + LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv4 DNS, but APN has none configured\n"); +} + +static void process_pco_element(const struct pco_element *pco_elem, struct msgb *resp, + const struct apn_ctx *apn, struct pdp_t *pdp) +{ + uint16_t protocol_id = osmo_load16be(&pco_elem->protocol_id); + + LOGPPDP(LOGL_DEBUG, pdp, "PCO Protocol 0x%04x\n", protocol_id); + switch (protocol_id) { + case PCO_P_PAP: + process_pco_element_pap(pco_elem, resp, apn, pdp); + break; + case PCO_P_IPCP: + process_pco_element_ipcp(pco_elem, resp, apn, pdp); + break; + case PCO_P_DNS_IPv6_ADDR: + process_pco_element_dns_ipv6(pco_elem, resp, apn, pdp); + break; + case PCO_P_DNS_IPv4_ADDR: + process_pco_element_dns_ipv4(pco_elem, resp, apn, pdp); + break; + default: + LOGPPDP(LOGL_INFO, pdp, "Unknown/Unimplemented PCO Protocol 0x%04x: %s\n", + protocol_id, osmo_hexdump_nospc(pco_elem->data, pco_elem->length)); + break; + } +} + +/* process one PCO request from a MS/UE, putting together the proper responses */ +void process_pco(const struct apn_ctx *apn, struct pdp_t *pdp) +{ + struct msgb *resp = msgb_alloc(256, "PCO.resp"); + const struct ul255_t *pco = &pdp->pco_req; + const struct pco_element *pco_elem; + const uint8_t *cur; + + /* build the header of the PCO response */ + OSMO_ASSERT(resp); + msgb_put_u8(resp, 0x80); /* ext-bit + configuration protocol byte */ + + /* iterate over the PCO elements in the request; call process_pco_element() for each */ + for (cur = pco->v + 1, pco_elem = (const struct pco_element *) cur; + cur + sizeof(struct pco_element) <= pco->v + pco->l; + cur += pco_elem->length + sizeof(*pco_elem), pco_elem = (const struct pco_element *) cur) { + process_pco_element(pco_elem, resp, apn, pdp); + } + + /* copy the PCO response msgb and copy its contents over to the PDP context */ + if (msgb_length(resp) > 1) { + memcpy(pdp->pco_neg.v, msgb_data(resp), msgb_length(resp)); + pdp->pco_neg.l = msgb_length(resp); + } else + pdp->pco_neg.l = 0; + msgb_free(resp); +} diff --git a/ggsn/pco.h b/ggsn/pco.h new file mode 100644 index 0000000..7ebe05a --- /dev/null +++ b/ggsn/pco.h @@ -0,0 +1,81 @@ +#pragma once + +#include + +#include "../gtp/pdp.h" + +/* 3GPP TS 24.008 10.6.5.3 */ +enum pco_protocols { + PCO_P_LCP = 0xC021, + PCO_P_PAP = 0xC023, + PCO_P_CHAP = 0xC223, + PCO_P_IPCP = 0x8021, + PCO_P_PCSCF_ADDR = 0x0001, + PCO_P_IM_CN_SS_F = 0x0002, + PCO_P_DNS_IPv6_ADDR = 0x0003, + PCO_P_POLICY_CTRL_REJ = 0x0004, /* only in Network->MS */ + PCO_P_MS_SUP_NETREQ_BCI = 0x0005, + /* reserved */ + PCO_P_DSMIPv6_HA_ADDR = 0x0007, + PCO_P_DSMIPv6_HN_PREF = 0x0008, + PCO_P_DSMIPv6_v4_HA_ADDR= 0x0009, + PCO_P_IP_ADDR_VIA_NAS = 0x000a, /* only MS->Network */ + PCO_P_IPv4_ADDR_VIA_DHCP= 0x000b, /* only MS->Netowrk */ + PCO_P_PCSCF_IPv4_ADDR = 0x000c, + PCO_P_DNS_IPv4_ADDR = 0x000d, + PCO_P_MSISDN = 0x000e, + PCO_P_IFOM_SUPPORT = 0x000f, + PCO_P_IPv4_LINK_MTU = 0x0010, + PCO_P_MS_SUPP_LOC_A_TFT = 0x0011, + PCO_P_PCSCF_RESEL_SUP = 0x0012, /* only MS->Network */ + PCO_P_NBIFOM_REQ = 0x0013, + PCO_P_NBIFOM_MODE = 0x0014, + PCO_P_NONIP_LINK_MTU = 0x0015, + PCO_P_APN_RATE_CTRL_SUP = 0x0016, + PCO_P_PS_DATA_OFF_UE = 0x0017, + PCO_P_REL_DATA_SVC = 0x0018, +}; + +struct pco_element { + uint16_t protocol_id; /* network byte order */ + uint8_t length; /* length of data below */ + uint8_t data[0]; +} __attribute__((packed)); + + +/* RFC 1332 */ +enum ipcp_options { + IPCP_OPT_IPADDR = 3, + IPCP_OPT_PRIMARY_DNS = 129, + IPCP_OPT_SECONDARY_DNS = 131, +}; + +struct ipcp_option_hdr { + uint8_t type; + uint8_t len; + uint8_t data[0]; +} __attribute__ ((packed)); + +struct ipcp_hdr { + uint8_t code; + uint8_t id; + uint16_t len; + uint8_t options[0]; +} __attribute__ ((packed)); + +/* RFC 1334, section 3.2. Packet Format */ +struct pap_element { + uint8_t code; + uint8_t id; + uint16_t len; /* length including header */ + uint8_t data[0]; +} __attribute__((packed)); + +enum pap_code { + PAP_CODE_AUTH_REQ = 1, + PAP_CODE_AUTH_ACK = 2, + PAP_CODE_AUTH_NAK = 3, +}; + +struct apn_ctx; +void process_pco(const struct apn_ctx *apn, struct pdp_t *pdp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ieaa7e71f17c7fd9377c76ef53362eab596d669a6 Gerrit-Change-Number: 15246 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:39 +0000 Subject: Change in ...osmo-ggsn[master]: in46_addr: Improve in46a_ntop documentation In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 ) Change subject: in46_addr: Improve in46a_ntop documentation ...................................................................... in46_addr: Improve in46a_ntop documentation Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 --- M lib/in46_addr.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/lib/in46_addr.c b/lib/in46_addr.c index f4bb8a2..2562c71 100644 --- a/lib/in46_addr.c +++ b/lib/in46_addr.c @@ -60,7 +60,11 @@ return 0; } -/*! Convenience wrapper around inet_ntop() for \ref in46_addr */ +/*! Convenience wrapper around inet_ntop() for in46_addr. + * \param[in] in the in46_addr to print + * \param[out] dst destination buffer where string representation of the address is stored + * \param[out] dst_size size dst. Usually it should be at least INET6_ADDRSTRLEN. + * \return address of dst on success, NULL on error */ const char *in46a_ntop(const struct in46_addr *in, char *dst, socklen_t dst_size) { int af; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I27238c330f9b805ac9e734e735d2c7ae158fe524 Gerrit-Change-Number: 15247 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:39 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 ) Change subject: ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas in46a_from_eua() API documentation clearly states an array of 2 items should be passed as pointer, but show_one_pdp() was passing only one, which would end up in out-of-bounds writes on v4v6 EUAs. Let's better use ippool to print allocated ip addresses instead of parsing EUAs we sent some point in the past. Related OS#4154 Change-Id: Ia34939957bb7856388cb52a741cec0c015a08c70 --- M ggsn/ggsn_vty.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index eb7cca7..0a86f49 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -734,7 +734,7 @@ static void show_one_pdp(struct vty *vty, struct pdp_t *pdp) { - struct in46_addr eua46; + struct ippoolm_t *peer; char name_buf[256]; char *apn_name; int rc; @@ -757,8 +757,12 @@ apn_name = osmo_apn_to_str(name_buf, pdp->apn_use.v, pdp->apn_use.l); vty_out(vty, " APN in use: %s%s", apn_name ? name_buf : "(NONE)", VTY_NEWLINE); - in46a_from_eua(&pdp->eua, &eua46); - vty_out(vty, " End-User Address: %s%s", in46a_ntoa(&eua46), VTY_NEWLINE); + if ((peer = pdp_get_peer_ipv(pdp, false))) + vty_out(vty, " End-User Address (IPv4): %s%s", + in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); + if ((peer = pdp_get_peer_ipv(pdp, true))) + vty_out(vty, " End-User Address (IPv6): %s%s", + in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); vty_out(vty, " Transmit GTP Sequence Number for G-PDU: %s%s", pdp->tx_gpdu_seq ? "Yes" : "No", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia34939957bb7856388cb52a741cec0c015a08c70 Gerrit-Change-Number: 15248 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:26:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:26:57 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Split application lifecycle related code into ggsn_main.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 ) Change subject: ggsn: Split application lifecycle related code into ggsn_main.c ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 Gerrit-Change-Number: 15249 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:26:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:27:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:27:30 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 ) Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:27:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:27:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:27:35 +0000 Subject: Change in ...osmo-ggsn[master]: doc: Update vty reference xml file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 ) Change subject: doc: Update vty reference xml file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I49e7db4d0f5c7868b86a4947d8b5739c2068da46 Gerrit-Change-Number: 15275 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Aug 2019 05:27:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:27:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:27:58 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 ) Change subject: libgtp: Introduce cb_recovery3 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Aug 2019 05:27:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:05 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Split application lifecycle related code into ggsn_main.c In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 ) Change subject: ggsn: Split application lifecycle related code into ggsn_main.c ...................................................................... ggsn: Split application lifecycle related code into ggsn_main.c This way we further shrink ggsn.c and leave there GGSN related code. Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 --- M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h A ggsn/ggsn_main.c 4 files changed, 214 insertions(+), 176 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index 022cdef..a8ddf1e 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -12,4 +12,4 @@ endif osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h +osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 3c702c2..c7756d9 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -42,22 +42,8 @@ #include #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "../lib/tun.h" @@ -71,19 +57,9 @@ #include "pco.h" #include "ggsn.h" -void *tall_ggsn_ctx; - -static int end = 0; -static int daemonize = 0; -static struct ctrl_handle *g_ctrlh; - -struct ul255_t qos; -struct ul255_t apn; - static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what); static int cb_tun_ind(struct tun_t *tun, void *pack, unsigned len); - static void pool_close_all_pdp(struct ippool_t *pool) { unsigned int i; @@ -690,8 +666,6 @@ return tun_encaps((struct tun_t *)pdp->ipif, pack, len); } -static char *config_file = "osmo-ggsn.cfg"; - /* callback for tun device osmocom select loop integration */ static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what) { @@ -749,29 +723,6 @@ ggsn_gtp_tmr_start(ggsn); } -/* To exit gracefully. Used with GCC compilation flag -pg and gprof */ -static void signal_handler(int s) -{ - LOGP(DGGSN, LOGL_NOTICE, "signal %d received\n", s); - switch (s) { - case SIGINT: - case SIGTERM: - LOGP(DGGSN, LOGL_NOTICE, "SIGINT received, shutting down\n"); - end = 1; - break; - case SIGABRT: - case SIGUSR1: - talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_ggsn_ctx, stderr); - break; - case SIGUSR2: - talloc_report_full(tall_vty_ctx, stderr); - break; - default: - break; - } -} - /* libgtp callback for confirmations */ static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp) { @@ -882,128 +833,3 @@ ggsn->started = false; return 0; } - -static void print_usage() -{ - printf("Usage: osmo-ggsn [-h] [-D] [-c configfile] [-V]\n"); -} - -static void print_help() -{ - printf( " Some useful help...\n" - " -h --help This help text\n" - " -D --daemonize Fork the process into a background daemon\n" - " -c --config-file filename The config file to use\n" - " -V --version Print the version of OsmoGGSN\n" - ); -} - -static void handle_options(int argc, char **argv) -{ - while (1) { - int option_index = 0, c; - static struct option long_options[] = { - { "help", 0, 0, 'h' }, - { "daemonize", 0, 0, 'D' }, - { "config-file", 1, 0, 'c' }, - { "version", 0, 0, 'V' }, - { 0, 0, 0, 0 } - }; - - c = getopt_long(argc, argv, "hdc:V", long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 'h': - print_usage(); - print_help(); - exit(0); - case 'D': - daemonize = 1; - break; - case 'c': - config_file = optarg; - break; - case 'V': - print_version(1); - exit(0); - break; - } - } -} - -int main(int argc, char **argv) -{ - struct ggsn_ctx *ggsn; - int rc; - - tall_ggsn_ctx = talloc_named_const(NULL, 0, "OsmoGGSN"); - msgb_talloc_ctx_init(tall_ggsn_ctx, 0); - g_vty_info.tall_ctx = tall_ggsn_ctx; - - /* Handle keyboard interrupt SIGINT */ - signal(SIGINT, &signal_handler); - signal(SIGTERM, &signal_handler); - signal(SIGABRT, &signal_handler); - signal(SIGUSR1, &signal_handler); - signal(SIGUSR2, &signal_handler); - - osmo_init_ignore_signals(); - osmo_init_logging2(tall_ggsn_ctx, &log_info); - osmo_stats_init(tall_ggsn_ctx); - - vty_init(&g_vty_info); - logging_vty_add_cmds(); - osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(); - ggsn_vty_init(); - ctrl_vty_init(tall_ggsn_ctx); - - handle_options(argc, argv); - - rate_ctr_init(tall_ggsn_ctx); - - rc = vty_read_config_file(config_file, NULL); - if (rc < 0) { - fprintf(stderr, "Failed to open config file: '%s'\n", config_file); - exit(2); - } - - rc = telnet_init_dynif(tall_ggsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_GGSN); - if (rc < 0) - exit(1); - - g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_GGSN, NULL); - if (!g_ctrlh) { - LOGP(DGGSN, LOGL_ERROR, "Failed to create CTRL interface.\n"); - exit(1); - } - - if (daemonize) { - rc = osmo_daemonize(); - if (rc < 0) { - perror("Error during daemonize"); - exit(1); - } - } - -#if 0 - /* qos */ - qos.l = 3; - qos.v[2] = (args_info.qos_arg) & 0xff; - qos.v[1] = ((args_info.qos_arg) >> 8) & 0xff; - qos.v[0] = ((args_info.qos_arg) >> 16) & 0xff; -#endif - - /* Main select loop */ - while (!end) { - osmo_select_main(0); - } - - llist_for_each_entry(ggsn, &g_ggsn_list, list) - ggsn_stop(ggsn); - - return 0; -} diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index a37381f..1bd067e 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "../lib/tun.h" #include "../lib/ippool.h" @@ -135,8 +136,11 @@ struct apn_ctx *ggsn_find_apn(struct ggsn_ctx *ggsn, const char *name); struct apn_ctx *ggsn_find_or_create_apn(struct ggsn_ctx *ggsn, const char *name); -/* ggsn.c */ +/* ggsn_main.c */ +extern struct ctrl_handle *g_ctrlh; extern void *tall_ggsn_ctx; + +/* ggsn.c */ extern int ggsn_start(struct ggsn_ctx *ggsn); extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); diff --git a/ggsn/ggsn_main.c b/ggsn/ggsn_main.c new file mode 100644 index 0000000..81a8ab1 --- /dev/null +++ b/ggsn/ggsn_main.c @@ -0,0 +1,208 @@ +/* + * OsmoGGSN - Gateway GPRS Support Node + * Copyright (C) 2002, 2003, 2004 Mondru AB. + * Copyright (C) 2017-2019 by Harald Welte + * Copyright (C) 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include "../config.h" + +#ifdef HAVE_STDINT_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ggsn.h" + +void *tall_ggsn_ctx; + +static int end = 0; +static int daemonize = 0; +struct ctrl_handle *g_ctrlh; + +struct ul255_t qos; +struct ul255_t apn; + +static char *config_file = "osmo-ggsn.cfg"; + +/* To exit gracefully. Used with GCC compilation flag -pg and gprof */ +static void signal_handler(int s) +{ + LOGP(DGGSN, LOGL_NOTICE, "signal %d received\n", s); + switch (s) { + case SIGINT: + case SIGTERM: + LOGP(DGGSN, LOGL_NOTICE, "SIGINT received, shutting down\n"); + end = 1; + break; + case SIGABRT: + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_ggsn_ctx, stderr); + break; + case SIGUSR2: + talloc_report_full(tall_vty_ctx, stderr); + break; + default: + break; + } +} + +static void print_usage() +{ + printf("Usage: osmo-ggsn [-h] [-D] [-c configfile] [-V]\n"); +} + +static void print_help() +{ + printf( " Some useful help...\n" + " -h --help This help text\n" + " -D --daemonize Fork the process into a background daemon\n" + " -c --config-file filename The config file to use\n" + " -V --version Print the version of OsmoGGSN\n" + ); +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "daemonize", 0, 0, 'D' }, + { "config-file", 1, 0, 'c' }, + { "version", 0, 0, 'V' }, + { 0, 0, 0, 0 } + }; + + c = getopt_long(argc, argv, "hdc:V", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 'D': + daemonize = 1; + break; + case 'c': + config_file = optarg; + break; + case 'V': + print_version(1); + exit(0); + break; + } + } +} + +int main(int argc, char **argv) +{ + struct ggsn_ctx *ggsn; + int rc; + + tall_ggsn_ctx = talloc_named_const(NULL, 0, "OsmoGGSN"); + msgb_talloc_ctx_init(tall_ggsn_ctx, 0); + g_vty_info.tall_ctx = tall_ggsn_ctx; + + /* Handle keyboard interrupt SIGINT */ + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + + osmo_init_ignore_signals(); + osmo_init_logging2(tall_ggsn_ctx, &log_info); + osmo_stats_init(tall_ggsn_ctx); + + vty_init(&g_vty_info); + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_stats_vty_add_cmds(); + ggsn_vty_init(); + ctrl_vty_init(tall_ggsn_ctx); + + handle_options(argc, argv); + + rate_ctr_init(tall_ggsn_ctx); + + rc = vty_read_config_file(config_file, NULL); + if (rc < 0) { + fprintf(stderr, "Failed to open config file: '%s'\n", config_file); + exit(2); + } + + rc = telnet_init_dynif(tall_ggsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_GGSN); + if (rc < 0) + exit(1); + + g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), + OSMO_CTRL_PORT_GGSN, NULL); + if (!g_ctrlh) { + LOGP(DGGSN, LOGL_ERROR, "Failed to create CTRL interface.\n"); + exit(1); + } + + if (daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + exit(1); + } + } + +#if 0 + /* qos */ + qos.l = 3; + qos.v[2] = (args_info.qos_arg) & 0xff; + qos.v[1] = ((args_info.qos_arg) >> 8) & 0xff; + qos.v[0] = ((args_info.qos_arg) >> 16) & 0xff; +#endif + + /* Main select loop */ + while (!end) { + osmo_select_main(0); + } + + llist_for_each_entry(ggsn, &g_ggsn_list, list) + ggsn_stop(ggsn); + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9e6a3beac7657f0a8c02d514b54c6f1caa93bba7 Gerrit-Change-Number: 15249 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:06 +0000 Subject: Change in ...osmo-ggsn[master]: Move pdp_get_peer_ipv() to lib/util.* In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 ) Change subject: Move pdp_get_peer_ipv() to lib/util.* ...................................................................... Move pdp_get_peer_ipv() to lib/util.* Preparation for next commit, where this function will be needed inside libmisc (lib/*). Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 --- M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c M ggsn/pco.c M lib/Makefile.am A lib/util.c A lib/util.h 7 files changed, 60 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index c7756d9..4e13151 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -51,6 +51,7 @@ #include "../lib/syserr.h" #include "../lib/in46_addr.h" #include "../lib/gtp-kernel.h" +#include "../lib/util.h" #include "../gtp/pdp.h" #include "../gtp/gtp.h" #include "icmpv6.h" @@ -365,26 +366,6 @@ return 0; } -/*! Get the peer of pdp based on IP version used. - * \param[in] pdp PDP context to select the peer from. - * \param[in] v4v6 IP version to select. Valid values are 4 and 6. - * \returns The selected peer matching the given IP version. NULL if not present. - */ -struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { - uint8_t i; - - for (i = 0; i < 2; i++) { - struct ippoolm_t * ippool = pdp->peer[i]; - if (!ippool) - continue; - if (is_ipv6 && in46a_is_v6(&ippool->addr)) - return ippool; - else if (!is_ipv6 && in46a_is_v4(&ippool->addr)) - return ippool; - } - return NULL; -} - static bool apn_supports_ipv4(const struct apn_ctx *apn) { if (apn->v4.cfg.static_prefix.addr.len || apn->v4.cfg.dynamic_prefix.addr.len) diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 1bd067e..88fd8b9 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -145,7 +145,6 @@ extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); extern int apn_stop(struct apn_ctx *apn); -extern struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6); #define LOGPAPN(level, apn, fmt, args...) \ LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 0a86f49..b85df77 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -37,6 +37,8 @@ #include "../gtp/gtp.h" #include "../gtp/pdp.h" +#include "../lib/util.h" + #include "ggsn.h" #define PREFIX_STR "Prefix (Network/Netmask)\n" diff --git a/ggsn/pco.c b/ggsn/pco.c index 5715865..e2181e1 100644 --- a/ggsn/pco.c +++ b/ggsn/pco.c @@ -17,6 +17,8 @@ #include #include +#include "../lib/util.h" + #include "pco.h" #include "ggsn.h" diff --git a/lib/Makefile.am b/lib/Makefile.am index b6e7aba..533d777 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,10 +1,10 @@ noinst_LIBRARIES = libmisc.a -noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h +noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h util.h AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) -libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c +libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c util.c if ENABLE_GTP_KERNEL AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) diff --git a/lib/util.c b/lib/util.c new file mode 100644 index 0000000..6bb0d85 --- /dev/null +++ b/lib/util.c @@ -0,0 +1,35 @@ +/* + * misc helpers + * Copyright 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include "../gtp/pdp.h" + +#include "ippool.h" +#include "in46_addr.h" + +/*! Get the peer of pdp based on IP version used. +* \param[in] pdp PDP context to select the peer from. +* \param[in] v4v6 IP version to select. Valid values are 4 and 6. +* \returns The selected peer matching the given IP version. NULL if not present. +*/ +struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) { + uint8_t i; + + for (i = 0; i < 2; i++) { + struct ippoolm_t * ippool = pdp->peer[i]; + if (!ippool) + continue; + if (is_ipv6 && in46a_is_v6(&ippool->addr)) + return ippool; + else if (!is_ipv6 && in46a_is_v4(&ippool->addr)) + return ippool; + } + return NULL; +} diff --git a/lib/util.h b/lib/util.h new file mode 100644 index 0000000..bc9674d --- /dev/null +++ b/lib/util.h @@ -0,0 +1,18 @@ +#pragma once +/* + * misc helpers + * Copyright 2019 sysmocom - s.f.m.c. GmbH + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include + +struct ippoolm_t; +struct pdp_t; + +struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 Gerrit-Change-Number: 15250 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:06 +0000 Subject: Change in ...osmo-ggsn[master]: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 ) Change subject: gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas ...................................................................... gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas in46a_from_eua() API documentation clearly states an array of 2 items should be passed as pointer, but show_one_pdp() was passing only one, which would end up in out-of-bounds writes on v4v6 EUAs. Let's better use ippool to print allocated ip addresses instead of parsing EUAs we sent some point in the past. Change-Id: I7e164f40f50de43027bcd4464aa879450d2fb10e --- M lib/gtp-kernel.c 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index 48811bc..f6df408 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -26,6 +26,8 @@ #include "../lib/tun.h" #include "../lib/syserr.h" +#include "../lib/util.h" +#include "../lib/ippool.h" #include "../gtp/pdp.h" #include "../gtp/gtp.h" @@ -37,16 +39,23 @@ static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp) { - struct in46_addr ia46; + char buf4[INET_ADDRSTRLEN], buf6[INET6_ADDRSTRLEN]; + struct ippoolm_t *peer; struct in_addr ia; - in46a_from_eua(&pdp->eua, &ia46); + buf4[0] = '\0'; + if ((peer = pdp_get_peer_ipv(pdp, false))) + in46a_ntop(&peer->addr, buf4, sizeof(buf4)); + buf6[0] = '\0'; + if ((peer = pdp_get_peer_ipv(pdp, true))) + in46a_ntop(&peer->addr, buf6, sizeof(buf6)); + gsna2in_addr(&ia, &pdp->gsnrc); - LOGPDPX(DGGSN, LOGL_DEBUG, pdp, "%s %s v%u TEID %"PRIx64" EUA=%s SGSN=%s\n", prefix, + LOGPDPX(DGGSN, LOGL_DEBUG, pdp, "%s %s v%u TEID %"PRIx64" EUA=(%s,%s) SGSN=%s\n", prefix, devname, pdp->version, pdp->version == 0 ? pdp_gettid(pdp->imsi, pdp->nsapi) : pdp->teid_gn, - in46a_ntoa(&ia46), inet_ntoa(ia)); + buf4, buf6, inet_ntoa(ia)); } static struct { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7e164f40f50de43027bcd4464aa879450d2fb10e Gerrit-Change-Number: 15251 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:07 +0000 Subject: Change in ...osmo-ggsn[master]: Introduce LOGTUN log helper In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 ) Change subject: Introduce LOGTUN log helper ...................................................................... Introduce LOGTUN log helper Change-Id: I237acdee0be19498804e0d509c610f4e0454ba72 --- M ggsn/ggsn.c M ggsn/ggsn.h 2 files changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 4e13151..94f47e3 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -556,7 +556,7 @@ pool = apn->v6.pool; break; default: - LOGP(DTUN, LOGL_NOTICE, "non-IPv%u packet received from tun\n", iph->version); + LOGTUN(LOGL_NOTICE, tun, "non-IPv%u packet received\n", iph->version); return -1; } @@ -564,15 +564,15 @@ if (!pool) return 0; - DEBUGP(DTUN, "Received packet for APN(%s) from tun %s", apn->cfg.name, tun->devname); - if (ippool_getip(pool, &ipm, &dst)) { - DEBUGPC(DTUN, " with no PDP contex! (%s)\n", iph->version == 4 ? + LOGTUN(LOGL_DEBUG, tun, "Received packet for APN(%s) with no PDP contex! (%s)\n", + apn->cfg.name, + iph->version == 4 ? inet_ntop(AF_INET, &iph->saddr, straddr, sizeof(straddr)) : inet_ntop(AF_INET6, &ip6h->ip6_src, straddr, sizeof(straddr))); return 0; } - DEBUGPC(DTUN, "\n"); + LOGTUN(LOGL_DEBUG, tun, "Received packet for APN(%s)\n", apn->cfg.name); if (ipm->peer) /* Check if a peer protocol is defined */ gtp_data_req(apn->ggsn->gsn, (struct pdp_t *)ipm->peer, pack, len); diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 88fd8b9..6155b30 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -153,3 +153,6 @@ LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args) #define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args) + +#define LOGTUN(level, tun, fmt, args...) \ + LOGP(DTUN, level, "TUN(%s): " fmt, (tun)->devname, ## args) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I237acdee0be19498804e0d509c610f4e0454ba72 Gerrit-Change-Number: 15252 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:07 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 ) Change subject: ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs ...................................................................... ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs Fixes potential duplicates when calling following VTY cmd: show pdp-context ggsn NAME show pdp-context ggsn NAME apn APN Related: OS#4154 Change-Id: I98db39a710a72a1438d71aabaf4f8227984643e3 --- M ggsn/ggsn_vty.c 1 file changed, 24 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index b85df77..a649173 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -734,13 +734,22 @@ return in46a_ntoa(&in46); } -static void show_one_pdp(struct vty *vty, struct pdp_t *pdp) +/* Useful for v4v6 APNs, where we first iterate over v4 pool and then over v6 + pool. param v4only can be used to avoid printing duplicates for pdp context + containing both IPv4 and IPv6 addresses. */ +static void show_one_pdp_v4only(struct vty *vty, struct pdp_t *pdp, bool v4only) { - struct ippoolm_t *peer; + struct ippoolm_t *peer4, *peer6; char name_buf[256]; char *apn_name; int rc; + peer4 = pdp_get_peer_ipv(pdp, false); + peer6 = pdp_get_peer_ipv(pdp, true); + + if (v4only && peer6) + return; + /* Attempt to decode MSISDN */ rc = gsm48_decode_bcd_number2(name_buf, sizeof(name_buf), pdp->msisdn.v, pdp->msisdn.l, 0); @@ -759,16 +768,21 @@ apn_name = osmo_apn_to_str(name_buf, pdp->apn_use.v, pdp->apn_use.l); vty_out(vty, " APN in use: %s%s", apn_name ? name_buf : "(NONE)", VTY_NEWLINE); - if ((peer = pdp_get_peer_ipv(pdp, false))) + if (peer4) vty_out(vty, " End-User Address (IPv4): %s%s", - in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); - if ((peer = pdp_get_peer_ipv(pdp, true))) + in46a_ntop(&peer4->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); + if (peer6) vty_out(vty, " End-User Address (IPv6): %s%s", - in46a_ntop(&peer->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); + in46a_ntop(&peer6->addr, name_buf, sizeof(name_buf)), VTY_NEWLINE); vty_out(vty, " Transmit GTP Sequence Number for G-PDU: %s%s", pdp->tx_gpdu_seq ? "Yes" : "No", VTY_NEWLINE); } +static void show_one_pdp(struct vty *vty, struct pdp_t *pdp) +{ + show_one_pdp_v4only(vty, pdp, false); +} + DEFUN(show_pdpctx_imsi, show_pdpctx_imsi_cmd, "show pdp-context ggsn NAME imsi IMSI [<0-15>]", SHOW_STR "Display information on PDP Context\n" @@ -853,7 +867,7 @@ } /* show all (active) PDP contexts within a pool */ -static void ippool_show_pdp_contexts(struct vty *vty, struct ippool_t *pool) +static void ippool_show_pdp_contexts(struct vty *vty, struct ippool_t *pool, bool pdp_v4only) { unsigned int i; @@ -864,15 +878,15 @@ struct ippoolm_t *member = &pool->member[i]; if (member->inuse == 0) continue; - show_one_pdp(vty, member->peer); + show_one_pdp_v4only(vty, member->peer, pdp_v4only); } } /* show all (active) PDP contexts within an APN */ static void apn_show_pdp_contexts(struct vty *vty, struct apn_ctx *apn) { - ippool_show_pdp_contexts(vty, apn->v4.pool); - ippool_show_pdp_contexts(vty, apn->v6.pool); + ippool_show_pdp_contexts(vty, apn->v4.pool, true); + ippool_show_pdp_contexts(vty, apn->v6.pool, false); } DEFUN(show_pdpctx, show_pdpctx_cmd, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I98db39a710a72a1438d71aabaf4f8227984643e3 Gerrit-Change-Number: 15253 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:08 +0000 Subject: Change in ...osmo-ggsn[master]: pdp: constify param in pdp_count_secondary() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 ) Change subject: pdp: constify param in pdp_count_secondary() ...................................................................... pdp: constify param in pdp_count_secondary() Change-Id: Ie772f2c54264c8bc91f50d9030479861dd8868b7 --- M gtp/pdp.c M gtp/pdp.h 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/gtp/pdp.c b/gtp/pdp.c index eaef545..739cf73 100644 --- a/gtp/pdp.c +++ b/gtp/pdp.c @@ -359,7 +359,7 @@ /* Count amount of secondary PDP contexts linked to this primary PDP context * (itself included). Must be called on a primary PDP context. */ -unsigned int pdp_count_secondary(struct pdp_t *pdp) +unsigned int pdp_count_secondary(const struct pdp_t *pdp) { unsigned int n; unsigned int count = 0; diff --git a/gtp/pdp.h b/gtp/pdp.h index fdfa824..4dcdde4 100644 --- a/gtp/pdp.h +++ b/gtp/pdp.h @@ -263,7 +263,7 @@ uint64_t pdp_gettid(uint64_t imsi, uint8_t nsapi); void pdp_set_imsi_nsapi(struct pdp_t *pdp, uint64_t teid); -unsigned int pdp_count_secondary(struct pdp_t *pdp); +unsigned int pdp_count_secondary(const struct pdp_t *pdp); /* Deprecated APIs (support for only 1 GSN per process). Must be used only after first call to gtp_new() and until it is freed. */ int pdp_init(struct gsn_t *gsn); /* Use only allowed inside libgtp to keep compatiblity with deprecated APIs defined here. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie772f2c54264c8bc91f50d9030479861dd8868b7 Gerrit-Change-Number: 15255 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:08 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn_vty.c: Improve output of VTY show pdp-context In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 ) Change subject: ggsn_vty.c: Improve output of VTY show pdp-context ...................................................................... ggsn_vty.c: Improve output of VTY show pdp-context GTP version and primary/secondary information is printed now for each pdp context. Related: OS#4154 Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 --- M ggsn/ggsn_vty.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index a649173..5684f5a 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -757,6 +757,20 @@ vty_out(vty, "IMSI: %s, NSAPI: %u, MSISDN: %s%s", imsi_gtp2str(&pdp->imsi), pdp->nsapi, rc ? "(NONE)" : name_buf, VTY_NEWLINE); + vty_out(vty, " Version: %d", pdp->version); + if (pdp->version == 1) { + if (!pdp->secondary) { + vty_out(vty, ", Primary, Num Secondaries: %d%s%s", + pdp_count_secondary(pdp) - 1, /* primary included in count */ + pdp->nodata ? ", No User Plane": "", + VTY_NEWLINE); + } else { + vty_out(vty, ", Secondary%s", VTY_NEWLINE); + } + } else { + vty_out(vty, "%s", VTY_NEWLINE); + } + vty_out(vty, " Control: %s:%08x ", print_gsnaddr(&pdp->gsnlc), pdp->teic_own); vty_out(vty, "<-> %s:%08x%s", print_gsnaddr(&pdp->gsnrc), pdp->teic_gn, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If9682fe343e9a1e78175a12538fb80d4bda54802 Gerrit-Change-Number: 15256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:08 +0000 Subject: Change in ...osmo-ggsn[master]: doc: Update vty reference xml file In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 ) Change subject: doc: Update vty reference xml file ...................................................................... doc: Update vty reference xml file Change-Id: I49e7db4d0f5c7868b86a4947d8b5739c2068da46 --- M doc/manuals/vty/ggsn_vty_reference.xml 1 file changed, 70 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, approved diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml index a395b23..15128ed 100644 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ b/doc/manuals/vty/ggsn_vty_reference.xml @@ -254,6 +254,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -614,6 +649,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I49e7db4d0f5c7868b86a4947d8b5739c2068da46 Gerrit-Change-Number: 15275 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:09 +0000 Subject: Change in ...osmo-ggsn[master]: libgtp: Introduce cb_recovery3 In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 ) Change subject: libgtp: Introduce cb_recovery3 ...................................................................... libgtp: Introduce cb_recovery3 Since osmo-ggsn can manage several GSN structures simultaneously, it needs the gsn_t pointer to know the ggsn it should forward the call to. Related: OS#4165 Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 --- M gtp/gtp.c M gtp/gtp.h 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index f0318f7..f70f534 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -219,6 +219,8 @@ gsn->cb_recovery(peer, recovery); if (gsn->cb_recovery2) gsn->cb_recovery2(peer, pdp, recovery); + if (gsn->cb_recovery3) + gsn->cb_recovery3(gsn, peer, pdp, recovery); } int gtp_set_cb_recovery(struct gsn_t *gsn, @@ -242,6 +244,21 @@ return 0; } +/* cb_recovery() + * pdp may be NULL if Recovery IE was received from a message independent + * of any PDP ctx (such as Echo Response), or because pdp ctx is unknown to the + * local setup. In case pdp is known, caller may want to keep that pdp alive to + * handle subsequent msg cb as this specific pdp ctx is still valid according to + * specs. + */ +int gtp_set_cb_recovery3(struct gsn_t *gsn, + int (*cb_recovery3) (struct gsn_t *gsn, struct sockaddr_in *peer, + struct pdp_t *pdp, uint8_t recovery)) +{ + gsn->cb_recovery3 = cb_recovery3; + return 0; +} + int gtp_set_cb_data_ind(struct gsn_t *gsn, int (*cb_data_ind) (struct pdp_t * pdp, void *pack, unsigned len)) diff --git a/gtp/gtp.h b/gtp/gtp.h index c2c5122..f2a4e1d 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -277,6 +277,7 @@ int (*cb_data_ind) (struct pdp_t * pdp, void *pack, unsigned len); int (*cb_recovery) (struct sockaddr_in * peer, uint8_t recovery); int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery); + int (*cb_recovery3) (struct gsn_t *gsn, struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery); /* Counters */ @@ -373,6 +374,11 @@ int gtp_set_cb_recovery2(struct gsn_t *gsn, int (*cb) (struct sockaddr_in * peer, struct pdp_t * pdp, + uint8_t recovery)) + OSMO_DEPRECATED("Use gtp_set_cb_recovery3() instead, to obtain gsn handling the recovery");; +int gtp_set_cb_recovery3(struct gsn_t *gsn, + int (*cb) (struct gsn_t * gsn, struct sockaddr_in * peer, + struct pdp_t * pdp, uint8_t recovery)); void gtp_clear_queues(struct gsn_t *gsn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 Gerrit-Change-Number: 15266 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:40 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 ) Change subject: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 05:28:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:28:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:28:41 +0000 Subject: Change in ...libosmo-sccp[master]: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 ) Change subject: osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 ...................................................................... osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 When using osmo_sccp_simple_client(), it will create an sccp instance if none exists. The sccp instance identifier starts with 0. The implicit created instance should use sccp instance 0 (the first connection). Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae --- M src/sccp_user.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved neels: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sccp_user.c b/src/sccp_user.c index 63eba2a..ff5eb08 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -635,7 +635,7 @@ * the only difference is that the ID of the CS7 instance will be * set to 1 statically */ - return osmo_sccp_simple_client_on_ss7_id(ctx, 1, name, default_pc, prot, + return osmo_sccp_simple_client_on_ss7_id(ctx, 0, name, default_pc, prot, default_local_port, default_local_ip, default_remote_port, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae Gerrit-Change-Number: 15062 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:30:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:30:22 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 ) Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c at 329 PS2, Line 329: close(conn->fd.fd); > I'm also wondering. [?] the normal solution employed in various other examples is to set 'conn->fd.fd = -1" at every close. This way you can then check "if (conn->fd.fd != -1)" or "if (conn->fd.fd >= 0)" around the fd_unregister+close. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:30:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:34:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:34:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 ) Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp File library/RAN_Adapter.ttcnpp: https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp at 196 PS2, Line 196: ba.vc_RAN_started one could probably simply test for "ba.vc_RAN != null" here. Or you could actually check for "if ba.vc_RAN:RANAP.checkstate("Connected")" like we do in other places. I don't think there's a need for inroduction of ba.vc_RAN_started, neither is it elegant to add a variable and thus keep redundant state information which may be out of sync if somebody else might already have disconnected the port or stopped a component, or... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 05:34:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:34:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:34:38 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_echo_timeout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 ) Change subject: sgsn: Introduce test TC_attach_echo_timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 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: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 Gerrit-Change-Number: 15306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 05:34:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:34:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:34:57 +0000 Subject: Change in ...pysim[master]: Make programming OPC optional In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15311 ) Change subject: Make programming OPC optional ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic600c325557918cb7d5b1fb179c01936a078c96c Gerrit-Change-Number: 15311 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 05:34:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:34:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:34:59 +0000 Subject: Change in ...pysim[master]: Make programming OPC optional In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/pysim/+/15311 ) Change subject: Make programming OPC optional ...................................................................... Make programming OPC optional Change-Id: Ic600c325557918cb7d5b1fb179c01936a078c96c --- M pySim/cards.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index a341b71..cb42d83 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -582,9 +582,9 @@ data, sw = self._scc.update_binary('00FF', p['ki']) # set OPc in proprietary file - content = "01" + p['opc'] - data, sw = self._scc.update_binary('00F7', content) - + if 'opc' in p: + content = "01" + p['opc'] + data, sw = self._scc.update_binary('00F7', content) # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic600c325557918cb7d5b1fb179c01936a078c96c Gerrit-Change-Number: 15311 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:35:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:35:34 +0000 Subject: Change in ...pysim[master]: make writing SMSP optional In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15312 ) Change subject: make writing SMSP optional ...................................................................... Patch Set 1: > I was kind of expecting a cmdline switch to go along with this? Som upcoming changes will make use of it. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4 Gerrit-Change-Number: 15312 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 29 Aug 2019 05:35:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:36:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:36:02 +0000 Subject: Change in ...osmo-msc[master]: log, cosmetic: add "RR" to "Ciphering Mode Complete" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15318 ) Change subject: log, cosmetic: add "RR" to "Ciphering Mode Complete" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4 Gerrit-Change-Number: 15318 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:36:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:39:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:39:32 +0000 Subject: Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15317 ) Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15317/3/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/#/c/15317/3/src/libmsc/msc_a.c at 1411 PS3, Line 1411: but this static msgb saves the extra allocation I'm really not sure if this is the right approach. No code in the osmocom universe ever assumes msgbs are on the stack, or which may not have gone through normal libosmocore handling. What if somebody later for some reason wants to put this on a queue? How does msgb ownership work out here? To me, it looks like a very dangerous premature optimization with potential to waste a lot of time and effort at some potential future point of development. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d Gerrit-Change-Number: 15317 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:39:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:39:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:39:47 +0000 Subject: Change in ...osmo-msc[master]: cc trans: make sure bearer cap is empty In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15320 ) Change subject: cc trans: make sure bearer cap is empty ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I147f10f9258fc8685f2f666878dd2a655b8e4583 Gerrit-Change-Number: 15320 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:39:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:39:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:39:56 +0000 Subject: Change in ...osmo-msc[master]: memleak on cc setup errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15319 ) Change subject: memleak on cc setup errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3333b90064575b270627721ace7e07d085f4ad43 Gerrit-Change-Number: 15319 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:39:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:39:58 +0000 Subject: Change in ...osmo-msc[master]: memleak on cc setup errors In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15319 ) Change subject: memleak on cc setup errors ...................................................................... memleak on cc setup errors Change-Id: I3333b90064575b270627721ace7e07d085f4ad43 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f974e90..a1fea9a 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -598,6 +598,7 @@ GSM48_CC_CAUSE_RESOURCE_UNAVAIL); trans->callref = 0; trans_free(trans); + msgb_free(msg); return rc; } @@ -610,6 +611,7 @@ GSM48_CC_CAUSE_RESOURCE_UNAVAIL); trans->callref = 0; trans_free(trans); + msgb_free(msg); return rc; } trans->transaction_id = trans_id; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3333b90064575b270627721ace7e07d085f4ad43 Gerrit-Change-Number: 15319 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:39:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:39:59 +0000 Subject: Change in ...osmo-msc[master]: cc trans: make sure bearer cap is empty In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15320 ) Change subject: cc trans: make sure bearer cap is empty ...................................................................... cc trans: make sure bearer cap is empty Change-Id: I147f10f9258fc8685f2f666878dd2a655b8e4583 --- M src/libmsc/transaction.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index ebdaced..11cde93 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -147,6 +147,10 @@ .transaction_id = trans_id, .callref = callref, .net = net, + /* empty bearer_cap: make sure the speech_ver array is empty */ + .bearer_cap = { + .speech_ver = { -1 }, + }, }; vlr_subscr_get(vsub, trans_vsub_use(type)); llist_add_tail(&trans->entry, &net->trans_list); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I147f10f9258fc8685f2f666878dd2a655b8e4583 Gerrit-Change-Number: 15320 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:40:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:40:43 +0000 Subject: Change in ...osmo-msc[master]: fix segfault: don't send CC REL on NULL msc_a In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15314 ) Change subject: fix segfault: don't send CC REL on NULL msc_a ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia1bb0410ad0618c182a5f6da06af342b6d483eff Gerrit-Change-Number: 15314 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:40:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:40:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:40:57 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15315 ) Change subject: vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2ea4f46efa013671d93892cb07bf830393289150 Gerrit-Change-Number: 15315 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:40:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:42:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:42:01 +0000 Subject: Change in ...osmo-msc[master]: tweak CC cause for incoming call to unattached nr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15316 ) Change subject: tweak CC cause for incoming call to unattached nr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia3d4f67b53fcc2654ff048fbc338e92cb763a095 Gerrit-Change-Number: 15316 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 05:42:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:42:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:42:03 +0000 Subject: Change in ...osmo-msc[master]: fix segfault: don't send CC REL on NULL msc_a In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15314 ) Change subject: fix segfault: don't send CC REL on NULL msc_a ...................................................................... fix segfault: don't send CC REL on NULL msc_a Apparently, if a conn disappears during an ongoing call, the CC code tried to send a CC REL on a NULL msc_a during cleanup, which lead to a crash (cccamp2019). Guard against that. Crash: #0 msc_a_tx_dtap_to_i (msc_a=0x0, dtap=0x55a4bf2fa0f0) at ../../../../src/osmo-msc/src/libmsc/msc_a.c:1565 #1 0x000055a4be1bb03c in trans_tx_gsm48 (trans=0x55a4bf2d52a0, trans=0x55a4bf2d52a0, trans=0x55a4bf2d52a0, msg=) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:82 #2 gsm48_cc_tx_release (trans=trans at entry=0x55a4bf2d52a0, arg=arg at entry=0x7ffdd731a0e0) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:1101 #3 0x000055a4be1bee65 in _gsm48_cc_trans_free (trans=trans at entry=0x55a4bf2d52a0) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:278 #4 0x000055a4be1ab654 in trans_free (trans=trans at entry=0x55a4bf2d52a0) at ../../../../src/osmo-msc/src/libmsc/transaction.c:170 #5 0x000055a4be1bd091 in mncc_tx_to_gsm_cc (net=, msg=msg at entry=0x55a4bf2d3b68) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:1971 #6 0x000055a4be1bf1e5 in mncc_tx_to_cc (net=, arg=arg at entry=0x55a4bf2d3b68) at ../../../../src/osmo-msc/src/libmsc/gsm_04_08_cc.c:2049 #7 0x000055a4be18ed63 in mncc_sock_read (bfd=0x55a4bf2563b8, bfd=0x55a4bf2563b8) at ../../../../src/osmo-msc/src/libmsc/mncc_sock.c:121 #8 mncc_sock_cb (bfd=0x55a4bf2563b8, flags=1) at ../../../../src/osmo-msc/src/libmsc/mncc_sock.c:189 #9 0x00007fcfad607ce1 in osmo_fd_disp_fds (_eset=0x7ffdd731a9a0, _wset=0x7ffdd731a920, _rset=0x7ffdd731a8a0) at ../../../src/libosmocore/src/select.c:223 #10 osmo_select_main (polling=) at ../../../src/libosmocore/src/select.c:263 #11 0x000055a4be17dd56 in main (argc=3, argv=) at ../../../../src/osmo-msc/src/osmo-msc/msc_main.c:723 Change-Id: Ia1bb0410ad0618c182a5f6da06af342b6d483eff --- M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c 2 files changed, 19 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a1fea9a..ba6a197 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1076,8 +1076,16 @@ static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg) { struct gsm_mncc *rel = arg; - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC REL"); - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + struct msgb *msg; + struct gsm48_hdr *gh; + + if (!trans->msc_a) { + LOG_TRANS(trans, LOGL_DEBUG, "Cannot send CC REL, there is no MSC-A connection\n"); + return -EINVAL; + } + + msg = gsm48_msgb_alloc_name("GSM 04.08 CC REL"); + gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_RELEASE; diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 553761f..b3e2e32 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1562,6 +1562,15 @@ { struct ran_msg ran_msg; + if (!msc_a) { + struct gsm48_hdr *gh = msgb_l3(dtap) ? : dtap->data; + uint8_t pdisc = gsm48_hdr_pdisc(gh); + LOGP(DMSC, LOGL_ERROR, "Attempt to send DTAP to NULL MSC-A, dropping message: %s %s\n", + gsm48_pdisc_name(pdisc), gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh))); + msgb_free(dtap); + return -EIO; + } + if (msc_a->c.ran->type == OSMO_RAT_EUTRAN_SGS) { /* The SGs connection to the MME always is at the MSC-A. */ return sgs_iface_tx_dtap_ud(msc_a, dtap); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia1bb0410ad0618c182a5f6da06af342b6d483eff Gerrit-Change-Number: 15314 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:42:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:42:03 +0000 Subject: Change in ...osmo-msc[master]: vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15315 ) Change subject: vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD ...................................................................... vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD Change-Id: I2ea4f46efa013671d93892cb07bf830393289150 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 454709f..2db5711 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1234,6 +1234,10 @@ } } break; + case VLR_ULA_E_ID_IMEI: + case VLR_ULA_E_ID_IMEISV: + /* Got the IMEI from ME, nothing to do right now though. */ + break; default: OSMO_ASSERT(0); break; @@ -1400,7 +1404,9 @@ }, [VLR_ULA_S_WAIT_HLR_UPD] = { .in_event_mask = S(VLR_ULA_E_HLR_LU_RES) | - S(VLR_ULA_E_UPD_HLR_COMPL), + S(VLR_ULA_E_UPD_HLR_COMPL) | + S(VLR_ULA_E_ID_IMEI) | + S(VLR_ULA_E_ID_IMEISV), .out_state_mask = S(VLR_ULA_S_WAIT_LU_COMPL) | S(VLR_ULA_S_WAIT_LU_COMPL_STANDALONE) | S(VLR_ULA_S_DONE), diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 893203e..7b9970d 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1789,7 +1789,6 @@ DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_ID_IMEISV -DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Event VLR_ULA_E_ID_IMEISV not permitted DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - ms_sends_ciphering_mode_complete: now used by 1 (lu) lu_result_sent == 0 - Subscriber has the IMEISV -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2ea4f46efa013671d93892cb07bf830393289150 Gerrit-Change-Number: 15315 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:42:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:42:04 +0000 Subject: Change in ...osmo-msc[master]: tweak CC cause for incoming call to unattached nr In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15316 ) Change subject: tweak CC cause for incoming call to unattached nr ...................................................................... tweak CC cause for incoming call to unattached nr So far we sent CC cause "Unassigned Number" But the MSC doesn't trivially know whether the HLR has the number assigned or not: any handset that is currently switched off would cause "Unassigned number" to be displayed on the caller's handset. Rather send a temporary failure cause code. Send this cause code for all cases, because claiming that an assigned number is unassigned is worse than rejecting an unassigned number with a temporary failure. Change-Id: Ia3d4f67b53fcc2654ff048fbc338e92cb763a095 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index ba6a197..1ec3342 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1892,7 +1892,7 @@ } if (!vsub) return mncc_release_ind(net, NULL, data->callref, GSM48_CAUSE_LOC_PRN_S_LU, - GSM48_CC_CAUSE_UNASSIGNED_NR); + GSM48_CC_CAUSE_USER_NOTRESPOND); /* update the subscriber we deal with */ log_set_context(LOG_CTX_VLR_SUBSCR, vsub); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia3d4f67b53fcc2654ff048fbc338e92cb763a095 Gerrit-Change-Number: 15316 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:42:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:42:53 +0000 Subject: Change in ...docker-playground[master]: ttcn3-ggsn: Disable echo-timer test when running against latest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15284 ) Change subject: ttcn3-ggsn: Disable echo-timer test when running against latest ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6657eefed00df96e3bcdca174a6ea0be1897b762 Gerrit-Change-Number: 15284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Aug 2019 05:42:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:42:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:42:54 +0000 Subject: Change in ...docker-playground[master]: ttcn3-ggsn: Disable echo-timer test when running against latest In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15284 ) Change subject: ttcn3-ggsn: Disable echo-timer test when running against latest ...................................................................... ttcn3-ggsn: Disable echo-timer test when running against latest Change-Id: I6657eefed00df96e3bcdca174a6ea0be1897b762 --- M ttcn3-ggsn-test/GGSN_Tests.cfg M ttcn3-ggsn-test/jenkins.sh 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg index 064bf37..11c22cb 100644 --- a/ttcn3-ggsn-test/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/GGSN_Tests.cfg @@ -18,5 +18,7 @@ # GGSN announced DNS address GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" +GGSN_Tests.m_ggsn_supports_echo_interval := true; + [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 4250e4d..c4fac9d 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -10,6 +10,10 @@ mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ +# VTY command "(no) echo-interval" must be disabled until osmo-ggsn.git release > 1.4.0 is available. +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/GGSN_Tests.m_ggsn_supports_echo_interval := true;/GGSN_Tests.m_ggsn_supports_echo_interval := false;/g" -i $VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg +fi mkdir $VOL_BASE_DIR/ggsn cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6657eefed00df96e3bcdca174a6ea0be1897b762 Gerrit-Change-Number: 15284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:43:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:43:37 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:43:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:43:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:43:38 +0000 Subject: Change in ...osmo-bsc[master]: gsm_08_08.c: always pick first msc for unsolicit paging responses In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15209 ) Change subject: gsm_08_08.c: always pick first msc for unsolicit paging responses ...................................................................... gsm_08_08.c: always pick first msc for unsolicit paging responses When osmo-bsc receives a paging response via the A-bis interface it tries to find the MSC which is in charge for the paging. This is due to the fact that osmo-bsc supports multiple msc connections, which is not specified by 3gpp specs. In an MT-CSFB call the MSC pages the UE via the SGs interface. Then the UE falls back to 2G. It then reports back as MS on the A-Bis interface with the paging response directly. In those cases osmo-bsc will not be able to determine an MSC in charge, so we will forward the paging response to the first configured MSC. Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Related: SYS#4624 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 16 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 4dc4883..43117a8 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -323,8 +323,8 @@ subscr = extract_sub(conn, msg); if (!subscr) { - LOGP(DMSC, LOGL_ERROR, "Got paged but no subscriber found.\n"); - return NULL; + LOGP(DMSC, LOGL_INFO, "Got paging response but no subscriber found, will now (blindly) deliver the paging response to the first configured MSC!\n"); + goto blind; } pag_msc = paging_get_msc(conn_get_bts(conn), subscr); @@ -344,7 +344,20 @@ return msc; } - LOGP(DMSC, LOGL_ERROR, "Got paged but no request found.\n"); + LOGP(DMSC, LOGL_INFO, "Got paging response but no request found, will now (blindly) deliver the paging response to the first configured MSC!\n"); + +blind: + /* In the case of an MT CSFB call we will get a paging response from + * the BTS without a preceding paging request via A-Interface. In those + * cases the MSC will page the subscriber via SGs interface, so the BSC + * can not know about the paging in advance. In those cases we can not + * know the MSC which is in charge. The only meaningful option we have + * is to deliver the paging response to the first configured MSC + * blindly. */ + msc = llist_first_entry_or_null(&bsc->mscs, struct bsc_msc_data, entry); + if (msc) + return msc; + LOGP(DMSC, LOGL_ERROR, "Unable to find any suitable MSC to deliver paging response!\n"); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7f091ed1bbc2afe12656e42031e122144eeb6826 Gerrit-Change-Number: 15209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:46:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:46:43 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: fix: vty crash by logging to killed telnet session ...................................................................... Patch Set 2: I'm actually with Pau on this one, and I would have independently "complained" about it in the review, if he hadn't brought it up. At the very least the root cause should be fixed, and then as a second, less important item we can discuss whether or not we should emply 'defensive programming' by checking for null here. I would actually rather OSMO_ASSERT on NULL situations, rather than silently dropping it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 05:47:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 05:47:11 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: properly handle unknown header version error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15300 ) Change subject: trx_toolkit/trx_sniff.py: properly handle unknown header version error ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie04782ced1fab7bc363549bfa37528f5a124e99d Gerrit-Change-Number: 15300 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 05:47:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 29 06:57:00 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 06:57:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d67775a351f0_e2a2aabfaa785fc3622e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 439s] ar: `u' modifier ignored since `D' is the default (see `U') [ 439s] libtool: link: ranlib .libs/libtransceiver_common.a [ 439s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 439s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 439s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 439s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 439s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 439s] collect2: error: ld returned 1 exit status [ 439s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 439s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 439s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 439s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 439s] make[1]: *** [Makefile:444: all] Error 2 [ 439s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 439s] dh_auto_build: make -j1 returned exit code 2 [ 439s] make: *** [debian/rules:6: build] Error 255 [ 439s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 439s] [ 439s] lamb22 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 06:56:48 UTC 2019. [ 439s] [ 439s] ### VM INTERACTION START ### [ 442s] [ 422.562946] sysrq: SysRq : Power Off [ 442s] [ 422.576471] reboot: Power down [ 443s] ### VM INTERACTION END ### [ 443s] [ 443s] lamb22 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 06:56:53 UTC 2019. [ 443s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 29 07:02:26 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 07:02:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d67788354505_e2a2aabfaa785fc3628ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 502s] ar: `u' modifier ignored since `D' is the default (see `U') [ 502s] libtool: link: ranlib .libs/libtransceiver_common.a [ 502s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 502s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 502s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 502s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 502s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 502s] collect2: error: ld returned 1 exit status [ 502s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 502s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 502s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 502s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 502s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 502s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 502s] make[1]: *** [Makefile:444: all] Error 2 [ 502s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 502s] dh_auto_build: make -j1 returned exit code 2 [ 502s] make: *** [debian/rules:6: build] Error 255 [ 502s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 502s] [ 502s] cloud122 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 07:02:08 UTC 2019. [ 502s] [ 502s] ### VM INTERACTION START ### [ 505s] [ 449.904352] sysrq: SysRq : Power Off [ 505s] [ 449.918809] reboot: Power down [ 507s] ### VM INTERACTION END ### [ 507s] [ 507s] cloud122 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 07:02:13 UTC 2019. [ 507s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 29 07:09:17 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 07:09:17 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_10/armv7l In-Reply-To: References: Message-ID: <5d677a28c3f03_e2a2aabfaa785fc364156@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_10/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 185s] [ 185s] -non-reconnecting test step 0 [client OK, server OK], FD reg 0 [ 185s] +non-reconnecting test step 0 [client OK, server OK], FD reg 1 [ 185s] --- expout 2019-08-29 07:09:03.245000000 +0000 [ 185s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stdout 2019-08-29 07:09:12.270000000 +0000 [ 185s] @@ -44,8 +44,6 @@ [ 185s] [OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 185s] [OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 [ 185s] [OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call [ 185s] -[OK] Client's read_cb_cli(): callback triggered [ 185s] -[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled [ 185s] non-reconnecting test complete. [ 185s] [ 185s] Stream tests completed [ 185s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 185s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 185s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 185s] make: *** [debian/rules:13: build] Error 2 [ 185s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 185s] [ 185s] armbuild25 failed "build libosmo-netif_0.6.0.dsc" at Thu Aug 29 07:09:13 UTC 2019. [ 185s] [ 185s] ### VM INTERACTION START ### [ 187s] [ 162.912862] sysrq: SysRq : Power Off [ 187s] [ 162.918933] reboot: Power down [ 187s] ### VM INTERACTION END ### [ 187s] [ 187s] armbuild25 failed "build libosmo-netif_0.6.0.dsc" at Thu Aug 29 07:09:16 UTC 2019. [ 187s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 07:30:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 07:30:35 +0000 Subject: Change in ...libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15321 Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE This is a bit of a hack, as we want to maintain binary compatibility without breaking existing users of libosmocore. To do so, we use the 'num_auth_vectors' field in two ways now: * In the existing use case as part of SEND_AUTH_INFO_RESPONSE, it indicates the number of vectors stored in the 'auth_vectors' field * In the new use case as part of SEND_AUTH_INFO_REQUEST, it indicates the number of vectors actually requested by the MSC/SGSN/MME. Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c 2 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/15321/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index fded89b..eff10f4 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -106,6 +106,7 @@ OSMO_GSUP_IMEI_IE = 0x50, OSMO_GSUP_IMEI_RESULT_IE = 0x51, + OSMO_GSUP_NUM_VECTORS_REQ_IE = 0x52, /* Inter-MSC handover related */ OSMO_GSUP_SOURCE_NAME_IE = 0x60, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 80ebcb2..f400002 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -564,6 +564,11 @@ gsup_msg->cause_sm = value[0]; break; + case OSMO_GSUP_NUM_VECTORS_REQ_IE: + if (gsup_msg->message_type == OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST) + gsup_msg->num_auth_vectors = value[0]; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -748,12 +753,17 @@ } } - for (idx = 0; idx < gsup_msg->num_auth_vectors; idx++) { - const struct osmo_auth_vector *auth_vector; + if (gsup_msg->message_type == OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST) { + uint8_t num = gsup_msg->num_auth_vectors; + msgb_tlv_put(msg, OSMO_GSUP_NUM_VECTORS_REQ_IE, 1, &num); + } else { + for (idx = 0; idx < gsup_msg->num_auth_vectors; idx++) { + const struct osmo_auth_vector *auth_vector; - auth_vector = &gsup_msg->auth_vectors[idx]; + auth_vector = &gsup_msg->auth_vectors[idx]; - encode_auth_info(msg, OSMO_GSUP_AUTH_TUPLE_IE, auth_vector); + encode_auth_info(msg, OSMO_GSUP_AUTH_TUPLE_IE, auth_vector); + } } if (gsup_msg->auts) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 08:27:10 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 29 Aug 2019 08:27:10 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 to look at the new patch set (#3). Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... mncc: do not unregister unregistered osmo fds The function close_connection() calls osmo_fd_unregister() without checking if the osmo_fd is registered at all. Lets make sure the osmo_fs is registered by checking it using osmo_fd_is_registered() Related: OS#4159 Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e --- M src/mncc.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/03/15303/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 08:32:05 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 29 Aug 2019 08:32:05 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: do not unregister unregistered osmo fds In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 ) Change subject: mncc: do not unregister unregistered osmo fds ...................................................................... Patch Set 3: (2 comments) I have tested it and it seems that the close_connection() is indeed called twice in this situation. I now mark the fd as closed by setting it to -1 and then I check on that. If it is -1, the function exits immediately. https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c at 327 PS2, Line 327: if (osmo_fd_is_registered(&conn->fd)) > Just wondering, we are also unconditionally closing conn->fd.fd. Can it happen that fd. [?] Done https://gerrit.osmocom.org/#/c/15303/2/src/mncc.c at 329 PS2, Line 329: close(conn->fd.fd); > the normal solution employed in various other examples is to set 'conn->fd.fd = -1" at every close. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 08:32:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 08:34:37 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 29 Aug 2019 08:34:37 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 to look at the new patch set (#4). Change subject: mncc: check fd before closing a connection ...................................................................... mncc: check fd before closing a connection The function close_connection() closes the fd without marking it as closed. Lets set the fd to -1 and check at the beginning if it is greater than zero. This prevents us from closing an already closed fd again. Related: OS#4159 Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e --- M src/mncc.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/03/15303/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:28:37 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:28:37 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: fix formatting in if line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 ) Change subject: cosmetic: fix formatting in if line ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15302/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15302/1//COMMIT_MSG at 10 PS1, Line 10: Fixes: 2d6a69e69a4b4cb2b8cc63c4810dae44e5a4d8f6 > AFAIK the'Fixes:' tag should reference an issue number. I'd rather say "Introduced in eefa...". That's pretty common tag used in projects like linux kernel. CTRL+F "Fixes:" in https://www.kernel.org/doc/html/latest/process/submitting-patches.html -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 Gerrit-Change-Number: 15302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:28:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:32:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:32:19 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Log msg retransmits and timeouts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 ) Change subject: gtp: Log msg retransmits and timeouts ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15305/1/gtp/gtp.c File gtp/gtp.c: https://gerrit.osmocom.org/#/c/15305/1/gtp/gtp.c at 604 PS1, Line 604: qmsg->seq); > (line width of 120?) [?] That's because "uint16_t" happens to be an "unsigned int" in this architecture/system, but that may not be necessarily the same in other architectures/systems. I prefer using PRIu16 there, it more clearly indicates it's a uint16_t and not an unsigned int. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 Gerrit-Change-Number: 15305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:32:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:34:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:34:55 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 ) Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp File library/RAN_Adapter.ttcnpp: https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp at 196 PS2, Line 196: ba.vc_RAN_started > one could probably simply test for "ba.vc_RAN != null" here. [?] Make sense, thanks I didn't know I could compare against null. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:34:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:39:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:39:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_echo_timeout In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 ) Change subject: sgsn: Introduce test TC_attach_echo_timeout ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15306/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/15306/1/sgsn/SGSN_Tests.ttcn at 1562 PS1, Line 1562: should drop the pdp ctx. Around T3 (3secs) * 6 (+ extra, a lot due to OS#4178): */ > maybe could f_vty_transceive() to configure a shorter timeout? (to get a shorter test run) I'm already using a really small value here (specs state must be at least 60 seconds), and as a result test not being as clean as I would like (new echo messages sent before retransmissions end), so I'll keep it this way. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 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: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 Gerrit-Change-Number: 15306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:39:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:39:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:39:29 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_echo_timeout In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 ) Change subject: sgsn: Introduce test TC_attach_echo_timeout ...................................................................... sgsn: Introduce test TC_attach_echo_timeout This test verifies sgsn drops all GGSN related pdp context when that GGSN stops answering echo requests. Change-Id: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 --- M sgsn/SGSN_Tests.ttcn M sgsn/expected-results.xml 2 files changed, 63 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index b146046..db7d54b 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -61,6 +61,7 @@ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_port := 4222; charstring mp_ggsn_ip := "127.0.0.2"; + integer mp_echo_interval := 5; /* in seconds. Only used in test enabling g_use_echo */ NSConfigurations mp_nsconfig := { { @@ -259,7 +260,7 @@ private function f_vty_enable_echo_interval(boolean enable) runs on test_CT { if (enable) { - f_vty_config(SGSNVTY, "sgsn", "ggsn 0 echo-interval 5"); + f_vty_config(SGSNVTY, "sgsn", "ggsn 0 echo-interval " & int2str(mp_echo_interval)); } else { f_vty_config(SGSNVTY, "sgsn", "ggsn 0 no echo-interval"); } @@ -1539,6 +1540,65 @@ vc_conn.done; } +private function f_TC_attach_echo_timeout(charstring id) runs on BSSGP_ConnHdlr { + var Gtp1cUnitdata g_ud; + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var integer seq_nr; + + /* first perform regular attach */ + f_TC_attach(id); + /* then activate PDP context */ + f_pdp_ctx_act(apars); + + /* Wait to receive first echo request and send initial Restart counter */ + GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + BSSGP[0].clear; + seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); + f_sleep(int2float(mp_echo_interval)); /* wait until around next echo is expected */ + } + + /* At some point next echo request not answered will timeout and SGSN + should drop the pdp ctx. Around T3 (3secs) * 6 (+ extra, a lot due to OS#4178): */ + timer T := 3.0 * 6.0 + 16.0; + T.start; + alt { + [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + setverdict(pass); + } + [] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + /* SGSN currently doesn't send this message because it expects GGSN to be non-reachable anyway */ + seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + log("Received deletePDPContextRequest seq_nr=" & int2str(seq_nr)); + GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + repeat; + } + [] GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + log("Received EchoRequest seq_nr=" & int2str(seq_nr)); + repeat; + } + [] T.timeout { + setverdict(fail, "BSSGP DeactPdpReq not received"); + mtc.stop; + } + [] as_xid(apars); + } + T.stop + + setverdict(pass); +} +/* ATTACH + trigger Recovery procedure through CreatePdpResp */ +testcase TC_attach_echo_timeout() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + g_use_echo := true; + f_init(); + vc_conn := f_start_handler(refers(f_TC_attach_echo_timeout), testcasename(), g_gb, 67, 50.0); + vc_conn.done; + g_use_echo := false; +} + private function f_TC_attach_restart_ctr_echo(charstring id) runs on BSSGP_ConnHdlr { var Gtp1cUnitdata g_ud; var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); @@ -2597,6 +2657,7 @@ execute( TC_attach_pdp_act_user_deact_mt() ); execute( TC_attach_pdp_act_deact_dup() ); execute( TC_attach_second_attempt() ); + execute( TC_attach_echo_timeout() ); execute( TC_attach_restart_ctr_echo() ); execute( TC_attach_restart_ctr_create() ); execute( TC_attach_pdp_act_deact_mt_t3395_expire() ); diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index d9c3706..fc8856a 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -54,6 +54,7 @@ SGSN_Tests.ttcn:MASKED TC_attach_second_attempt testcase + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15306 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: Ic31748924e7bf05ea2ccf2b1be0c460eefed5782 Gerrit-Change-Number: 15306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:43:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:43:51 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging to killed telnet session In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: fix: vty crash by logging to killed telnet session ...................................................................... Patch Set 2: OSMO_ASSERT is fine for me. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:43:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:45:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:45:52 +0000 Subject: Change in ...libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15321 ) Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... Patch Set 1: unit tests are failing here -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:45:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:49:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:49:31 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 ) Change subject: mncc: check fd before closing a connection ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/15303/4/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/15303/4/src/mncc.c at 327 PS4, Line 327: if (conn->fd.fd < 0) Would be great knowing why is close_connection() being called twice. Why is someone calling close_connection on an already close connection (delaying again the reconnect timer by 5 seconds in the future). https://gerrit.osmocom.org/#/c/15303/4/src/mncc.c at 332 PS4, Line 332: conn->fd.fd = -1; Did you make sure upon allocation this fd is set to NULL? otherwise you'd be calling close(0) or whatever value, and that's probably something we want to avoid. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 09:49:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 09:51:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 09:51:31 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: Implement echo req/resp and recovery In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 ) Change subject: ggsn: Implement echo req/resp and recovery ...................................................................... ggsn: Implement echo req/resp and recovery This patch is quite big because implementing echo req/resp and recovery requires having knowledge and managing differentiated state for each GSN peer attached/connected to osmo-ggsn. This kind of information was not available in osmo-ggsn nor in libgtp. So osmo-ggsn is now able to track GSN peers connected to a ggsn_ctx (associated gsn_t from libgtp) by means of "sgsn_peer" data structure, and accessible from the ggsn through a list. The instances of sgsn_peer are currently allocated and destroyed dynamically based on discovered peer who have at least a pdp context attached to us (we are not interested in peers without pdp contexts because we don't need to send echo requests/responses and maintain state in that case). A new private pointer (pdp_t->priv) data structure struct pdp_priv_t is added to be able to relate a pdp_t to an sgsn as well as the already existing pointer to an apn. An "echo-interval <0-36000>" VTY command is added which allows configuring time wait between echo requests being sent to each sgsn_peer. Transmission of echo requests is disabled by default. Finally, a new "show sgsn" VTY command is introduced, and its output is also printed during "show ggsn". Related: OS#4165 Change-Id: Id2c84165dc59dff495106758146a701ca488834f --- M doc/manuals/vty/ggsn_vty_reference.xml M ggsn/Makefile.am M ggsn/ggsn.c M ggsn/ggsn.h M ggsn/ggsn_vty.c A ggsn/sgsn.c A ggsn/sgsn.h 7 files changed, 406 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml index 15128ed..64bd07a 100644 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ b/doc/manuals/vty/ggsn_vty_reference.xml @@ -1380,6 +1380,18 @@ + + + + + + + + + + + + config-ggsn-apn diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index a8ddf1e..ca389f0 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -12,4 +12,4 @@ endif osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h +osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 94f47e3..89b183f 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -61,6 +61,17 @@ static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what); static int cb_tun_ind(struct tun_t *tun, void *pack, unsigned len); +void ggsn_close_one_pdp(struct pdp_t *pdp) +{ + LOGPPDP(LOGL_DEBUG, pdp, "Sending DELETE PDP CTX due to shutdown\n"); + gtp_delete_context_req2(pdp->gsn, pdp, NULL, 1); + /* We have nothing more to do with pdp ctx, free it. Upon cb_delete_context + called during this call we'll clean up ggsn related stuff attached to this + pdp context. After this call, ippool member is cleared so + data is no longer valid and should not be accessed anymore. */ + gtp_freepdp_teardown(pdp->gsn, pdp); +} + static void pool_close_all_pdp(struct ippool_t *pool) { unsigned int i; @@ -77,13 +88,7 @@ pdp = member->peer; if (!pdp) continue; - LOGPPDP(LOGL_DEBUG, pdp, "Sending DELETE PDP CTX due to shutdown\n"); - gtp_delete_context_req2(pdp->gsn, pdp, NULL, 1); - /* We have nothing more to do with pdp ctx, free it. Upon cb_delete_context - called during this call we'll clean up ggsn related stuff attached to this - pdp context. After this call, ippool member is cleared so - data is no longer valid and should not be accessed anymore. */ - gtp_freepdp_teardown(pdp->gsn, pdp); + ggsn_close_one_pdp(pdp); } } @@ -341,7 +346,8 @@ static int delete_context(struct pdp_t *pdp) { struct gsn_t *gsn = pdp->gsn; - struct apn_ctx *apn = pdp->priv; + struct pdp_priv_t *pdp_priv = pdp->priv; + struct apn_ctx *apn; struct ippoolm_t *member; int i; @@ -356,6 +362,15 @@ LOGPPDP(LOGL_ERROR, pdp, "Cannot find/free IP Pool member\n"); } + if (!pdp_priv) { + LOGPPDP(LOGL_NOTICE, pdp, "Deleting PDP context: without private structure!\n"); + return 0; + } + + /* Remove from SGSN */ + sgsn_peer_remove_pdp_priv(pdp_priv); + + apn = pdp_priv->apn; if (apn && apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { if (gtp_kernel_tunnel_del(pdp, apn->tun.cfg.dev_name)) { LOGPPDP(LOGL_ERROR, pdp, "Cannot delete tunnel from kernel:%s\n", @@ -363,6 +378,8 @@ } } + talloc_free(pdp_priv); + return 0; } @@ -380,6 +397,36 @@ return false; } +static struct sgsn_peer* ggsn_find_sgsn(struct ggsn_ctx *ggsn, struct in_addr *peer_addr) +{ + struct sgsn_peer *sgsn; + + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) { + if (memcmp(&sgsn->addr, peer_addr, sizeof(*peer_addr)) == 0) + return sgsn; + } + return NULL; +} + +static struct sgsn_peer* ggsn_find_or_create_sgsn(struct ggsn_ctx *ggsn, struct pdp_t *pdp) +{ + struct sgsn_peer *sgsn; + struct in_addr ia; + + if (gsna2in_addr(&ia, &pdp->gsnrc)) { + LOGPPDP(LOGL_ERROR, pdp, "Failed parsing gsnrc (len=%u) to discover SGSN\n", + pdp->gsnrc.l); + return NULL; + } + + if ((sgsn = ggsn_find_sgsn(ggsn, &ia))) + return sgsn; + + sgsn = sgsn_peer_allocate(ggsn, &ia, pdp->version); + llist_add(&sgsn->entry, &ggsn->sgsn_list); + return sgsn; +} + int create_context_ind(struct pdp_t *pdp) { static char name_buf[256]; @@ -391,6 +438,8 @@ struct apn_ctx *apn = NULL; int rc, num_addr, i; char *apn_name; + struct sgsn_peer *sgsn; + struct pdp_priv_t *pdp_priv; apn_name = osmo_apn_to_str(name_buf, pdp->apn_req.v, pdp->apn_req.l); LOGPPDP(LOGL_DEBUG, pdp, "Processing create PDP context request for APN '%s'\n", @@ -492,7 +541,14 @@ } pdp->ipif = apn->tun.tun; /* TODO */ - pdp->priv = apn; + + pdp_priv = talloc_zero(ggsn, struct pdp_priv_t); + pdp->priv = pdp_priv; + pdp_priv->lib = pdp; + /* Create sgsn and assign pdp to it */ + sgsn = ggsn_find_or_create_sgsn(ggsn, pdp); + sgsn_peer_add_pdp_priv(sgsn, pdp_priv); + pdp_priv->apn = apn; /* TODO: change trap to send 2 IPs */ if (!send_trap(gsn, pdp, member, "imsi-ass-ip")) { /* TRAP with IP assignment */ @@ -707,6 +763,7 @@ /* libgtp callback for confirmations */ static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp) { + struct sgsn_peer *sgsn; int rc = 0; if (cause == EOF) @@ -725,12 +782,31 @@ Rx path. This code is nevertheless left here in order to ease future developent and avoid possible future memleaks once more scenarios where GGSN sends a DeleteCtxRequest are introduced. */ - if (pdp) + if (pdp) rc = pdp_freepdp(pdp); + break; + case GTP_ECHO_REQ: + sgsn = (struct sgsn_peer *)cbp; + sgsn_peer_echo_resp(sgsn, cause == EOF); + break; } return rc; } +static int cb_recovery3(struct gsn_t *gsn, struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery) +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *)gsn->priv; + struct sgsn_peer *sgsn; + + sgsn = ggsn_find_sgsn(ggsn, &peer->sin_addr); + if (!sgsn) { + LOGPGGSN(LOGL_NOTICE, ggsn, "Received Recovery IE for unknown SGSN (no PDP contexts active)\n"); + return -EINVAL; + } + + return sgsn_peer_handle_recovery(sgsn, pdp, recovery); +} + /* Start a given GGSN */ int ggsn_start(struct ggsn_ctx *ggsn) { @@ -778,6 +854,7 @@ gtp_set_cb_delete_context(ggsn->gsn, delete_context); gtp_set_cb_create_context_ind(ggsn->gsn, create_context_ind); gtp_set_cb_conf(ggsn->gsn, cb_conf); + gtp_set_cb_recovery3(ggsn->gsn, cb_recovery3); LOGPGGSN(LOGL_NOTICE, ggsn, "Successfully started\n"); ggsn->started = true; diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h index 6155b30..f23df54 100644 --- a/ggsn/ggsn.h +++ b/ggsn/ggsn.h @@ -14,6 +14,8 @@ #include "../lib/in46_addr.h" #include "../gtp/gtp.h" +#include "sgsn.h" + #define APN_TYPE_IPv4 0x01 /* v4-only */ #define APN_TYPE_IPv6 0x02 /* v6-only */ #define APN_TYPE_IPv4v6 0x04 /* v4v6 dual-stack */ @@ -89,6 +91,14 @@ struct apn_ctx_ip v6; }; +struct pdp_priv_t { + struct pdp_t *lib; /* pointer to libgtp associated pdp_t instance */ + struct sgsn_peer *sgsn; + struct apn_ctx *apn; + struct llist_head entry; /* to be included into sgsn_peer */ + /* struct ggsn_ctx can be reached through lib->gsn->priv, or through sgsn->ggsn */ +}; + struct ggsn_ctx { /* global list of GGSNs */ struct llist_head list; @@ -96,6 +106,9 @@ /* list of APNs in this GGSN */ struct llist_head apn_list; + /* list of SGSN peers (struct sgsn_peer) in this GGSN. TODO: hash table with key ? */ + struct llist_head sgsn_list; + bool started; struct { @@ -112,6 +125,8 @@ struct in46_addr gtpu_addr; /* directory for state file */ char *state_dir; + /* Time between Echo requests on each SGSN */ + unsigned int echo_interval; /* administratively shut-down (true) or not (false) */ bool shutdown; } cfg; @@ -145,6 +160,7 @@ extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int apn_start(struct apn_ctx *apn); extern int apn_stop(struct apn_ctx *apn); +void ggsn_close_one_pdp(struct pdp_t *pdp); #define LOGPAPN(level, apn, fmt, args...) \ LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args) diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 5684f5a..cb92a8a 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -40,6 +40,7 @@ #include "../lib/util.h" #include "ggsn.h" +#include "sgsn.h" #define PREFIX_STR "Prefix (Network/Netmask)\n" #define IFCONFIG_STR "GGSN-based interface configuration\n" @@ -79,6 +80,7 @@ ggsn->cfg.state_dir = talloc_strdup(ggsn, "/tmp"); ggsn->cfg.shutdown = true; INIT_LLIST_HEAD(&ggsn->apn_list); + INIT_LLIST_HEAD(&ggsn->sgsn_list); llist_add_tail(&ggsn->list, &g_ggsn_list); return ggsn; @@ -328,6 +330,80 @@ return CMD_SUCCESS; } +static void show_one_sgsn(struct vty *vty, const struct sgsn_peer *sgsn, const char* prefix) +{ + char buf[INET_ADDRSTRLEN]; + + inet_ntop(AF_INET, &sgsn->addr, buf, sizeof(buf)); + vty_out(vty, "%s(S)GSN %s%s", prefix, buf, VTY_NEWLINE); + vty_out(vty, "%s Restart Counter: %d%s", prefix, sgsn->remote_restart_ctr, VTY_NEWLINE); + vty_out(vty, "%s PDP contexts: %d%s", prefix, llist_count(&sgsn->pdp_list), VTY_NEWLINE); + vty_out(vty, "%s Echo Requests in-flight: %u%s", prefix, sgsn->tx_msgs_queued, VTY_NEWLINE); +} + +DEFUN(cfg_ggsn_show_sgsn, cfg_ggsn_show_sgsn_cmd, + "show sgsn", + NO_STR GGSN_STR "Remove the GGSN from administrative shut-down\n") +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; + struct sgsn_peer *sgsn; + + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) { + show_one_sgsn(vty, sgsn, ""); + } + + return CMD_SUCCESS; +} + +/* Seee 3GPP TS 29.060 section 7.2.1 */ +DEFUN(cfg_ggsn_echo_interval, cfg_ggsn_echo_interval_cmd, + "echo-interval <1-36000>", + GGSN_STR "GGSN Number\n" + "Send an echo request to this static GGSN every interval\n" + "Interval between echo requests in seconds\n") +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; + int prev_interval = ggsn->cfg.echo_interval; + struct sgsn_peer *sgsn; + + ggsn->cfg.echo_interval = atoi(argv[0]); + + if (ggsn->cfg.echo_interval < 60) + vty_out(vty, "%% 3GPP TS 29.060 section states interval should " \ + "not be lower than 60 seconds, use this value for " \ + "testing purposes only!%s", VTY_NEWLINE); + + if (prev_interval == ggsn->cfg.echo_interval) + return CMD_SUCCESS; + + /* Re-enable echo timer for all sgsn */ + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) + sgsn_echo_timer_start(sgsn); + + return CMD_SUCCESS; +} + +DEFUN(cfg_ggsn_no_echo_interval, cfg_ggsn_no_echo_interval_cmd, + "no echo-interval", + GGSN_STR "GGSN Number\n" + NO_STR "Send an echo request to this static GGSN every interval.\n") +{ + struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; + int prev_interval = ggsn->cfg.echo_interval; + struct sgsn_peer *sgsn; + + if (prev_interval == ggsn->cfg.echo_interval) + return CMD_SUCCESS; + + ggsn->cfg.echo_interval = 0; + + /* Disable echo timer for all sgsn */ + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) + sgsn_echo_timer_stop(sgsn); + + return CMD_SUCCESS; +} + /* APN Node */ static struct cmd_node apn_node = { @@ -716,6 +792,8 @@ config_write_apn(vty, apn); if (ggsn->cfg.default_apn) vty_out(vty, " default-apn %s%s", ggsn->cfg.default_apn->cfg.name, VTY_NEWLINE); + if (ggsn->cfg.echo_interval) + vty_out(vty, " echo-interval %u%s", ggsn->cfg.echo_interval, VTY_NEWLINE); /* must be last */ vty_out(vty, " %sshutdown ggsn%s", ggsn->cfg.shutdown ? "" : "no ", VTY_NEWLINE); } @@ -964,12 +1042,15 @@ static void show_one_ggsn(struct vty *vty, struct ggsn_ctx *ggsn) { struct apn_ctx *apn; + struct sgsn_peer *sgsn; vty_out(vty, "GGSN %s: Bound to %s%s", ggsn->cfg.name, in46a_ntoa(&ggsn->cfg.listen_addr), VTY_NEWLINE); /* FIXME */ llist_for_each_entry(apn, &ggsn->apn_list, list) show_apn(vty, apn); + llist_for_each_entry(sgsn, &ggsn->sgsn_list, entry) + show_one_sgsn(vty, sgsn, " "); } DEFUN(show_ggsn, show_ggsn_cmd, @@ -1016,6 +1097,9 @@ install_element(GGSN_NODE, &cfg_ggsn_no_apn_cmd); install_element(GGSN_NODE, &cfg_ggsn_default_apn_cmd); install_element(GGSN_NODE, &cfg_ggsn_no_default_apn_cmd); + install_element(GGSN_NODE, &cfg_ggsn_show_sgsn_cmd); + install_element(GGSN_NODE, &cfg_ggsn_echo_interval_cmd); + install_element(GGSN_NODE, &cfg_ggsn_no_echo_interval_cmd); install_node(&apn_node, NULL); install_element(APN_NODE, &cfg_description_cmd); diff --git a/ggsn/sgsn.c b/ggsn/sgsn.c new file mode 100644 index 0000000..8360439 --- /dev/null +++ b/ggsn/sgsn.c @@ -0,0 +1,160 @@ +#include "sgsn.h" +#include "ggsn.h" + + +static bool sgsn_peer_attempt_free(struct sgsn_peer *sgsn) +{ + /* We have to be careful here, since if all pdp ctx for that sgsn were + deactivated in-between we sent the Echo Req and receivied the timeout + indication, the sgsn (cbp) may be already gone. We need to add some + counter reference of echo requets in flight and only free sgsn + structures when it goes to zero decreased for all Echo Resp. We do it + this way because currently in libgtp there's no understanding of "gsn + peer" for which messages are grouped and hence we cannot request + libgtp to drop all queued messages for a specific peer. */ + if (sgsn->tx_msgs_queued) { + LOGSGSN(LOGL_INFO, sgsn, "Delaying delete, still %u echo messages queued\n", + sgsn->tx_msgs_queued); + return false; + } + llist_del(&sgsn->entry); + LOGSGSN(LOGL_INFO, sgsn, "Deleting SGSN\n"); + talloc_free(sgsn); + return true; +} + +static void sgsn_peer_echo_req(struct sgsn_peer *sgsn) +{ + struct ggsn_ctx *ggsn = sgsn->ggsn; + LOGSGSN(LOGL_INFO, sgsn, "Tx Echo Request\n"); + gtp_echo_req(ggsn->gsn, sgsn->gtp_version, sgsn, &sgsn->addr); + sgsn->tx_msgs_queued++; +} + +void sgsn_peer_echo_resp(struct sgsn_peer *sgsn, bool timeout) +{ + if (timeout) { + LOGSGSN(LOGL_NOTICE, sgsn, "Rx Echo Request timed out!\n"); + sgsn_peer_drop_all_pdp(sgsn); + } else { + LOGSGSN(LOGL_INFO, sgsn, "Rx Echo Response\n"); + } + + /* We decrement it here after dropping all pdps to make sure sgsn was + not freed upon last pdp ctx deleted and is still alive now */ + sgsn->tx_msgs_queued--; + if (llist_empty(&sgsn->pdp_list)) + sgsn_peer_attempt_free(sgsn); +} + +void sgsn_echo_timer_start(struct sgsn_peer *sgsn) +{ + if (sgsn->ggsn->cfg.echo_interval == 0) + return; + sgsn_peer_echo_req(sgsn); + osmo_timer_schedule(&sgsn->echo_timer, sgsn->ggsn->cfg.echo_interval, 0); +} + +void sgsn_echo_timer_stop(struct sgsn_peer *sgsn) +{ + osmo_timer_del(&sgsn->echo_timer); +} + +static void sgsn_echo_timer_cb(void *data) +{ + struct sgsn_peer *sgsn = (struct sgsn_peer *) data; + sgsn_echo_timer_start(sgsn); +} + +struct sgsn_peer *sgsn_peer_allocate(struct ggsn_ctx *ggsn, struct in_addr *ia, unsigned int gtp_version) +{ + struct sgsn_peer *sgsn; + + sgsn = talloc_zero_size(ggsn, sizeof(struct sgsn_peer)); + sgsn->ggsn = ggsn; + sgsn->addr = *ia; + sgsn->gtp_version = gtp_version; + sgsn->remote_restart_ctr = -1; + INIT_LLIST_HEAD(&sgsn->pdp_list); + INIT_LLIST_HEAD(&sgsn->entry); + + osmo_timer_setup(&sgsn->echo_timer, sgsn_echo_timer_cb, sgsn); + + LOGSGSN(LOGL_INFO, sgsn, "Discovered\n"); + return sgsn; +} + +void sgsn_peer_add_pdp_priv(struct sgsn_peer *sgsn, struct pdp_priv_t *pdp_priv) +{ + bool was_empty = llist_empty(&sgsn->pdp_list); + pdp_priv->sgsn = sgsn; + llist_add(&pdp_priv->entry, &sgsn->pdp_list); + if (was_empty) + sgsn_echo_timer_start(sgsn); +} + +void sgsn_peer_remove_pdp_priv(struct pdp_priv_t* pdp_priv) +{ + struct sgsn_peer *sgsn = pdp_priv->sgsn; + llist_del(&pdp_priv->entry); + if (sgsn && llist_empty(&sgsn->pdp_list)) { + /* No PDP contexts associated to this SGSN, no need to keep it */ + sgsn_echo_timer_stop(sgsn); + /* sgsn may not be freed if there are some messages still queued + in libgtp which could return a pointer to it */ + sgsn_peer_attempt_free(sgsn); + } + + pdp_priv->sgsn = NULL; +} + +/* High-level function to be called in case a GGSN has disappeared or + * otherwise lost state (recovery procedure). It will detach all related pdp ctx + * from a ggsn and communicate deact to MS. Optionally (!NULL), one pdp ctx can + * be kept alive to allow handling later message which contained the Recovery IE. */ +static unsigned int sgsn_peer_drop_all_pdp_except(struct sgsn_peer *sgsn, struct pdp_priv_t *except) +{ + unsigned int num = 0; + char buf[INET_ADDRSTRLEN]; + + inet_ntop(AF_INET, &sgsn->addr, buf, sizeof(buf)); + + struct pdp_priv_t *pdp, *pdp2; + llist_for_each_entry_safe(pdp, pdp2, &sgsn->pdp_list, entry) { + if (pdp == except) + continue; + ggsn_close_one_pdp(pdp->lib); + num++; + } + + /* Note: if except is NULL, all pdp contexts are freed and sgsn is + already freed at this point */ + LOGP(DGGSN, LOGL_INFO, "SGSN(%s) Dropped %u PDP contexts\n", buf, num); + + return num; +} + +unsigned int sgsn_peer_drop_all_pdp(struct sgsn_peer *sgsn) +{ + return sgsn_peer_drop_all_pdp_except(sgsn, NULL); +} + +int sgsn_peer_handle_recovery(struct sgsn_peer *sgsn, struct pdp_t *pdp, uint8_t recovery) +{ + struct pdp_priv_t *pdp_priv = NULL; + + if (sgsn->remote_restart_ctr == -1) { + /* First received ECHO RESPONSE, note the restart ctr */ + sgsn->remote_restart_ctr = recovery; + } else if (sgsn->remote_restart_ctr != recovery) { + /* counter has changed (SGSN restart): release all PDP */ + LOGSGSN(LOGL_NOTICE, sgsn, "SGSN recovery (%u->%u) pdp=%p, " + "releasing all%s PDP contexts\n", + sgsn->remote_restart_ctr, recovery, pdp, pdp ? " other" : ""); + sgsn->remote_restart_ctr = recovery; + if (pdp) + pdp_priv = pdp->priv; + sgsn_peer_drop_all_pdp_except(sgsn, pdp_priv); + } + return 0; +} diff --git a/ggsn/sgsn.h b/ggsn/sgsn.h new file mode 100644 index 0000000..d2c3c0c --- /dev/null +++ b/ggsn/sgsn.h @@ -0,0 +1,46 @@ +#pragma once + +#include +#include +#include +#include + +#include +#include + +#include "../gtp/pdp.h" + +struct ggsn_ctx; +struct pdp_priv_t; + +struct sgsn_peer { + struct llist_head entry; /* to be included into ggsn_ctx */ + struct ggsn_ctx *ggsn; /* backpointer to ggsn_ctx */ + struct in_addr addr; /* Addr of the sgsn peer */ + unsigned int gtp_version; /* GTP version */ + int remote_restart_ctr; /* Last received Restart Ctr from sgsn peer, -1 == unknown */ + /* list of pdp contexts associated with this sgsn */ + struct llist_head pdp_list; + /* Sends echo request towards SGSN on expiration. Echo Resp is received + through cb_recovery2(), and echo Req timeout through + cb_conf(GTP_ECHO_REQ, EOF, NULL, cbp); */ + struct osmo_timer_list echo_timer; + /* Number of GTP messages in libgtp transmit queue */ + unsigned int tx_msgs_queued; +}; + +struct sgsn_peer *sgsn_peer_allocate(struct ggsn_ctx *ggsn, struct in_addr *ia, unsigned int gtp_version); +void sgsn_peer_add_pdp_priv(struct sgsn_peer *sgsn, struct pdp_priv_t *pdp_priv); +void sgsn_peer_remove_pdp_priv(struct pdp_priv_t *pdp_priv); + +void sgsn_echo_timer_start(struct sgsn_peer *sgsn); +void sgsn_echo_timer_stop(struct sgsn_peer *sgsn); + +void sgsn_peer_echo_resp(struct sgsn_peer *sgsn, bool timeout); +unsigned int sgsn_peer_drop_all_pdp(struct sgsn_peer *sgsn); +int sgsn_peer_handle_recovery(struct sgsn_peer *sgsn, struct pdp_t *pdp, uint8_t recovery); + +#define LOGSGSN(level, sgsn, fmt, args...) { \ + char _buf[INET_ADDRSTRLEN]; \ + LOGP(DGGSN, level, "SGSN(%s): " fmt, inet_ntop(AF_INET, &sgsn->addr, _buf, sizeof(_buf)), ## args); \ + } while (0) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id2c84165dc59dff495106758146a701ca488834f Gerrit-Change-Number: 15267 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 10:52:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 10:52:09 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 ) Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp File library/RAN_Adapter.ttcnpp: https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp at 196 PS2, Line 196: ba.vc_RAN_started > Make sense, thanks I didn't know I could compare against null. I tried using: ba.vc_RAN:RANAP.checkstate("Connected") But I get compilation error: RAN_Adapter.ttcnpp:192.15: error: at or before token `:': syntax error, unexpected ':', expecting ')' Looks like I can only access the port from inside its component. I'll submit a new patch using the null check. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 10:52:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 10:52:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 10:52:19 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 to look at the new patch set (#3). Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... sgsn: Proper shutdown of RAN_Adapter components Otherwise TTCN3 errors sproadically during shutdown: """" SCCP_Emulation.ttcn:5661 Receive operation on port SCCP_SP_PORT succeeded, message from SGSN_Test_0-RAN(414) ... SCCP_Emulation.ttcn:5293 Sent on MTP3_SCCP_PORT to SGSN_Test_0-M3UA(415) @SCCP_Types.ASP_MTP3_TRANSFERreq_sccp SCCP_Emulation.ttcn:5293 Outgoing message was mapped to @MTP3asp_Types.ASP_MTP3_TRANSFERreq SCCP_Emulation.ttcn:5293 Dynamic test case error: Sending data on the connection of port MTP3_SCCP_PORT to 415:MTP3_SP_PORT failed. (Broken pipe) SCCP_Emulation.ttcn:5293 setverdict(error): none -> error """ Similar shutdown is already done in f_cleanup() of SCCP_Tests.ttcn. Related: OS#4176 Change-Id: I471eb851e5d41de5d8d974ec81be27024d7d313a --- M library/RAN_Adapter.ttcnpp M sgsn/SGSN_Tests.ttcn 2 files changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/15295/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 11:31:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 11:31:24 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: fix formatting in if line In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 ) Change subject: cosmetic: fix formatting in if line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 Gerrit-Change-Number: 15302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 11:31:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 11:33:02 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 11:33:02 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Log msg retransmits and timeouts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 ) Change subject: gtp: Log msg retransmits and timeouts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 Gerrit-Change-Number: 15305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 11:33:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 11:36:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 11:36:10 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: fix formatting in if line In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 ) Change subject: cosmetic: fix formatting in if line ...................................................................... cosmetic: fix formatting in if line Fixes: eefa30dce8fa8e0ae16a3108e23041f92ea6ab21 Fixes: 2d6a69e69a4b4cb2b8cc63c4810dae44e5a4d8f6 Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 --- M ggsn/ggsn.c M gtp/pdp.c 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 89b183f..7b32bde 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -358,8 +358,9 @@ member = pdp->peer[i]; send_trap(gsn, pdp, member, "imsi-rem-ip"); /* TRAP with IP removal */ ippool_freeip(member->pool, member); - } else if(i == 0) + } else if (i == 0) { LOGPPDP(LOGL_ERROR, pdp, "Cannot find/free IP Pool member\n"); + } } if (!pdp_priv) { diff --git a/gtp/pdp.c b/gtp/pdp.c index 739cf73..518f5d4 100644 --- a/gtp/pdp.c +++ b/gtp/pdp.c @@ -109,7 +109,7 @@ int pdp_init(struct gsn_t *gsn) { - if(!g_gsn) { + if (!g_gsn) { g_gsn = gsn; } else { LOGP(DLGTP, LOGL_FATAL, "This interface is depreacted and doesn't support multiple GGSN!"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 Gerrit-Change-Number: 15302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 11:36:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 11:36:10 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Log msg retransmits and timeouts In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 ) Change subject: gtp: Log msg retransmits and timeouts ...................................................................... gtp: Log msg retransmits and timeouts Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 --- M gtp/gtp.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index f70f534..2ea949d 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -600,10 +600,14 @@ (qmsg->timeout <= now)) { /*printf("Retrans timeout found: %d\n", (int) time(NULL)); */ if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */ + LOGP(DLGTP, LOGL_NOTICE, "Timeout of seq %" PRIu16 "\n", + qmsg->seq); if (gsn->cb_conf) gsn->cb_conf(qmsg->type, EOF, NULL, qmsg->cbp); queue_freemsg(gsn->queue_req, qmsg); } else { + LOGP(DLGTP, LOGL_INFO, "Retransmit (%d) of seq %" PRIu16 "\n", + qmsg->retrans, qmsg->seq); if (sendto(qmsg->fd, &qmsg->p, qmsg->l, 0, (struct sockaddr *)&qmsg->peer, sizeof(struct sockaddr_in)) < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie768ddb45313582b4b5358b97a981080be64fd42 Gerrit-Change-Number: 15305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:07:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 12:07:22 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: gtp: Drop commented out code calling pdp_freepdp() Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15322 Change subject: cosmetic: gtp: Drop commented out code calling pdp_freepdp() ...................................................................... cosmetic: gtp: Drop commented out code calling pdp_freepdp() That code was commented out in 0b076a331e1e7f955580313a5da416c170b3b4ce (year 2003), and indeed it makes no sense to call those in current pdp lifecycle (they are expected to be freed by the application). Change-Id: I096d8cb8d749ff9b737d6f3f96b1d423660ece37 --- M gtp/gtp.c 1 file changed, 0 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/22/15322/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 2ea949d..ba248c6 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1752,8 +1752,6 @@ "Invalid message format\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1764,8 +1762,6 @@ "Missing mandatory information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1792,8 +1788,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } @@ -1805,8 +1799,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1818,8 +1810,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1830,8 +1820,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } @@ -1844,8 +1832,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1856,8 +1842,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } @@ -1869,8 +1853,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ } if (gtpie_gettlv(ie, GTPIE_EUA, 0, &pdp->eua.l, @@ -1881,8 +1863,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1894,8 +1874,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1907,8 +1885,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1922,8 +1898,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I096d8cb8d749ff9b737d6f3f96b1d423660ece37 Gerrit-Change-Number: 15322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:07:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 12:07:23 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: gtp: Improve documentation of gtp_delete_context_req2() Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15323 Change subject: cosmetic: gtp: Improve documentation of gtp_delete_context_req2() ...................................................................... cosmetic: gtp: Improve documentation of gtp_delete_context_req2() Change-Id: I1f85c7cc7684e146fca4f17914927d45410dbb84 --- M gtp/gtp.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/23/15323/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index ba248c6..88248d1 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -2427,8 +2427,9 @@ } /* API: Send Delete PDP Context Request. PDP CTX shall be free'd by user at any - point in time later than this function through a call to pdp_freepdp(pdp), but - it must be freed no later than during cb_conf(GTP_DELETE_PDP_REQ, pdp) */ + point in time later than this function through a call to pdp_freepdp(pdp) (or + through gtp_freepdp() if willing to receive cb_delete_context() callback), + but it must be freed no later than during cb_conf(GTP_DELETE_PDP_REQ, pdp) */ int gtp_delete_context_req2(struct gsn_t *gsn, struct pdp_t *pdp, void *cbp, int teardown) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I1f85c7cc7684e146fca4f17914927d45410dbb84 Gerrit-Change-Number: 15323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:07:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 12:07:23 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp... Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15324 Change subject: ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() ...................................................................... ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() Update documentation since nowadays there are more paths calling ggsn_close_one_pdp() (because we now close pdp contexts during sgsn timeouts). Switch pdp_freepdp() to gtp_freepdp() since in the event we ended up there in the future we want to go through normal delete_ctx_cb to free related application data structures. Change-Id: I7d9ae9a27390498ba387797aac6651e32fa44f29 --- M ggsn/ggsn.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/24/15324/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 7b32bde..ffa508b 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -775,16 +775,17 @@ case GTP_DELETE_PDP_REQ: /* Remark: We actually never reach this path nowadays because only place where we call gtp_delete_context_req2() is during - apn_stop()->pool_close_all_pdp() path, and in that case we - free all pdp contexts immediatelly without waiting for - confirmation since we want to tear down the whole APN - anyways. As a result, DeleteCtxResponse will never reach here - since it will be dropped at some point in lower layers in the - Rx path. This code is nevertheless left here in order to ease - future developent and avoid possible future memleaks once more - scenarios where GGSN sends a DeleteCtxRequest are introduced. */ + ggsn_close_one_pdp() path, and in that case we free all pdp + contexts immediatelly without waiting for confirmation + (through gtp_freepdp_teardown()) since we want to tear down + the whole APN anyways. As a result, DeleteCtxResponse will + never reach here since it will be dropped at some point in + lower layers in the Rx path. This code is nevertheless left + here in order to ease future developent and avoid possible + future memleaks once more scenarios where GGSN sends a + DeleteCtxRequest are introduced. */ if (pdp) - rc = pdp_freepdp(pdp); + rc = gtp_freepdp(pdp->gsn, pdp); break; case GTP_ECHO_REQ: sgsn = (struct sgsn_peer *)cbp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7d9ae9a27390498ba387797aac6651e32fa44f29 Gerrit-Change-Number: 15324 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:24:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 12:24:36 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 Change subject: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL ...................................................................... gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL Change-Id: I02c46062d6dc9802d9cae057587e66a68a65436c --- M src/gprs/sgsn_libgtp.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/25/15325/1 diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index ac4b7b1..a8ad527 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -652,8 +652,9 @@ LOGPDPX(DGPRS, LOGL_INFO, pdp, "Context %p was deleted\n", pdp); - /* unlink the now non-existing library handle from the pdp - * context */ + /* unlink the now non-existing library handle from the pdp context. + This way we avoid calling pdp_freepdp() on it, since after returning + from cb_delete_context callback, libgtp is already doing so. */ pctx->lib = NULL; sgsn_ggsn_ctx_drop_pdp(pctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I02c46062d6dc9802d9cae057587e66a68a65436c Gerrit-Change-Number: 15325 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:31:45 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 12:31:45 +0000 Subject: Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 ) Change subject: mncc: check fd before closing a connection ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e Gerrit-Change-Number: 15303 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 12:31:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:32:36 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 12:32:36 +0000 Subject: Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15317 ) Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15317/3/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/#/c/15317/3/src/libmsc/msc_a.c at 1411 PS3, Line 1411: but this static msgb saves the extra allocation > I'm really not sure if this is the right approach. [?] ACK. This approach wouldn't be that dangerous if all DTAP-handling functions were accepting 'const struct msgb *', so we could be sure that nobody calls msgb_free(). But they don't. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d Gerrit-Change-Number: 15317 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 29 Aug 2019 12:32:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:36:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 12:36:29 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... pcu_sock: fix endian-swapped CellID Restore the correct endianness of the cell identity stored in the system information type 3 struct, just like we do it with the location area code. In the Osmocom stack, the CellID is configured in OsmoBSC, sent via RSL to OsmoBTS, then with a socket to OsmoPCU. OsmoBTS was always sending the swapped CellID to OsmoPCU. In March 2018, a regression in OsmoPCU ([1]) caused it to swap the CellID again, by chance resulting in the correct value sent from OsmoBSC. This regression was fixed in March 2019 ([2]). I've verified this fix with a TTCN3 test [3]. [1] I787fed84a7b613158a5618dd5cffafe4e4927234 (osmo-pcu) [2] I2f6cc930c5dbf8dac386b24b0756df2efe8199e4 (osmo-pcu) [3] I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 (osmo-ttcn3-hacks) Related: OS#3854 Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/15326/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 36cc6ed..84a98f5 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -259,7 +259,7 @@ bts->si_buf[SYSINFO_TYPE_3]; osmo_plmn_from_bcd(si3->lai.digits, &net->plmn); bts->location_area_code = ntohs(si3->lai.lac); - bts->cell_identity = si3->cell_identity; + bts->cell_identity = ntohs(si3->cell_identity); avail_lai = 1; break; case S_NEW_NSE_ATTR: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:36:41 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 12:36:41 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: f_init_pcu: sleep before connect Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 Change subject: bts: f_init_pcu: sleep before connect ...................................................................... bts: f_init_pcu: sleep before connect Give the emulated BSC side some time to send the various SI via RSL. This workaround makes OsmoBTS send the correct CellID and other information instead of empty values to the PCU socket. The next commit tests these values. Related: OS#4179 Change-Id: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/15327/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d3fb958..7f0b205 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -324,6 +324,9 @@ pcu_conn_id := -1; return; } + + f_sleep(0.5); /* workaround for OS#4179 */ + pcu_conn_id := f_pcuif_connect(pt, mp_pcu_socket); T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 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: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 Gerrit-Change-Number: 15327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:36:42 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 12:36:42 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add test TC_pcu_socket_verify_info_ind Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 Change subject: bts: add test TC_pcu_socket_verify_info_ind ...................................................................... bts: add test TC_pcu_socket_verify_info_ind Verify that the CellID of SI3 (TS 04.08 9.1.35) and other values are passed properly to the PCU socket. A bug in OsmoBTS is currently causing it to send a byte-swapped CellID, related fix is in [1]. [1] I68faf4558f0686fb2a3db24077dceaae05bf0262 (osmo-bts) Related: OS#3854 Change-Id: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/15328/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 7f0b205..67564ed 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4866,6 +4866,28 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* Verify that the cell_id of SI3 (TS 04.08 9.1.35) and other values are passed properly to the PCU socket (OS#3854) */ +testcase TC_pcu_socket_verify_info_ind() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); + + f_init(); + + /* Verify cell_id */ + var uint16_t cell_id_si3 := si3.payload.si3.cell_id; + var uint16_t cell_id_pcu := g_pcu_last_info.u.info_ind.cell_id; + if (cell_id_si3 != cell_id_pcu) { + setverdict(fail, "Expected cell_id ", cell_id_si3, " got: ", cell_id_pcu); + } + + /* Verify LAC */ + var uint16_t lac_si3 := si3.payload.si3.lai.lac; + var uint16_t lac_pcu := g_pcu_last_info.u.info_ind.lac; + if (lac_si3 != lac_pcu) { + setverdict(fail, "Expected LAC ", lac_si3, " got: ", lac_pcu); + } + + setverdict(pass); +} /*********************************************************************** * Osmocom Style Dynamic Timeslot Support @@ -6138,7 +6160,6 @@ /* repetition of SABM or DISC N200 times without ACK */ /* receptiom of SABM in multi-frame established state */ - /* TODO Areas: * channel activation @@ -6253,6 +6274,7 @@ execute( TC_pcu_socket_noconnect_nosi3gprs() ); execute( TC_pcu_socket_connect_si3gprs() ); execute( TC_pcu_socket_disconnect_nosi3gprs() ); + execute( TC_pcu_socket_verify_info_ind() ); } else { log("PCU socket path not available, skipping PCU tests"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 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: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 Gerrit-Change-Number: 15328 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:36:42 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 12:36:42 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add configs for running without docker Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 Change subject: bts: add configs for running without docker ...................................................................... bts: add configs for running without docker Base on docker-playground.git's ttcn3-bts-test/*.cfg files, change IPs from 172.18.9.* to 127.0.0.* (last octet unchanged). Change-Id: I9eb2bb4599a4e874424f73483d9658a4467b8b8c --- M bts/BTS_Tests.cfg A bts/osmo-bsc.cfg A bts/osmo-bts.cfg 3 files changed, 225 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/15329/1 diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg index 78a288d..ed04163 100644 --- a/bts/BTS_Tests.cfg +++ b/bts/BTS_Tests.cfg @@ -12,13 +12,17 @@ #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.191" # sysmoBTS Max #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau #*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home -*.BTSVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bts-trx -*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bsc +*.BTSVTY.CTRL_HOSTNAME := "127.0.0.20" # osmo-bts-trx +*.BSCVTY.CTRL_HOSTNAME := "127.0.0.11" # osmo-bsc [MODULE_PARAMETERS] +L1CTL_PortType.m_l1ctl_sock_path := "/tmp/osmocom_l2" #BTS_Tests.mp_rsl_ip := "10.9.1.2" # office -BTS_Tests.mp_rsl_ip := "192.168.100.2" # home -#BTS_Tests.mp_pcu_socket := "" +#BTS_Tests.mp_rsl_ip := "192.168.100.2" # home +BTS_Tests.mp_rsl_ip := "127.0.0.10" +BTS_Tests.mp_pcu_socket := "/tmp/pcu_sock" +BTS_Tests.mp_bts_trxc_ip := "127.0.0.21" +BTS_Tests.mp_ctrl_ip := "127.0.0.20" #BTS_Tests_OML.mp_oml_ip := "192.168.102.239" # home #BTS_Tests_OML.mp_oml_port := 3002 diff --git a/bts/osmo-bsc.cfg b/bts/osmo-bsc.cfg new file mode 100644 index 0000000..3b31eb7 --- /dev/null +++ b/bts/osmo-bsc.cfg @@ -0,0 +1,160 @@ +! +! OsmoBSC (1.1.2.236-5f22) configuration saved from vty +!! +password foo +! +log gsmtap 127.0.0.10 + logging level set-all debug +! +log stderr + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +stats interval 5 +! +line vty + no login + bind 127.0.0.11 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive + ipa bind 127.0.0.11 +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 2905 0 m3ua + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 2 0.23.3 +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + handover 0 + handover1 window rxlev averaging 10 + handover1 window rxqual averaging 1 + handover1 window rxlev neighbor averaging 10 + handover1 power budget interval 6 + handover1 power budget hysteresis 3 + handover1 maximum distance 9999 + periodic location update 30 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + early-classmark-sending-3g allowed + ip.access unit_id 1234 0 + ip.access rsl-ip 127.0.0.10 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config SDCCH8 + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +msc 0 + core-location-area-code 666 + core-cell-identity 333 + ip.access rtp-base 4000 + timeout-ping 12 + timeout-pong 14 + no timeout-ping advanced + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + codec-list fr1 fr2 fr3 + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden +bsc + mid-call-timeout 0 + no missing-msc-text + access-list-name bsc-list diff --git a/bts/osmo-bts.cfg b/bts/osmo-bts.cfg new file mode 100644 index 0000000..a9867bf --- /dev/null +++ b/bts/osmo-bts.cfg @@ -0,0 +1,57 @@ +! +! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty +!! +! +log gsmtap 127.0.0.10 + logging level set-all debug +! +log stderr + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +line vty + no login + bind 127.0.0.20 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +phy 0 + osmotrx ip local 127.0.0.20 + osmotrx ip remote 127.0.0.21 + osmotrx fn-advance 20 + osmotrx rts-advance 5 + instance 0 + osmotrx rx-gain 10 + osmotrx tx-attenuation 0 +bts 0 + band DCS1800 + ipa unit-id 1234 0 + oml remote-ip 127.0.0.11 + rtp jitter-buffer 100 + paging queue-size 200 + paging lifetime 0 + uplink-power-target -75 + gsmtap-sapi rach + gsmtap-sapi agch + gsmtap-sapi bcch + gsmtap-sapi pch + gsmtap-sapi sdcch + gsmtap-sapi sacch + min-qual-rach 50 + min-qual-norm -5 + !settsc + pcu-socket /tmp/pcu_sock + trx 0 + power-ramp max-initial 0 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 +ctrl + bind 127.0.0.20 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 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: I9eb2bb4599a4e874424f73483d9658a4467b8b8c Gerrit-Change-Number: 15329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:41:08 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 12:41:08 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add test TC_pcu_socket_verify_info_ind In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 ) Change subject: bts: add test TC_pcu_socket_verify_info_ind ...................................................................... bts: add test TC_pcu_socket_verify_info_ind Verify that the CellID of SI3 (TS 04.08 9.1.35) and other values are passed properly to the PCU socket. A bug in OsmoBTS is currently causing it to send a byte-swapped CellID, related fix is in [1]. [1] I68faf4558f0686fb2a3db24077dceaae05bf0262 (osmo-bts) Related: OS#3854 Change-Id: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/15328/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 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: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 Gerrit-Change-Number: 15328 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:44:27 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 12:44:27 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 12:44:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:45:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 12:45:02 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: Reject PdpActReq if no GTP pdp ctx exists Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15330 Change subject: sgsn: Reject PdpActReq if no GTP pdp ctx exists ...................................................................... sgsn: Reject PdpActReq if no GTP pdp ctx exists It could happen that SGSN drops GTP side of a pdp ctx (pdp->lib=NULL) while still maintaing the other side (to notify about the entire pdp ctx being torn down). If a PdpActReq arrives during that time, we need to account for that situation, otherwise osmo-sgsn crashes accessing pdp->lib. If no pdp->lib is found at that time, let's reject the request and expect at some point later in time the entire pdp context will be destroyed and reestablished. Related: OS#4173 Change-Id: I6dd87557ebb26fdbd280504abde10d976acecf64 --- M src/gprs/gprs_gmm.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/30/15330/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index e44b3ec..5a0f72f 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2713,6 +2713,11 @@ /* Check if NSAPI is already in use */ pdp = sgsn_pdp_ctx_by_nsapi(mmctx, act_req->req_nsapi); if (pdp) { + /* Make sure pdp ctx was not already torn down on GTP side */ + if (!pdp->lib) { + gsm_cause = GSM_CAUSE_REACT_RQD; + goto no_context; + } /* We already have a PDP context for this TLLI + NSAPI tuple */ if (pdp->sapi == act_req->req_llc_sapi && pdp->ti == transaction_id) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6dd87557ebb26fdbd280504abde10d976acecf64 Gerrit-Change-Number: 15330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 12:57:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 12:57:13 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/15326/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15326/1//COMMIT_MSG at 14 PS1, Line 14: to OsmoBTS, then with a socket to OsmoPCU. OsmoBTS was always sending "the CellID is configured in OsmoBSC, sent via RSL to OsmoBTS" -> as BE. "OsmoBTS was always sending the swapped CellID to OsmoPCU" -> meaning it's sending a BE integer over a unix socket in a LE system(wrong!)? Or swapping the value before sending it over the unix socket (correct)? "In March 2018, a regression in OsmoPCU ([1]) caused it to swap the CellID again" -> What do you mean with "spaw" here? moved in code? because I see it moves the line but still uses ntohs(). "This regression was fixed in March 2019 ([2])." -> Ok, here cellID coming from unix socket is handled as LE on a LE system, fine. Please rework the commit description so it's clear what you mean. https://gerrit.osmocom.org/#/c/15326/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/#/c/15326/1/src/common/pcu_sock.c at 262 PS1, Line 262: bts->cell_identity = ntohs(si3->cell_identity); So here we are again handling a BE integer coming from a unix socket (intra-host)? Why? I'd expect to receive a host endianess integer here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 12:57:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:27:07 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 13:27:07 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: fix message length check in parse_msg() Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15331 Change subject: trx_toolkit/data_msg.py: fix message length check in parse_msg() ...................................................................... trx_toolkit/data_msg.py: fix message length check in parse_msg() Unlike DATA_MSG.HDR_LEN, the CHDR_LEN is a constant that defines length of the common header, which is mandatory for every version. DATA_MSG.HDR_LEN in its turn defines length of the whole header, including the version specific fields. Thus we need to know the header version before using it. In DATA_MSG.parse_msg() we need to parse the common header first, so then we know the version and length of the whole header. After that we can safely use DATA_MSG.HDR_LEN. Change-Id: I2809f5f96209eed64bdabf7a15575144313f7cc9 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/15331/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index a1046ec..c5d284d 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -275,9 +275,9 @@ # Parses a TRX DATA message def parse_msg(self, msg): - # Make sure we have at least header - if len(msg) < self.HDR_LEN: - raise ValueError("Message is to short") + # Make sure we have at least common header + if len(msg) < self.CHDR_LEN: + raise ValueError("Message is to short: missing common header") # Parse version and TDMA TN self.ver = (msg[0] >> 4) @@ -286,6 +286,11 @@ # Parse TDMA FN self.fn = struct.unpack(">L", msg[1:5])[0] + # Make sure we have the whole header, + # including the version specific fields + if len(msg) < self.HDR_LEN: + raise ValueError("Message is to short: missing version specific header") + # Specific message part self.parse_hdr(msg) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2809f5f96209eed64bdabf7a15575144313f7cc9 Gerrit-Change-Number: 15331 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:27:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 13:27:08 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: fix: make sure header version is known Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15332 Change subject: trx_toolkit/data_msg.py: fix: make sure header version is known ...................................................................... trx_toolkit/data_msg.py: fix: make sure header version is known Before using DATA_MSG.HDR_LEN, we need to make sure that a parsed header version is known and supported. Otherwise we will get an IndexError exception. Change-Id: Ie1887aa8709da1a2a287aa58a7873e72c0b4ed33 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/15332/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index c5d284d..a1c41c0 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -279,11 +279,13 @@ if len(msg) < self.CHDR_LEN: raise ValueError("Message is to short: missing common header") - # Parse version and TDMA TN + # Parse the header version first self.ver = (msg[0] >> 4) - self.tn = (msg[0] & 0x07) + if not self.ver in self.known_versions: + raise ValueError("Unknown TRXD header version %d" % self.ver) - # Parse TDMA FN + # Parse TDMA TN and FN + self.tn = (msg[0] & 0x07) self.fn = struct.unpack(">L", msg[1:5])[0] # Make sure we have the whole header, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1887aa8709da1a2a287aa58a7873e72c0b4ed33 Gerrit-Change-Number: 15332 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:27:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 13:27:08 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15333 Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... trx_toolkit/data_msg.py: also print burst length in desc_hdr() Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/15333/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index a1c41c0..d8b21b4 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -182,6 +182,9 @@ if self.tn is not None: result += ("tn=%u " % self.tn) + if type(self.burst) is list and len(self.burst) > 0: + result += ("bl=%u " % len(self.burst)) + return result # Converts unsigned soft-bits {254..0} to soft-bits {-127..127} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:27:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 13:27:09 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: enrich some ValueError messages Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15334 Change subject: trx_toolkit/data_msg.py: enrich some ValueError messages ...................................................................... trx_toolkit/data_msg.py: enrich some ValueError messages Change-Id: Icdf0d136a9b820cfaec534e2604204da9ea42092 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/15334/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index d8b21b4..9e12458 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -233,7 +233,7 @@ # Validates the message fields (throws ValueError) def validate(self): if not self.ver in self.known_versions: - raise ValueError("Unknown TRXD header version") + raise ValueError("Unknown TRXD header version %d" % self.ver) if self.fn is None: raise ValueError("TDMA frame-number is not set") @@ -823,7 +823,7 @@ self.mod_type = Modulation.pick_by_bl(bl - 2) if self.mod_type is None: - raise ValueError("Odd burst length") + raise ValueError("Odd burst length %u" % bl) return burst[:self.mod_type.bl] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icdf0d136a9b820cfaec534e2604204da9ea42092 Gerrit-Change-Number: 15334 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:27:27 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 13:27:27 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/trx_sniff.py: properly handle unknown header version error In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15300 ) Change subject: trx_toolkit/trx_sniff.py: properly handle unknown header version error ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie04782ced1fab7bc363549bfa37528f5a124e99d Gerrit-Change-Number: 15300 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:41:03 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 13:41:03 +0000 Subject: Change in ...osmo-pcu[master]: implement support for 3-digit MNC with leading zeros In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/6666 ) Change subject: implement support for 3-digit MNC with leading zeros ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/6666/3/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/#/c/6666/3/src/pcu_l1_if.cpp at 493 PS3, Line 493: cell_id Bug discussed in OS#3854: * before this patch: info_ind->cell_id * after this patch: ntohs(info_ind->cell_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/6666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I787fed84a7b613158a5618dd5cffafe4e4927234 Gerrit-Change-Number: 6666 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Aug 2019 13:41:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:46:14 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 13:46:14 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: Hello pespin, fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 to look at the new patch set (#2). Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... pcu_sock: fix endian-swapped CellID Convert the cell identity to LE when sending it to the PCU via unix socket, just like we do it with the location area code. In the Osmocom stack, the CellID is configured in OsmoBSC, sent as BE via RSL to OsmoBTS, then with a socket to OsmoPCU (where OsmoPCU expects it to be LE in a LE system). OsmoBTS was always sending the CellID as BE to OsmoPCU. In March 2018, a regression in OsmoPCU [1] caused an endianness swap in the CellID on LE systems, resulting by chance in the correct, LE encoded, CellID as it should have been sent from OsmoBSC (for LE systems). This regression was fixed in March 2019 [2]. I've verified this fix with a TTCN3 test [3]. [1] I787fed84a7b613158a5618dd5cffafe4e4927234 (osmo-pcu) [2] I2f6cc930c5dbf8dac386b24b0756df2efe8199e4 (osmo-pcu) [3] I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 (osmo-ttcn3-hacks) Related: OS#3854 Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/15326/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:46:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 13:46:24 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15326/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15326/1//COMMIT_MSG at 14 PS1, Line 14: to OsmoBTS, then with a socket to OsmoPCU. OsmoBTS was always sending > "the CellID is configured in OsmoBSC, sent via RSL to OsmoBTS" -> as BE. Yes. > "OsmoBTS was always sending the swapped CellID to OsmoPCU" -> meaning it's sending a BE integer over a unix socket in a LE system(wrong!)? Or swapping the value before sending it over the unix socket (correct)? Meaning it was sending a BE integer over a unix socket in a LE system, which is wrong. > "In March 2018, a regression in OsmoPCU ([1]) caused it to swap the CellID again" -> What do you mean with "spaw" here? moved in code? because I see it moves the line but still uses ntohs(). I don't mean moved in the code. After the patch, it passes ntohs(info_ind->cell_id) instead of info_ind->cell_id to gprs_bssgp_create_and_connect(): https://gerrit.osmocom.org/c/osmo-pcu/+/6666/3/src/pcu_l1_if.cpp#493 > Please rework the commit description so it's clear what you mean. Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:46:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:48:42 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 13:48:42 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15326/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/#/c/15326/1/src/common/pcu_sock.c at 262 PS1, Line 262: bts->cell_identity = ntohs(si3->cell_identity); > So here we are again handling a BE integer coming from a unix socket (intra-host)? Why? I'd expect t [?] The data in "si3" was received via RSL, we are converting it to LE on a LE system, to pass that LE version to the unix socket. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:48:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:50:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:50:35 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: f_init_pcu: sleep before connect In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 ) Change subject: bts: f_init_pcu: sleep before connect ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15327/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/15327/1/bts/BTS_Tests.ttcn at 328 PS1, Line 328: f_sleep(0.5); /* workaround for OS#4179 */ Isn't there a better way? like waiting for some flag set upon receival of some message on emulated BSC from BTS? Then while(!foo) { sleep(0.1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 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: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 Gerrit-Change-Number: 15327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:50:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:51:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:51:46 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15326/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/#/c/15326/1/src/common/pcu_sock.c at 262 PS1, Line 262: bts->cell_identity = ntohs(si3->cell_identity); > The data in "si3" was received via RSL, we are converting it to LE on a LE system, to pass that LE v [?] Ah sorry, this is in osmo-bts, I thought this was in osmo-pcu. Then it makes sense! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:51:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:53:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:53:10 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add test TC_pcu_socket_verify_info_ind In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 ) Change subject: bts: add test TC_pcu_socket_verify_info_ind ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 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: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 Gerrit-Change-Number: 15328 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:53:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:54:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:54:01 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add configs for running without docker In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 ) Change subject: bts: add configs for running without docker ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 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: I9eb2bb4599a4e874424f73483d9658a4467b8b8c Gerrit-Change-Number: 15329 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:54:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:57:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 13:57:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: f_init_pcu: sleep before connect In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 ) Change subject: bts: f_init_pcu: sleep before connect ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15327/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/15327/1/bts/BTS_Tests.ttcn at 328 PS1, Line 328: f_sleep(0.5); /* workaround for OS#4179 */ > Isn't there a better way? like waiting for some flag set upon receival of some message on emulated B [?] I did it in the style of this patch: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/6899 I guess we could implement such a flag and wait for it, but then we might as well do the proper fix in OsmoBTS. I've decided for this workaround because the main issue I'm working on right now is OS#3925, and I'm not making so much progress there because of issues in the way like the endianness bug. So I though using the workaround for now, and making progress on OS#3925 would be a better use of my time. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 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: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 Gerrit-Change-Number: 15327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:57:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:57:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:57:25 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: fix message length check in parse_msg() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15331 ) Change subject: trx_toolkit/data_msg.py: fix message length check in parse_msg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2809f5f96209eed64bdabf7a15575144313f7cc9 Gerrit-Change-Number: 15331 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:57:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:57:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:57:54 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: fix: make sure header version is known In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15332 ) Change subject: trx_toolkit/data_msg.py: fix: make sure header version is known ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1887aa8709da1a2a287aa58a7873e72c0b4ed33 Gerrit-Change-Number: 15332 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:57:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 13:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 13:59:58 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15333 ) Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py at 185 PS1, Line 185: if type(self.burst) is list and len(self.burst) > 0: Why type(self.burst) is list? how can it be different? "self.burst is not None"? https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py at 186 PS1, Line 186: result += ("bl=%u " % len(self.burst)) May be worth precaching len(self.burst), I don't know if python lists have precached len. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 13:59:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 14:00:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 14:00:12 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: enrich some ValueError messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15334 ) Change subject: trx_toolkit/data_msg.py: enrich some ValueError messages ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icdf0d136a9b820cfaec534e2604204da9ea42092 Gerrit-Change-Number: 15334 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 14:00:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 14:02:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 14:02:46 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... Patch Set 2: Code-Review+2 (taking the feedon to re-add the +1 from fixeria here since you updated the commit description for me). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 14:02:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 14:09:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Aug 2019 14:09:24 +0000 Subject: Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326 ) Change subject: pcu_sock: fix endian-swapped CellID ...................................................................... pcu_sock: fix endian-swapped CellID Convert the cell identity to LE when sending it to the PCU via unix socket, just like we do it with the location area code. In the Osmocom stack, the CellID is configured in OsmoBSC, sent as BE via RSL to OsmoBTS, then with a socket to OsmoPCU (where OsmoPCU expects it to be LE in a LE system). OsmoBTS was always sending the CellID as BE to OsmoPCU. In March 2018, a regression in OsmoPCU [1] caused an endianness swap in the CellID on LE systems, resulting by chance in the correct, LE encoded, CellID as it should have been sent from OsmoBSC (for LE systems). This regression was fixed in March 2019 [2]. I've verified this fix with a TTCN3 test [3]. [1] I787fed84a7b613158a5618dd5cffafe4e4927234 (osmo-pcu) [2] I2f6cc930c5dbf8dac386b24b0756df2efe8199e4 (osmo-pcu) [3] I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 (osmo-ttcn3-hacks) Related: OS#3854 Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 36cc6ed..84a98f5 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -259,7 +259,7 @@ bts->si_buf[SYSINFO_TYPE_3]; osmo_plmn_from_bcd(si3->lai.digits, &net->plmn); bts->location_area_code = ntohs(si3->lai.lac); - bts->cell_identity = si3->cell_identity; + bts->cell_identity = ntohs(si3->cell_identity); avail_lai = 1; break; case S_NEW_NSE_ATTR: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262 Gerrit-Change-Number: 15326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 15:23:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 15:23:50 +0000 Subject: Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 Change subject: Move lots of Iu/ranap specific code into its own file ...................................................................... Move lots of Iu/ranap specific code into its own file RANAP related functionalities were splitted among several files (gprs_gmm.c, gprs_sgsn.c and sgsn_libgtp.c). Let's move it into its own file to shrink complexity/size of existing files. It also allows to keep a lot of conditionally enabled code (BUILD_IU) and its dependencies (osmo-iuh) together. Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_ranap.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_libgtp.c M src/gprs/sgsn_main.c M tests/sgsn/Makefile.am 11 files changed, 276 insertions(+), 238 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/35/15335/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index cbf7c51..b4cd5db 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -8,6 +8,7 @@ gprs_gmm_attach.h \ gprs_llc.h \ gprs_llc_xid.h \ + gprs_ranap.h \ gprs_sgsn.h \ gprs_sndcp_comp.h \ gprs_sndcp_dcomp.h \ diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index ffcebd3..047bd77 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -17,8 +17,10 @@ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable); -int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, - uint16_t *sai); +int gsm0408_rcv_gsm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, + struct gprs_llc_llme *llme); +int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, + struct gprs_llc_llme *llme, bool drop_cipherable); int gsm0408_gprs_force_reattach(struct sgsn_mm_ctx *mmctx); int gsm0408_gprs_force_reattach_oldmsg(struct msgb *msg, struct gprs_llc_llme *llme); @@ -33,8 +35,6 @@ time_t gprs_max_time_to_idle(void); -int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp); - int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type); int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, uint8_t gmm_cause); @@ -42,9 +42,12 @@ int gprs_gmm_attach_req_ies(struct msgb *a, struct msgb *b); +int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx); /* TODO: move extract_subscr_* when gsm48_gmm_authorize() got removed */ void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx); void extract_subscr_hlr(struct sgsn_mm_ctx *ctx); void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp); + +void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); #endif /* _GPRS_GMM_H */ diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h new file mode 100644 index 0000000..b300130 --- /dev/null +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include + +#ifdef BUILD_IU +#include +#include +#include + +void activate_pdp_rabs(struct sgsn_mm_ctx *ctx); +int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data); +int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp); + +int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, uint16_t *sai); +#endif + +struct ranap_ue_conn_ctx; +/* On RANAP, Returns pointer to he associated ranap_ue_conn_ctx in msg, filled + * in by osmo-iuh's iu_recv_cb(). + * On Gb, returns NULL */ +#define MSG_IU_UE_CTX(msg) ((struct ranap_ue_conn_ctx *)(msg)->dst) +#define MSG_IU_UE_CTX_SET(msg, val) (msg)->dst = (val) diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 78803c7..e1c5c4a 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -161,7 +161,7 @@ /* Main input function for Gb proxy */ int sgsn_rcvmsg(struct msgb *msg, struct gprs_nsvc *nsvc, uint16_t ns_bvci); - +/* sgsn_libgtp.c */ struct sgsn_pdp_ctx *sgsn_create_pdp_ctx(struct sgsn_ggsn_ctx *ggsn, struct sgsn_mm_ctx *mmctx, uint16_t nsapi, @@ -169,6 +169,7 @@ int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx); void sgsn_pdp_upd_gtp_u(struct sgsn_pdp_ctx *pdp, void *addr, size_t alen); void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc); +int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx); /* gprs_sndcp.c */ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index ba5dfd6..384b893 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -62,6 +62,7 @@ osmo_sgsn_SOURCES = \ gprs_gmm_attach.c \ gprs_gmm.c \ + gprs_ranap.c \ gprs_sgsn.c \ gprs_sndcp.c \ gprs_sndcp_comp.c \ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index e44b3ec..96753d3 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -47,12 +47,6 @@ #include -#ifdef BUILD_IU -#include -#include -#include -#endif - #include #include #include @@ -63,6 +57,7 @@ #include #include #include +#include #include @@ -117,14 +112,6 @@ { 0, NULL } }; -/* On RANAP, Returns pointer to he associated ranap_ue_conn_ctx in msg, filled - * in by osmo-iuh's iu_recv_cb(). - * On Gb, returns NULL */ -#define MSG_IU_UE_CTX(msg) ((struct ranap_ue_conn_ctx *)(msg)->dst) -#define MSG_IU_UE_CTX_SET(msg, val) (msg)->dst = (val) - -static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx); - static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) { struct sgsn_pdp_ctx *pdp; @@ -188,7 +175,7 @@ mm->gb.state_T = 0; } -static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); @@ -245,62 +232,6 @@ ctx->pmm_state = state; } -#ifdef BUILD_IU -int sgsn_ranap_rab_ass_resp(struct sgsn_mm_ctx *ctx, RANAP_RAB_SetupOrModifiedItemIEs_t *setup_ies); -int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) -{ - struct sgsn_mm_ctx *mm; - int rc = -1; - - mm = sgsn_mm_ctx_by_ue_ctx(ctx); - -#define REQUIRE_MM \ - if (!mm) { \ - LOGIUP(ctx, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \ - return rc; \ - } - - switch (type) { - case RANAP_IU_EVENT_RAB_ASSIGN: - REQUIRE_MM - rc = sgsn_ranap_rab_ass_resp(mm, (RANAP_RAB_SetupOrModifiedItemIEs_t *)data); - break; - case RANAP_IU_EVENT_IU_RELEASE: - /* fall thru */ - case RANAP_IU_EVENT_LINK_INVALIDATED: - /* Clean up ranap_ue_conn_ctx here */ - if (mm) - LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); - else - LOGIUP(ctx, LOGL_INFO, "IU release\n"); - if (mm && mm->pmm_state == PMM_CONNECTED) - mmctx_set_pmm_state(mm, PMM_IDLE); - rc = 0; - break; - case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE: - REQUIRE_MM - /* Continue authentication here */ - mm->iu.ue_ctx->integrity_active = 1; - - /* FIXME: remove gmm_authorize */ - if (mm->pending_req != GSM48_MT_GMM_ATTACH_REQ) - gsm48_gmm_authorize(mm); - else - osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL); - break; - default: - if (mm) - LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type); - else - LOGIUP(ctx, LOGL_NOTICE, "Unknown event received: %i\n", type); - rc = -1; - break; - } - return rc; -} -#endif - - /* Our implementation, should be kept in SGSN */ static void mmctx_timer_cb(void *_mm); @@ -1072,21 +1003,8 @@ static int gsm48_tx_gmm_ra_upd_ack(struct sgsn_mm_ctx *mm); -#ifdef BUILD_IU -/* Send RAB activation requests for all PDP contexts */ -void activate_pdp_rabs(struct sgsn_mm_ctx *ctx) -{ - struct sgsn_pdp_ctx *pdp; - if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) - return; - llist_for_each_entry(pdp, &ctx->pdp_list, list) { - iu_rab_act_ps(pdp->nsapi, pdp); - } -} -#endif - /* Check if we can already authorize a subscriber */ -static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx) +int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx) { #ifdef BUILD_IU int rc; @@ -2051,7 +1969,7 @@ } /* Rx GPRS Mobility Management. MMCTX can be NULL when called. On !Gb (Iu), llme is NULL */ -static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, +int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable) { struct sgsn_signal_data sig_data; @@ -2923,7 +2841,7 @@ /* GPRS Session Management */ -static int gsm0408_rcv_gsm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, +int gsm0408_rcv_gsm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, struct gprs_llc_llme *llme) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); @@ -2998,45 +2916,6 @@ return rc; } -/* Main entry point for incoming 04.08 GPRS messages from Iu */ -int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, - uint16_t *sai) -{ - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); - uint8_t pdisc = gsm48_hdr_pdisc(gh); - struct sgsn_mm_ctx *mmctx; - int rc = -EINVAL; - - mmctx = sgsn_mm_ctx_by_ue_ctx(MSG_IU_UE_CTX(msg)); - if (mmctx) { - rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); - if (ra_id) - memcpy(&mmctx->ra, ra_id, sizeof(mmctx->ra)); - } - - /* MMCTX can be NULL */ - - switch (pdisc) { - case GSM48_PDISC_MM_GPRS: - rc = gsm0408_rcv_gmm(mmctx, msg, NULL, false); -#pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" - break; - case GSM48_PDISC_SM_GPRS: - rc = gsm0408_rcv_gsm(mmctx, msg, NULL); - break; - default: - LOGMMCTXP(LOGL_NOTICE, mmctx, - "Unknown GSM 04.08 discriminator 0x%02x: %s\n", - pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); - /* FIXME: return status message */ - break; - } - - /* MMCTX can be invalid */ - - return rc; -} - /* Update the MM context state */ static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx) { @@ -3144,30 +3023,3 @@ mmctx->gmm_state = GMM_REGISTERED_NORMAL; return 0; } - -#ifdef BUILD_IU -int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp) -{ - struct msgb *msg; - struct sgsn_mm_ctx *mm = pdp->mm; - struct ranap_ue_conn_ctx *uectx; - uint32_t ggsn_ip; - bool use_x213_nsap; - - uectx = mm->iu.ue_ctx; - use_x213_nsap = (uectx->rab_assign_addr_enc == RANAP_NSAP_ADDR_ENC_X213); - - /* Get the IP address for ggsn user plane */ - memcpy(&ggsn_ip, pdp->lib->gsnru.v, pdp->lib->gsnru.l); - ggsn_ip = htonl(ggsn_ip); - - LOGP(DRANAP, LOGL_DEBUG, "Assigning RAB: rab_id=%d, ggsn_ip=%x," - " teid_gn=%x, use_x213_nsap=%d\n", - rab_id, ggsn_ip, pdp->lib->teid_gn, use_x213_nsap); - - msg = ranap_new_msg_rab_assign_data(rab_id, ggsn_ip, - pdp->lib->teid_gn, use_x213_nsap); - msg->l2h = msg->data; - return ranap_iu_rab_act(uectx, msg); -} -#endif diff --git a/src/gprs/gprs_ranap.c b/src/gprs/gprs_ranap.c new file mode 100644 index 0000000..e5fcb7a --- /dev/null +++ b/src/gprs/gprs_ranap.c @@ -0,0 +1,233 @@ +/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface + * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */ + +/* (C) 2009-2015 by Harald Welte + * (C) 2010 by On-Waves + * (C) 2015 by Holger Hans Peter Freyther + * (C) 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include "bscconfig.h" + +#ifdef BUILD_IU + +#include + +#include + +#include + +#include +#include +#include +#include +#include + +/* Send RAB activation requests for all PDP contexts */ +void activate_pdp_rabs(struct sgsn_mm_ctx *ctx) +{ + struct sgsn_pdp_ctx *pdp; + if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) + return; + llist_for_each_entry(pdp, &ctx->pdp_list, list) { + iu_rab_act_ps(pdp->nsapi, pdp); + } +} + +/* Callback for RAB assignment response */ +static int sgsn_ranap_rab_ass_resp(struct sgsn_mm_ctx *ctx, RANAP_RAB_SetupOrModifiedItemIEs_t *setup_ies) +{ + uint8_t rab_id; + bool require_pdp_update = false; + struct sgsn_pdp_ctx *pdp = NULL; + RANAP_RAB_SetupOrModifiedItem_t *item = &setup_ies->raB_SetupOrModifiedItem; + + rab_id = item->rAB_ID.buf[0]; + + pdp = sgsn_pdp_ctx_by_nsapi(ctx, rab_id); + if (!pdp) { + LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Response for unknown RAB/NSAPI=%u\n", rab_id); + return -1; + } + + if (item->transportLayerAddress) { + LOGPC(DRANAP, LOGL_INFO, " Setup: (%u/%s)", rab_id, osmo_hexdump(item->transportLayerAddress->buf, + item->transportLayerAddress->size)); + switch (item->transportLayerAddress->size) { + case 7: + /* It must be IPv4 inside a X213 NSAP */ + memcpy(pdp->lib->gsnlu.v, &item->transportLayerAddress->buf[3], 4); + break; + case 4: + /* It must be a raw IPv4 address */ + memcpy(pdp->lib->gsnlu.v, item->transportLayerAddress->buf, 4); + break; + case 16: + /* TODO: It must be a raw IPv6 address */ + case 19: + /* TODO: It must be IPv6 inside a X213 NSAP */ + default: + LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Resp: Unknown " + "transport layer address size %u\n", + item->transportLayerAddress->size); + return -1; + } + require_pdp_update = true; + } + + /* The TEI on the RNC side might have changed, too */ + if (item->iuTransportAssociation && + item->iuTransportAssociation->present == RANAP_IuTransportAssociation_PR_gTP_TEI && + item->iuTransportAssociation->choice.gTP_TEI.buf && + item->iuTransportAssociation->choice.gTP_TEI.size >= 4) { + uint32_t tei = osmo_load32be(item->iuTransportAssociation->choice.gTP_TEI.buf); + LOGP(DRANAP, LOGL_DEBUG, "Updating TEID on RNC side from 0x%08x to 0x%08x\n", + pdp->lib->teid_own, tei); + pdp->lib->teid_own = tei; + require_pdp_update = true; + } + + if (require_pdp_update) + gtp_update_context(pdp->ggsn->gsn, pdp->lib, pdp, &pdp->lib->hisaddr0); + + if (pdp->state != PDP_STATE_CR_CONF) { + send_act_pdp_cont_acc(pdp); + pdp->state = PDP_STATE_CR_CONF; + } + return 0; + +} + +int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) +{ + struct sgsn_mm_ctx *mm; + int rc = -1; + + mm = sgsn_mm_ctx_by_ue_ctx(ctx); + +#define REQUIRE_MM \ + if (!mm) { \ + LOGIUP(ctx, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \ + return rc; \ + } + + switch (type) { + case RANAP_IU_EVENT_RAB_ASSIGN: + REQUIRE_MM + rc = sgsn_ranap_rab_ass_resp(mm, (RANAP_RAB_SetupOrModifiedItemIEs_t *)data); + break; + case RANAP_IU_EVENT_IU_RELEASE: + /* fall thru */ + case RANAP_IU_EVENT_LINK_INVALIDATED: + /* Clean up ranap_ue_conn_ctx here */ + if (mm) + LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); + else + LOGIUP(ctx, LOGL_INFO, "IU release\n"); + if (mm && mm->pmm_state == PMM_CONNECTED) + mmctx_set_pmm_state(mm, PMM_IDLE); + rc = 0; + break; + case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE: + REQUIRE_MM + /* Continue authentication here */ + mm->iu.ue_ctx->integrity_active = 1; + + /* FIXME: remove gmm_authorize */ + if (mm->pending_req != GSM48_MT_GMM_ATTACH_REQ) + gsm48_gmm_authorize(mm); + else + osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL); + break; + default: + if (mm) + LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type); + else + LOGIUP(ctx, LOGL_NOTICE, "Unknown event received: %i\n", type); + rc = -1; + break; + } + return rc; +} + +int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp) +{ + struct msgb *msg; + struct sgsn_mm_ctx *mm = pdp->mm; + struct ranap_ue_conn_ctx *uectx; + uint32_t ggsn_ip; + bool use_x213_nsap; + + uectx = mm->iu.ue_ctx; + use_x213_nsap = (uectx->rab_assign_addr_enc == RANAP_NSAP_ADDR_ENC_X213); + + /* Get the IP address for ggsn user plane */ + memcpy(&ggsn_ip, pdp->lib->gsnru.v, pdp->lib->gsnru.l); + ggsn_ip = htonl(ggsn_ip); + + LOGP(DRANAP, LOGL_DEBUG, "Assigning RAB: rab_id=%d, ggsn_ip=%x," + " teid_gn=%x, use_x213_nsap=%d\n", + rab_id, ggsn_ip, pdp->lib->teid_gn, use_x213_nsap); + + msg = ranap_new_msg_rab_assign_data(rab_id, ggsn_ip, + pdp->lib->teid_gn, use_x213_nsap); + msg->l2h = msg->data; + return ranap_iu_rab_act(uectx, msg); +} + + +/* Main entry point for incoming 04.08 GPRS messages from Iu */ +int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, + uint16_t *sai) +{ + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); + uint8_t pdisc = gsm48_hdr_pdisc(gh); + struct sgsn_mm_ctx *mmctx; + int rc = -EINVAL; + + mmctx = sgsn_mm_ctx_by_ue_ctx(MSG_IU_UE_CTX(msg)); + if (mmctx) { + rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); + if (ra_id) + memcpy(&mmctx->ra, ra_id, sizeof(mmctx->ra)); + } + + /* MMCTX can be NULL */ + + switch (pdisc) { + case GSM48_PDISC_MM_GPRS: + rc = gsm0408_rcv_gmm(mmctx, msg, NULL, false); +#pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" + break; + case GSM48_PDISC_SM_GPRS: + rc = gsm0408_rcv_gsm(mmctx, msg, NULL); + break; + default: + LOGMMCTXP(LOGL_NOTICE, mmctx, + "Unknown GSM 04.08 discriminator 0x%02x: %s\n", + pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); + /* FIXME: return status message */ + break; + } + + /* MMCTX can be invalid */ + + return rc; +} +#endif diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 829204e..ee1902c 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -50,10 +50,6 @@ #include "../../bscconfig.h" -#if BUILD_IU -#include -#endif - #define GPRS_LLME_CHECK_TICK 30 extern struct sgsn_instance *sgsn; diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index a8ad527..5e3f48f 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -50,11 +50,7 @@ #include #include #include - -#ifdef BUILD_IU -#include -#include -#endif +#include #include #include @@ -359,7 +355,7 @@ { 0, 0 } }; -static int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx) +int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx) { struct sgsn_signal_data sig_data; int rc; @@ -473,72 +469,6 @@ gtp_echo_req(ggc->gsn, ggc->gtp_version, ggc, &ggc->remote_addr); } -#ifdef BUILD_IU -/* Callback for RAB assignment response */ -int sgsn_ranap_rab_ass_resp(struct sgsn_mm_ctx *ctx, RANAP_RAB_SetupOrModifiedItemIEs_t *setup_ies) -{ - uint8_t rab_id; - bool require_pdp_update = false; - struct sgsn_pdp_ctx *pdp = NULL; - RANAP_RAB_SetupOrModifiedItem_t *item = &setup_ies->raB_SetupOrModifiedItem; - - rab_id = item->rAB_ID.buf[0]; - - pdp = sgsn_pdp_ctx_by_nsapi(ctx, rab_id); - if (!pdp) { - LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Response for unknown RAB/NSAPI=%u\n", rab_id); - return -1; - } - - if (item->transportLayerAddress) { - LOGPC(DRANAP, LOGL_INFO, " Setup: (%u/%s)", rab_id, osmo_hexdump(item->transportLayerAddress->buf, - item->transportLayerAddress->size)); - switch (item->transportLayerAddress->size) { - case 7: - /* It must be IPv4 inside a X213 NSAP */ - memcpy(pdp->lib->gsnlu.v, &item->transportLayerAddress->buf[3], 4); - break; - case 4: - /* It must be a raw IPv4 address */ - memcpy(pdp->lib->gsnlu.v, item->transportLayerAddress->buf, 4); - break; - case 16: - /* TODO: It must be a raw IPv6 address */ - case 19: - /* TODO: It must be IPv6 inside a X213 NSAP */ - default: - LOGP(DRANAP, LOGL_ERROR, "RAB Assignment Resp: Unknown " - "transport layer address size %u\n", - item->transportLayerAddress->size); - return -1; - } - require_pdp_update = true; - } - - /* The TEI on the RNC side might have changed, too */ - if (item->iuTransportAssociation && - item->iuTransportAssociation->present == RANAP_IuTransportAssociation_PR_gTP_TEI && - item->iuTransportAssociation->choice.gTP_TEI.buf && - item->iuTransportAssociation->choice.gTP_TEI.size >= 4) { - uint32_t tei = osmo_load32be(item->iuTransportAssociation->choice.gTP_TEI.buf); - LOGP(DRANAP, LOGL_DEBUG, "Updating TEID on RNC side from 0x%08x to 0x%08x\n", - pdp->lib->teid_own, tei); - pdp->lib->teid_own = tei; - require_pdp_update = true; - } - - if (require_pdp_update) - gtp_update_context(pdp->ggsn->gsn, pdp->lib, pdp, &pdp->lib->hisaddr0); - - if (pdp->state != PDP_STATE_CR_CONF) { - send_act_pdp_cont_acc(pdp); - pdp->state = PDP_STATE_CR_CONF; - } - return 0; - -} -#endif - /* Confirmation of a PDP Context Delete */ static int delete_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) { diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index fe6823e..29f006d 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -354,10 +355,6 @@ .num_cat = ARRAY_SIZE(gprs_categories), }; -#if BUILD_IU -int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data); -#endif - static bool file_exists(const char *path) { struct stat sb; diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 956ef8d..ae397b3 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -45,6 +45,7 @@ $(top_builddir)/src/gprs/gprs_llc_parse.o \ $(top_builddir)/src/gprs/gprs_llc.o \ $(top_builddir)/src/gprs/crc24.o \ + $(top_builddir)/src/gprs/gprs_ranap.o \ $(top_builddir)/src/gprs/gprs_sndcp.o \ $(top_builddir)/src/gprs/gprs_gmm_attach.o \ $(top_builddir)/src/gprs/gprs_gmm.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 Gerrit-Change-Number: 15335 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 15:58:55 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 15:58:55 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15333 ) Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py at 185 PS1, Line 185: if type(self.burst) is list and len(self.burst) > 0: > Why type(self.burst) is list? how can it be different? "self. [?] In general, yes: it can either be a list, or None. I can change it to "self.burst is not None". https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py at 186 PS1, Line 186: result += ("bl=%u " % len(self.burst)) > May be worth precaching len(self.burst), I don't know if python lists have precached len. I just checked: https://stackoverflow.com/questions/29057153/does-the-len-built-in-function-iterates-through-the-collection-to-calculate-it -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 15:58:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 16:01:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 16:01:41 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15333 ) Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py at 185 PS1, Line 185: if type(self.burst) is list and len(self.burst) > 0: > In general, yes: it can either be a list, or None. I can change it to "self.burst is not None". Please do, it's much more clearer https://gerrit.osmocom.org/#/c/15333/1/src/target/trx_toolkit/data_msg.py at 186 PS1, Line 186: result += ("bl=%u " % len(self.burst)) > I just checked: https://stackoverflow. [?] Fine thanks! -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 16:01:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 16:01:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 16:01:55 +0000 Subject: Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file In-Reply-To: References: Message-ID: Hello lynxis lazus, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 to look at the new patch set (#2). Change subject: Move lots of Iu/ranap specific code into its own file ...................................................................... Move lots of Iu/ranap specific code into its own file RANAP related functionalities were splitted among several files (gprs_gmm.c, gprs_sgsn.c and sgsn_libgtp.c). Let's move it into its own file to shrink complexity/size of existing files. It also allows to keep a lot of conditionally enabled code (BUILD_IU) and its dependencies (osmo-iuh) together. Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_ranap.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_libgtp.c M src/gprs/sgsn_main.c M tests/sgsn/Makefile.am 11 files changed, 275 insertions(+), 238 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/35/15335/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 Gerrit-Change-Number: 15335 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 16:02:07 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 16:02:07 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 to look at the new patch set (#2). Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... trx_toolkit/data_msg.py: also print burst length in desc_hdr() Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/15333/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 16:05:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 16:05:26 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15333 ) Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 16:05:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 29 17:24:53 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 17:24:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d680a7b68ca9_2f5b2ab0e462a6001342d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 408s] ar: `u' modifier ignored since `D' is the default (see `U') [ 408s] libtool: link: ranlib .libs/libtransceiver_common.a [ 408s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 408s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 408s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 408s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 408s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 408s] collect2: error: ld returned 1 exit status [ 408s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 408s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 408s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 408s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 408s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 408s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 408s] make[1]: *** [Makefile:444: all] Error 2 [ 408s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 408s] dh_auto_build: make -j1 returned exit code 2 [ 408s] make: *** [debian/rules:6: build] Error 255 [ 408s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 408s] [ 408s] morla5 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 17:24:48 UTC 2019. [ 408s] [ 408s] ### VM INTERACTION START ### [ 412s] [ 392.291214] sysrq: SysRq : Power Off [ 412s] [ 392.298705] reboot: Power down [ 412s] ### VM INTERACTION END ### [ 412s] [ 412s] morla5 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 17:24:52 UTC 2019. [ 412s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 29 17:24:53 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 17:24:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d680a7b1b37a_2f5b2ab0e462a600134115@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 407s] ar: `u' modifier ignored since `D' is the default (see `U') [ 407s] libtool: link: ranlib .libs/libtransceiver_common.a [ 407s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 407s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 408s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 408s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 408s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 408s] collect2: error: ld returned 1 exit status [ 408s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 408s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 408s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 408s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 408s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 408s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 408s] make[1]: *** [Makefile:444: all] Error 2 [ 408s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 408s] dh_auto_build: make -j1 returned exit code 2 [ 408s] make: *** [debian/rules:6: build] Error 255 [ 408s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 408s] [ 408s] morla5 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 17:24:43 UTC 2019. [ 408s] [ 408s] ### VM INTERACTION START ### [ 411s] [ 392.281171] sysrq: SysRq : Power Off [ 411s] [ 392.288808] reboot: Power down [ 411s] ### VM INTERACTION END ### [ 411s] [ 411s] morla5 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 17:24:47 UTC 2019. [ 411s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 17:29:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 17:29:32 +0000 Subject: Change in ...osmo-sgsn[master]: Move llc->MM/SM Gb specific glue code to its own file Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15336 Change subject: Move llc->MM/SM Gb specific glue code to its own file ...................................................................... Move llc->MM/SM Gb specific glue code to its own file Now that we have RANAP/Iu handling specificities in its own file, let's have also Gb specific glue code for messages coming from llc up to MM/SM layer in its own file. This way same entry points in gprs_gmm.c are used by Gb and Iu: gsm0408_rcv_gmm() (for MM) and gsm0408_rcv_gsm() (for SM). Change-Id: Iaf57922a0970c1d03f6f1d6337d27ae3d4aaf32c --- M include/osmocom/sgsn/Makefile.am A include/osmocom/sgsn/gprs_gb.h M include/osmocom/sgsn/gprs_gmm.h M src/gprs/Makefile.am A src/gprs/gprs_gb.c M src/gprs/gprs_gmm.c M tests/sgsn/Makefile.am 7 files changed, 110 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/36/15336/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index b4cd5db..b91c9f1 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -3,6 +3,7 @@ crc24.h \ debug.h \ gb_proxy.h \ + gprs_gb.h \ gprs_gb_parse.h \ gprs_gmm.h \ gprs_gmm_attach.h \ diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h new file mode 100644 index 0000000..3bc3676 --- /dev/null +++ b/include/osmocom/sgsn/gprs_gb.h @@ -0,0 +1,9 @@ +#pragma once + +#include + +#include +#include + +int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, + bool drop_cipherable); diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 047bd77..9316351 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -50,4 +50,8 @@ void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp); void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); +void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T); +void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); + +void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg); #endif /* _GPRS_GMM_H */ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 384b893..85ba906 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -60,6 +60,7 @@ $(NULL) osmo_sgsn_SOURCES = \ + gprs_gb.c \ gprs_gmm_attach.c \ gprs_gmm.c \ gprs_ranap.c \ diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c new file mode 100644 index 0000000..29bfc53 --- /dev/null +++ b/src/gprs/gprs_gb.c @@ -0,0 +1,91 @@ +/* Messages on the Gb interface (A/Gb mode) */ + +/* (C) 2009-2015 by Harald Welte + * (C) 2010 by On-Waves + * (C) 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include + +#include "bscconfig.h" + +#include +#include +#include + +/* Update the MM context state */ +static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx) +{ + switch (mmctx->pmm_state) { + case MM_STANDBY: + mmctx_set_mm_state(mmctx, MM_READY); + break; + case MM_READY: /* RE-arm the timer upon receival of Gb PDUs */ + mmctx_state_timer_start(mmctx, 3314); + break; + default: + break; + } +} + +/* Main entry point for incoming 04.08 GPRS messages from Gb */ +int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, + bool drop_cipherable) +{ + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); + uint8_t pdisc = gsm48_hdr_pdisc(gh); + struct sgsn_mm_ctx *mmctx; + struct gprs_ra_id ra_id; + int rc = -EINVAL; + + bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); + mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); + if (mmctx) { + msgid2mmctx(mmctx, msg); + rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); + mmctx->gb.llme = llme; + } + + /* MMCTX can be NULL */ + + if (mmctx) + gsm0408_gprs_notify_pdu_gb(mmctx); + + switch (pdisc) { + case GSM48_PDISC_MM_GPRS: + rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable); + break; + case GSM48_PDISC_SM_GPRS: + rc = gsm0408_rcv_gsm(mmctx, msg, llme); + break; + default: + LOGMMCTXP(LOGL_NOTICE, mmctx, + "Unknown GSM 04.08 discriminator 0x%02x: %s\n", + pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); + /* FIXME: return status message */ + break; + } + + /* MMCTX can be invalid */ + + return rc; +} diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 96753d3..e5fa047 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -124,7 +124,6 @@ } } -static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); static void mmctx_state_timer_cb(void *_mm) { struct sgsn_mm_ctx *mm = _mm; @@ -149,7 +148,7 @@ } } -static void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T) +void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T) { unsigned long seconds; @@ -200,7 +199,7 @@ ctx->pmm_state = state; } -static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb); @@ -304,7 +303,7 @@ } /* Store BVCI/NSEI in MM context */ -static void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg) +void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg) { mm->gb.bvci = msgb_bvci(msg); mm->gb.nsei = msgb_nsei(msg); @@ -2916,64 +2915,6 @@ return rc; } -/* Update the MM context state */ -static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx) -{ - switch (mmctx->pmm_state) { - case MM_STANDBY: - mmctx_set_mm_state(mmctx, MM_READY); - break; - case MM_READY: /* RE-arm the timer upon receival of Gb PDUs */ - mmctx_state_timer_start(mmctx, 3314); - break; - default: - break; - } -} - -/* Main entry point for incoming 04.08 GPRS messages from Gb */ -int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, - bool drop_cipherable) -{ - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); - uint8_t pdisc = gsm48_hdr_pdisc(gh); - struct sgsn_mm_ctx *mmctx; - struct gprs_ra_id ra_id; - int rc = -EINVAL; - - bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); - mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); - if (mmctx) { - msgid2mmctx(mmctx, msg); - rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); - mmctx->gb.llme = llme; - } - - /* MMCTX can be NULL */ - - if (mmctx) - gsm0408_gprs_notify_pdu_gb(mmctx); - - switch (pdisc) { - case GSM48_PDISC_MM_GPRS: - rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable); - break; - case GSM48_PDISC_SM_GPRS: - rc = gsm0408_rcv_gsm(mmctx, msg, llme); - break; - default: - LOGMMCTXP(LOGL_NOTICE, mmctx, - "Unknown GSM 04.08 discriminator 0x%02x: %s\n", - pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); - /* FIXME: return status message */ - break; - } - - /* MMCTX can be invalid */ - - return rc; -} - int gprs_gmm_rx_suspend(struct gprs_ra_id *raid, uint32_t tlli) { struct sgsn_mm_ctx *mmctx; diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index ae397b3..b035468 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -45,6 +45,7 @@ $(top_builddir)/src/gprs/gprs_llc_parse.o \ $(top_builddir)/src/gprs/gprs_llc.o \ $(top_builddir)/src/gprs/crc24.o \ + $(top_builddir)/src/gprs/gprs_gb.o \ $(top_builddir)/src/gprs/gprs_ranap.o \ $(top_builddir)/src/gprs/gprs_sndcp.o \ $(top_builddir)/src/gprs/gprs_gmm_attach.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaf57922a0970c1d03f6f1d6337d27ae3d4aaf32c Gerrit-Change-Number: 15336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 18:28:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 18:28:29 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Split enum gprs_pmm_state into Iu and Gb counterparts Those two state sets are not part of the same state machine, and are used in different scenarios, so let's split them and handle them in Gb and Iu specific parts of struct sgsn_mm_ctx. This is required in order to improve related code (for instance, use osmocom fsm). Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 --- M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gb.c M src/gprs/gprs_gmm.c M src/gprs/gprs_ranap.c M src/gprs/gprs_sgsn.c 6 files changed, 43 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/37/15337/1 diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 9316351..6c72cda 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -49,9 +49,9 @@ void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp); -void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); +void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state); void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T); -void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state); +void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state); void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg); #endif /* _GPRS_GMM_H */ diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 5fef89e..581164d 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -32,14 +32,17 @@ GMM_DEREGISTERED_INIT, /* 4.1.3.3.1.4 */ }; -/* TS 23.060 6.1.1 and 6.1.2 Mobility management states A/Gb and Iu mode */ -enum gprs_pmm_state { - PMM_DETACHED, - PMM_CONNECTED, - PMM_IDLE, +/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */ +enum gprs_mm_state_gb { MM_IDLE, MM_READY, - MM_STANDBY, + MM_STANDBY +}; +/* TS 23.060 6.1.2 Mobility Management States (Iu mode) */ +enum gprs_mm_state_iu { + PMM_DETACHED, + PMM_CONNECTED, + PMM_IDLE }; enum gprs_mm_ctr { @@ -138,7 +141,6 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; enum gprs_gmm_state gmm_state; - enum gprs_pmm_state pmm_state; /* Iu: page when in PMM-IDLE mode */ uint32_t p_tmsi; uint32_t p_tmsi_old; /* old P-TMSI before new is confirmed */ uint32_t p_tmsi_sig; @@ -158,9 +160,11 @@ uint32_t tlli; uint32_t tlli_new; + /* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */ + enum gprs_mm_state_gb mm_state; /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */ struct osmo_timer_list state_timer; - unsigned int state_T; /* Txxxx number but only used for pmm_states */ + unsigned int state_T; /* Txxxx number but only used for mm_state */ } gb; struct { int new_key; @@ -175,6 +179,8 @@ /* Voice Support Match Indicator */ struct ranap_ue_conn_ctx *ue_ctx; struct service_info service; + /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */ + enum gprs_mm_state_iu mm_state; } iu; struct { struct osmo_fsm_inst *fsm; diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c index 29bfc53..43af434 100644 --- a/src/gprs/gprs_gb.c +++ b/src/gprs/gprs_gb.c @@ -35,7 +35,7 @@ /* Update the MM context state */ static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx) { - switch (mmctx->pmm_state) { + switch (mmctx->gb.mm_state) { case MM_STANDBY: mmctx_set_mm_state(mmctx, MM_READY); break; diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index e5fa047..189187c 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -102,10 +102,14 @@ }, }; -static const struct value_string gprs_pmm_state_names[] = { - OSMO_VALUE_STRING(PMM_DETACHED), - OSMO_VALUE_STRING(PMM_CONNECTED), - OSMO_VALUE_STRING(PMM_IDLE), +static const struct value_string gprs_mm_state_gb_names[] = { + OSMO_VALUE_STRING(MM_IDLE), + OSMO_VALUE_STRING(MM_READY), + OSMO_VALUE_STRING(MM_STANDBY), + { 0, NULL } +}; + +static const struct value_string gprs_mm_state_iu_names[] = { OSMO_VALUE_STRING(MM_IDLE), OSMO_VALUE_STRING(MM_READY), OSMO_VALUE_STRING(MM_STANDBY), @@ -130,14 +134,14 @@ switch (mm->gb.state_T) { case 3314: - switch (mm->pmm_state) { + switch (mm->gb.mm_state) { case MM_READY: LOGMMCTXP(LOGL_INFO, mm, "T3314 expired\n"); mmctx_set_mm_state(mm, MM_STANDBY); break; default: LOGMMCTXP(LOGL_ERROR, mm, "T3314 expired in state %s != MM_READY\n", - get_value_string(gprs_pmm_state_names, mm->pmm_state)); + get_value_string(gprs_mm_state_gb_names, mm->gb.mm_state)); break; } break; @@ -174,16 +178,16 @@ mm->gb.state_T = 0; } -void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state) { OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); - if (ctx->pmm_state == state) + if (ctx->iu.mm_state == state) return; LOGMMCTXP(LOGL_INFO, ctx, "Changing PMM state from %s to %s\n", - get_value_string(gprs_pmm_state_names, ctx->pmm_state), - get_value_string(gprs_pmm_state_names, state)); + get_value_string(gprs_mm_state_iu_names, ctx->iu.mm_state), + get_value_string(gprs_mm_state_iu_names, state)); switch (state) { case PMM_IDLE: @@ -192,23 +196,23 @@ break; case PMM_CONNECTED: break; - default: + case PMM_DETACHED: break; } - ctx->pmm_state = state; + ctx->iu.mm_state = state; } -void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) +void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state) { OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb); - if (ctx->pmm_state == state) + if (ctx->gb.mm_state == state) return; LOGMMCTXP(LOGL_INFO, ctx, "Changing MM state from %s to %s\n", - get_value_string(gprs_pmm_state_names, ctx->pmm_state), - get_value_string(gprs_pmm_state_names, state)); + get_value_string(gprs_mm_state_gb_names, ctx->gb.mm_state), + get_value_string(gprs_mm_state_iu_names, state)); switch (state) { case MM_READY: @@ -216,19 +220,16 @@ mmctx_state_timer_start(ctx, 3314); break; case MM_IDLE: - if (ctx->pmm_state == MM_READY) + if (ctx->gb.mm_state == MM_READY) mmctx_state_timer_stop(ctx, 3314); break; case MM_STANDBY: - if (ctx->pmm_state == MM_READY) + if (ctx->gb.mm_state == MM_READY) mmctx_state_timer_stop(ctx, 3314); break; - default: - /* when changing to state != MM_READY */ - break; } - ctx->pmm_state = state; + ctx->gb.mm_state = state; } /* Our implementation, should be kept in SGSN */ diff --git a/src/gprs/gprs_ranap.c b/src/gprs/gprs_ranap.c index 5d2adee..e835af7 100644 --- a/src/gprs/gprs_ranap.c +++ b/src/gprs/gprs_ranap.c @@ -139,7 +139,7 @@ LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); else LOGIUP(ctx, LOGL_INFO, "IU release\n"); - if (mm && mm->pmm_state == PMM_CONNECTED) + if (mm && mm->iu.mm_state == PMM_CONNECTED) mmctx_set_pmm_state(mm, PMM_IDLE); rc = 0; break; diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index ee1902c..b395852 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -227,8 +227,8 @@ memcpy(&ctx->ra, raid, sizeof(ctx->ra)); ctx->ran_type = MM_CTX_T_GERAN_Gb; ctx->gb.tlli = tlli; + ctx->gb.mm_state = MM_IDLE; ctx->gmm_state = GMM_DEREGISTERED; - ctx->pmm_state = MM_IDLE; ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL; ctx->ciph_algo = sgsn->cfg.cipher; LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n", @@ -262,8 +262,8 @@ ctx->iu.ue_ctx = ue_ctx; ctx->iu.ue_ctx->rab_assign_addr_enc = sgsn->cfg.iu.rab_assign_addr_enc; ctx->iu.new_key = 1; + ctx->iu.mm_state = PMM_DETACHED; ctx->gmm_state = GMM_DEREGISTERED; - ctx->pmm_state = PMM_DETACHED; ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL; ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, ue_ctx->conn_id); if (!ctx->ctrg) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 18:54:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 29 Aug 2019 18:54:28 +0000 Subject: Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 Change subject: Merge common allocation steps for Gb and Iu ctx ...................................................................... Merge common allocation steps for Gb and Iu ctx This way it's easier to add new common functionalitites without forgetting to add it on both sides, and simplifies the code. Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c --- M src/gprs/gprs_sgsn.c 1 file changed, 27 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/15338/1 diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index b395852..16f3f34 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -214,9 +214,8 @@ } -/* Allocate a new SGSN MM context for GERAN_Gb */ -struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_gb(uint32_t tlli, - const struct gprs_ra_id *raid) +/* Allocate a new SGSN MM context, generic part */ +struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t rate_ctr_id) { struct sgsn_mm_ctx *ctx; @@ -224,16 +223,9 @@ if (!ctx) return NULL; - memcpy(&ctx->ra, raid, sizeof(ctx->ra)); - ctx->ran_type = MM_CTX_T_GERAN_Gb; - ctx->gb.tlli = tlli; - ctx->gb.mm_state = MM_IDLE; ctx->gmm_state = GMM_DEREGISTERED; ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL; - ctx->ciph_algo = sgsn->cfg.cipher; - LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n", - get_value_string(gprs_cipher_names, ctx->ciph_algo)); - ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, tlli); + ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, rate_ctr_id); if (!ctx->ctrg) { LOGMMCTXP(LOGL_ERROR, ctx, "Cannot allocate counter group\n"); talloc_free(ctx); @@ -241,45 +233,49 @@ } ctx->gmm_att_req.fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "gb_gmm_req"); INIT_LLIST_HEAD(&ctx->pdp_list); - llist_add(&ctx->list, &sgsn_mm_ctxts); return ctx; } +/* Allocate a new SGSN MM context for GERAN_Gb */ +struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_gb(uint32_t tlli, + const struct gprs_ra_id *raid) +{ + struct sgsn_mm_ctx *ctx; -/* Allocate a new SGSN MM context */ + ctx = sgsn_mm_ctx_alloc(tlli); + if (!ctx) + return NULL; + + memcpy(&ctx->ra, raid, sizeof(ctx->ra)); + ctx->ran_type = MM_CTX_T_GERAN_Gb; + ctx->gb.tlli = tlli; + ctx->gb.mm_state = MM_IDLE; + ctx->ciph_algo = sgsn->cfg.cipher; + + LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n", + get_value_string(gprs_cipher_names, ctx->ciph_algo)); + return ctx; +} + +/* Allocate a new SGSN MM context for UTRAN_Iu */ struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_iu(void *uectx) { #if BUILD_IU struct sgsn_mm_ctx *ctx; struct ranap_ue_conn_ctx *ue_ctx = uectx; - ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx); + ctx = sgsn_mm_ctx_alloc(ue_ctx->conn_id); if (!ctx) return NULL; + /* Need to get RAID from IU conn */ + ctx->ra = ue_ctx->ra_id; ctx->ran_type = MM_CTX_T_UTRAN_Iu; ctx->iu.ue_ctx = ue_ctx; ctx->iu.ue_ctx->rab_assign_addr_enc = sgsn->cfg.iu.rab_assign_addr_enc; ctx->iu.new_key = 1; ctx->iu.mm_state = PMM_DETACHED; - ctx->gmm_state = GMM_DEREGISTERED; - ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL; - ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, ue_ctx->conn_id); - if (!ctx->ctrg) { - LOGMMCTXP(LOGL_ERROR, ctx, "Cannot allocate counter group for %s.%u\n", - mmctx_ctrg_desc.group_name_prefix, ue_ctx->conn_id); - talloc_free(ctx); - return NULL; - } - ctx->gmm_att_req.fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "gb_gmm_req"); - - /* Need to get RAID from IU conn */ - ctx->ra = ctx->iu.ue_ctx->ra_id; - - INIT_LLIST_HEAD(&ctx->pdp_list); - - llist_add(&ctx->list, &sgsn_mm_ctxts); return ctx; #else -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c Gerrit-Change-Number: 15338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:36:50 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 19:36:50 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: fix message length check in parse_msg() In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15331 ) Change subject: trx_toolkit/data_msg.py: fix message length check in parse_msg() ...................................................................... trx_toolkit/data_msg.py: fix message length check in parse_msg() Unlike DATA_MSG.HDR_LEN, the CHDR_LEN is a constant that defines length of the common header, which is mandatory for every version. DATA_MSG.HDR_LEN in its turn defines length of the whole header, including the version specific fields. Thus we need to know the header version before using it. In DATA_MSG.parse_msg() we need to parse the common header first, so then we know the version and length of the whole header. After that we can safely use DATA_MSG.HDR_LEN. Change-Id: I2809f5f96209eed64bdabf7a15575144313f7cc9 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index a1046ec..c5d284d 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -275,9 +275,9 @@ # Parses a TRX DATA message def parse_msg(self, msg): - # Make sure we have at least header - if len(msg) < self.HDR_LEN: - raise ValueError("Message is to short") + # Make sure we have at least common header + if len(msg) < self.CHDR_LEN: + raise ValueError("Message is to short: missing common header") # Parse version and TDMA TN self.ver = (msg[0] >> 4) @@ -286,6 +286,11 @@ # Parse TDMA FN self.fn = struct.unpack(">L", msg[1:5])[0] + # Make sure we have the whole header, + # including the version specific fields + if len(msg) < self.HDR_LEN: + raise ValueError("Message is to short: missing version specific header") + # Specific message part self.parse_hdr(msg) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2809f5f96209eed64bdabf7a15575144313f7cc9 Gerrit-Change-Number: 15331 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:36:51 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 19:36:51 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: fix: make sure header version is known In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15332 ) Change subject: trx_toolkit/data_msg.py: fix: make sure header version is known ...................................................................... trx_toolkit/data_msg.py: fix: make sure header version is known Before using DATA_MSG.HDR_LEN, we need to make sure that a parsed header version is known and supported. Otherwise we will get an IndexError exception. Change-Id: Ie1887aa8709da1a2a287aa58a7873e72c0b4ed33 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index c5d284d..a1c41c0 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -279,11 +279,13 @@ if len(msg) < self.CHDR_LEN: raise ValueError("Message is to short: missing common header") - # Parse version and TDMA TN + # Parse the header version first self.ver = (msg[0] >> 4) - self.tn = (msg[0] & 0x07) + if not self.ver in self.known_versions: + raise ValueError("Unknown TRXD header version %d" % self.ver) - # Parse TDMA FN + # Parse TDMA TN and FN + self.tn = (msg[0] & 0x07) self.fn = struct.unpack(">L", msg[1:5])[0] # Make sure we have the whole header, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1887aa8709da1a2a287aa58a7873e72c0b4ed33 Gerrit-Change-Number: 15332 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:36:53 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 19:36:53 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: also print burst length in desc_hdr() In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15333 ) Change subject: trx_toolkit/data_msg.py: also print burst length in desc_hdr() ...................................................................... trx_toolkit/data_msg.py: also print burst length in desc_hdr() Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index a1c41c0..0774d32 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -182,6 +182,9 @@ if self.tn is not None: result += ("tn=%u " % self.tn) + if self.burst is not None and len(self.burst) > 0: + result += ("bl=%u " % len(self.burst)) + return result # Converts unsigned soft-bits {254..0} to soft-bits {-127..127} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0036cbf70a3736a7f9779e030e05221cba8add9 Gerrit-Change-Number: 15333 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:36:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 19:36:54 +0000 Subject: Change in ...osmocom-bb[master]: trx_toolkit/data_msg.py: enrich some ValueError messages In-Reply-To: References: Message-ID: fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmocom-bb/+/15334 ) Change subject: trx_toolkit/data_msg.py: enrich some ValueError messages ...................................................................... trx_toolkit/data_msg.py: enrich some ValueError messages Change-Id: Icdf0d136a9b820cfaec534e2604204da9ea42092 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 0774d32..ec59b85 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -233,7 +233,7 @@ # Validates the message fields (throws ValueError) def validate(self): if not self.ver in self.known_versions: - raise ValueError("Unknown TRXD header version") + raise ValueError("Unknown TRXD header version %d" % self.ver) if self.fn is None: raise ValueError("TDMA frame-number is not set") @@ -823,7 +823,7 @@ self.mod_type = Modulation.pick_by_bl(bl - 2) if self.mod_type is None: - raise ValueError("Odd burst length") + raise ValueError("Odd burst length %u" % bl) return burst[:self.mod_type.bl] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/15334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icdf0d136a9b820cfaec534e2604204da9ea42092 Gerrit-Change-Number: 15334 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:45:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 19:45:50 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: f_init_pcu: sleep before connect In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 ) Change subject: bts: f_init_pcu: sleep before connect ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 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: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 Gerrit-Change-Number: 15327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 19:45:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:46:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 19:46:19 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add test TC_pcu_socket_verify_info_ind In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 ) Change subject: bts: add test TC_pcu_socket_verify_info_ind ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 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: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 Gerrit-Change-Number: 15328 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 19:46:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:46:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 19:46:47 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add configs for running without docker In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 ) Change subject: bts: add configs for running without docker ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 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: I9eb2bb4599a4e874424f73483d9658a4467b8b8c Gerrit-Change-Number: 15329 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 19:46:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:46:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 19:46:49 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: f_init_pcu: sleep before connect In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 ) Change subject: bts: f_init_pcu: sleep before connect ...................................................................... bts: f_init_pcu: sleep before connect Give the emulated BSC side some time to send the various SI via RSL. This workaround makes OsmoBTS send the correct CellID and other information instead of empty values to the PCU socket. The next commit tests these values. Related: OS#4179 Change-Id: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d3fb958..7f0b205 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -324,6 +324,9 @@ pcu_conn_id := -1; return; } + + f_sleep(0.5); /* workaround for OS#4179 */ + pcu_conn_id := f_pcuif_connect(pt, mp_pcu_socket); T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15327 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: I547f2b8e0796b6976506c28b1b493b1f5bce28f8 Gerrit-Change-Number: 15327 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:46:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 19:46:50 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add test TC_pcu_socket_verify_info_ind In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 ) Change subject: bts: add test TC_pcu_socket_verify_info_ind ...................................................................... bts: add test TC_pcu_socket_verify_info_ind Verify that the CellID of SI3 (TS 04.08 9.1.35) and other values are passed properly to the PCU socket. A bug in OsmoBTS is currently causing it to send a byte-swapped CellID, related fix is in [1]. [1] I68faf4558f0686fb2a3db24077dceaae05bf0262 (osmo-bts) Related: OS#3854 Change-Id: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 7f0b205..15948a3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4866,6 +4866,28 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* Verify that the cell_id of SI3 (TS 04.08 9.1.35) and other values are passed properly to the PCU socket (OS#3854) */ +testcase TC_pcu_socket_verify_info_ind() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); + + f_init(); + + /* Verify cell_id */ + var uint16_t cell_id_si3 := si3.payload.si3.cell_id; + var uint16_t cell_id_pcu := g_pcu_last_info.u.info_ind.cell_id; + if (cell_id_si3 != cell_id_pcu) { + setverdict(fail, "Expected cell_id ", cell_id_si3, " got: ", cell_id_pcu); + } + + /* Verify LAC */ + var uint16_t lac_si3 := si3.payload.si3.lai.lac; + var uint16_t lac_pcu := g_pcu_last_info.u.info_ind.lac; + if (lac_si3 != lac_pcu) { + setverdict(fail, "Expected LAC ", lac_si3, " got: ", lac_pcu); + } + + setverdict(pass); +} /*********************************************************************** * Osmocom Style Dynamic Timeslot Support @@ -6253,6 +6275,7 @@ execute( TC_pcu_socket_noconnect_nosi3gprs() ); execute( TC_pcu_socket_connect_si3gprs() ); execute( TC_pcu_socket_disconnect_nosi3gprs() ); + execute( TC_pcu_socket_verify_info_ind() ); } else { log("PCU socket path not available, skipping PCU tests"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15328 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: I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 Gerrit-Change-Number: 15328 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:46:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 29 Aug 2019 19:46:50 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: bts: add configs for running without docker In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 ) Change subject: bts: add configs for running without docker ...................................................................... bts: add configs for running without docker Base on docker-playground.git's ttcn3-bts-test/*.cfg files, change IPs from 172.18.9.* to 127.0.0.* (last octet unchanged). Change-Id: I9eb2bb4599a4e874424f73483d9658a4467b8b8c --- M bts/BTS_Tests.cfg A bts/osmo-bsc.cfg A bts/osmo-bts.cfg 3 files changed, 225 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg index 78a288d..ed04163 100644 --- a/bts/BTS_Tests.cfg +++ b/bts/BTS_Tests.cfg @@ -12,13 +12,17 @@ #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.191" # sysmoBTS Max #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau #*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home -*.BTSVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bts-trx -*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bsc +*.BTSVTY.CTRL_HOSTNAME := "127.0.0.20" # osmo-bts-trx +*.BSCVTY.CTRL_HOSTNAME := "127.0.0.11" # osmo-bsc [MODULE_PARAMETERS] +L1CTL_PortType.m_l1ctl_sock_path := "/tmp/osmocom_l2" #BTS_Tests.mp_rsl_ip := "10.9.1.2" # office -BTS_Tests.mp_rsl_ip := "192.168.100.2" # home -#BTS_Tests.mp_pcu_socket := "" +#BTS_Tests.mp_rsl_ip := "192.168.100.2" # home +BTS_Tests.mp_rsl_ip := "127.0.0.10" +BTS_Tests.mp_pcu_socket := "/tmp/pcu_sock" +BTS_Tests.mp_bts_trxc_ip := "127.0.0.21" +BTS_Tests.mp_ctrl_ip := "127.0.0.20" #BTS_Tests_OML.mp_oml_ip := "192.168.102.239" # home #BTS_Tests_OML.mp_oml_port := 3002 diff --git a/bts/osmo-bsc.cfg b/bts/osmo-bsc.cfg new file mode 100644 index 0000000..3b31eb7 --- /dev/null +++ b/bts/osmo-bsc.cfg @@ -0,0 +1,160 @@ +! +! OsmoBSC (1.1.2.236-5f22) configuration saved from vty +!! +password foo +! +log gsmtap 127.0.0.10 + logging level set-all debug +! +log stderr + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +stats interval 5 +! +line vty + no login + bind 127.0.0.11 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive + ipa bind 127.0.0.11 +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 2905 0 m3ua + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 2 0.23.3 +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + handover 0 + handover1 window rxlev averaging 10 + handover1 window rxqual averaging 1 + handover1 window rxlev neighbor averaging 10 + handover1 power budget interval 6 + handover1 power budget hysteresis 3 + handover1 maximum distance 9999 + periodic location update 30 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + early-classmark-sending-3g allowed + ip.access unit_id 1234 0 + ip.access rsl-ip 127.0.0.10 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config SDCCH8 + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +msc 0 + core-location-area-code 666 + core-cell-identity 333 + ip.access rtp-base 4000 + timeout-ping 12 + timeout-pong 14 + no timeout-ping advanced + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + codec-list fr1 fr2 fr3 + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden +bsc + mid-call-timeout 0 + no missing-msc-text + access-list-name bsc-list diff --git a/bts/osmo-bts.cfg b/bts/osmo-bts.cfg new file mode 100644 index 0000000..a9867bf --- /dev/null +++ b/bts/osmo-bts.cfg @@ -0,0 +1,57 @@ +! +! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty +!! +! +log gsmtap 127.0.0.10 + logging level set-all debug +! +log stderr + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +line vty + no login + bind 127.0.0.20 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +phy 0 + osmotrx ip local 127.0.0.20 + osmotrx ip remote 127.0.0.21 + osmotrx fn-advance 20 + osmotrx rts-advance 5 + instance 0 + osmotrx rx-gain 10 + osmotrx tx-attenuation 0 +bts 0 + band DCS1800 + ipa unit-id 1234 0 + oml remote-ip 127.0.0.11 + rtp jitter-buffer 100 + paging queue-size 200 + paging lifetime 0 + uplink-power-target -75 + gsmtap-sapi rach + gsmtap-sapi agch + gsmtap-sapi bcch + gsmtap-sapi pch + gsmtap-sapi sdcch + gsmtap-sapi sacch + min-qual-rach 50 + min-qual-norm -5 + !settsc + pcu-socket /tmp/pcu_sock + trx 0 + power-ramp max-initial 0 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 +ctrl + bind 127.0.0.20 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15329 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: I9eb2bb4599a4e874424f73483d9658a4467b8b8c Gerrit-Change-Number: 15329 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 19:54:02 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 19:54:02 +0000 Subject: Change in ...osmo-pcu[master]: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15281 ) Change subject: WIP: gprs_bssgp_destroy(): fix NULL-pointer dereference ...................................................................... Patch Set 2: > You probably want to get rid of the WIP here. Somehow this change breaks the 'tbf' unit test. Let's keep it WIP for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I42cb911a679b9198fd06e74b42f1e2cb28323de9 Gerrit-Change-Number: 15281 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 19:54:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 29 22:25:05 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 22:25:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6850cb33022_2f5b2ab0e462a600170678@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 420s] ar: `u' modifier ignored since `D' is the default (see `U') [ 420s] libtool: link: ranlib .libs/libtransceiver_common.a [ 420s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 420s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 420s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 421s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 421s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 421s] collect2: error: ld returned 1 exit status [ 421s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 421s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 421s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 421s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 421s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 421s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 421s] make[1]: *** [Makefile:444: all] Error 2 [ 421s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 421s] dh_auto_build: make -j1 returned exit code 2 [ 421s] make: *** [debian/rules:6: build] Error 255 [ 421s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 421s] [ 421s] lamb58 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 22:24:54 UTC 2019. [ 421s] [ 421s] ### VM INTERACTION START ### [ 424s] [ 405.167940] sysrq: SysRq : Power Off [ 424s] [ 405.176517] reboot: Power down [ 424s] ### VM INTERACTION END ### [ 424s] [ 424s] lamb58 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Aug 29 22:24:58 UTC 2019. [ 424s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 29 22:26:48 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 29 Aug 2019 22:26:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d685142e4567_2f5b2ab0e462a60017076a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 455s] ar: `u' modifier ignored since `D' is the default (see `U') [ 455s] libtool: link: ranlib .libs/libtransceiver_common.a [ 455s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 455s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 456s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 456s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 456s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 456s] collect2: error: ld returned 1 exit status [ 456s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 456s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 456s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 456s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 456s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 456s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 456s] make[1]: *** [Makefile:444: all] Error 2 [ 456s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 456s] dh_auto_build: make -j1 returned exit code 2 [ 456s] make: *** [debian/rules:6: build] Error 255 [ 456s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 456s] [ 456s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 22:26:43 UTC 2019. [ 456s] [ 456s] ### VM INTERACTION START ### [ 459s] [ 440.426840] sysrq: SysRq : Power Off [ 459s] [ 440.434859] reboot: Power down [ 459s] ### VM INTERACTION END ### [ 459s] [ 459s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Thu Aug 29 22:26:47 UTC 2019. [ 459s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 29 22:51:00 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 22:51:00 +0000 Subject: Change in ...libosmocore[master]: sanity: make vty buffer_* API NULL safe In-Reply-To: References: Message-ID: Hello fixeria, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15265 to look at the new patch set (#3). Change subject: sanity: make vty buffer_* API NULL safe ...................................................................... sanity: make vty buffer_* API NULL safe Even after I1d235cbfbfb9aaf411316642c7bcfac12106df44, I still think it makes sense to guard against NULL in public API. Related: OS#4164 Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 --- M src/vty/buffer.c 1 file changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/15265/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 22:51:04 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 22:51:04 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging during VTY_CLOSED event handling Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15339 Change subject: fix: vty crash by logging during VTY_CLOSED event handling ...................................................................... fix: vty crash by logging during VTY_CLOSED event handling When a VTY closes, dispatch the VTY_CLOSED signal before tearing down the VTY buffer and fd. In particular this fixes: - a crash during telnet_close_client(), invoked by the VTY_CLOSED event, which logs to DLGLOBAL and uses vty->obuf that, so far, vty_close() had already unallocated earlier (OS#4164). - the logging about closing a telnet session so far logged: DLGLOBAL INFO Closing telnet connection r=NULL<->l=NULL By dispatching the VTY_CLOSED event while the fd is still valid, we instead get the actual connection IP address and port being closed: DLGLOBAL INFO Closing telnet connection r=127.0.0.1:36708<->l=127.0.0.1:4258 Related: OS#4164 Change-Id: I1d235cbfbfb9aaf411316642c7bcfac12106df44 --- M src/vty/vty.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/15339/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index a96d86c..aa23fa0 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -205,6 +205,9 @@ { int i; + /* VTY_CLOSED is handled by the telnet_interface */ + vty_event(VTY_CLOSED, vty->fd, vty); + if (vty->obuf) { /* Flush buffer. */ buffer_flush_all(vty->obuf, vty->fd); @@ -236,9 +239,6 @@ /* Check configure. */ vty_config_unlock(vty); - /* VTY_CLOSED is handled by the telnet_interface */ - vty_event(VTY_CLOSED, vty->fd, vty); - /* OK free vty. */ talloc_free(vty); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d235cbfbfb9aaf411316642c7bcfac12106df44 Gerrit-Change-Number: 15339 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 22:51:11 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 22:51:11 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15340 Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition ...................................................................... OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition Since (R)->ip is a char[], it is always non-NULL. The (x ? : "") condition is completely pointless. Remove it. Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec --- M include/osmocom/core/sockaddr_str.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/15340/1 diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 253b755..7c01732 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -62,7 +62,7 @@ * printf("got " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(my_sockaddr_str)); */ #define OSMO_SOCKADDR_STR_FMT "%s:%u" -#define OSMO_SOCKADDR_STR_FMT_ARGS(R) ((R)->ip ? : ""), (R)->port +#define OSMO_SOCKADDR_STR_FMT_ARGS(R) (R)->ip, (R)->port bool osmo_sockaddr_str_is_set(const struct osmo_sockaddr_str *sockaddr_str); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec Gerrit-Change-Number: 15340 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 22:51:12 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 22:51:12 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15341 Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer ...................................................................... OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer The pointless '(R)->ip?' condition of the previous commit made me want to protect against R == NULL instead. Change-Id: Ie2f47ad8ae585aaf67a6476c67f8e014820a72bc --- M include/osmocom/core/sockaddr_str.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/15341/1 diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 7c01732..d16dc86 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -62,7 +62,7 @@ * printf("got " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(my_sockaddr_str)); */ #define OSMO_SOCKADDR_STR_FMT "%s:%u" -#define OSMO_SOCKADDR_STR_FMT_ARGS(R) (R)->ip, (R)->port +#define OSMO_SOCKADDR_STR_FMT_ARGS(R) ((R)? (R)->ip : "NULL"), ((R)? (R)->port : 0) bool osmo_sockaddr_str_is_set(const struct osmo_sockaddr_str *sockaddr_str); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2f47ad8ae585aaf67a6476c67f8e014820a72bc Gerrit-Change-Number: 15341 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 22:53:56 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 22:53:56 +0000 Subject: Change in ...libosmocore[master]: sanity: make vty buffer_* API NULL safe In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: sanity: make vty buffer_* API NULL safe ...................................................................... Patch Set 3: see https://gerrit.osmocom.org/c/libosmocore/+/15339 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 22:53:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 22:55:31 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 22:55:31 +0000 Subject: Change in ...libosmocore[master]: sanity: make vty buffer_* API NULL safe In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: sanity: make vty buffer_* API NULL safe ...................................................................... Patch Set 3: I realize I was trying to talk my way out of spending more time on it, because who will pay for that. Figured it out now in actually exactly 42 minutes... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 22:55:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:08:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:08:08 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 ) Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Patch Set 1: Code-Review-1 (8 comments) I like this change, but CR-1 because of two potential copy-paste mistakes. https://gerrit.osmocom.org/#/c/15337/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/15337/1/include/osmocom/sgsn/gprs_sgsn.h at 43 PS1, Line 43: PMM_ Any reason why it needs to be prefixed with 'PMM_', and not with 'MM_'? What is the meaning of 'P' here? Maybe we should rather use 'MM_GB_ST_' and 'MM_IU_ST_' prefixes for both enums? This naming would help to avoid confusion. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 113 PS1, Line 113: MM_IDLE Looks like a copy-paste error to me, as 'gprs_mm_state_iu' enum defines different states (than 'gprs_mm_state_gb'). https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 181 PS1, Line 181: mmctx_set_pmm_state Same problem with naming, maybe we should also use '_iu_' / '_gb_' prefixes here? https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 199 PS1, Line 199: case PMM_DETACHED: This change looks unrelated, but in general I am not against it. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 206 PS1, Line 206: mmctx_set_mm_state Same. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 215 PS1, Line 215: gprs_mm_state_iu_names Looks like a mistake to me. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_sgsn.c File src/gprs/gprs_sgsn.c: https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_sgsn.c at 230 PS1, Line 230: ctx->gb.mm_state = MM_IDLE; Please keep the same order, it was after the 'ctx->gmm_state' assignment. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_sgsn.c at 265 PS1, Line 265: ctx->iu.mm_state = PMM_DETACHED; Same. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:08:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:16:15 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 23:16:15 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 Change subject: ran_dec logging: log message sizes on errors ...................................................................... ran_dec logging: log message sizes on errors Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb --- M src/libmsc/ran_msg_a.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/15342/1 diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 5b624a3..c75b656 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -753,13 +753,17 @@ } if (msgb_l3len(bssmap) < h->length) { - LOG_RAN_A_DEC(ran_dec, LOGL_ERROR, "BSSMAP data truncated, discarding message\n"); + LOG_RAN_A_DEC(ran_dec, LOGL_ERROR, "BSSMAP data truncated, discarding message:" + " msgb_l3len(bssmap) == %u < bssmap_header->length == %u\n", + msgb_l3len(bssmap), h->length); return -1; } if (msgb_l3len(bssmap) > h->length) { - LOG_RAN_A_DEC(ran_dec, LOGL_NOTICE, "There are %u extra bytes after the BSSMAP data, truncating\n", - msgb_l3len(bssmap) - h->length); + LOG_RAN_A_DEC(ran_dec, LOGL_NOTICE, "There are %u extra bytes after the BSSMAP data, truncating:\n", + " msgb_l3len(bssmap) == %u > bssmap_header->length == %u\n", + msgb_l3len(bssmap) - h->length, + msgb_l3len(bssmap), h->length); msgb_l3trim(bssmap, h->length); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:16:33 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 23:16:33 +0000 Subject: Change in ...osmo-msc[master]: msc_vlr_tests: GSUP: don't care about extra IEs Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15343 Change subject: msc_vlr_tests: GSUP: don't care about extra IEs ...................................................................... msc_vlr_tests: GSUP: don't care about extra IEs To not break the msc_vlr tests by new GSUP IEs added to some of the GSUP messages, make msc_vlr_tests only match the start of the GSUP message and not care about extra IEs. The extra IEs are anyway seen in the expected logs. The reason to drop the msgb_eq_data_print() is because it is useless for mismatching lengths. It will always print only the length mismatch, instead we need to be able to compare with what was expected. Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/15343/1 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 4ccaee9..3d69ae8 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -746,8 +746,16 @@ if (len < 1) abort(); - if (!msgb_eq_data_print(msg, buf, len)) + /* Compare only the length expected. Extra data is fine, to not care about new GSUP IEs invented later. */ + if (msg->len < len) { + fprintf(stderr, "ERROR: GSUP message too short, expected '%s'\n", gsup_tx_expected); abort(); + } + + if (memcmp(msg->data, buf, len)) { + fprintf(stderr, "ERROR: GSUP message mismatch, expected it to start with '%s'\n", gsup_tx_expected); + abort(); + } talloc_free(msg); gsup_tx_confirmed = true; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11 Gerrit-Change-Number: 15343 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:16:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 23:16:34 +0000 Subject: Change in ...osmo-msc[master]: gsm48_tch_rtp_create(): check against NULL mgcp_info Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15344 Change subject: gsm48_tch_rtp_create(): check against NULL mgcp_info ...................................................................... gsm48_tch_rtp_create(): check against NULL mgcp_info osmo_mgcpc_ep_ci_get_rtp_info() might return a NULL mgcp_info, guard against that. Fixes: CID#203651 Change-Id: I98fe5860c49751ade1af10d99487aba259504f23 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/44/15344/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 1ec3342..e83caa2 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1700,7 +1700,10 @@ /* Payload Type number */ mgcp_info = osmo_mgcpc_ep_ci_get_rtp_info(rtp_cn->ci); - payload_type = map_codec_to_pt(mgcp_info->ptmap, mgcp_info->ptmap_len, rtp_cn->codec); + if (mgcp_info && mgcp_info->ptmap_len) + payload_type = map_codec_to_pt(mgcp_info->ptmap, mgcp_info->ptmap_len, rtp_cn->codec); + else + payload_type = rtp_cn->codec; rtp_cn_local = call_leg_local_ip(cl, RTP_TO_CN); if (!rtp_cn_local) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I98fe5860c49751ade1af10d99487aba259504f23 Gerrit-Change-Number: 15344 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:16:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 23:16:34 +0000 Subject: Change in ...osmo-msc[master]: msc_a.c, CC trans: change a comment to a debug log Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15345 Change subject: msc_a.c, CC trans: change a comment to a debug log ...................................................................... msc_a.c, CC trans: change a comment to a debug log Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5 --- M src/libmsc/msc_a.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/45/15345/1 diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index e141c0e..9786ba7 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1671,7 +1671,7 @@ OSMO_ASSERT(cc_trans->type == TRANS_CC); if (msc_a->cc.active_trans == cc_trans) { - /* Assignment for this trans already started earlier. */ + LOG_MSC_A(msc_a, LOGL_DEBUG, "Assignment for this trans already started earlier\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5 Gerrit-Change-Number: 15345 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:16:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 23:16:34 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15346 Change subject: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. ...................................................................... cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. Change-Id: I576bc5c1fd63fe8048a7a6a2d06763fc3221fa49 --- M include/osmocom/msc/call_leg.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/15346/1 diff --git a/include/osmocom/msc/call_leg.h b/include/osmocom/msc/call_leg.h index f35816c..a225b66 100644 --- a/include/osmocom/msc/call_leg.h +++ b/include/osmocom/msc/call_leg.h @@ -74,7 +74,7 @@ int call_leg_ensure_rtp_alloc(struct call_leg *cl, enum rtp_direction dir, uint32_t call_id, struct gsm_trans *for_trans); int call_leg_ensure_ci(struct call_leg *cl, enum rtp_direction dir, uint32_t call_id, struct gsm_trans *for_trans, - const enum mgcp_codecs *codec_if_known, const struct osmo_sockaddr_str *remote_port_if_known); + const enum mgcp_codecs *codec_if_known, const struct osmo_sockaddr_str *remote_addr_if_known); struct osmo_sockaddr_str *call_leg_local_ip(struct call_leg *cl, enum rtp_direction dir); void call_leg_rtp_stream_gone(struct call_leg *cl, struct rtp_stream *rtps); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I576bc5c1fd63fe8048a7a6a2d06763fc3221fa49 Gerrit-Change-Number: 15346 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:16:34 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 29 Aug 2019 23:16:34 +0000 Subject: Change in ...osmo-msc[master]: fix msc_vlr_test_call.c Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15347 Change subject: fix msc_vlr_test_call.c ...................................................................... fix msc_vlr_test_call.c Substantial parts of the CC / MNCC call establishment were so far completely missing from the msc_vlr_test_call.c tests. With my new insights on CC and MNCC procedures, complete the tests. Root reason: since I am going to re-order the sequence of events to enable codec negotiation via SDP in MNCC, I want to have comprehensive tests of the CC procedures to see the effect as diffs in the test output. Change-Id: Ie995e264eb1e3dd9558a1753ff6f9b55c1d084e1 --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 4 files changed, 433 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/15347/1 diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 065af25..4d898be 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -213,6 +213,25 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); mncc.callref = cc_to_mncc_tx_got_callref; + btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + expect_crcx(RTP_TO_RAN); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + OSMO_ASSERT(got_crcx); + + btw("MGW acknowledges the CRCX, triggering Assignment"); + expect_iu_rab_assignment(); + crcx_ok(RTP_TO_RAN); + OSMO_ASSERT(iu_rab_assignment_sent); + + btw("Assignment succeeds, triggering CRCX to CN"); + expect_crcx(RTP_TO_CN); + ms_sends_assignment_complete(); + OSMO_ASSERT(got_crcx); + + btw("CN RTP address is available, trigger MNCC_RTP_CREATE"); + cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); + crcx_ok(RTP_TO_CN); + btw("MNCC says that's fine"); dtap_expect_tx("8302" /* CC: Call Proceeding */); mncc_sends_to_cc(MNCC_CALL_PROC_REQ, &mncc); @@ -298,11 +317,32 @@ dtap_expect_tx("0305" /* CC: Setup */); ms_sends_security_mode_complete(); + btw("MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND"); + expect_crcx(RTP_TO_RAN); cc_to_mncc_expect_tx(IMSI, MNCC_CALL_CONF_IND); ms_sends_msg("8348" /* CC: Call Confirmed */ "0406600402000581" /* Bearer Capability */ "15020100" /* Call Control Capabilities */ "40080402600400021f00" /* Supported Codec List */); + OSMO_ASSERT(got_crcx); + OSMO_ASSERT(cc_to_mncc_tx_confirmed); + + btw("MNCC sends MNCC_RTP_CREATE"); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + + btw("MGW acknowledges the CRCX to RAN, triggering Assignment"); + expect_iu_rab_assignment(); + crcx_ok(RTP_TO_RAN); + OSMO_ASSERT(iu_rab_assignment_sent); + + btw("Assignment completes, triggering CRCX to CN"); + expect_crcx(RTP_TO_CN); + ms_sends_assignment_complete(); + OSMO_ASSERT(got_crcx); + + btw("When the CN side RTP address is known, send MNCC_RTP_CREATE"); + cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); + crcx_ok(RTP_TO_CN); fake_time_passes(1, 23); @@ -380,13 +420,32 @@ dtap_expect_tx("0305" /* CC: Setup */); ms_sends_security_mode_complete(); + btw("MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND"); + expect_crcx(RTP_TO_RAN); cc_to_mncc_expect_tx(IMSI, MNCC_CALL_CONF_IND); ms_sends_msg("8348" /* CC: Call Confirmed */ "0406600402000581" /* Bearer Capability */ "15020100" /* Call Control Capabilities */ "40080402600400021f00" /* Supported Codec List */); + OSMO_ASSERT(got_crcx); OSMO_ASSERT(cc_to_mncc_tx_confirmed); + btw("MNCC sends MNCC_RTP_CREATE"); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + + btw("MGW acknowledges the CRCX to RAN, triggering Assignment"); + expect_iu_rab_assignment(); + crcx_ok(RTP_TO_RAN); + OSMO_ASSERT(iu_rab_assignment_sent); + + btw("Assignment completes, triggering CRCX to CN"); + expect_crcx(RTP_TO_CN); + ms_sends_assignment_complete(); + OSMO_ASSERT(got_crcx); + + btw("When the CN side RTP address is known, send MNCC_RTP_CREATE"); + cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); + crcx_ok(RTP_TO_CN); fake_time_passes(1, 23); cc_to_mncc_expect_tx("", MNCC_ALERT_IND); @@ -470,6 +529,25 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); mncc.callref = cc_to_mncc_tx_got_callref; + btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + expect_crcx(RTP_TO_RAN); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + OSMO_ASSERT(got_crcx); + + btw("MGW acknowledges the CRCX, triggering Assignment"); + expect_iu_rab_assignment(); + crcx_ok(RTP_TO_RAN); + OSMO_ASSERT(iu_rab_assignment_sent); + + btw("Assignment succeeds, triggering CRCX to CN"); + expect_crcx(RTP_TO_CN); + ms_sends_assignment_complete(); + OSMO_ASSERT(got_crcx); + + btw("CN RTP address is available, trigger MNCC_RTP_CREATE"); + cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); + crcx_ok(RTP_TO_CN); + btw("MNCC says that's fine"); dtap_expect_tx("8302" /* CC: Call Proceeding */); mncc_sends_to_cc(MNCC_CALL_PROC_REQ, &mncc); @@ -547,6 +625,25 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); mncc.callref = cc_to_mncc_tx_got_callref; + btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + expect_crcx(RTP_TO_RAN); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + OSMO_ASSERT(got_crcx); + + btw("MGW acknowledges the CRCX, triggering Assignment"); + expect_iu_rab_assignment(); + crcx_ok(RTP_TO_RAN); + OSMO_ASSERT(iu_rab_assignment_sent); + + btw("Assignment succeeds, triggering CRCX to CN"); + expect_crcx(RTP_TO_CN); + ms_sends_assignment_complete(); + OSMO_ASSERT(got_crcx); + + btw("CN RTP address is available, trigger MNCC_RTP_CREATE"); + cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); + crcx_ok(RTP_TO_CN); + btw("MNCC says that's fine"); dtap_expect_tx("8302" /* CC: Call Proceeding */); mncc_sends_to_cc(MNCC_CALL_PROC_REQ, &mncc); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index bbfa61b..c802cd4 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -296,6 +296,37 @@ DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) tx MNCC_SETUP_IND MSC --> MNCC: callref 0x80000001: MNCC_SETUP_IND DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: - rx_from_ms: now used by 1 (cc) +- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) rx MNCC_RTP_CREATE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Starting call assignment +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Allocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) + MGW <--CRCX to RTP_TO_RAN-- MSC: callref=0x80000001 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +- MGW acknowledges the CRCX, triggering Assignment + MGW --CRCX OK to RTP_TO_RAN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_RAN: 10.23.23.1:23 (osmux=no:-2) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: RAN encode: ASSIGNMENT_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +- Assignment succeeds, triggering CRCX to CN +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: RAN decode: ASSIGNMENT_COMPLETE +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_RAN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: setting remote addr to :0 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Not committing: no MGW endpoint CI set up + MGW <--CRCX to RTP_TO_CN-- MSC: callref=0x80000001 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_CN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +- CN RTP address is available, trigger MNCC_RTP_CREATE + MGW --CRCX OK to RTP_TO_CN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_CN: 10.23.23.1:23 (osmux=no:-2) +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) tx MNCC_RTP_CREATE + MSC --> MNCC: callref 0x80000001: MNCC_RTP_CREATE - MNCC says that's fine DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) rx MNCC_CALL_PROC_REQ DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) stopping pending guard timer @@ -306,10 +337,7 @@ - DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CALL_PROC: 8302 - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Starting call assignment -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Allocated -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) - MS <--Call Assignment-- MSC: callref=0x80000001 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier - Total time passed: 1.000023 s - The other call leg got established (not shown here), MNCC tells us so DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) rx MNCC_ALERT_REQ @@ -390,9 +418,15 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: state_chg to RELEASING DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_CN:no-CI){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_CN:no-CI){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_CN:no-CI){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483649:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Received Event MSC_EV_CALL_LEG_TERM -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Deallocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Deallocated, including all deferred deallocations DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST @@ -720,6 +754,7 @@ DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - Paging: now used by 3 (attached,CC,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: - paging-response: now used by 1 (cc) +- MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_CALL_CONF DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: + rx_from_ms: now used by 2 (cc,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN decode: DTAP @@ -731,10 +766,38 @@ DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Starting call assignment DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: Allocated DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) - MS <--Call Assignment-- MSC: callref=0x423 + MGW <--CRCX to RTP_TO_RAN-- MSC: callref=0x423 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_CALL_CONF_IND MSC --> MNCC: callref 0x423: MNCC_CALL_CONF_IND DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: - rx_from_ms: now used by 1 (cc) +- MNCC sends MNCC_RTP_CREATE +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) rx MNCC_RTP_CREATE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier +- MGW acknowledges the CRCX to RAN, triggering Assignment + MGW --CRCX OK to RTP_TO_RAN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_RAN: 10.23.23.1:23 (osmux=no:-2) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: ASSIGNMENT_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +- Assignment completes, triggering CRCX to CN +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN decode: ASSIGNMENT_COMPLETE +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: setting remote addr to :0 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Not committing: no MGW endpoint CI set up + MGW <--CRCX to RTP_TO_CN-- MSC: callref=0x423 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +- When the CN side RTP address is known, send MNCC_RTP_CREATE + MGW --CRCX OK to RTP_TO_CN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_CN: 10.23.23.1:23 (osmux=no:-2) +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_RTP_CREATE + MSC --> MNCC: callref 0x423: MNCC_RTP_CREATE - Total time passed: 1.000023 s MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_ALERTING DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: + rx_from_ms: now used by 2 (cc,rx_from_ms) @@ -814,9 +877,15 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: state_chg to RELEASING DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Received Event MSC_EV_CALL_LEG_TERM -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Deallocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Deallocated, including all deferred deallocations DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST @@ -1144,6 +1213,7 @@ DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - Paging: now used by 3 (attached,CC,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: - paging-response: now used by 1 (cc) +- MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_CALL_CONF DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: + rx_from_ms: now used by 2 (cc,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN decode: DTAP @@ -1155,10 +1225,38 @@ DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Starting call assignment DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: Allocated DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) - MS <--Call Assignment-- MSC: callref=0x423 + MGW <--CRCX to RTP_TO_RAN-- MSC: callref=0x423 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_CALL_CONF_IND MSC --> MNCC: callref 0x423: MNCC_CALL_CONF_IND DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: - rx_from_ms: now used by 1 (cc) +- MNCC sends MNCC_RTP_CREATE +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) rx MNCC_RTP_CREATE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier +- MGW acknowledges the CRCX to RAN, triggering Assignment + MGW --CRCX OK to RTP_TO_RAN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_RAN: 10.23.23.1:23 (osmux=no:-2) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: ASSIGNMENT_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +- Assignment completes, triggering CRCX to CN +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN decode: ASSIGNMENT_COMPLETE +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: setting remote addr to :0 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Not committing: no MGW endpoint CI set up + MGW <--CRCX to RTP_TO_CN-- MSC: callref=0x423 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +- When the CN side RTP address is known, send MNCC_RTP_CREATE + MGW --CRCX OK to RTP_TO_CN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_CN: 10.23.23.1:23 (osmux=no:-2) +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_RTP_CREATE + MSC --> MNCC: callref 0x423: MNCC_RTP_CREATE - Total time passed: 1.000023 s MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_ALERTING DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: + rx_from_ms: now used by 2 (cc,rx_from_ms) @@ -1196,9 +1294,15 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Received Event MSC_A_EV_UNUSED DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){ESTABLISHING}: state_chg to RELEASING DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_CN:no-CI){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP:trans-0:call-1059:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Received Event MSC_EV_CALL_LEG_TERM -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Deallocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){RELEASING}: Deallocated, including all deferred deallocations DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST @@ -1529,6 +1633,37 @@ DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) tx MNCC_SETUP_IND MSC --> MNCC: callref 0x80000002: MNCC_SETUP_IND DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: - rx_from_ms: now used by 1 (cc) +- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) rx MNCC_RTP_CREATE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Starting call assignment +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Allocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) + MGW <--CRCX to RTP_TO_RAN-- MSC: callref=0x80000002 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +- MGW acknowledges the CRCX, triggering Assignment + MGW --CRCX OK to RTP_TO_RAN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_RAN: 10.23.23.1:23 (osmux=no:-2) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: RAN encode: ASSIGNMENT_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +- Assignment succeeds, triggering CRCX to CN +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: RAN decode: ASSIGNMENT_COMPLETE +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_RAN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: setting remote addr to :0 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Not committing: no MGW endpoint CI set up + MGW <--CRCX to RTP_TO_CN-- MSC: callref=0x80000002 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_CN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +- CN RTP address is available, trigger MNCC_RTP_CREATE + MGW --CRCX OK to RTP_TO_CN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_CN: 10.23.23.1:23 (osmux=no:-2) +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) tx MNCC_RTP_CREATE + MSC --> MNCC: callref 0x80000002: MNCC_RTP_CREATE - MNCC says that's fine DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) rx MNCC_CALL_PROC_REQ DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) stopping pending guard timer @@ -1539,10 +1674,7 @@ - DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CALL_PROC: 8302 - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Starting call assignment -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Allocated -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) - MS <--Call Assignment-- MSC: callref=0x80000002 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier - But the other side's MSISDN could not be resolved, MNCC tells us to cancel DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) rx MNCC_REL_REQ DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) stopping pending guard timer @@ -1582,9 +1714,15 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: state_chg to RELEASING DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_CN:no-CI){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_CN:no-CI){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_CN:no-CI){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483650:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Received Event MSC_EV_CALL_LEG_TERM -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Deallocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Deallocated, including all deferred deallocations DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST @@ -1914,6 +2052,37 @@ DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) tx MNCC_SETUP_IND MSC --> MNCC: callref 0x80000003: MNCC_SETUP_IND DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: - rx_from_ms: now used by 1 (cc) +- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) rx MNCC_RTP_CREATE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Starting call assignment +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Allocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) + MGW <--CRCX to RTP_TO_RAN-- MSC: callref=0x80000003 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +- MGW acknowledges the CRCX, triggering Assignment + MGW --CRCX OK to RTP_TO_RAN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_RAN: 10.23.23.1:23 (osmux=no:-2) +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: RAN encode: ASSIGNMENT_COMMAND on UTRAN-Iu +DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST +- Assignment succeeds, triggering CRCX to CN +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: RAN decode: ASSIGNMENT_COMPLETE +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_RAN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: setting remote addr to :0 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Not committing: no MGW endpoint CI set up + MGW <--CRCX to RTP_TO_CN-- MSC: callref=0x80000003 +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: Allocated +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){UNINITIALIZED}: is child of call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_CN:no-CI){UNINITIALIZED}: setting codec to PCMU/8000/1 +- CN RTP address is available, trigger MNCC_RTP_CREATE + MGW --CRCX OK to RTP_TO_CN--> MSC +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Received Event CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE +DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Received Event MSC_EV_CALL_LEG_RTP_LOCAL_ADDR_AVAILABLE +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: MGW endpoint's RTP address available for the CI RTP_TO_CN: 10.23.23.1:23 (osmux=no:-2) +DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) tx MNCC_RTP_CREATE + MSC --> MNCC: callref 0x80000003: MNCC_RTP_CREATE - MNCC says that's fine DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) rx MNCC_CALL_PROC_REQ DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) stopping pending guard timer @@ -1924,10 +2093,7 @@ - DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CALL_PROC: 8302 - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Starting call assignment -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: Allocated -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: is child of msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) - MS <--Call Assignment-- MSC: callref=0x80000003 +DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier - But the other side's MSISDN could not be resolved, MNCC tells us to cancel DMNCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) rx MNCC_REL_REQ DCC trans(CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) stopping pending guard timer @@ -1963,9 +2129,15 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){ESTABLISHING}: state_chg to RELEASING DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_CN:no-CI){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_CN:no-CI){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_CN:no-CI){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Removing from parent call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) +DCC rtp_stream(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ:trans-8:call-2147483651:RTP_TO_RAN:no-CI:local-10-23-23-1-23){UNINITIALIZED}: Deferring: will deallocate with call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Removing from parent msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: Received Event MSC_EV_CALL_LEG_TERM -DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Deallocated +DCC call_leg(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){RELEASING}: Deallocated, including all deferred deallocations DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on UTRAN-Iu DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 3d69ae8..48f55e1 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -73,11 +73,19 @@ bool bssap_clear_expected = false; bool bssap_clear_sent = false; +bool bssap_assignment_expected = false; +bool bssap_assignment_sent = false; +bool iu_rab_assignment_expected = false; +bool iu_rab_assignment_sent = false; + uint32_t cc_to_mncc_tx_expected_msg_type = 0; const char *cc_to_mncc_tx_expected_imsi = NULL; bool cc_to_mncc_tx_confirmed = false; uint32_t cc_to_mncc_tx_got_callref = 0; +enum rtp_direction expecting_crcx = -1; +bool got_crcx = false; + extern int ran_dec_dtap_undup_pdisc_ctr_bin(uint8_t pdisc); /* static state variables for the L3 send sequence numbers */ @@ -296,6 +304,20 @@ return 0; } +static void bssap_validate_assignment_cmd() +{ + OSMO_ASSERT(bssap_assignment_expected); + bssap_assignment_expected = false; + bssap_assignment_sent = true; +} + +static void iucs_validate_assignment_cmd() +{ + OSMO_ASSERT(iu_rab_assignment_expected); + iu_rab_assignment_expected = false; + iu_rab_assignment_sent = true; +} + static int iucs_validate_security_mode_ctrl(const struct ran_cipher_mode_command *cmd) { const char *got_ik; @@ -346,6 +368,18 @@ OSMO_ASSERT(false); } break; + case RAN_MSG_ASSIGNMENT_COMMAND: + switch (ran_type) { + case OSMO_RAT_GERAN_A: + bssap_validate_assignment_cmd(); + break; + case OSMO_RAT_UTRAN_IU: + iucs_validate_assignment_cmd(); + break; + default: + OSMO_ASSERT(false); + } + break; default: break; } @@ -602,6 +636,14 @@ bssap_clear_sent = false; osmo_gettimeofday_override = false; + + expecting_crcx = -1; + got_crcx = false; + + bssap_assignment_expected = false; + bssap_assignment_sent = false; + iu_rab_assignment_expected = false; + iu_rab_assignment_sent = false; } static struct log_info_cat test_categories[] = { @@ -763,14 +805,76 @@ return 0; } -/* override, requires '-Wl,--wrap=call_leg_ensure_ci' */ -int __real_call_leg_ensure_ci(struct call_leg *cl, enum rtp_direction dir, uint32_t call_id, struct gsm_trans *for_trans); -int __wrap_call_leg_ensure_ci(struct call_leg *cl, enum rtp_direction dir, uint32_t call_id, struct gsm_trans *for_trans) +struct rtp_stream fake_rtp[2] = { + { + .dir = RTP_TO_RAN, + .local = { + .ip = "10.23.42.1", + .port = 99, + }, + .remote = { + .ip = "10.23.42.2", + .port = 100, + }, + }, + { + .dir = RTP_TO_CN, + .local = { + .ip = "10.23.42.1", + .port = 23, + }, + .remote = { + .ip = "10.23.42.2", + .port = 42, + }, + }, +}; + +void expect_crcx(enum rtp_direction towards) { - log("MS <--Call Assignment-- MSC: callref=0x%x", call_id); + OSMO_ASSERT(expecting_crcx == -1); + expecting_crcx = towards; + got_crcx = false; +} + +/* override, requires '-Wl,--wrap=call_leg_ensure_ci' */ +int __real_call_leg_ensure_ci(struct call_leg *cl, enum rtp_direction dir, uint32_t call_id, struct gsm_trans *for_trans, + const enum mgcp_codecs *codec_if_known, const struct osmo_sockaddr_str *remote_addr_if_known); +int __wrap_call_leg_ensure_ci(struct call_leg *cl, enum rtp_direction dir, uint32_t call_id, struct gsm_trans *for_trans, + const enum mgcp_codecs *codec_if_known, const struct osmo_sockaddr_str *remote_addr_if_known) +{ + if (!cl->rtp[dir]) { + log("MGW <--CRCX to %s-- MSC: callref=0x%x", rtp_direction_name(dir), call_id); + + OSMO_ASSERT(expecting_crcx == dir); + expecting_crcx = -1; + got_crcx = true; + + call_leg_ensure_rtp_alloc(cl, dir, call_id, for_trans); + if (codec_if_known) + rtp_stream_set_codec(cl->rtp[dir], *codec_if_known); + if (remote_addr_if_known && osmo_sockaddr_str_is_set(remote_addr_if_known)) + rtp_stream_set_remote_addr(cl->rtp[dir], remote_addr_if_known); + } + return 0; } +/* override, requires '-Wl,--wrap=rtp_stream_set_codec' */ +void rtp_stream_set_codec(struct rtp_stream *rtps, enum mgcp_codecs codec); + +void crcx_ok(enum rtp_direction dir) +{ + struct msc_a *msc_a = msub_msc_a(g_msub); + struct call_leg *cl = msc_a->cc.call_leg; + OSMO_ASSERT(cl); + OSMO_ASSERT(cl->rtp[dir]); + osmo_sockaddr_str_from_str(&cl->rtp[dir]->local, "10.23.23.1", 23); + //osmo_sockaddr_str_from_str(&cl->rtp[dir].remote, "10.42.42.1", 42); + log("MGW --CRCX OK to %s--> MSC", rtp_direction_name(dir)); + osmo_fsm_inst_dispatch(cl->fi, CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE, cl->rtp[dir]); +} + static int fake_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi) { struct msc_a *msc_a = msc_conn_ref; @@ -895,6 +999,19 @@ g_msub = NULL; } +void ms_sends_assignment_complete() +{ + struct ran_msg ran_dec; + + ran_dec = (struct ran_msg){ + .msg_type = RAN_MSG_ASSIGNMENT_COMPLETE, + }; + fake_msc_a_ran_dec(&ran_dec); + + if (!conn_exists(g_msub)) + g_msub = NULL; +} + void ran_sends_clear_complete() { struct ran_msg ran_dec; diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 9df9cf0..70a7c49 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -31,6 +31,8 @@ #include #include #include +#include +#include extern bool _log_lines; #define _log(fmt, args...) do { \ @@ -140,6 +142,23 @@ } } +extern bool bssap_assignment_expected; +extern bool bssap_assignment_sent; +extern bool iu_rab_assignment_expected; +extern bool iu_rab_assignment_sent; + +static inline void expect_bssap_assignment() +{ + bssap_assignment_expected = true; + bssap_assignment_sent = false; +} + +static inline void expect_iu_rab_assignment() +{ + iu_rab_assignment_expected = true; + iu_rab_assignment_sent = false; +} + struct msc_vlr_test_cmdline_opts { bool verbose; int run_test_nr; @@ -163,10 +182,12 @@ void ms_sends_classmark_update(const struct osmo_gsm48_classmark *classmark); void ms_sends_ciphering_mode_complete(const char *inner_nas_msg); void ms_sends_security_mode_complete(); +void ms_sends_assignment_complete(); void gsup_rx(const char *rx_hex, const char *expect_tx_hex); void send_sms(struct vlr_subscr *receiver, struct vlr_subscr *sender, char *str); +void crcx_ok(enum rtp_direction dir); void ran_sends_clear_complete(); @@ -248,3 +269,6 @@ #define VLR_TO_HLR "0a0101" #define EUSE_TO_MSC_USSD "0a0103" #define MSC_USSD_TO_EUSE "0a0103" + +extern bool got_crcx; +void expect_crcx(enum rtp_direction towards); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie995e264eb1e3dd9558a1753ff6f9b55c1d084e1 Gerrit-Change-Number: 15347 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:25:48 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:25:48 +0000 Subject: Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 ) Change subject: Merge common allocation steps for Gb and Iu ctx ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15338/1/src/gprs/gprs_sgsn.c File src/gprs/gprs_sgsn.c: https://gerrit.osmocom.org/#/c/15338/1/src/gprs/gprs_sgsn.c at a244 PS1, Line 244: Unrelated. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c Gerrit-Change-Number: 15338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:25:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:28:30 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:28:30 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: make echo_interval unsigned In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 ) Change subject: gtp: make echo_interval unsigned ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I689034887188a53590eddeffda781629694eb5ed Gerrit-Change-Number: 15304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:28:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:36:41 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:36:41 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 ) Change subject: Introduce log helper LOGGGSN ...................................................................... Patch Set 2: (3 comments) So you're not only adding LOGGGSN() macro, but also a new DGTP logging category. Please either state this in the commit message, or move to a separate change. https://gerrit.osmocom.org/#/c/15307/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/15307/2/include/osmocom/sgsn/gprs_sgsn.h at 410 PS2, Line 410: INET_ADDRSTRLEN What about '\0'? As far as I can see, other code parts are using INET_ADDRSTRLEN + 1, while in libosmocore we just use INET_ADDRSTRLEN... https://gerrit.osmocom.org/#/c/15307/2/include/osmocom/sgsn/gprs_sgsn.h at 411 PS2, Line 411: &(ggc)->remote_addr So this address is always IPv4, right? https://gerrit.osmocom.org/#/c/15307/2/src/gprs/sgsn_main.c File src/gprs/sgsn_main.c: https://gerrit.osmocom.org/#/c/15307/2/src/gprs/sgsn_main.c at 348 PS2, Line 348: } Let's make it git-friendly and add a comma. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c Gerrit-Change-Number: 15307 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:36:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:43:32 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:43:32 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 ) Change subject: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15308/2/src/gprs/sgsn_libgtp.c File src/gprs/sgsn_libgtp.c: https://gerrit.osmocom.org/#/c/15308/2/src/gprs/sgsn_libgtp.c at 589 PS2, Line 589: sgsn_ggsn_ctx_drop_all_pdp This one seems to be the key change of this commit, while the others: - use LOGGGSN() instead of DEBUGP(); - use cause == EOF to indicate timeout; could be done separately? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd Gerrit-Change-Number: 15308 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:43:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:44:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:44:09 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 ) Change subject: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I02c46062d6dc9802d9cae057587e66a68a65436c Gerrit-Change-Number: 15325 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:44:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:48:16 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:48:16 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging during VTY_CLOSED event handling In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15339 ) Change subject: fix: vty crash by logging during VTY_CLOSED event handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d235cbfbfb9aaf411316642c7bcfac12106df44 Gerrit-Change-Number: 15339 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:48:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:54:34 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:54:34 +0000 Subject: Change in ...libosmocore[master]: sanity: make vty buffer_* API NULL safe In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: sanity: make vty buffer_* API NULL safe ...................................................................... Patch Set 3: Code-Review+1 (4 comments) https://gerrit.osmocom.org/#/c/15265/3/src/vty/buffer.c File src/vty/buffer.c: https://gerrit.osmocom.org/#/c/15265/3/src/vty/buffer.c at 204 PS3, Line 204: if (!b) Cosmetic: we already have similar check in buffer_put(). https://gerrit.osmocom.org/#/c/15265/3/src/vty/buffer.c at 212 PS3, Line 212: if (!b) Cosmetic: we already have similar check in buffer_put(). https://gerrit.osmocom.org/#/c/15265/3/src/vty/buffer.c at 225 PS3, Line 225: !b Probably BUFFER_ERROR is better in this case. https://gerrit.osmocom.org/#/c/15265/3/src/vty/buffer.c at 419 PS3, Line 419: BUFFER_EMPTY Why not BUFFER_ERROR? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Aug 2019 23:54:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:55:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:55:28 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15340 ) Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec Gerrit-Change-Number: 15340 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:55:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 29 23:57:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 29 Aug 2019 23:57:31 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15341 ) Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2f47ad8ae585aaf67a6476c67f8e014820a72bc Gerrit-Change-Number: 15341 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 29 Aug 2019 23:57:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 30 01:44:18 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 30 Aug 2019 01:44:18 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5d687f7c1cec2_2f5b2ab0e462a600215754@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_8.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 59s] [183/200] installing base-files-8 [ 60s] Processing triggers for man-db (2.7.0.2-5) ... [ 60s] [184/200] installing libmount1-2.25.2-6 [ 60s] Processing triggers for libc-bin (2.19-18) ... [ 60s] [185/200] installing mount-2.25.2-6 [ 60s] Processing triggers for man-db (2.7.0.2-5) ... [ 60s] [186/200] installing bash-4.3-11+b1 [ 60s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode [ 60s] Processing triggers for man-db (2.7.0.2-5) ... [ 60s] [187/200] installing dpkg-dev-1.17.25 [ 61s] Processing triggers for man-db (2.7.0.2-5) ... [ 62s] [188/200] installing build-essential-11.7 [ 62s] [189/200] installing initscripts-2.88dsf-59 [ 62s] /usr/sbin/invoke-rc.d: 1: /usr/sbin/invoke-rc.d: /sbin/runlevel: not found [ 62s] invoke-rc.d: policy-rc.d denied execution of start. [ 62s] Processing triggers for man-db (2.7.0.2-5) ... [ 63s] [190/200] installing debhelper-9.20150101 [ 63s] /.build/build-pkg-deb: line 31: 13280 Segmentation fault (core dumped) ( cd $1 && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C chroot $* ) [ 63s] exit ... [ 63s] [ 63s] lamb22 failed "build libosmo-abis_0.7.0.dsc" at Fri Aug 30 01:44:07 UTC 2019. [ 63s] [ 63s] ### VM INTERACTION START ### [ 66s] [ 52.898539] sysrq: SysRq : Power Off [ 66s] [ 52.903623] reboot: Power down [ 66s] ### VM INTERACTION END ### [ 66s] [ 66s] lamb22 failed "build libosmo-abis_0.7.0.dsc" at Fri Aug 30 01:44:10 UTC 2019. [ 66s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 30 02:10:35 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 30 Aug 2019 02:10:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5d6885b0322c0_2f5b2ab0e462a6002233a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_10/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 171s] | #define HAVE_STDINT_H 1 [ 171s] | #define HAVE_UNISTD_H 1 [ 171s] | #define HAVE_DLFCN_H 1 [ 171s] | #define LT_OBJDIR ".libs/" [ 171s] | #define STDC_HEADERS 1 [ 171s] | #define HAVE_EXECINFO_H 1 [ 172s] | #define HAVE_SYS_SELECT_H 1 [ 172s] | #define HAVE_SYS_SOCKET_H 1 [ 172s] | #define HAVE_SYSLOG_H 1 [ 172s] | #define HAVE_CTYPE_H 1 [ 172s] | #define HAVE_LIBSCTP 1 [ 172s] | #define HAVE_PCAP_H 1 [ 172s] | [ 172s] | configure: exit 0 [ 172s] [ 172s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] make: *** [debian/rules:13: build] Error 2 [ 172s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 172s] [ 172s] lamb05 failed "build libosmo-netif_0.6.0.dsc" at Fri Aug 30 02:10:17 UTC 2019. [ 172s] [ 172s] ### VM INTERACTION START ### [ 175s] [ 160.635642] sysrq: SysRq : Power Off [ 175s] [ 160.657747] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb05 failed "build libosmo-netif_0.6.0.dsc" at Fri Aug 30 02:10:22 UTC 2019. [ 175s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 30 02:38:01 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 30 Aug 2019 02:38:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d688c2254dea_2f5b2ab0e462a600228063@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 564s] asciidoc: test-usermanual.adoc: line 28: reading: /usr/src/packages/BUILD/common/chapters/gfdl.adoc [ 564s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/smpp.adoc [ 565s] asciidoc: test-usermanual.adoc: line 29: reading: /usr/src/packages/BUILD/common/chapters/smpp.adoc [ 565s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/sigtran.adoc [ 565s] asciidoc: test-usermanual.adoc: line 30: reading: /usr/src/packages/BUILD/common/chapters/sigtran.adoc [ 565s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/mncc.adoc [ 565s] asciidoc: test-usermanual.adoc: line 31: reading: /usr/src/packages/BUILD/common/chapters/mncc.adoc [ 565s] asciidoc: include: /usr/src/packages/BUILD/common/chapters/abis.adoc [ 565s] asciidoc: test-usermanual.adoc: line 32: reading: /usr/src/packages/BUILD/common/chapters/abis.adoc [ 565s] [ 565s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 565s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 565s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 565s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 565s] make[1]: *** [Makefile:362: all] Error 2 [ 565s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 565s] dh_auto_build: make -j1 returned exit code 2 [ 565s] make: *** [debian/rules:5: binary] Error 255 [ 565s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 565s] [ 565s] lamb59 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Fri Aug 30 02:37:43 UTC 2019. [ 565s] [ 565s] ### VM INTERACTION START ### [ 568s] [ 543.931958] sysrq: SysRq : Power Off [ 568s] [ 543.947767] reboot: Power down [ 568s] ### VM INTERACTION END ### [ 568s] [ 568s] lamb59 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Fri Aug 30 02:37:47 UTC 2019. [ 568s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 30 04:20:54 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 30 Aug 2019 04:20:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d68a42949a48_2f5b2ab0e462a6002538d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 322s] ar: `u' modifier ignored since `D' is the default (see `U') [ 322s] libtool: link: ranlib .libs/libtransceiver_common.a [ 322s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 322s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 322s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 322s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 322s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 322s] collect2: error: ld returned 1 exit status [ 322s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 322s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 322s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 322s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 322s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 322s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 322s] make[1]: *** [Makefile:444: all] Error 2 [ 322s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 322s] dh_auto_build: make -j1 returned exit code 2 [ 322s] make: *** [debian/rules:6: build] Error 255 [ 322s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 323s] [ 323s] sheep81 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Fri Aug 30 04:20:34 UTC 2019. [ 323s] [ 323s] ### VM INTERACTION START ### [ 326s] [ 312.108425] sysrq: SysRq : Power Off [ 326s] [ 312.113858] reboot: Power down [ 326s] ### VM INTERACTION END ### [ 326s] [ 326s] sheep81 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Fri Aug 30 04:20:38 UTC 2019. [ 326s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 30 05:22:18 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 30 Aug 2019 05:22:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d68b2957f5f0_2f5b2ab0e462a600267856@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 572s] ar: `u' modifier ignored since `D' is the default (see `U') [ 572s] libtool: link: ranlib .libs/libtransceiver_common.a [ 572s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 572s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 572s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 573s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 573s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 573s] collect2: error: ld returned 1 exit status [ 573s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 573s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 573s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 573s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 573s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 573s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 573s] make[1]: *** [Makefile:444: all] Error 2 [ 573s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 573s] dh_auto_build: make -j1 returned exit code 2 [ 573s] make: *** [debian/rules:6: build] Error 255 [ 573s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 573s] [ 573s] build33 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Fri Aug 30 05:21:57 UTC 2019. [ 573s] [ 573s] ### VM INTERACTION START ### [ 576s] [ 548.633083] sysrq: SysRq : Power Off [ 576s] [ 548.686374] reboot: Power down [ 577s] ### VM INTERACTION END ### [ 577s] [ 577s] build33 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Fri Aug 30 05:22:01 UTC 2019. [ 577s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:20:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:20:41 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging during VTY_CLOSED event handling In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15339 ) Change subject: fix: vty crash by logging during VTY_CLOSED event handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d235cbfbfb9aaf411316642c7bcfac12106df44 Gerrit-Change-Number: 15339 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:20:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:20:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:20:50 +0000 Subject: Change in ...libosmocore[master]: fix: vty crash by logging during VTY_CLOSED event handling In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15339 ) Change subject: fix: vty crash by logging during VTY_CLOSED event handling ...................................................................... fix: vty crash by logging during VTY_CLOSED event handling When a VTY closes, dispatch the VTY_CLOSED signal before tearing down the VTY buffer and fd. In particular this fixes: - a crash during telnet_close_client(), invoked by the VTY_CLOSED event, which logs to DLGLOBAL and uses vty->obuf that, so far, vty_close() had already unallocated earlier (OS#4164). - the logging about closing a telnet session so far logged: DLGLOBAL INFO Closing telnet connection r=NULL<->l=NULL By dispatching the VTY_CLOSED event while the fd is still valid, we instead get the actual connection IP address and port being closed: DLGLOBAL INFO Closing telnet connection r=127.0.0.1:36708<->l=127.0.0.1:4258 Related: OS#4164 Change-Id: I1d235cbfbfb9aaf411316642c7bcfac12106df44 --- M src/vty/vty.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/vty/vty.c b/src/vty/vty.c index a96d86c..aa23fa0 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -205,6 +205,9 @@ { int i; + /* VTY_CLOSED is handled by the telnet_interface */ + vty_event(VTY_CLOSED, vty->fd, vty); + if (vty->obuf) { /* Flush buffer. */ buffer_flush_all(vty->obuf, vty->fd); @@ -236,9 +239,6 @@ /* Check configure. */ vty_config_unlock(vty); - /* VTY_CLOSED is handled by the telnet_interface */ - vty_event(VTY_CLOSED, vty->fd, vty); - /* OK free vty. */ talloc_free(vty); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d235cbfbfb9aaf411316642c7bcfac12106df44 Gerrit-Change-Number: 15339 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:21:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:21:24 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15340 ) Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec Gerrit-Change-Number: 15340 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:21:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:21:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:21:40 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15341 ) Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2f47ad8ae585aaf67a6476c67f8e014820a72bc Gerrit-Change-Number: 15341 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:21:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:22:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:22:21 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: make echo_interval unsigned In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 ) Change subject: gtp: make echo_interval unsigned ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I689034887188a53590eddeffda781629694eb5ed Gerrit-Change-Number: 15304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:22:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:22:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:22:22 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: make echo_interval unsigned In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 ) Change subject: gtp: make echo_interval unsigned ...................................................................... gtp: make echo_interval unsigned There's no real need to use -1 to indicate echo timer as disabled, since 0 can also be used (it doesn't make sense to have a timer timeout of 0). This way code is simplified. Change-Id: I689034887188a53590eddeffda781629694eb5ed --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c 3 files changed, 5 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 336155c..48c063d 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -392,7 +392,7 @@ struct gsn_t *gsn; struct llist_head pdp_list; /* list of associated pdp ctx (struct sgsn_pdp_ctx*) */ struct osmo_timer_list echo_timer; - int echo_interval; + unsigned int echo_interval; }; struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id); void sgsn_ggsn_ctx_free(struct sgsn_ggsn_ctx *ggc); diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 9f02d54..7174bd5 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -500,7 +500,7 @@ bool pending = osmo_timer_pending(&ggc->echo_timer); /* Only enable if allowed by policy and at least 1 pdp ctx exists against ggsn */ - if (!llist_empty(&ggc->pdp_list) && ggc->echo_interval > 0) { + if (!llist_empty(&ggc->pdp_list) && ggc->echo_interval) { if (!pending) osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0); } else { @@ -528,7 +528,6 @@ ggc->id = id; ggc->gtp_version = 1; ggc->remote_restart_ctr = -1; - ggc->echo_interval = -1; /* if we are called from config file parse, this gsn doesn't exist yet */ ggc->gsn = sgsn->gsn; INIT_LLIST_HEAD(&ggc->pdp_list); diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 68d3a77..42b5121 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -190,8 +190,8 @@ inet_ntoa(gctx->remote_addr), VTY_NEWLINE); vty_out(vty, " ggsn %u gtp-version %u%s", gctx->id, gctx->gtp_version, VTY_NEWLINE); - if (gctx->echo_interval != -1) - vty_out(vty, " ggsn %u echo-interval %"PRId32"%s", + if (gctx->echo_interval) + vty_out(vty, " ggsn %u echo-interval %u%s", gctx->id, gctx->echo_interval, VTY_NEWLINE); else vty_out(vty, " ggsn %u no echo-interval%s", @@ -395,7 +395,7 @@ uint32_t id = atoi(argv[0]); struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id); - ggc->echo_interval = -1; + ggc->echo_interval = 0; sgsn_ggsn_ctx_check_echo_timer(ggc); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I689034887188a53590eddeffda781629694eb5ed Gerrit-Change-Number: 15304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:24:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:24:01 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 ) Change subject: Introduce log helper LOGGGSN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15307/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/15307/2/include/osmocom/sgsn/gprs_sgsn.h at 411 PS2, Line 411: ggc->id it's customary to use (ggc)->id in such macros, as you don't know how exactly somebody provides the argument -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c Gerrit-Change-Number: 15307 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:24:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:24:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:24:40 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 ) Change subject: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I02c46062d6dc9802d9cae057587e66a68a65436c Gerrit-Change-Number: 15325 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:24:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:29:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:29:31 +0000 Subject: Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 ) Change subject: Move lots of Iu/ranap specific code into its own file ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15335/2/src/gprs/gprs_ranap.c File src/gprs/gprs_ranap.c: https://gerrit.osmocom.org/#/c/15335/2/src/gprs/gprs_ranap.c at 4 PS2, Line 4: * (C) 2010 by On-Waves this can be dropped for sure, as On-Waves had no involvement in development of Iu support. I'm also realtively sure Holger had no involvement, but I'm not 100% sure on that. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 Gerrit-Change-Number: 15335 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 08:29:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 30 08:30:01 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 30 Aug 2019 08:30:01 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-gmr_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#2260?= Message-ID: <687988353.523.1567153801673.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 31.12 KB...] Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC utils.lo CC vector.lo CC telnet_interface.lo CC logging_vty.lo CC stats_vty.lo utils.c: In function ?handle_counter?: utils.c:317:3: warning: ?osmo_counter_get? is deprecated: Implement as osmo_stat_item instead [-Wdeprecated-declarations] osmo_counter_get(counter), VTY_NEWLINE); ^~~~~~~~~~~~~~~~ In file included from utils.c:39:0: ../../include/osmocom/core/counter.h:35:29: note: declared here static inline unsigned long osmo_counter_get(struct osmo_counter *ctr) ^~~~~~~~~~~~~~~~ CC fsm_vty.lo CC talloc_ctx_vty.lo CC tdef_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 8:0:4 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo tdef_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.4.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.4.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.4.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.4.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.4.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm660.lo CC gsm620.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128v23.lo CC comp128.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo gsm_utils.c:121:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:459:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ CC gsm48_arfcn_range_encode.lo CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo gsm48_ie.c: In function ?gsm48_decode_called?: gsm48_ie.c:411:2: warning: ?gsm48_decode_bcd_number? is deprecated: Use gsm48_decode_bcd_number2() for improved bounds checking [-Wdeprecated-declarations] gsm48_decode_bcd_number(called->number, sizeof(called->number), lv, 1); ^~~~~~~~~~~~~~~~~~~~~~~ gsm48_ie.c:54:5: note: declared here int gsm48_decode_bcd_number(char *output, int output_len, ^~~~~~~~~~~~~~~~~~~~~~~ gsm48_ie.c: In function ?gsm48_decode_callerid?: gsm48_ie.c:466:2: warning: ?gsm48_decode_bcd_number? is deprecated: Use gsm48_decode_bcd_number2() for improved bounds checking [-Wdeprecated-declarations] gsm48_decode_bcd_number(callerid->number, sizeof(callerid->number), lv, i); ^~~~~~~~~~~~~~~~~~~~~~~ gsm48_ie.c:54:5: note: declared here int gsm48_decode_bcd_number(char *output, int output_len, ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC gsm29205.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC apn.lo CC gsm0341.lo CC gsup_sms.lo CC gsup.lo CC gprs_gea.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:104:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 1); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC gsm48_rest_octets.lo /bin/bash: line 2: 27605 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm48_rest_octets.lo -MD -MP -MF $depbase.Tpo -c -o gsm48_rest_octets.lo gsm48_rest_octets.c Makefile:606: recipe for target 'gsm48_rest_octets.lo' failed make[3]: *** [gsm48_rest_octets.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:711: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:627: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:926: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:30:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:30:20 +0000 Subject: Change in ...osmo-sgsn[master]: Move llc->MM/SM Gb specific glue code to its own file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15336 ) Change subject: Move llc->MM/SM Gb specific glue code to its own file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaf57922a0970c1d03f6f1d6337d27ae3d4aaf32c Gerrit-Change-Number: 15336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:30:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:33:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:33:10 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 ) Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15337/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/15337/1/include/osmocom/sgsn/gprs_sgsn.h at 43 PS1, Line 43: PMM_ > Any reason why it needs to be prefixed with 'PMM_', and not with 'MM_'? What is the meaning of 'P' h [?] I guess the source of the names is documented very clearly: see the spec referenced in the comment above In Iu mode, the MM states for a GPRS subscriber are PMM-DETACHED, PMM-IDLE, and PMM-CONNECTED -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:33:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 08:33:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 08:33:47 +0000 Subject: Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 ) Change subject: Merge common allocation steps for Gb and Iu ctx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c Gerrit-Change-Number: 15338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 08:33:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 30 10:00:37 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 30 Aug 2019 10:00:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d68f3cccc3d7_6aec2acc1e0e65f4528b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 694s] ar: `u' modifier ignored since `D' is the default (see `U') [ 694s] libtool: link: ranlib .libs/libtransceiver_common.a [ 694s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 694s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 695s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 695s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 695s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 695s] collect2: error: ld returned 1 exit status [ 695s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 695s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 695s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 695s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 695s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 695s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 695s] make[1]: *** [Makefile:444: all] Error 2 [ 695s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 695s] dh_auto_build: make -j1 returned exit code 2 [ 695s] make: *** [debian/rules:6: build] Error 255 [ 695s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 695s] [ 695s] lamb62 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 30 10:00:26 UTC 2019. [ 695s] [ 695s] ### VM INTERACTION START ### [ 699s] [ 673.457879] sysrq: SysRq : Power Off [ 699s] [ 673.474441] reboot: Power down [ 699s] ### VM INTERACTION END ### [ 699s] [ 699s] lamb62 failed "build osmo-trx_1.1.1.dsc" at Fri Aug 30 10:00:30 UTC 2019. [ 699s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:07:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:07:49 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 1: Compilation warnings, jenkins fails. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:07:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:09:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 10:09:07 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: as_unblocked: fix SIG broadcast Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348 Change subject: BSSGP_Emulation: as_unblocked: fix SIG broadcast ...................................................................... BSSGP_Emulation: as_unblocked: fix SIG broadcast I am not aware that this caused breakage anywhere. But from reading the patch, this is a regression that needs to be fixed. Fixes: 955aa94504510139a12d223071cf49ef90788a3d ("BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure") Change-Id: I36a9a4d61be52a4d86ac1cbf6e6976cf01cff7c6 --- M library/BSSGP_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/15348/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index f8b9f06..44946c1 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -593,7 +593,7 @@ // TITAN DOESN'T DO THIS, *SIGH*: "BSSGP_SP.send(dec) to all component;" for (var integer i := 0; i < sizeof(ClientTable); i := i+1) { if (isbound(ClientTable[i].comp_ref)) { - f_send_bssgp_dec(dec, vc_conn, BSSGP_SP_SIG); + f_send_bssgp_dec(dec, ClientTable[i].comp_ref, BSSGP_SP_SIG); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348 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: I36a9a4d61be52a4d86ac1cbf6e6976cf01cff7c6 Gerrit-Change-Number: 15348 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:09:08 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 10:09:08 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu/GPRS_TBF.ttcn: less verbose logging Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349 Change subject: pcu/GPRS_TBF.ttcn: less verbose logging ...................................................................... pcu/GPRS_TBF.ttcn: less verbose logging Reduce the formatted log size of TC_ul_tbf from ~140 MB to ~8 MB. Related: OS#3925 Change-Id: Ibccfc399a6e8b50e4f01b5f167c47fbbde4533ed --- M pcu/GPRS_TBF.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/15349/1 diff --git a/pcu/GPRS_TBF.ttcn b/pcu/GPRS_TBF.ttcn index 9fbe191..1c9a75b 100644 --- a/pcu/GPRS_TBF.ttcn +++ b/pcu/GPRS_TBF.ttcn @@ -144,8 +144,6 @@ us.cur_index := us.cur_index + len; us.total_bytes_remain := us.total_bytes_remain - len; - log("copy_from_llc: ", ret, " us: ", us); - /* if we completed this PDU, move on to the next, resetting the index */ if (us.cur_index >= pdu_len) { us.cur_pdu := us.cur_pdu +1; @@ -307,7 +305,6 @@ var integer blk_len_net := f_gprs_blocksize(cs) - hdr_size; var integer num_remain := f_div_round_up(us.total_bytes_remain, blk_len_net); var integer cv := f_calc_cv(num_remain + sizeof(us.rlc_sent), us.bsn_p, us.num_ts, us.tbf.initial_cs, 14 /* FIXME */); - log("CV=", cv, ", num_rmain=", num_remain, " from ", us); return cv; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349 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: Ibccfc399a6e8b50e4f01b5f167c47fbbde4533ed Gerrit-Change-Number: 15349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:09:08 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 10:09:08 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: update configs for running without docker Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 Change subject: sgsn: update configs for running without docker ...................................................................... sgsn: update configs for running without docker Base on docker-playground.git's ttcn3-sgsn-test/*.cfg files, change IPs to 127.0.0.* (keep last octet), log to stderr, disable colors in logs. The reasoning behind the IP change is, that using almost the same IP as in the docker configs makes it easier to compare the configs. Change-Id: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 --- M sgsn/SGSN_Tests.cfg M sgsn/osmo-sgsn.cfg A sgsn/osmo-stp.cfg 3 files changed, 72 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/15350/1 diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index 8782845..5167750 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -9,8 +9,30 @@ [LOGGING] [TESTPORT_PARAMETERS] +*.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10" [MODULE_PARAMETERS] +SGSN_Tests.mp_nsconfig := { + { + local_ip := "127.0.0.103", + remote_ip := "127.0.0.10" + }, + { + local_ip := "127.0.0.103", + remote_ip := "127.0.0.10" + }, + { + local_ip := "127.0.0.103", + remote_ip := "127.0.0.10" + } +} +SGSN_Tests.mp_ranap_cfg := { + { + sctp_addr := { 23908, "127.0.0.103", 2905, "127.0.0.200" } + } +} +SGSN_Tests.mp_hlr_ip := "127.0.0.103" +SGSN_Tests.mp_ggsn_ip := "127.0.0.103" [MAIN_CONTROLLER] diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index 09da510..de391fb 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -4,7 +4,7 @@ ! log stderr logging filter all 1 - logging color 1 + logging color 0 logging print category 1 logging timestamp 1 logging print extended-timestamp 1 @@ -28,10 +28,17 @@ ! line vty no login - bind 127.0.0.1 + bind 127.0.0.10 ctrl - bind 127.0.0.1 + bind 127.0.0.10 ! +cs7 instance 0 + point-code 0.23.4 + asp asp-clnt-OsmoSGSN-A 2905 0 m3ua + remote-ip 127.0.0.200 + as as-clnt-OsmoSGSN-A m3ua + asp asp-clnt-OsmoSGSN-A + routing-key 3 0.23.4 ns timer tns-block 3 timer tns-block-retries 3 @@ -40,15 +47,15 @@ timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 + encapsulation udp local-ip 127.0.0.10 encapsulation udp local-port 23000 encapsulation framerelay-gre enabled 0 bssgp sgsn - gtp local-ip 127.0.0.1 - ggsn 0 remote-ip 127.0.0.2 + gtp local-ip 127.0.0.10 + ggsn 0 remote-ip 127.0.0.103 ggsn 0 gtp-version 1 - gsup remote-ip 127.0.0.1 + gsup remote-ip 127.0.0.103 gsup remote-port 4222 auth-policy remote gsup oap-id 0 diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg new file mode 100644 index 0000000..ef9904b --- /dev/null +++ b/sgsn/osmo-stp.cfg @@ -0,0 +1,36 @@ +! +! OsmoSTP (0.8.1) configuration saved from vty +!! +! +log gsmtap 127.0.0.1 + logging level set-all debug +! +log stderr + logging color 0 + logging filter all 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug +! +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + asp virt-rnc0-0 23908 2905 m3ua + local-ip 127.0.0.200 + remote-ip 127.0.0.103 + as virt-rnc0 m3ua + asp virt-rnc0-0 + routing-key 2 0.24.3 + route-table system + update route 0.24.3 7.255.7 linkset virt-rnc0 + listen m3ua 2905 + local-ip 127.0.0.200 + accept-asp-connections dynamic-permitted + listen ipa 5000 + local-ip 127.0.0.200 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 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: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 Gerrit-Change-Number: 15350 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:10:34 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 10:10:34 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu: add configs for running without docker In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 ) Change subject: pcu: add configs for running without docker ...................................................................... Patch Set 2: All pcu and pcu-sns related configs added, that are needed to run the testsuites. The SNS configs are there, so I can do regression testing when changing something in the libraries, that potentially affects the pcu-sns tests too. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 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: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9 Gerrit-Change-Number: 14960 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Aug 2019 10:10:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:11:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:11:44 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 ) Change subject: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15308/2/src/gprs/sgsn_libgtp.c File src/gprs/sgsn_libgtp.c: https://gerrit.osmocom.org/#/c/15308/2/src/gprs/sgsn_libgtp.c at 589 PS2, Line 589: sgsn_ggsn_ctx_drop_all_pdp > This one seems to be the key change of this commit, while the others: [?] Yes, they could be made separate, but tbh I prefer keeping them together since they are related, since they are improving related code to add the feature. It's basically rewriting echo_conf to do something useful with it. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd Gerrit-Change-Number: 15308 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 30 Aug 2019 10:11:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:17:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:17:12 +0000 Subject: Change in ...libosmocore[master]: sanity: make vty buffer_* API NULL safe In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15265 ) Change subject: sanity: make vty buffer_* API NULL safe ...................................................................... Patch Set 3: Code-Review-2 -2 due to previous comments from laforge and me. Either use OSMO_ASSERT() or drop the patch completely. imho it doesn't make any sense in general to go early returning on public APIs when the object for which the method is called is NULL (it makes sense for convinience in some specific APIs such as free()). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idca3f54dc986abf6784790c12e69e02bdf77cb41 Gerrit-Change-Number: 15265 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:17:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:27:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:27:53 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 ) Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 113 PS1, Line 113: MM_IDLE > Looks like a copy-paste error to me, as 'gprs_mm_state_iu' enum defines different states (than 'gprs [?] Good catch, thanks! https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 181 PS1, Line 181: mmctx_set_pmm_state > Same problem with naming, maybe we should also use '_iu_' / '_gb_' prefixes here? That's going to get replaced soon anyway with FSMs, so, I didn't want to make this commit even more complex changing names which will be dropped anyway. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 199 PS1, Line 199: case PMM_DETACHED: > This change looks unrelated, but in general I am not against it. It's not unrelated. It's related to the fact that now we have only 3 fields in the enum. But yes, you can always argument whether it should go together or not. https://gerrit.osmocom.org/#/c/15337/1/src/gprs/gprs_gmm.c at 215 PS1, Line 215: gprs_mm_state_iu_names > Looks like a mistake to me. Indeed, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 10:27:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:29:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:29:42 +0000 Subject: Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 ) Change subject: Merge common allocation steps for Gb and Iu ctx ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15338/1/src/gprs/gprs_sgsn.c File src/gprs/gprs_sgsn.c: https://gerrit.osmocom.org/#/c/15338/1/src/gprs/gprs_sgsn.c at a244 PS1, Line 244: > Unrelated. That cannot be unrelated, It's a new function, and this one was heavily rewritten. Please don't look line to line but commit-wise (I know it's difficult with commits refactoring code). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c Gerrit-Change-Number: 15338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:29:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:31:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:31:05 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: as_unblocked: fix SIG broadcast In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348 ) Change subject: BSSGP_Emulation: as_unblocked: fix SIG broadcast ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348 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: I36a9a4d61be52a4d86ac1cbf6e6976cf01cff7c6 Gerrit-Change-Number: 15348 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:31:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:31:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:31:45 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu/GPRS_TBF.ttcn: less verbose logging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349 ) Change subject: pcu/GPRS_TBF.ttcn: less verbose logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349 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: Ibccfc399a6e8b50e4f01b5f167c47fbbde4533ed Gerrit-Change-Number: 15349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:31:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:33:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:33:25 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: update configs for running without docker In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 ) Change subject: sgsn: update configs for running without docker ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/15350/1/sgsn/osmo-sgsn.cfg File sgsn/osmo-sgsn.cfg: https://gerrit.osmocom.org/#/c/15350/1/sgsn/osmo-sgsn.cfg at 7 PS1, Line 7: logging color 0 This looks like a un-ending battle. Why disabling color? I like color, it's useful. Put some color on your life! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 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: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 Gerrit-Change-Number: 15350 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:33:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:34:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:34:53 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu: add configs for running without docker In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 ) Change subject: pcu: add configs for running without docker ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14960/2/pcu/osmo-bsc.cfg File pcu/osmo-bsc.cfg: https://gerrit.osmocom.org/#/c/14960/2/pcu/osmo-bsc.cfg at 11 PS2, Line 11: logging color 0 You got gsmtap logs, I wanna get color in my life! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 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: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9 Gerrit-Change-Number: 14960 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 10:34:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 10:41:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 10:41:27 +0000 Subject: Change in ...osmo-sgsn[master]: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL In-Reply-To: References: Message-ID: pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 ) Change subject: gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL ...................................................................... gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL Change-Id: I02c46062d6dc9802d9cae057587e66a68a65436c --- M src/gprs/sgsn_libgtp.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 88b8d04..79d5543 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -649,8 +649,9 @@ LOGPDPX(DGPRS, LOGL_INFO, pdp, "Context %p was deleted\n", pdp); - /* unlink the now non-existing library handle from the pdp - * context */ + /* unlink the now non-existing library handle from the pdp context. + This way we avoid calling pdp_freepdp() on it, since after returning + from cb_delete_context callback, libgtp is already doing so. */ pctx->lib = NULL; sgsn_ggsn_ctx_drop_pdp(pctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I02c46062d6dc9802d9cae057587e66a68a65436c Gerrit-Change-Number: 15325 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:08:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:08:01 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN and log category DGTP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 to look at the new patch set (#3). Change subject: Introduce log helper LOGGGSN and log category DGTP ...................................................................... Introduce log helper LOGGGSN and log category DGTP It will be used in forthcoming commits. Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c --- M include/osmocom/sgsn/debug.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_main.c 3 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/15307/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c Gerrit-Change-Number: 15307 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:08:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:08:01 +0000 Subject: Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file In-Reply-To: References: Message-ID: Hello lynxis lazus, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 to look at the new patch set (#3). Change subject: Move lots of Iu/ranap specific code into its own file ...................................................................... Move lots of Iu/ranap specific code into its own file RANAP related functionalities were splitted among several files (gprs_gmm.c, gprs_sgsn.c and sgsn_libgtp.c). Let's move it into its own file to shrink complexity/size of existing files. It also allows to keep a lot of conditionally enabled code (BUILD_IU) and its dependencies (osmo-iuh) together. Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_ranap.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_libgtp.c M src/gprs/sgsn_main.c M tests/sgsn/Makefile.am 11 files changed, 274 insertions(+), 238 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/35/15335/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 Gerrit-Change-Number: 15335 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:08:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:08:01 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 to look at the new patch set (#2). Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Split enum gprs_pmm_state into Iu and Gb counterparts Those two state sets are not part of the same state machine, and are used in different scenarios, so let's split them and handle them in Gb and Iu specific parts of struct sgsn_mm_ctx. This is required in order to improve related code (for instance, use osmocom fsm). Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 --- M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gb.c M src/gprs/gprs_gmm.c M src/gprs/gprs_ranap.c M src/gprs/gprs_sgsn.c 6 files changed, 43 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/37/15337/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:08:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:08:01 +0000 Subject: Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 to look at the new patch set (#2). Change subject: Merge common allocation steps for Gb and Iu ctx ...................................................................... Merge common allocation steps for Gb and Iu ctx This way it's easier to add new common functionalitites without forgetting to add it on both sides, and simplifies the code. Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c --- M src/gprs/gprs_sgsn.c 1 file changed, 27 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/15338/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c Gerrit-Change-Number: 15338 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:11:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:11:23 +0000 Subject: Change in ...osmo-trx[master]: Transceiver: Drop last 2 garbage bytes sent at end in uplink bursts In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14632 ) Change subject: Transceiver: Drop last 2 garbage bytes sent at end in uplink bursts ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iedc54011f333f48c6c8b81cab4d640f7601e01dd Gerrit-Change-Number: 14632 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:27:01 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 11:27:01 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu: add configs for running without docker In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 to look at the new patch set (#3). Change subject: pcu: add configs for running without docker ...................................................................... pcu: add configs for running without docker Base on docker-playground.git's ttcn3-pcu-test/*.cfg files, change IPs to 127.0.0.1, log to stderr, adjust pcu-socket path. Change-Id: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9 --- A pcu/PCU_Tests_SNS.cfg A pcu/osmo-bsc.cfg A pcu/osmo-bts.cfg A pcu/osmo-pcu-sns.cfg A pcu/osmo-pcu.cfg 5 files changed, 346 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/14960/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 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: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9 Gerrit-Change-Number: 14960 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:27:01 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 11:27:01 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: update configs for running without docker In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 to look at the new patch set (#2). Change subject: sgsn: update configs for running without docker ...................................................................... sgsn: update configs for running without docker Base on docker-playground.git's ttcn3-sgsn-test/*.cfg files, change IPs to 127.0.0.* (keep last octet), log to stderr. The reasoning behind the IP change is, that using almost the same IP as in the docker configs makes it easier to compare the configs. Change-Id: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 --- M sgsn/SGSN_Tests.cfg M sgsn/osmo-sgsn.cfg A sgsn/osmo-stp.cfg 3 files changed, 71 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/15350/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 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: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 Gerrit-Change-Number: 15350 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:27:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 11:27:07 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu: add configs for running without docker In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 ) Change subject: pcu: add configs for running without docker ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14960/2/pcu/osmo-bsc.cfg File pcu/osmo-bsc.cfg: https://gerrit.osmocom.org/#/c/14960/2/pcu/osmo-bsc.cfg at 11 PS2, Line 11: logging color 0 > You got gsmtap logs, I wanna get color in my life! Fine with me, updated :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 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: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9 Gerrit-Change-Number: 14960 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 11:27:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:27:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 11:27:11 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: update configs for running without docker In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 ) Change subject: sgsn: update configs for running without docker ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15350/1/sgsn/osmo-sgsn.cfg File sgsn/osmo-sgsn.cfg: https://gerrit.osmocom.org/#/c/15350/1/sgsn/osmo-sgsn.cfg at 7 PS1, Line 7: logging color 0 > This looks like a un-ending battle. Why disabling color? I like color, it's useful. [?] I'm redirecting stdout and stderr to a file, and I find it easier to read that without logs. I should probably switch to a text editor that display them properly... But fair enough, I've changed it to "color 1" ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 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: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 Gerrit-Change-Number: 15350 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 11:27:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:41:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:41:13 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: pcu: add configs for running without docker In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 ) Change subject: pcu: add configs for running without docker ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 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: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9 Gerrit-Change-Number: 14960 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 11:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 11:42:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 11:42:15 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: update configs for running without docker In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 ) Change subject: sgsn: update configs for running without docker ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15350/1/sgsn/osmo-sgsn.cfg File sgsn/osmo-sgsn.cfg: https://gerrit.osmocom.org/#/c/15350/1/sgsn/osmo-sgsn.cfg at 7 PS1, Line 7: logging color 0 > I'm redirecting stdout and stderr to a file, and I find it easier to read that without logs. [?] "less -R" is your friend. Otherwise, I add a new log file target. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 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: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 Gerrit-Change-Number: 15350 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 11:42:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:09:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 30 Aug 2019 12:09:55 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15340 to look at the new patch set (#3). Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition ...................................................................... OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition Since (R)->ip is a char[], it is always non-NULL. The (x ? : "") condition is completely pointless. Remove it. Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec --- M include/osmocom/core/sockaddr_str.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/15340/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec Gerrit-Change-Number: 15340 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:12:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 12:12:19 +0000 Subject: Change in ...osmo-gsm-manuals[master]: tests/Makefile.am: always put glossary at the end Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 Change subject: tests/Makefile.am: always put glossary at the end ...................................................................... tests/Makefile.am: always put glossary at the end Make sure that glossary.adoc is the last file, when building the test pdf with all common chapters included. Otherwise, newer asciidoc versions will complain that we cannot have subchapters after the glossary began: asciidoc: ERROR: mgcp_extension_osmux.adoc: line 2: glossary section cannot contain sub-sections Related: OS#4183 Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3 --- M tests/Makefile.am 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/51/15351/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index b2f579d..a88fe00 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,10 +6,11 @@ # Do not install any of the test pdfs OSMO_GSM_MANUALS_NO_INSTALL = 1 -# Generate adoc file that includes all chapters +# Generate adoc file that includes all chapters (OS#4183: glossary.adoc must be the last file) ASCIIDOC = test-usermanual.adoc ASCIIDOC_DEPS = -COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc') +COMMON_CHAPTERS := $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc' | grep -v glossary\.adoc) \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/glossary.adoc $(ASCIIDOC): $(COMMON_CHAPTERS) echo ":gfdl-enabled:" > $@ echo ":program-name: Test" >> $@ -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 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: I91e857255b1b6d5b8708cc7f7b303a58403120d3 Gerrit-Change-Number: 15351 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:15:03 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 30 Aug 2019 12:15:03 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 1: > Patch Set 1: > > Compilation warnings, jenkins fails. I can see that :) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 12:15:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:15:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Aug 2019 12:15:44 +0000 Subject: Change in ...osmo-gsm-manuals[master]: tests/Makefile.am: always put glossary at the end In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 to look at the new patch set (#2). Change subject: tests/Makefile.am: always put glossary at the end ...................................................................... tests/Makefile.am: always put glossary at the end Make sure that glossary.adoc is the last file, when building the test pdf with all common chapters included. Otherwise, newer asciidoc versions will complain that we cannot have subchapters after the glossary began: asciidoc: ERROR: mgcp_extension_osmux.adoc: line 2: glossary section cannot contain sub-sections Related: OS#4183 Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3 --- M tests/Makefile.am 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/51/15351/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 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: I91e857255b1b6d5b8708cc7f7b303a58403120d3 Gerrit-Change-Number: 15351 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:18:09 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 30 Aug 2019 12:18:09 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15342/1/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/#/c/15342/1/src/libmsc/ran_msg_a.c at 763 PS1, Line 763: , that's weird: there is definitely a string format bug in this patch, i.e. a comma is separating two parts of the string format, yet this error is only caught by the --disable-iu build, and the --enable-iu builds fine?? How is that possible!? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 12:18:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:21:02 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 30 Aug 2019 12:21:02 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 1: The --enable-iu build only warns: "ran_msg_a.c:763:3: warning: format ?%u? expects..." The --disable-iu build errors: "ran_msg_a.c:763:3: error: format ?%u? expects..." I see, it's actually done on purpose in the jenkins.sh, I guess to avoid breaking on the million RANAP warnings from the generated code. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 12:21:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:30:05 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 30 Aug 2019 12:30:05 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 1: interesting to note that my gcc seems to not warn about this at all. ---- gcc -DHAVE_CONFIG_H -I. -I../../../../src/osmo-msc/src/libmsc -I../.. -I../../../../src/osmo-msc/include -I../.. -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/asn1c -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -I/usr/local/include/ -g -O0 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -MT ran_msg_a.o -MD -MP -MF .deps/ran_msg_a.Tpo -c -o ran_msg_a.o ../../../../src/osmo-msc/src/libmsc/ran_msg_a.c mv -f .deps/ran_msg_a.Tpo .deps/ran_msg_a.Po ---- gcc (Debian 8.3.0-6) 8.3.0 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 12:30:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 12:31:06 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 30 Aug 2019 12:31:06 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 to look at the new patch set (#2). Change subject: ran_dec logging: log message sizes on errors ...................................................................... ran_dec logging: log message sizes on errors Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb --- M src/libmsc/ran_msg_a.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/15342/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:37:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:37:35 +0000 Subject: Change in ...osmo-gsm-manuals[master]: tests/Makefile.am: always put glossary at the end In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 ) Change subject: tests/Makefile.am: always put glossary at the end ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 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: I91e857255b1b6d5b8708cc7f7b303a58403120d3 Gerrit-Change-Number: 15351 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:38:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:38:25 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 2: > Patch Set 1: > > The --enable-iu build only warns: "ran_msg_a.c:763:3: warning: format ?%u? expects..." > The --disable-iu build errors: "ran_msg_a.c:763:3: error: format ?%u? expects..." > > I see, it's actually done on purpose in the jenkins.sh, I guess to avoid breaking on the million RANAP warnings from the generated code. That's it :) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:38:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:38:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:38:39 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:38:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:39:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:39:55 +0000 Subject: Change in ...osmo-msc[master]: msc_vlr_tests: GSUP: don't care about extra IEs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15343 ) Change subject: msc_vlr_tests: GSUP: don't care about extra IEs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11 Gerrit-Change-Number: 15343 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:39:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:41:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:41:02 +0000 Subject: Change in ...osmo-msc[master]: gsm48_tch_rtp_create(): check against NULL mgcp_info In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15344 ) Change subject: gsm48_tch_rtp_create(): check against NULL mgcp_info ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I98fe5860c49751ade1af10d99487aba259504f23 Gerrit-Change-Number: 15344 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:41:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:41:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:41:22 +0000 Subject: Change in ...osmo-msc[master]: msc_a.c, CC trans: change a comment to a debug log In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15345 ) Change subject: msc_a.c, CC trans: change a comment to a debug log ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5 Gerrit-Change-Number: 15345 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:41:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 13:41:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 13:41:44 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15346 ) Change subject: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I576bc5c1fd63fe8048a7a6a2d06763fc3221fa49 Gerrit-Change-Number: 15346 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 13:41:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:54:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:54:02 +0000 Subject: Change in ...osmo-msc[master]: msc_a.c, CC trans: change a comment to a debug log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15345 ) Change subject: msc_a.c, CC trans: change a comment to a debug log ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5 Gerrit-Change-Number: 15345 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:54:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:54:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:54:13 +0000 Subject: Change in ...osmo-msc[master]: gsm48_tch_rtp_create(): check against NULL mgcp_info In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15344 ) Change subject: gsm48_tch_rtp_create(): check against NULL mgcp_info ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I98fe5860c49751ade1af10d99487aba259504f23 Gerrit-Change-Number: 15344 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:54:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:54:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:54:23 +0000 Subject: Change in ...osmo-msc[master]: msc_vlr_tests: GSUP: don't care about extra IEs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15343 ) Change subject: msc_vlr_tests: GSUP: don't care about extra IEs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11 Gerrit-Change-Number: 15343 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:54:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:54:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:54:47 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:54:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:55:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:55:29 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN and log category DGTP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 ) Change subject: Introduce log helper LOGGGSN and log category DGTP ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c Gerrit-Change-Number: 15307 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 30 Aug 2019 15:55:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:55:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:55:43 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 ) Change subject: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd Gerrit-Change-Number: 15308 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 30 Aug 2019 15:55:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:56:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:56:06 +0000 Subject: Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 ) Change subject: Move lots of Iu/ranap specific code into its own file ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I549042aaff045a378de77d657cc396ee08f22f33 Gerrit-Change-Number: 15335 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:56:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:56:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:56:38 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 ) Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:56:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:56:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:56:48 +0000 Subject: Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 ) Change subject: Merge common allocation steps for Gb and Iu ctx ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c Gerrit-Change-Number: 15338 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:56:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:58:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:58:30 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 ) Change subject: sgsn: Proper shutdown of RAN_Adapter components ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp File library/RAN_Adapter.ttcnpp: https://gerrit.osmocom.org/#/c/15295/2/library/RAN_Adapter.ttcnpp at 196 PS2, Line 196: ba.vc_RAN_started > Make sense, thanks I didn't know I could compare against null. 'null' in TTCN-3 is a special value that only appears on the context of an unbound/unassigned component ID. So basically if a component ID hasn't been assigned, it is null. Not to be confused with NULL in general in C/C++ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 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: I471eb851e5d41de5d8d974ec81be27024d7d313a Gerrit-Change-Number: 15295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:58:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:02 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: gtp: Drop commented out code calling pdp_freepdp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15322 ) Change subject: cosmetic: gtp: Drop commented out code calling pdp_freepdp() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I096d8cb8d749ff9b737d6f3f96b1d423660ece37 Gerrit-Change-Number: 15322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:59:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:10 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: gtp: Improve documentation of gtp_delete_context_req2() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15323 ) Change subject: cosmetic: gtp: Improve documentation of gtp_delete_context_req2() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I1f85c7cc7684e146fca4f17914927d45410dbb84 Gerrit-Change-Number: 15323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 15:59:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:20 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15324 ) Change subject: ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7d9ae9a27390498ba387797aac6651e32fa44f29 Gerrit-Change-Number: 15324 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 15:59:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:24 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: gtp: Drop commented out code calling pdp_freepdp() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15322 ) Change subject: cosmetic: gtp: Drop commented out code calling pdp_freepdp() ...................................................................... cosmetic: gtp: Drop commented out code calling pdp_freepdp() That code was commented out in 0b076a331e1e7f955580313a5da416c170b3b4ce (year 2003), and indeed it makes no sense to call those in current pdp lifecycle (they are expected to be freed by the application). Change-Id: I096d8cb8d749ff9b737d6f3f96b1d423660ece37 --- M gtp/gtp.c 1 file changed, 0 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index 2ea949d..ba248c6 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1752,8 +1752,6 @@ "Invalid message format\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1764,8 +1762,6 @@ "Missing mandatory information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1792,8 +1788,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } @@ -1805,8 +1799,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1818,8 +1810,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1830,8 +1820,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } @@ -1844,8 +1832,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1856,8 +1842,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } @@ -1869,8 +1853,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ } if (gtpie_gettlv(ie, GTPIE_EUA, 0, &pdp->eua.l, @@ -1881,8 +1863,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1894,8 +1874,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1907,8 +1885,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } @@ -1922,8 +1898,6 @@ "Missing conditional information field\n"); if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp); - /* if (gsn->cb_delete_context) gsn->cb_delete_context(pdp); - pdp_freepdp(pdp); */ return EOF; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I096d8cb8d749ff9b737d6f3f96b1d423660ece37 Gerrit-Change-Number: 15322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:24 +0000 Subject: Change in ...osmo-ggsn[master]: cosmetic: gtp: Improve documentation of gtp_delete_context_req2() In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15323 ) Change subject: cosmetic: gtp: Improve documentation of gtp_delete_context_req2() ...................................................................... cosmetic: gtp: Improve documentation of gtp_delete_context_req2() Change-Id: I1f85c7cc7684e146fca4f17914927d45410dbb84 --- M gtp/gtp.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index ba248c6..88248d1 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -2427,8 +2427,9 @@ } /* API: Send Delete PDP Context Request. PDP CTX shall be free'd by user at any - point in time later than this function through a call to pdp_freepdp(pdp), but - it must be freed no later than during cb_conf(GTP_DELETE_PDP_REQ, pdp) */ + point in time later than this function through a call to pdp_freepdp(pdp) (or + through gtp_freepdp() if willing to receive cb_delete_context() callback), + but it must be freed no later than during cb_conf(GTP_DELETE_PDP_REQ, pdp) */ int gtp_delete_context_req2(struct gsn_t *gsn, struct pdp_t *pdp, void *cbp, int teardown) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I1f85c7cc7684e146fca4f17914927d45410dbb84 Gerrit-Change-Number: 15323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:24 +0000 Subject: Change in ...osmo-ggsn[master]: ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp... In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15324 ) Change subject: ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() ...................................................................... ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() Update documentation since nowadays there are more paths calling ggsn_close_one_pdp() (because we now close pdp contexts during sgsn timeouts). Switch pdp_freepdp() to gtp_freepdp() since in the event we ended up there in the future we want to go through normal delete_ctx_cb to free related application data structures. Change-Id: I7d9ae9a27390498ba387797aac6651e32fa44f29 --- M ggsn/ggsn.c 1 file changed, 10 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 7b32bde..ffa508b 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -775,16 +775,17 @@ case GTP_DELETE_PDP_REQ: /* Remark: We actually never reach this path nowadays because only place where we call gtp_delete_context_req2() is during - apn_stop()->pool_close_all_pdp() path, and in that case we - free all pdp contexts immediatelly without waiting for - confirmation since we want to tear down the whole APN - anyways. As a result, DeleteCtxResponse will never reach here - since it will be dropped at some point in lower layers in the - Rx path. This code is nevertheless left here in order to ease - future developent and avoid possible future memleaks once more - scenarios where GGSN sends a DeleteCtxRequest are introduced. */ + ggsn_close_one_pdp() path, and in that case we free all pdp + contexts immediatelly without waiting for confirmation + (through gtp_freepdp_teardown()) since we want to tear down + the whole APN anyways. As a result, DeleteCtxResponse will + never reach here since it will be dropped at some point in + lower layers in the Rx path. This code is nevertheless left + here in order to ease future developent and avoid possible + future memleaks once more scenarios where GGSN sends a + DeleteCtxRequest are introduced. */ if (pdp) - rc = pdp_freepdp(pdp); + rc = gtp_freepdp(pdp->gsn, pdp); break; case GTP_ECHO_REQ: sgsn = (struct sgsn_peer *)cbp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7d9ae9a27390498ba387797aac6651e32fa44f29 Gerrit-Change-Number: 15324 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 15:59:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 15:59:56 +0000 Subject: Change in ...osmo-ggsn[master]: gtp: Manage queue timers internally In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15309 ) Change subject: gtp: Manage queue timers internally ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ife7cfd66d6356f413263fe5bda9e43091f5c9e98 Gerrit-Change-Number: 15309 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 15:59:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:33:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:33:45 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Replace inet_ntoa with inet_ntop Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15352 Change subject: gprs_gmm.c: Replace inet_ntoa with inet_ntop ...................................................................... gprs_gmm.c: Replace inet_ntoa with inet_ntop inet_ntop manual states: "inet_ntoa(3) is now considered to be deprecated in favor of inet_ntop()". Change-Id: I0c708d047122f349acf46797a9e5973040e7ae04 --- M src/gprs/gprs_gmm.c 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/52/15352/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 9c5f689..766d0f4 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -118,10 +118,12 @@ static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) { + char buf[INET_ADDRSTRLEN]; struct sgsn_pdp_ctx *pdp; llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) { LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> %s\n", - sgsn_gtp_ntoa(&pdp->lib->gsnlu), inet_ntoa(sgsn->cfg.gtp_listenaddr.sin_addr)); + sgsn_gtp_ntoa(&pdp->lib->gsnlu), + inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf))); sgsn_pdp_upd_gtp_u(pdp, &sgsn->cfg.gtp_listenaddr.sin_addr, sizeof(sgsn->cfg.gtp_listenaddr.sin_addr)); @@ -2469,6 +2471,7 @@ struct sgsn_ggsn_ctx *ggsn; struct sgsn_ggsn_lookup *lookup = arg; struct in_addr *addr = NULL; + char buf[INET_ADDRSTRLEN]; /* The context is gone while we made a request */ if (!lookup->mmctx) { @@ -2525,7 +2528,8 @@ } ggsn->remote_addr = *addr; LOGMMCTXP(LOGL_NOTICE, lookup->mmctx, - "Selected %s as GGSN.\n", inet_ntoa(*addr)); + "Selected %s as GGSN.\n", + inet_ntop(AF_INET, addr, buf, sizeof(buf))); /* forget about the ggsn look-up */ lookup->mmctx->ggsn_lookup = NULL; @@ -2561,6 +2565,7 @@ char *hostname; int rc; struct gprs_llc_lle *lle; + char buf[INET_ADDRSTRLEN]; LOGMMCTXP(LOGL_INFO, mmctx, "-> ACTIVATE PDP CONTEXT REQ: SAPI=%u NSAPI=%u ", act_req->req_llc_sapi, act_req->req_nsapi); @@ -2589,7 +2594,7 @@ if (req_pdpa_len >= 6) { struct in_addr ia; ia.s_addr = ntohl(*((uint32_t *) (req_pdpa+2))); - DEBUGPC(DMM, "%s ", inet_ntoa(ia)); + DEBUGPC(DMM, "%s ", inet_ntop(AF_INET, &ia, buf, sizeof(buf))); } break; case 0x57: -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0c708d047122f349acf46797a9e5973040e7ae04 Gerrit-Change-Number: 15352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:33:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:33:46 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce FSM mm_state_gb_fsm Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15353 Change subject: Introduce FSM mm_state_gb_fsm ...................................................................... Introduce FSM mm_state_gb_fsm Implement TS 23.060 6.1.1 Mobility Management States (A/Gb mode) using osmocom FSM and drop old implementation. Most of the logic on each state is still kept in gprs_gmm.c, will be inserted into the FSM later. Change-Id: I04004423e993107374d5a3549b8a93ac169251dd --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_mm_state_gb_fsm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gb.c M src/gprs/gprs_gmm.c A src/gprs/gprs_mm_state_gb_fsm.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 10 files changed, 154 insertions(+), 125 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/53/15353/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index b91c9f1..d6ee445 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -7,6 +7,7 @@ gprs_gb_parse.h \ gprs_gmm.h \ gprs_gmm_attach.h \ + gprs_mm_state_gb_fsm.h \ gprs_llc.h \ gprs_llc_xid.h \ gprs_ranap.h \ diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 6c72cda..2fa12e5 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -50,8 +50,6 @@ void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp); void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state); -void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T); -void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state); void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg); #endif /* _GPRS_GMM_H */ diff --git a/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h b/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h new file mode 100644 index 0000000..e69e1e1 --- /dev/null +++ b/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h @@ -0,0 +1,26 @@ +#pragma once + +#include + +struct sgsn_mm_ctx; + + +/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */ +enum mm_state_gb_fsm_states { + ST_MM_IDLE, + ST_MM_READY, + ST_MM_STANDBY +}; + +enum mm_state_gb_fsm_events { + E_MM_GPRS_ATTACH, + /* E_GPRS_DETACH, TODO: not used */ + E_MM_PDU_RECEPTION, + E_MM_IMPLICIT_DETACH, /* = E_MM_CANCEL_LOCATION */ + E_MM_READY_TIMER_EXPIRY, + /* E_FORCE_TO_STANDBY, TODO: not used */ + /* E_ABNSORMAL_RLC_CONDITION, TODO: not used */ + E_MM_RA_UPDATE, +}; + +extern struct osmo_fsm mm_state_gb_fsm; diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index f64e07b..382019c 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -32,12 +32,6 @@ GMM_DEREGISTERED_INIT, /* 4.1.3.3.1.4 */ }; -/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */ -enum gprs_mm_state_gb { - MM_IDLE, - MM_READY, - MM_STANDBY -}; /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */ enum gprs_mm_state_iu { PMM_DETACHED, @@ -161,10 +155,7 @@ uint32_t tlli_new; /* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */ - enum gprs_mm_state_gb mm_state; - /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */ - struct osmo_timer_list state_timer; - unsigned int state_T; /* Txxxx number but only used for mm_state */ + struct osmo_fsm_inst *mm_state_fsm; } gb; struct { int new_key; diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 85ba906..94861e2 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -63,6 +63,7 @@ gprs_gb.c \ gprs_gmm_attach.c \ gprs_gmm.c \ + gprs_mm_state_gb_fsm.c \ gprs_ranap.c \ gprs_sgsn.c \ gprs_sndcp.c \ diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c index 43af434..65342cf 100644 --- a/src/gprs/gprs_gb.c +++ b/src/gprs/gprs_gb.c @@ -28,25 +28,11 @@ #include "bscconfig.h" +#include #include #include #include -/* Update the MM context state */ -static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx) -{ - switch (mmctx->gb.mm_state) { - case MM_STANDBY: - mmctx_set_mm_state(mmctx, MM_READY); - break; - case MM_READY: /* RE-arm the timer upon receival of Gb PDUs */ - mmctx_state_timer_start(mmctx, 3314); - break; - default: - break; - } -} - /* Main entry point for incoming 04.08 GPRS messages from Gb */ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable) @@ -63,13 +49,11 @@ msgid2mmctx(mmctx, msg); rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); mmctx->gb.llme = llme; + osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL); } /* MMCTX can be NULL */ - if (mmctx) - gsm0408_gprs_notify_pdu_gb(mmctx); - switch (pdisc) { case GSM48_PDISC_MM_GPRS: rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable); diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 766d0f4..75d99fb 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -102,13 +103,6 @@ }, }; -static const struct value_string gprs_mm_state_gb_names[] = { - OSMO_VALUE_STRING(MM_IDLE), - OSMO_VALUE_STRING(MM_READY), - OSMO_VALUE_STRING(MM_STANDBY), - { 0, NULL } -}; - static const struct value_string gprs_mm_state_iu_names[] = { OSMO_VALUE_STRING(PMM_DETACHED), OSMO_VALUE_STRING(PMM_CONNECTED), @@ -130,56 +124,6 @@ } } -static void mmctx_state_timer_cb(void *_mm) -{ - struct sgsn_mm_ctx *mm = _mm; - - switch (mm->gb.state_T) { - case 3314: - switch (mm->gb.mm_state) { - case MM_READY: - LOGMMCTXP(LOGL_INFO, mm, "T3314 expired\n"); - mmctx_set_mm_state(mm, MM_STANDBY); - break; - default: - LOGMMCTXP(LOGL_ERROR, mm, "T3314 expired in state %s != MM_READY\n", - get_value_string(gprs_mm_state_gb_names, mm->gb.mm_state)); - break; - } - break; - default: - LOGMMCTXP(LOGL_ERROR, mm, "state timer expired in unknown mode %u\n", - mm->gb.state_T); - break; - } -} - -void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T) -{ - unsigned long seconds; - - if (mm->gb.state_T && mm->gb.state_T != T) - LOGMMCTXP(LOGL_ERROR, mm, "Attempting to start timer %u but %u is active!\n", - T, mm->gb.state_T); - - mm->gb.state_T = T; - mm->gb.state_timer.data = mm; - mm->gb.state_timer.cb = &mmctx_state_timer_cb; - - seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1); - osmo_timer_schedule(&mm->gb.state_timer, seconds, 0); -} - -static void mmctx_state_timer_stop(struct sgsn_mm_ctx *mm, unsigned int T) -{ - if (mm->gb.state_T == T) - osmo_timer_del(&mm->gb.state_timer); - else - LOGMMCTXP(LOGL_ERROR, mm, "Attempting to stop timer %u but %u is active!\n", - T, mm->gb.state_T); - mm->gb.state_T = 0; -} - void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state) { OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); @@ -205,35 +149,6 @@ ctx->iu.mm_state = state; } -void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state) -{ - OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb); - - if (ctx->gb.mm_state == state) - return; - - LOGMMCTXP(LOGL_INFO, ctx, "Changing MM state from %s to %s\n", - get_value_string(gprs_mm_state_gb_names, ctx->gb.mm_state), - get_value_string(gprs_mm_state_gb_names, state)); - - switch (state) { - case MM_READY: - /* on expiration, T3314 moves mm state back to MM_STANDBY */ - mmctx_state_timer_start(ctx, 3314); - break; - case MM_IDLE: - if (ctx->gb.mm_state == MM_READY) - mmctx_state_timer_stop(ctx, 3314); - break; - case MM_STANDBY: - if (ctx->gb.mm_state == MM_READY) - mmctx_state_timer_stop(ctx, 3314); - break; - } - - ctx->gb.mm_state = state; -} - /* Our implementation, should be kept in SGSN */ static void mmctx_timer_cb(void *_mm); @@ -342,7 +257,7 @@ mmctx_set_pmm_state(ctx, PMM_DETACHED); break; case MM_CTX_T_GERAN_Gb: - mmctx_set_mm_state(ctx, MM_IDLE); + osmo_fsm_inst_dispatch(ctx->gb.mm_state_fsm, E_MM_IMPLICIT_DETACH, NULL); break; } @@ -2097,7 +2012,7 @@ gprs_llme_copy_key(mmctx, mmctx->gb.llme); gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); - mmctx_set_mm_state(mmctx, MM_READY); + osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_GPRS_ATTACH, NULL); break; } rc = 0; @@ -2126,7 +2041,7 @@ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); - mmctx_set_mm_state(mmctx, MM_READY); + osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_RA_UPDATE, NULL); break; } rc = 0; diff --git a/src/gprs/gprs_mm_state_gb_fsm.c b/src/gprs/gprs_mm_state_gb_fsm.c new file mode 100644 index 0000000..2056540 --- /dev/null +++ b/src/gprs/gprs_mm_state_gb_fsm.c @@ -0,0 +1,112 @@ +#include + +#include + +#include +#include + +#define X(s) (1 << (s)) + +static const struct osmo_tdef_state_timeout mm_state_gb_fsm_timeouts[32] = { + [ST_MM_IDLE] = { }, + [ST_MM_READY] = { .T=3314 }, + [ST_MM_STANDBY] = { }, +}; + +#define mm_state_gb_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, mm_state_gb_fsm_timeouts, sgsn->cfg.T_defs, -1) + +static void st_mm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_MM_GPRS_ATTACH: + mm_state_gb_fsm_state_chg(fi, ST_MM_READY); + break; + case E_MM_PDU_RECEPTION: + break; + } +} + +static void st_mm_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + unsigned long t_secs; + + switch(event) { + case E_MM_READY_TIMER_EXPIRY: + case E_MM_IMPLICIT_DETACH: + mm_state_gb_fsm_state_chg(fi, ST_MM_STANDBY); + break; + case E_MM_PDU_RECEPTION: + /* RE-arm the READY timer upon receival of Gb PDUs */ + t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, t_secs, 0); + break; + case E_MM_RA_UPDATE: + break; + } +} + +static void st_mm_standby(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_MM_PDU_RECEPTION: + mm_state_gb_fsm_state_chg(fi, ST_MM_READY); + break; + } +} + +static struct osmo_fsm_state mm_state_gb_fsm_states[] = { + [ST_MM_IDLE] = { + .in_event_mask = X(E_MM_GPRS_ATTACH) | X(E_MM_PDU_RECEPTION), + .out_state_mask = X(ST_MM_READY), + .name = "Idle", + .action = st_mm_idle, + }, + [ST_MM_READY] = { + .in_event_mask = X(E_MM_READY_TIMER_EXPIRY) | X(E_MM_RA_UPDATE) | X(E_MM_IMPLICIT_DETACH) | X(E_MM_PDU_RECEPTION), + .out_state_mask = X(ST_MM_IDLE) | X(ST_MM_STANDBY), + .name = "Ready", + .action = st_mm_ready, + }, + [ST_MM_STANDBY] = { + .in_event_mask = X(E_MM_PDU_RECEPTION), + .out_state_mask = X(ST_MM_IDLE) | X(ST_MM_READY), + .name = "Standby", + .action = st_mm_standby, + }, +}; + +const struct value_string mm_state_gb_fsm_event_names[] = { + OSMO_VALUE_STRING(E_MM_GPRS_ATTACH), + OSMO_VALUE_STRING(E_MM_PDU_RECEPTION), + OSMO_VALUE_STRING(E_MM_IMPLICIT_DETACH), + OSMO_VALUE_STRING(E_MM_READY_TIMER_EXPIRY), + OSMO_VALUE_STRING(E_MM_RA_UPDATE), + { 0, NULL } +}; + +int mm_state_gb_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch(fi->state) { + case ST_MM_READY: + /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */ + osmo_fsm_inst_dispatch(fi, E_MM_READY_TIMER_EXPIRY, NULL); + break; + } + + return 0; +} + +struct osmo_fsm mm_state_gb_fsm = { + .name = "MM_STATE_Gb", + .states = mm_state_gb_fsm_states, + .num_states = ARRAY_SIZE(mm_state_gb_fsm_states), + .event_names = mm_state_gb_fsm_event_names, + .log_subsys = DMM, + .timer_cb = mm_state_gb_fsm_timer_cb, +}; + +static __attribute__((constructor)) void mm_state_gb_fsm_init(void) +{ + osmo_fsm_register(&mm_state_gb_fsm); +} diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 6acc66e..82855a6 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -243,6 +244,7 @@ const struct gprs_ra_id *raid) { struct sgsn_mm_ctx *ctx; + char buf[32]; ctx = sgsn_mm_ctx_alloc(tlli); if (!ctx) @@ -251,8 +253,9 @@ memcpy(&ctx->ra, raid, sizeof(ctx->ra)); ctx->ran_type = MM_CTX_T_GERAN_Gb; ctx->gb.tlli = tlli; - ctx->gb.mm_state = MM_IDLE; ctx->ciph_algo = sgsn->cfg.cipher; + snprintf(buf, sizeof(buf), "%" PRIu32, tlli); + ctx->gb.mm_state_fsm = osmo_fsm_inst_alloc(&mm_state_gb_fsm, ctx, ctx, LOGL_DEBUG, buf); LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n", get_value_string(gprs_cipher_names, ctx->ciph_algo)); @@ -334,11 +337,6 @@ osmo_timer_del(&mm->timer); } - if (osmo_timer_pending(&mm->gb.state_timer)) { - LOGMMCTXP(LOGL_INFO, mm, "Cancelling MM state timer %u\n", mm->gb.state_T); - osmo_timer_del(&mm->gb.state_timer); - } - memset(&sig_data, 0, sizeof(sig_data)); sig_data.mm = mm; osmo_signal_dispatch(SS_SGSN, S_SGSN_MM_FREE, &sig_data); @@ -353,6 +351,8 @@ if (mm->gmm_att_req.fsm) gmm_att_req_free(mm); + if (mm->gb.mm_state_fsm) + osmo_fsm_inst_free(mm->gb.mm_state_fsm); sgsn_mm_ctx_free(mm); mm = NULL; diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index b035468..8a26d88 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -50,6 +50,7 @@ $(top_builddir)/src/gprs/gprs_sndcp.o \ $(top_builddir)/src/gprs/gprs_gmm_attach.o \ $(top_builddir)/src/gprs/gprs_gmm.o \ + $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \ $(top_builddir)/src/gprs/gprs_sgsn.o \ $(top_builddir)/src/gprs/sgsn_vty.o \ $(top_builddir)/src/gprs/sgsn_libgtp.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I04004423e993107374d5a3549b8a93ac169251dd Gerrit-Change-Number: 15353 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:33:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:33:46 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce FSM mm_state_iu_fsm Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15354 Change subject: Introduce FSM mm_state_iu_fsm ...................................................................... Introduce FSM mm_state_iu_fsm Implement TS 23.060 6.1.2 Mobility Management States (Iu mode) using osmocom FSM and drop old implementation. Most of the logic on each state is still kept in gprs_gmm.c, will be inserted into the FSM later. Change-Id: I4c9cf8c27194817c56e8949af0205e1cc14af317 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_mm_state_iu_fsm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_mm_state_iu_fsm.c M src/gprs/gprs_ranap.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 10 files changed, 165 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/54/15354/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index d6ee445..0ab00fe 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -8,6 +8,7 @@ gprs_gmm.h \ gprs_gmm_attach.h \ gprs_mm_state_gb_fsm.h \ + gprs_mm_state_iu_fsm.h \ gprs_llc.h \ gprs_llc_xid.h \ gprs_ranap.h \ diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 2fa12e5..982cd93 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -49,7 +49,5 @@ void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp); -void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state); - void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg); #endif /* _GPRS_GMM_H */ diff --git a/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h new file mode 100644 index 0000000..7f02bcc --- /dev/null +++ b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +struct sgsn_mm_ctx; + + +/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */ +enum mm_state_iu_fsm_states { + ST_PMM_DETACHED, + ST_PMM_CONNECTED, + ST_PMM_IDLE +}; + +enum mm_state_iu_fsm_events { + E_PMM_PS_ATTACH, + /* E_PS_DETACH, TODO: not used */ + E_PMM_PS_CONN_RELEASE, + E_PMM_PS_CONN_ESTABLISH, + E_PMM_IMPLICIT_DETACH, /* = E_PS_ATTACH_REJECT, E_RAU_REJECT */ + E_PMM_RA_UPDATE, /* = Serving RNC relocation */ +}; + +extern struct osmo_fsm mm_state_iu_fsm; diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 382019c..8f16c5b 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -32,13 +32,6 @@ GMM_DEREGISTERED_INIT, /* 4.1.3.3.1.4 */ }; -/* TS 23.060 6.1.2 Mobility Management States (Iu mode) */ -enum gprs_mm_state_iu { - PMM_DETACHED, - PMM_CONNECTED, - PMM_IDLE -}; - enum gprs_mm_ctr { GMM_CTR_PKTS_SIG_IN, GMM_CTR_PKTS_SIG_OUT, @@ -171,7 +164,7 @@ struct ranap_ue_conn_ctx *ue_ctx; struct service_info service; /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */ - enum gprs_mm_state_iu mm_state; + struct osmo_fsm_inst *mm_state_fsm; } iu; struct { struct osmo_fsm_inst *fsm; diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 94861e2..05d5b4c 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -64,6 +64,7 @@ gprs_gmm_attach.c \ gprs_gmm.c \ gprs_mm_state_gb_fsm.c \ + gprs_mm_state_iu_fsm.c \ gprs_ranap.c \ gprs_sgsn.c \ gprs_sndcp.c \ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 75d99fb..511cf1e 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -103,52 +104,6 @@ }, }; -static const struct value_string gprs_mm_state_iu_names[] = { - OSMO_VALUE_STRING(PMM_DETACHED), - OSMO_VALUE_STRING(PMM_CONNECTED), - OSMO_VALUE_STRING(PMM_IDLE), - { 0, NULL } -}; - -static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) -{ - char buf[INET_ADDRSTRLEN]; - struct sgsn_pdp_ctx *pdp; - llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) { - LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> %s\n", - sgsn_gtp_ntoa(&pdp->lib->gsnlu), - inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf))); - sgsn_pdp_upd_gtp_u(pdp, - &sgsn->cfg.gtp_listenaddr.sin_addr, - sizeof(sgsn->cfg.gtp_listenaddr.sin_addr)); - } -} - -void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state) -{ - OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); - - if (ctx->iu.mm_state == state) - return; - - LOGMMCTXP(LOGL_INFO, ctx, "Changing PMM state from %s to %s\n", - get_value_string(gprs_mm_state_iu_names, ctx->iu.mm_state), - get_value_string(gprs_mm_state_iu_names, state)); - - switch (state) { - case PMM_IDLE: - /* TODO: start RA Upd timer */ - mmctx_change_gtpu_endpoints_to_sgsn(ctx); - break; - case PMM_CONNECTED: - break; - case PMM_DETACHED: - break; - } - - ctx->iu.mm_state = state; -} - /* Our implementation, should be kept in SGSN */ static void mmctx_timer_cb(void *_mm); @@ -254,7 +209,7 @@ switch(ctx->ran_type) { case MM_CTX_T_UTRAN_Iu: - mmctx_set_pmm_state(ctx, PMM_DETACHED); + osmo_fsm_inst_dispatch(ctx->iu.mm_state_fsm, E_PMM_IMPLICIT_DETACH, NULL); break; case MM_CTX_T_GERAN_Gb: osmo_fsm_inst_dispatch(ctx->gb.mm_state_fsm, E_MM_IMPLICIT_DETACH, NULL); @@ -1013,7 +968,7 @@ #ifdef BUILD_IU case GSM48_MT_GMM_SERVICE_REQ: ctx->pending_req = 0; - mmctx_set_pmm_state(ctx, PMM_CONNECTED); + osmo_fsm_inst_dispatch(ctx->iu.mm_state_fsm, E_PMM_PS_ATTACH, NULL); rc = gsm48_tx_gmm_service_ack(ctx); if (ctx->iu.service.type != GPRS_SERVICE_T_SIGNALLING) @@ -2004,7 +1959,7 @@ mmctx->gmm_state = GMM_REGISTERED_NORMAL; switch(mmctx->ran_type) { case MM_CTX_T_UTRAN_Iu: - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_PS_ATTACH, NULL); break; case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ @@ -2034,7 +1989,7 @@ mmctx->gmm_state = GMM_REGISTERED_NORMAL; switch(mmctx->ran_type) { case MM_CTX_T_UTRAN_Iu: - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_RA_UPDATE, NULL); break; case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ diff --git a/src/gprs/gprs_mm_state_iu_fsm.c b/src/gprs/gprs_mm_state_iu_fsm.c new file mode 100644 index 0000000..1ed5f56 --- /dev/null +++ b/src/gprs/gprs_mm_state_iu_fsm.c @@ -0,0 +1,121 @@ +#include + +#include + +#include + +#include +#include + +#define X(s) (1 << (s)) + +static const struct osmo_tdef_state_timeout mm_state_iu_fsm_timeouts[32] = { + [ST_PMM_DETACHED] = { }, + [ST_PMM_CONNECTED] = { }, + [ST_PMM_IDLE] = { }, +}; + +#define mm_state_iu_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, mm_state_iu_fsm_timeouts, sgsn->cfg.T_defs, -1) + +static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) +{ + char buf[INET_ADDRSTRLEN]; + struct sgsn_pdp_ctx *pdp; + llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) { + LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> %s\n", + sgsn_gtp_ntoa(&pdp->lib->gsnlu), + inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf))); + sgsn_pdp_upd_gtp_u(pdp, + &sgsn->cfg.gtp_listenaddr.sin_addr, + sizeof(sgsn->cfg.gtp_listenaddr.sin_addr)); + } +} + +static void st_pmm_detached(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_PMM_PS_ATTACH: + mm_state_iu_fsm_state_chg(fi, ST_PMM_CONNECTED); + break; + case E_PMM_IMPLICIT_DETACH: + break; + } +} + +static void st_pmm_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_PMM_PS_CONN_RELEASE: + mm_state_iu_fsm_state_chg(fi, ST_PMM_IDLE); + break; + case E_PMM_IMPLICIT_DETACH: + mm_state_iu_fsm_state_chg(fi, ST_PMM_DETACHED); + break; + case E_PMM_RA_UPDATE: + break; + } +} + +static void st_pmm_idle_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + mmctx_change_gtpu_endpoints_to_sgsn(ctx); +} + +static void st_pmm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_PMM_PS_CONN_ESTABLISH: + mm_state_iu_fsm_state_chg(fi, ST_PMM_CONNECTED); + break; + case E_PMM_IMPLICIT_DETACH: + mm_state_iu_fsm_state_chg(fi, ST_PMM_DETACHED); + break; + } +} + +static struct osmo_fsm_state mm_state_iu_fsm_states[] = { + [ST_PMM_DETACHED] = { + .in_event_mask = X(E_PMM_PS_ATTACH) | X(E_PMM_IMPLICIT_DETACH), + .out_state_mask = X(ST_PMM_CONNECTED), + .name = "Detached", + .action = st_pmm_detached, + }, + [ST_PMM_CONNECTED] = { + .in_event_mask = X(E_PMM_PS_CONN_RELEASE) | X(E_PMM_RA_UPDATE) | X(E_PMM_IMPLICIT_DETACH), + .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_IDLE), + .name = "Connected", + .action = st_pmm_connected, + }, + [ST_PMM_IDLE] = { + .in_event_mask = X(E_PMM_IMPLICIT_DETACH) | X(E_PMM_PS_CONN_ESTABLISH), + .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_CONNECTED), + .name = "Idle", + .onenter = st_pmm_idle_on_enter, + .action = st_pmm_idle, + }, +}; + +const struct value_string mm_state_iu_fsm_event_names[] = { + OSMO_VALUE_STRING(E_PMM_PS_ATTACH), + OSMO_VALUE_STRING(E_PMM_PS_CONN_RELEASE), + OSMO_VALUE_STRING(E_PMM_PS_CONN_ESTABLISH), + OSMO_VALUE_STRING(E_PMM_IMPLICIT_DETACH), + OSMO_VALUE_STRING(E_PMM_RA_UPDATE), + { 0, NULL } +}; + +struct osmo_fsm mm_state_iu_fsm = { + .name = "MM_STATE_Iu", + .states = mm_state_iu_fsm_states, + .num_states = ARRAY_SIZE(mm_state_iu_fsm_states), + .event_names = mm_state_iu_fsm_event_names, + .log_subsys = DMM, +}; + +static __attribute__((constructor)) void mm_state_iu_fsm_init(void) +{ + osmo_fsm_register(&mm_state_iu_fsm); +} diff --git a/src/gprs/gprs_ranap.c b/src/gprs/gprs_ranap.c index 836937b..027b666 100644 --- a/src/gprs/gprs_ranap.c +++ b/src/gprs/gprs_ranap.c @@ -36,6 +36,7 @@ #include #include #include +#include /* Send RAB activation requests for all PDP contexts */ void activate_pdp_rabs(struct sgsn_mm_ctx *ctx) @@ -134,12 +135,11 @@ /* fall thru */ case RANAP_IU_EVENT_LINK_INVALIDATED: /* Clean up ranap_ue_conn_ctx here */ - if (mm) + if (mm) { LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); - else + osmo_fsm_inst_dispatch(mm->iu.mm_state_fsm, E_PMM_PS_CONN_RELEASE, NULL); + } else LOGIUP(ctx, LOGL_INFO, "IU release\n"); - if (mm && mm->iu.mm_state == PMM_CONNECTED) - mmctx_set_pmm_state(mm, PMM_IDLE); rc = 0; break; case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE: diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 82855a6..2334707 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -266,6 +267,7 @@ struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_iu(void *uectx) { #if BUILD_IU + char buf[32]; struct sgsn_mm_ctx *ctx; struct ranap_ue_conn_ctx *ue_ctx = uectx; @@ -279,7 +281,9 @@ ctx->iu.ue_ctx = ue_ctx; ctx->iu.ue_ctx->rab_assign_addr_enc = sgsn->cfg.iu.rab_assign_addr_enc; ctx->iu.new_key = 1; - ctx->iu.mm_state = PMM_DETACHED; + snprintf(buf, sizeof(buf), "%" PRIu32, ue_ctx->conn_id); + ctx->iu.mm_state_fsm = osmo_fsm_inst_alloc(&mm_state_iu_fsm, ctx, ctx, LOGL_DEBUG, buf); + return ctx; #else @@ -353,6 +357,8 @@ gmm_att_req_free(mm); if (mm->gb.mm_state_fsm) osmo_fsm_inst_free(mm->gb.mm_state_fsm); + if (mm->iu.mm_state_fsm) + osmo_fsm_inst_free(mm->iu.mm_state_fsm); sgsn_mm_ctx_free(mm); mm = NULL; diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 8a26d88..47189e5 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -51,6 +51,7 @@ $(top_builddir)/src/gprs/gprs_gmm_attach.o \ $(top_builddir)/src/gprs/gprs_gmm.o \ $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \ + $(top_builddir)/src/gprs/gprs_mm_state_iu_fsm.o \ $(top_builddir)/src/gprs/gprs_sgsn.o \ $(top_builddir)/src/gprs/sgsn_vty.o \ $(top_builddir)/src/gprs/sgsn_libgtp.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4c9cf8c27194817c56e8949af0205e1cc14af317 Gerrit-Change-Number: 15354 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:33:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:33:46 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_vty: Print correct Iu mmctx id in 'show mm-context' Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 Change subject: sgsn_vty: Print correct Iu mmctx id in 'show mm-context' ...................................................................... sgsn_vty: Print correct Iu mmctx id in 'show mm-context' Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6 --- M src/gprs/sgsn_vty.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/55/15355/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 42b5121..d77701d 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -525,10 +525,25 @@ static void vty_dump_mmctx(struct vty *vty, const char *pfx, struct sgsn_mm_ctx *mm, int pdp) { + uint32_t id; + + switch(mm->ran_type) { + case MM_CTX_T_UTRAN_Iu: +#if BUILD_IU + id = mm->iu.ue_ctx->conn_id; +#else + id = 0; +#endif + break; + case MM_CTX_T_GERAN_Gb: + id = mm->gb.tlli; + break; + } + vty_out(vty, "%sMM Context for IMSI %s, IMEI %s, P-TMSI %08x%s", pfx, mm->imsi, mm->imei, mm->p_tmsi, VTY_NEWLINE); vty_out(vty, "%s MSISDN: %s, TLLI: %08x%s HLR: %s", - pfx, mm->msisdn, mm->gb.tlli, mm->hlr, VTY_NEWLINE); + pfx, mm->msisdn, id, mm->hlr, VTY_NEWLINE); vty_out(vty, "%s MM State: %s, Routeing Area: %s, Cell ID: %u%s", pfx, get_value_string(gprs_mm_st_strs, mm->gmm_state), osmo_rai_name(&mm->ra), mm->gb.cell_id, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6 Gerrit-Change-Number: 15355 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:33:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:33:46 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_vty: Fix mmctx rate_ctr output indentation Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15356 Change subject: sgsn_vty: Fix mmctx rate_ctr output indentation ...................................................................... sgsn_vty: Fix mmctx rate_ctr output indentation Change-Id: I1b89c179e1ba08b65e31727fdce90c7b578f4d6d --- M src/gprs/sgsn_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/15356/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index d77701d..8637909 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -548,7 +548,7 @@ pfx, get_value_string(gprs_mm_st_strs, mm->gmm_state), osmo_rai_name(&mm->ra), mm->gb.cell_id, VTY_NEWLINE); - vty_out_rate_ctr_group(vty, " ", mm->ctrg); + vty_out_rate_ctr_group(vty, " ", mm->ctrg); if (pdp) { struct sgsn_pdp_ctx *pdp; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1b89c179e1ba08b65e31727fdce90c7b578f4d6d Gerrit-Change-Number: 15356 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:33:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:33:47 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Print MM state and RAN type in show mm-context Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 Change subject: vty: Print MM state and RAN type in show mm-context ...................................................................... vty: Print MM state and RAN type in show mm-context Value presviosuly printed as MM state is actually usually refereed as GMM state, so rename it. Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c 3 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/15357/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 8f16c5b..8e8b762 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -104,6 +104,7 @@ MM_CTX_T_GERAN_Iu, #endif }; +extern const struct value_string sgsn_ran_type_names[]; struct service_info { uint8_t type; diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 2334707..387c0d5 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -62,6 +62,15 @@ LLIST_HEAD(sgsn_apn_ctxts); LLIST_HEAD(sgsn_pdp_ctxts); +const struct value_string sgsn_ran_type_names[] = { + { MM_CTX_T_GERAN_Gb, "GPRS/EDGE via Gb" }, + { MM_CTX_T_UTRAN_Iu, "UMTS via Iu" }, +#if 0 + { MM_CTX_T_GERAN_Iu, "GPRS/EDGE via Iu" }, +#endif + { 0, NULL } +}; + static const struct rate_ctr_desc mmctx_ctr_description[] = { { "sign:packets:in", "Signalling Messages ( In)" }, { "sign:packets:out", "Signalling Messages (Out)" }, diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 8637909..7798f17 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -526,17 +526,21 @@ struct sgsn_mm_ctx *mm, int pdp) { uint32_t id; + const char *mm_state_name; switch(mm->ran_type) { case MM_CTX_T_UTRAN_Iu: #if BUILD_IU id = mm->iu.ue_ctx->conn_id; + mm_state_name = osmo_fsm_inst_state_name(mm->iu.mm_state_fsm); #else id = 0; + mm_state_name = NULL; #endif break; case MM_CTX_T_GERAN_Gb: id = mm->gb.tlli; + mm_state_name = osmo_fsm_inst_state_name(mm->gb.mm_state_fsm); break; } @@ -544,9 +548,11 @@ pfx, mm->imsi, mm->imei, mm->p_tmsi, VTY_NEWLINE); vty_out(vty, "%s MSISDN: %s, TLLI: %08x%s HLR: %s", pfx, mm->msisdn, id, mm->hlr, VTY_NEWLINE); - vty_out(vty, "%s MM State: %s, Routeing Area: %s, Cell ID: %u%s", + vty_out(vty, "%s GMM State: %s, Routeing Area: %s, Cell ID: %u%s", pfx, get_value_string(gprs_mm_st_strs, mm->gmm_state), osmo_rai_name(&mm->ra), mm->gb.cell_id, VTY_NEWLINE); + vty_out(vty, "%s MM State: %s, RAN Type: %s%s", pfx, mm_state_name, + get_value_string(sgsn_ran_type_names, mm->ran_type), VTY_NEWLINE); vty_out_rate_ctr_group(vty, " ", mm->ctrg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba Gerrit-Change-Number: 15357 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:44:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:44:42 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_vty: Print correct Iu mmctx id in 'show mm-context' In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 to look at the new patch set (#2). Change subject: sgsn_vty: Print correct Iu mmctx id in 'show mm-context' ...................................................................... sgsn_vty: Print correct Iu mmctx id in 'show mm-context' Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6 --- M src/gprs/sgsn_vty.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/55/15355/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6 Gerrit-Change-Number: 15355 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:44:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:44:42 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Print MM state and RAN type in show mm-context In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 to look at the new patch set (#2). Change subject: vty: Print MM state and RAN type in show mm-context ...................................................................... vty: Print MM state and RAN type in show mm-context Value presviosuly printed as MM state is actually usually refereed as GMM state, so rename it. Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_vty.c 3 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/15357/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba Gerrit-Change-Number: 15357 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 16:47:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 16:47:20 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_cdrc: Fix ip addr string buffer size Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15358 Change subject: sgsn_cdrc: Fix ip addr string buffer size ...................................................................... sgsn_cdrc: Fix ip addr string buffer size INET(6)_ADDRSTRLEN already contains the required extra null byte at the end, no need to add +1 to it. Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9 --- M src/gprs/sgsn_cdr.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/15358/1 diff --git a/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c index 93ed0af..a50b4df 100644 --- a/src/gprs/sgsn_cdr.c +++ b/src/gprs/sgsn_cdr.c @@ -153,9 +153,9 @@ struct sgsn_pdp_ctx *pdp) { char apni[(pdp->lib ? pdp->lib->apn_use.l : 0) + 1]; - char ggsn_addr[INET_ADDRSTRLEN + 1]; - char sgsn_addr[INET_ADDRSTRLEN + 1]; - char eua_addr[INET6_ADDRSTRLEN + 1]; + char ggsn_addr[INET_ADDRSTRLEN]; + char sgsn_addr[INET_ADDRSTRLEN]; + char eua_addr[INET6_ADDRSTRLEN]; struct tm tm; struct timeval tv; time_t duration; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9 Gerrit-Change-Number: 15358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 18:57:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 18:57:31 +0000 Subject: Change in ...osmo-hlr[master]: change format of 'last LU seen' Message-ID: Hello lynxis lazus, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 to review the following change. Change subject: change format of 'last LU seen' ...................................................................... change format of 'last LU seen' So far, the time string format comes from ctime_r, and we manually add "UTC" to it. The ctime_r format is wildly chaotic IMHO, mixing weekday, day-of-month and hour and year in very unsorted ways. Adding "UTC" to it is non-standard. Instead use an ISO-8601 standardized time string via strftime(). Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a --- M src/hlr_vty_subscr.c 1 file changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/15359/1 diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 73dfab6..b53227a 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -35,16 +35,15 @@ #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf)) -static char * -get_datestr(const time_t *t, char *datebuf) +static char *get_datestr(const time_t *t) { - char *p, *s = ctime_r(t, datebuf); + static char buf[32]; + struct tm tm; - /* Strip trailing newline. */ - p = strchr(s, '\n'); - if (p) - *p = '\0'; - return s; + tm = *gmtime(t); + + strftime(buf, sizeof(buf), "%FT%T+00:00", &tm); + return buf; } static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr) @@ -52,7 +51,6 @@ int rc; struct osmo_sub_auth_data aud2g; struct osmo_sub_auth_data aud3g; - char datebuf[26]; /* for ctime_r(3) */ vty_out(vty, " ID: %"PRIu64"%s", subscr->id, VTY_NEWLINE); @@ -88,7 +86,7 @@ if (subscr->ms_purged_ps) vty_out(vty, " PS purged%s", VTY_NEWLINE); if (subscr->last_lu_seen) - vty_out(vty, " last LU seen: %s UTC%s", get_datestr(&subscr->last_lu_seen, datebuf), VTY_NEWLINE); + vty_out(vty, " last LU seen: %s%s", get_datestr(&subscr->last_lu_seen), VTY_NEWLINE); if (!*subscr->imsi) return; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:07:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 19:07:03 +0000 Subject: Change in ...osmo-sgsn[master]: src/gprs/Makefile.am: Move build of shared .c files to an internal lib Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 Change subject: src/gprs/Makefile.am: Move build of shared .c files to an internal lib ...................................................................... src/gprs/Makefile.am: Move build of shared .c files to an internal lib Build files shared by osmo-sgsn, osmo-gbpy and osmo-gtphub into a .la library, so we can later split each application into its own subdir and clearly identify what's used by who. Due to a dependency error with .Po files, I cannot depend on the specific .o files directly in LDADD for each binary, but it works fine on follow up commits when binaries are splitted into different makefiles, so it will be done later. Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6 --- M .gitignore M debian/copyright M src/gprs/Makefile.am 3 files changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/60/15360/1 diff --git a/.gitignore b/.gitignore index 3480380..70193ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o *.lo *.a +*.la .deps Makefile Makefile.in diff --git a/debian/copyright b/debian/copyright index 4e53664..b9bc8e0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -81,17 +81,19 @@ include/osmocom/sgsn/gprs_utils.h include/osmocom/sgsn/gtphub.h include/osmocom/sgsn/signal.h + src/gprs/gprs_llc_parse.c src/gprs/crc24.c + src/gprs/gprs_gb_parse.c + src/gprs/gprs_utils.c + src/gprs/sgsn_ares.c src/gprs/gb_proxy.c src/gprs/gb_proxy_main.c src/gprs/gb_proxy_patch.c src/gprs/gb_proxy_peer.c src/gprs/gb_proxy_tlli.c src/gprs/gb_proxy_vty.c - src/gprs/gprs_gb_parse.c src/gprs/gprs_gmm.c src/gprs/gprs_llc.c - src/gprs/gprs_llc_parse.c src/gprs/gprs_llc_vty.c src/gprs/gprs_llc_xid.c src/gprs/gprs_sgsn.c @@ -102,11 +104,9 @@ src/gprs/gprs_sndcp_vty.c src/gprs/gprs_sndcp_xid.c src/gprs/gprs_subscriber.c - src/gprs/gprs_utils.c src/gprs/gtphub.c src/gprs/gtphub_main.c src/gprs/gtphub_vty.c - src/gprs/sgsn_ares.c src/gprs/sgsn_auth.c src/gprs/sgsn_cdr.c src/gprs/sgsn_ctrl.c diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 05d5b4c..e6144f4 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -35,6 +35,27 @@ $(LIBGTP_LIBS) \ $(NULL) +noinst_LTLIBRARIES = libcommon.la + +libcommon_la_SOURCES = \ + gprs_gb_parse.c \ + gprs_llc_parse.c \ + crc24.c \ + gprs_utils.c \ + sgsn_ares.c \ + $(NULL) + +libcommon_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBCARES_LIBS) \ + $(LIBGTP_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBCARES_LIBS) \ + -lrt \ + $(NULL) + bin_PROGRAMS = \ osmo-gbproxy \ osmo-sgsn \ @@ -49,12 +70,9 @@ gb_proxy_patch.c \ gb_proxy_tlli.c \ gb_proxy_peer.c \ - gprs_gb_parse.c \ - gprs_llc_parse.c \ - crc24.c \ - gprs_utils.c \ $(NULL) osmo_gbproxy_LDADD = \ + libcommon.la \ $(OSMO_LIBS) \ -lrt \ $(NULL) @@ -77,20 +95,17 @@ sgsn_vty.c \ sgsn_libgtp.c \ gprs_llc.c \ - gprs_llc_parse.c \ gprs_llc_vty.c \ - crc24.c \ sgsn_ctrl.c \ sgsn_auth.c \ gprs_subscriber.c \ - gprs_utils.c \ sgsn_cdr.c \ - sgsn_ares.c \ slhc.c \ gprs_llc_xid.c \ v42bis.c \ $(NULL) osmo_sgsn_LDADD = \ + libcommon.la \ $(OSMO_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ @@ -113,10 +128,9 @@ gtphub_sock.c \ gtphub_ares.c \ gtphub_vty.c \ - sgsn_ares.c \ - gprs_utils.c \ $(NULL) osmo_gtphub_LDADD = \ + libcommon.la \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6 Gerrit-Change-Number: 15360 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:07:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 19:07:04 +0000 Subject: Change in ...osmo-sgsn[master]: Move out gbproxy to its own subdir Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15361 Change subject: Move out gbproxy to its own subdir ...................................................................... Move out gbproxy to its own subdir Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e --- M configure.ac M debian/copyright M osmoappdesc.py M src/Makefile.am A src/gbproxy/Makefile.am R src/gbproxy/gb_proxy.c R src/gbproxy/gb_proxy_ctrl.c R src/gbproxy/gb_proxy_main.c R src/gbproxy/gb_proxy_patch.c R src/gbproxy/gb_proxy_peer.c R src/gbproxy/gb_proxy_tlli.c R src/gbproxy/gb_proxy_vty.c M src/gprs/Makefile.am M tests/gbproxy/Makefile.am M tests/vty_test_runner.py 15 files changed, 62 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/15361/1 diff --git a/configure.ac b/configure.ac index 02dcf05..1c3f03b 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,7 @@ include/osmocom/sgsn/Makefile src/Makefile src/gprs/Makefile + src/gbproxy/Makefile tests/Makefile tests/atlocal tests/gprs/Makefile diff --git a/debian/copyright b/debian/copyright index b9bc8e0..695d768 100644 --- a/debian/copyright +++ b/debian/copyright @@ -86,12 +86,12 @@ src/gprs/gprs_gb_parse.c src/gprs/gprs_utils.c src/gprs/sgsn_ares.c - src/gprs/gb_proxy.c - src/gprs/gb_proxy_main.c - src/gprs/gb_proxy_patch.c - src/gprs/gb_proxy_peer.c - src/gprs/gb_proxy_tlli.c - src/gprs/gb_proxy_vty.c + src/gbproxy/gb_proxy.c + src/gbproxy/gb_proxy_main.c + src/gbproxy/gb_proxy_patch.c + src/gbproxy/gb_proxy_peer.c + src/gbproxy/gb_proxy_tlli.c + src/gbproxy/gb_proxy_vty.c src/gprs/gprs_gmm.c src/gprs/gprs_llc.c src/gprs/gprs_llc_vty.c diff --git a/osmoappdesc.py b/osmoappdesc.py index f610e77..1c47aee 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -23,7 +23,7 @@ } -apps = [(4246, "src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), +apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"), (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub") ] diff --git a/src/Makefile.am b/src/Makefile.am index d2dcb9f..024938d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ gprs \ + gbproxy \ $(NULL) diff --git a/src/gbproxy/Makefile.am b/src/gbproxy/Makefile.am new file mode 100644 index 0000000..6876f68 --- /dev/null +++ b/src/gbproxy/Makefile.am @@ -0,0 +1,46 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOGB_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBGTP_CFLAGS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-gbproxy \ + $(NULL) + +osmo_gbproxy_SOURCES = \ + gb_proxy.c \ + gb_proxy_main.c \ + gb_proxy_vty.c \ + gb_proxy_ctrl.c \ + gb_proxy_patch.c \ + gb_proxy_tlli.c \ + gb_proxy_peer.c \ + $(NULL) +osmo_gbproxy_LDADD = \ + $(top_builddir)/src/gprs/gprs_gb_parse.o \ + $(top_builddir)/src/gprs/gprs_llc_parse.o \ + $(top_builddir)/src/gprs/crc24.o \ + $(top_builddir)/src/gprs/gprs_utils.o \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOGB_LIBS) \ + $(LIBGTP_LIBS) \ + -lrt \ + $(NULL) diff --git a/src/gprs/gb_proxy.c b/src/gbproxy/gb_proxy.c similarity index 100% rename from src/gprs/gb_proxy.c rename to src/gbproxy/gb_proxy.c diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gbproxy/gb_proxy_ctrl.c similarity index 100% rename from src/gprs/gb_proxy_ctrl.c rename to src/gbproxy/gb_proxy_ctrl.c diff --git a/src/gprs/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c similarity index 100% rename from src/gprs/gb_proxy_main.c rename to src/gbproxy/gb_proxy_main.c diff --git a/src/gprs/gb_proxy_patch.c b/src/gbproxy/gb_proxy_patch.c similarity index 100% rename from src/gprs/gb_proxy_patch.c rename to src/gbproxy/gb_proxy_patch.c diff --git a/src/gprs/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c similarity index 100% rename from src/gprs/gb_proxy_peer.c rename to src/gbproxy/gb_proxy_peer.c diff --git a/src/gprs/gb_proxy_tlli.c b/src/gbproxy/gb_proxy_tlli.c similarity index 100% rename from src/gprs/gb_proxy_tlli.c rename to src/gbproxy/gb_proxy_tlli.c diff --git a/src/gprs/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c similarity index 100% rename from src/gprs/gb_proxy_vty.c rename to src/gbproxy/gb_proxy_vty.c diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index e6144f4..e951004 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -57,26 +57,10 @@ $(NULL) bin_PROGRAMS = \ - osmo-gbproxy \ osmo-sgsn \ osmo-gtphub \ $(NULL) -osmo_gbproxy_SOURCES = \ - gb_proxy.c \ - gb_proxy_main.c \ - gb_proxy_vty.c \ - gb_proxy_ctrl.c \ - gb_proxy_patch.c \ - gb_proxy_tlli.c \ - gb_proxy_peer.c \ - $(NULL) -osmo_gbproxy_LDADD = \ - libcommon.la \ - $(OSMO_LIBS) \ - -lrt \ - $(NULL) - osmo_sgsn_SOURCES = \ gprs_gb.c \ gprs_gmm_attach.c \ diff --git a/tests/gbproxy/Makefile.am b/tests/gbproxy/Makefile.am index ef38fb6..cb245b4 100644 --- a/tests/gbproxy/Makefile.am +++ b/tests/gbproxy/Makefile.am @@ -32,10 +32,10 @@ $(NULL) gbproxy_test_LDADD = \ - $(top_builddir)/src/gprs/gb_proxy.o \ - $(top_builddir)/src/gprs/gb_proxy_patch.o \ - $(top_builddir)/src/gprs/gb_proxy_peer.o \ - $(top_builddir)/src/gprs/gb_proxy_tlli.o \ + $(top_builddir)/src/gbproxy/gb_proxy.o \ + $(top_builddir)/src/gbproxy/gb_proxy_patch.o \ + $(top_builddir)/src/gbproxy/gb_proxy_peer.o \ + $(top_builddir)/src/gbproxy/gb_proxy_tlli.o \ $(top_builddir)/src/gprs/gprs_gb_parse.o \ $(top_builddir)/src/gprs/gprs_llc_parse.o \ $(top_builddir)/src/gprs/crc24.o \ diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 19eaf28..a71865d 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -71,11 +71,11 @@ class TestVTYGbproxy(TestVTYBase): def vty_command(self): - return ["./src/gprs/osmo-gbproxy", "-c", + return ["./src/gbproxy/osmo-gbproxy", "-c", "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"] def vty_app(self): - return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy") + return (4246, "./src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy") def testVtyTree(self): self.vty.enable() @@ -277,7 +277,7 @@ self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) def add_gbproxy_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-gbproxy")): + if not os.path.isfile(os.path.join(workdir, "src/gbproxy/osmo-gbproxy")): print("Skipping the Gb-Proxy test") return test = unittest.TestLoader().loadTestsFromTestCase(TestVTYGbproxy) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e Gerrit-Change-Number: 15361 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:07:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 19:07:04 +0000 Subject: Change in ...osmo-sgsn[master]: Move out gtphub to its own subdir Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 Change subject: Move out gtphub to its own subdir ...................................................................... Move out gtphub to its own subdir Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea --- M configure.ac M debian/copyright M doc/examples/osmo-gtphub/gtphub-example.txt M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/gtphub/Makefile.am R src/gtphub/gtphub.c R src/gtphub/gtphub_ares.c R src/gtphub/gtphub_main.c R src/gtphub/gtphub_sock.c R src/gtphub/gtphub_vty.c M tests/gtphub/Makefile.am 13 files changed, 48 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/15362/1 diff --git a/configure.ac b/configure.ac index 1c3f03b..6672204 100644 --- a/configure.ac +++ b/configure.ac @@ -248,6 +248,7 @@ src/Makefile src/gprs/Makefile src/gbproxy/Makefile + src/gtphub/Makefile tests/Makefile tests/atlocal tests/gprs/Makefile diff --git a/debian/copyright b/debian/copyright index 695d768..5d883b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -104,9 +104,9 @@ src/gprs/gprs_sndcp_vty.c src/gprs/gprs_sndcp_xid.c src/gprs/gprs_subscriber.c - src/gprs/gtphub.c - src/gprs/gtphub_main.c - src/gprs/gtphub_vty.c + src/gtphub/gtphub.c + src/gtphub/gtphub_main.c + src/gtphub/gtphub_vty.c src/gprs/sgsn_auth.c src/gprs/sgsn_cdr.c src/gprs/sgsn_ctrl.c @@ -140,8 +140,8 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Files: src/gprs/gtphub_ares.c - src/gprs/gtphub_sock.c +Files: src/gtphub/gtphub_ares.c + src/gtphub/gtphub_sock.c tests/gbproxy/gbproxy_test.c Copyright: 2013 Jacob Erlbeck 2013 sysmocom s.f.m.c. GmbH diff --git a/doc/examples/osmo-gtphub/gtphub-example.txt b/doc/examples/osmo-gtphub/gtphub-example.txt index 9c65f92..17f6914 100644 --- a/doc/examples/osmo-gtphub/gtphub-example.txt +++ b/doc/examples/osmo-gtphub/gtphub-example.txt @@ -59,7 +59,7 @@ 2. GTPHub: cd - path/to/openbsc/openbsc/src/gprs/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level + path/to/openbsc/openbsc/src/gtphub/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level 3. SGSN tests: diff --git a/osmoappdesc.py b/osmoappdesc.py index 1c47aee..9c3fd5d 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -25,7 +25,7 @@ apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"), - (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub") + (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub") ] vty_command = ["./src/gprs/osmo-sgsn", "-c", diff --git a/src/Makefile.am b/src/Makefile.am index 024938d..2abd437 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ gprs \ gbproxy \ + gtphub \ $(NULL) diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index e951004..4c0e40f 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -58,7 +58,6 @@ bin_PROGRAMS = \ osmo-sgsn \ - osmo-gtphub \ $(NULL) osmo_sgsn_SOURCES = \ @@ -105,21 +104,3 @@ $(LIBASN1C_LIBS) \ $(NULL) endif - -osmo_gtphub_SOURCES = \ - gtphub_main.c \ - gtphub.c \ - gtphub_sock.c \ - gtphub_ares.c \ - gtphub_vty.c \ - $(NULL) -osmo_gtphub_LDADD = \ - libcommon.la \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBCARES_LIBS) \ - $(LIBGTP_LIBS) \ - $(LIBOSMOSIGTRAN_LIBS) \ - -lrt \ - $(NULL) diff --git a/src/gtphub/Makefile.am b/src/gtphub/Makefile.am new file mode 100644 index 0000000..f3aac2c --- /dev/null +++ b/src/gtphub/Makefile.am @@ -0,0 +1,38 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBGTP_CFLAGS) \ + $(NULL) + +bin_PROGRAMS = osmo-gtphub + +osmo_gtphub_SOURCES = \ + gtphub_main.c \ + gtphub.c \ + gtphub_sock.c \ + gtphub_ares.c \ + gtphub_vty.c \ + $(NULL) + +osmo_gtphub_LDADD = \ + $(top_builddir)/src/gprs/sgsn_ares.o \ + $(top_builddir)/src/gprs/gprs_utils.o \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBCARES_LIBS) \ + $(LIBGTP_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + -lrt \ + $(NULL) diff --git a/src/gprs/gtphub.c b/src/gtphub/gtphub.c similarity index 100% rename from src/gprs/gtphub.c rename to src/gtphub/gtphub.c diff --git a/src/gprs/gtphub_ares.c b/src/gtphub/gtphub_ares.c similarity index 100% rename from src/gprs/gtphub_ares.c rename to src/gtphub/gtphub_ares.c diff --git a/src/gprs/gtphub_main.c b/src/gtphub/gtphub_main.c similarity index 100% rename from src/gprs/gtphub_main.c rename to src/gtphub/gtphub_main.c diff --git a/src/gprs/gtphub_sock.c b/src/gtphub/gtphub_sock.c similarity index 100% rename from src/gprs/gtphub_sock.c rename to src/gtphub/gtphub_sock.c diff --git a/src/gprs/gtphub_vty.c b/src/gtphub/gtphub_vty.c similarity index 100% rename from src/gprs/gtphub_vty.c rename to src/gtphub/gtphub_vty.c diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am index 523df61..fea01e0 100644 --- a/tests/gtphub/Makefile.am +++ b/tests/gtphub/Makefile.am @@ -31,7 +31,7 @@ $(NULL) gtphub_test_LDADD = \ - $(top_builddir)/src/gprs/gtphub.o \ + $(top_builddir)/src/gtphub/gtphub.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea Gerrit-Change-Number: 15362 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:07:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 19:07:04 +0000 Subject: Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 Change subject: Move out sgsn to its own subdir ...................................................................... Move out sgsn to its own subdir Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 --- M configure.ac M debian/copyright M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/sgsn/Makefile.am R src/sgsn/gprs_gb.c R src/sgsn/gprs_gmm.c R src/sgsn/gprs_gmm_attach.c R src/sgsn/gprs_llc.c R src/sgsn/gprs_llc_vty.c R src/sgsn/gprs_llc_xid.c R src/sgsn/gprs_mm_state_gb_fsm.c R src/sgsn/gprs_mm_state_iu_fsm.c R src/sgsn/gprs_ranap.c R src/sgsn/gprs_sgsn.c R src/sgsn/gprs_sndcp.c R src/sgsn/gprs_sndcp_comp.c R src/sgsn/gprs_sndcp_dcomp.c R src/sgsn/gprs_sndcp_pcomp.c R src/sgsn/gprs_sndcp_vty.c R src/sgsn/gprs_sndcp_xid.c R src/sgsn/gprs_subscriber.c R src/sgsn/sgsn_auth.c R src/sgsn/sgsn_cdr.c R src/sgsn/sgsn_ctrl.c R src/sgsn/sgsn_libgtp.c R src/sgsn/sgsn_main.c R src/sgsn/sgsn_vty.c R src/sgsn/slhc.c R src/sgsn/v42bis.c M tests/Makefile.am M tests/ctrl_test_runner.py M tests/sgsn/Makefile.am M tests/slhc/Makefile.am M tests/sndcp_xid/Makefile.am M tests/v42bis/Makefile.am M tests/vty_test_runner.py M tests/xid/Makefile.am 39 files changed, 144 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/15363/1 diff --git a/configure.ac b/configure.ac index 6672204..ec7af6e 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,7 @@ include/osmocom/sgsn/Makefile src/Makefile src/gprs/Makefile + src/sgsn/Makefile src/gbproxy/Makefile src/gtphub/Makefile tests/Makefile diff --git a/debian/copyright b/debian/copyright index 5d883b9..fa7405f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -92,27 +92,27 @@ src/gbproxy/gb_proxy_peer.c src/gbproxy/gb_proxy_tlli.c src/gbproxy/gb_proxy_vty.c - src/gprs/gprs_gmm.c - src/gprs/gprs_llc.c - src/gprs/gprs_llc_vty.c - src/gprs/gprs_llc_xid.c - src/gprs/gprs_sgsn.c - src/gprs/gprs_sndcp.c - src/gprs/gprs_sndcp_comp.c - src/gprs/gprs_sndcp_dcomp.c - src/gprs/gprs_sndcp_pcomp.c - src/gprs/gprs_sndcp_vty.c - src/gprs/gprs_sndcp_xid.c - src/gprs/gprs_subscriber.c src/gtphub/gtphub.c src/gtphub/gtphub_main.c src/gtphub/gtphub_vty.c - src/gprs/sgsn_auth.c - src/gprs/sgsn_cdr.c - src/gprs/sgsn_ctrl.c - src/gprs/sgsn_libgtp.c - src/gprs/sgsn_main.c - src/gprs/sgsn_vty.c + src/sgsn/gprs_gmm.c + src/sgsn/gprs_llc.c + src/sgsn/gprs_llc_vty.c + src/sgsn/gprs_llc_xid.c + src/sgsn/gprs_sgsn.c + src/sgsn/gprs_sndcp.c + src/sgsn/gprs_sndcp_comp.c + src/sgsn/gprs_sndcp_dcomp.c + src/sgsn/gprs_sndcp_pcomp.c + src/sgsn/gprs_sndcp_vty.c + src/sgsn/gprs_sndcp_xid.c + src/sgsn/gprs_subscriber.c + src/sgsn/sgsn_auth.c + src/sgsn/sgsn_cdr.c + src/sgsn/sgsn_ctrl.c + src/sgsn/sgsn_libgtp.c + src/sgsn/sgsn_main.c + src/sgsn/sgsn_vty.c tests/gtphub/gtphub_test.c tests/sgsn/sgsn_test.c tests/slhc/slhc_test.c diff --git a/osmoappdesc.py b/osmoappdesc.py index 9c3fd5d..08166a9 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -24,11 +24,11 @@ apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), - (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"), + (4245, "src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn"), (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub") ] -vty_command = ["./src/gprs/osmo-sgsn", "-c", +vty_command = ["./src/sgsn/osmo-sgsn", "-c", "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] vty_app = apps[1] diff --git a/src/Makefile.am b/src/Makefile.am index 2abd437..c45d3ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ gprs \ + sgsn \ gbproxy \ gtphub \ $(NULL) diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 4c0e40f..64648e2 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -26,15 +26,6 @@ $(NULL) endif -OSMO_LIBS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOCTRL_LIBS) \ - $(LIBOSMOGB_LIBS) \ - $(LIBGTP_LIBS) \ - $(NULL) - noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = \ @@ -55,52 +46,3 @@ $(LIBCARES_LIBS) \ -lrt \ $(NULL) - -bin_PROGRAMS = \ - osmo-sgsn \ - $(NULL) - -osmo_sgsn_SOURCES = \ - gprs_gb.c \ - gprs_gmm_attach.c \ - gprs_gmm.c \ - gprs_mm_state_gb_fsm.c \ - gprs_mm_state_iu_fsm.c \ - gprs_ranap.c \ - gprs_sgsn.c \ - gprs_sndcp.c \ - gprs_sndcp_comp.c \ - gprs_sndcp_dcomp.c \ - gprs_sndcp_pcomp.c \ - gprs_sndcp_vty.c \ - gprs_sndcp_xid.c \ - sgsn_main.c \ - sgsn_vty.c \ - sgsn_libgtp.c \ - gprs_llc.c \ - gprs_llc_vty.c \ - sgsn_ctrl.c \ - sgsn_auth.c \ - gprs_subscriber.c \ - sgsn_cdr.c \ - slhc.c \ - gprs_llc_xid.c \ - v42bis.c \ - $(NULL) -osmo_sgsn_LDADD = \ - libcommon.la \ - $(OSMO_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOGSUPCLIENT_LIBS) \ - $(LIBCARES_LIBS) \ - $(LIBGTP_LIBS) \ - -lrt \ - -lm \ - $(NULL) -if BUILD_IU -osmo_sgsn_LDADD += \ - $(LIBOSMOSIGTRAN_LIBS) \ - $(LIBOSMORANAP_LIBS) \ - $(LIBASN1C_LIBS) \ - $(NULL) -endif diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am new file mode 100644 index 0000000..a8da943 --- /dev/null +++ b/src/sgsn/Makefile.am @@ -0,0 +1,88 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOGB_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCARES_CFLAGS) \ + $(LIBGTP_CFLAGS) \ + $(NULL) +if BUILD_IU +AM_CFLAGS += \ + $(LIBASN1C_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMORANAP_CFLAGS) \ + $(NULL) +endif + +OSMO_LIBS = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOGB_LIBS) \ + $(LIBGTP_LIBS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-sgsn \ + $(NULL) + +osmo_sgsn_SOURCES = \ + gprs_gb.c \ + gprs_gmm_attach.c \ + gprs_gmm.c \ + gprs_mm_state_gb_fsm.c \ + gprs_mm_state_iu_fsm.c \ + gprs_ranap.c \ + gprs_sgsn.c \ + gprs_sndcp.c \ + gprs_sndcp_comp.c \ + gprs_sndcp_dcomp.c \ + gprs_sndcp_pcomp.c \ + gprs_sndcp_vty.c \ + gprs_sndcp_xid.c \ + sgsn_main.c \ + sgsn_vty.c \ + sgsn_libgtp.c \ + gprs_llc.c \ + gprs_llc_vty.c \ + sgsn_ctrl.c \ + sgsn_auth.c \ + gprs_subscriber.c \ + sgsn_cdr.c \ + slhc.c \ + gprs_llc_xid.c \ + v42bis.c \ + $(NULL) +osmo_sgsn_LDADD = \ + $(top_builddir)/src/gprs/gprs_llc_parse.o \ + $(top_builddir)/src/gprs/crc24.o \ + $(top_builddir)/src/gprs/gprs_utils.o \ + $(top_builddir)/src/gprs/sgsn_ares.o \ + $(OSMO_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ + $(LIBCARES_LIBS) \ + $(LIBGTP_LIBS) \ + -lrt \ + -lm \ + $(NULL) +if BUILD_IU +osmo_sgsn_LDADD += \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMORANAP_LIBS) \ + $(LIBASN1C_LIBS) \ + $(NULL) +endif diff --git a/src/gprs/gprs_gb.c b/src/sgsn/gprs_gb.c similarity index 100% rename from src/gprs/gprs_gb.c rename to src/sgsn/gprs_gb.c diff --git a/src/gprs/gprs_gmm.c b/src/sgsn/gprs_gmm.c similarity index 100% rename from src/gprs/gprs_gmm.c rename to src/sgsn/gprs_gmm.c diff --git a/src/gprs/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c similarity index 100% rename from src/gprs/gprs_gmm_attach.c rename to src/sgsn/gprs_gmm_attach.c diff --git a/src/gprs/gprs_llc.c b/src/sgsn/gprs_llc.c similarity index 100% rename from src/gprs/gprs_llc.c rename to src/sgsn/gprs_llc.c diff --git a/src/gprs/gprs_llc_vty.c b/src/sgsn/gprs_llc_vty.c similarity index 100% rename from src/gprs/gprs_llc_vty.c rename to src/sgsn/gprs_llc_vty.c diff --git a/src/gprs/gprs_llc_xid.c b/src/sgsn/gprs_llc_xid.c similarity index 100% rename from src/gprs/gprs_llc_xid.c rename to src/sgsn/gprs_llc_xid.c diff --git a/src/gprs/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c similarity index 100% rename from src/gprs/gprs_mm_state_gb_fsm.c rename to src/sgsn/gprs_mm_state_gb_fsm.c diff --git a/src/gprs/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c similarity index 100% rename from src/gprs/gprs_mm_state_iu_fsm.c rename to src/sgsn/gprs_mm_state_iu_fsm.c diff --git a/src/gprs/gprs_ranap.c b/src/sgsn/gprs_ranap.c similarity index 100% rename from src/gprs/gprs_ranap.c rename to src/sgsn/gprs_ranap.c diff --git a/src/gprs/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c similarity index 100% rename from src/gprs/gprs_sgsn.c rename to src/sgsn/gprs_sgsn.c diff --git a/src/gprs/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c similarity index 100% rename from src/gprs/gprs_sndcp.c rename to src/sgsn/gprs_sndcp.c diff --git a/src/gprs/gprs_sndcp_comp.c b/src/sgsn/gprs_sndcp_comp.c similarity index 100% rename from src/gprs/gprs_sndcp_comp.c rename to src/sgsn/gprs_sndcp_comp.c diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/sgsn/gprs_sndcp_dcomp.c similarity index 100% rename from src/gprs/gprs_sndcp_dcomp.c rename to src/sgsn/gprs_sndcp_dcomp.c diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/sgsn/gprs_sndcp_pcomp.c similarity index 100% rename from src/gprs/gprs_sndcp_pcomp.c rename to src/sgsn/gprs_sndcp_pcomp.c diff --git a/src/gprs/gprs_sndcp_vty.c b/src/sgsn/gprs_sndcp_vty.c similarity index 100% rename from src/gprs/gprs_sndcp_vty.c rename to src/sgsn/gprs_sndcp_vty.c diff --git a/src/gprs/gprs_sndcp_xid.c b/src/sgsn/gprs_sndcp_xid.c similarity index 100% rename from src/gprs/gprs_sndcp_xid.c rename to src/sgsn/gprs_sndcp_xid.c diff --git a/src/gprs/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c similarity index 100% rename from src/gprs/gprs_subscriber.c rename to src/sgsn/gprs_subscriber.c diff --git a/src/gprs/sgsn_auth.c b/src/sgsn/sgsn_auth.c similarity index 100% rename from src/gprs/sgsn_auth.c rename to src/sgsn/sgsn_auth.c diff --git a/src/gprs/sgsn_cdr.c b/src/sgsn/sgsn_cdr.c similarity index 100% rename from src/gprs/sgsn_cdr.c rename to src/sgsn/sgsn_cdr.c diff --git a/src/gprs/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c similarity index 100% rename from src/gprs/sgsn_ctrl.c rename to src/sgsn/sgsn_ctrl.c diff --git a/src/gprs/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c similarity index 100% rename from src/gprs/sgsn_libgtp.c rename to src/sgsn/sgsn_libgtp.c diff --git a/src/gprs/sgsn_main.c b/src/sgsn/sgsn_main.c similarity index 100% rename from src/gprs/sgsn_main.c rename to src/sgsn/sgsn_main.c diff --git a/src/gprs/sgsn_vty.c b/src/sgsn/sgsn_vty.c similarity index 100% rename from src/gprs/sgsn_vty.c rename to src/sgsn/sgsn_vty.c diff --git a/src/gprs/slhc.c b/src/sgsn/slhc.c similarity index 100% rename from src/gprs/slhc.c rename to src/sgsn/slhc.c diff --git a/src/gprs/v42bis.c b/src/sgsn/v42bis.c similarity index 100% rename from src/gprs/v42bis.c rename to src/sgsn/v42bis.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 6c392af..a23d931 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -63,7 +63,7 @@ vty-transcript-test: osmo_verify_transcript_vty.py -v \ -n OsmoSGSN -p 4245 \ - -r "$(top_builddir)/src/gprs/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ + -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ $(U) $${T:-$(srcdir)/*.vty} rm -f $(builddir)/sms.db $(builddir)/gsn_restart diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 57ef82e..9c253fc 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -145,11 +145,11 @@ class TestCtrlSGSN(TestCtrlBase): def ctrl_command(self): - return ["./src/gprs/osmo-sgsn", "-c", + return ["./src/sgsn/osmo-sgsn", "-c", "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] def ctrl_app(self): - return (4251, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn") + return (4251, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") def testListSubscribers(self): # TODO. Add command to mark a subscriber as active @@ -159,7 +159,7 @@ self.assertEquals(r['value'], None) def add_sgsn_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")): + if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")): print("Skipping the SGSN test") return test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlSGSN) diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 47189e5..7ba70eb 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -42,31 +42,31 @@ $(NULL) sgsn_test_LDADD = \ - $(top_builddir)/src/gprs/gprs_llc_parse.o \ - $(top_builddir)/src/gprs/gprs_llc.o \ - $(top_builddir)/src/gprs/crc24.o \ - $(top_builddir)/src/gprs/gprs_gb.o \ - $(top_builddir)/src/gprs/gprs_ranap.o \ - $(top_builddir)/src/gprs/gprs_sndcp.o \ - $(top_builddir)/src/gprs/gprs_gmm_attach.o \ - $(top_builddir)/src/gprs/gprs_gmm.o \ - $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \ - $(top_builddir)/src/gprs/gprs_mm_state_iu_fsm.o \ - $(top_builddir)/src/gprs/gprs_sgsn.o \ - $(top_builddir)/src/gprs/sgsn_vty.o \ - $(top_builddir)/src/gprs/sgsn_libgtp.o \ - $(top_builddir)/src/gprs/sgsn_auth.o \ - $(top_builddir)/src/gprs/sgsn_ares.o \ + $(top_builddir)/src/sgsn/gprs_llc.o \ + $(top_builddir)/src/sgsn/gprs_gb.o \ + $(top_builddir)/src/sgsn/gprs_ranap.o \ + $(top_builddir)/src/sgsn/gprs_sndcp.o \ + $(top_builddir)/src/sgsn/gprs_gmm_attach.o \ + $(top_builddir)/src/sgsn/gprs_gmm.o \ + $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \ + $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \ + $(top_builddir)/src/sgsn/gprs_sgsn.o \ + $(top_builddir)/src/sgsn/sgsn_vty.o \ + $(top_builddir)/src/sgsn/sgsn_libgtp.o \ + $(top_builddir)/src/sgsn/sgsn_auth.o \ + $(top_builddir)/src/sgsn/gprs_subscriber.o \ + $(top_builddir)/src/sgsn/gprs_llc_xid.o \ + $(top_builddir)/src/sgsn/gprs_sndcp_xid.o \ + $(top_builddir)/src/sgsn/slhc.o \ + $(top_builddir)/src/sgsn/gprs_sndcp_comp.o \ + $(top_builddir)/src/sgsn/gprs_sndcp_pcomp.o \ + $(top_builddir)/src/sgsn/v42bis.o \ + $(top_builddir)/src/sgsn/gprs_sndcp_dcomp.o \ $(top_builddir)/src/gprs/gprs_utils.o \ - $(top_builddir)/src/gprs/gprs_subscriber.o \ + $(top_builddir)/src/gprs/gprs_llc_parse.o \ $(top_builddir)/src/gprs/gprs_gb_parse.o \ - $(top_builddir)/src/gprs/gprs_llc_xid.o \ - $(top_builddir)/src/gprs/gprs_sndcp_xid.o \ - $(top_builddir)/src/gprs/slhc.o \ - $(top_builddir)/src/gprs/gprs_sndcp_comp.o \ - $(top_builddir)/src/gprs/gprs_sndcp_pcomp.o \ - $(top_builddir)/src/gprs/v42bis.o \ - $(top_builddir)/src/gprs/gprs_sndcp_dcomp.o \ + $(top_builddir)/src/gprs/crc24.o \ + $(top_builddir)/src/gprs/sgsn_ares.o \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/slhc/Makefile.am b/tests/slhc/Makefile.am index 818ae2e..b6738c2 100644 --- a/tests/slhc/Makefile.am +++ b/tests/slhc/Makefile.am @@ -8,7 +8,7 @@ slhc_test_SOURCES = slhc_test.c slhc_test_LDADD = \ - $(top_builddir)/src/gprs/slhc.o \ + $(top_builddir)/src/sgsn/slhc.o \ $(LIBOSMOCORE_LIBS) diff --git a/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am index fbcb36c..24626b3 100644 --- a/tests/sndcp_xid/Makefile.am +++ b/tests/sndcp_xid/Makefile.am @@ -8,7 +8,7 @@ sndcp_xid_test_SOURCES = sndcp_xid_test.c sndcp_xid_test_LDADD = \ - $(top_builddir)/src/gprs/gprs_sndcp_xid.o \ + $(top_builddir)/src/sgsn/gprs_sndcp_xid.o \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/v42bis/Makefile.am b/tests/v42bis/Makefile.am index 8e17b4a..7442392 100644 --- a/tests/v42bis/Makefile.am +++ b/tests/v42bis/Makefile.am @@ -8,7 +8,7 @@ v42bis_test_SOURCES = v42bis_test.c v42bis_test_LDADD = \ - $(top_builddir)/src/gprs/v42bis.o \ + $(top_builddir)/src/sgsn/v42bis.o \ $(LIBOSMOCORE_LIBS) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index a71865d..a925b6b 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -119,11 +119,11 @@ class TestVTYSGSN(TestVTYBase): def vty_command(self): - return ["./src/gprs/osmo-sgsn", "-c", + return ["./src/sgsn/osmo-sgsn", "-c", "doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg"] def vty_app(self): - return (4245, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn") + return (4245, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") def testVtyTree(self): self.vty.enable() @@ -284,7 +284,7 @@ suite.addTest(test) def add_sgsn_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")): + if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")): print("Skipping the SGSN test") return test = unittest.TestLoader().loadTestsFromTestCase(TestVTYSGSN) diff --git a/tests/xid/Makefile.am b/tests/xid/Makefile.am index 92876ec..6f058f5 100644 --- a/tests/xid/Makefile.am +++ b/tests/xid/Makefile.am @@ -24,7 +24,7 @@ $(NULL) xid_test_LDADD = \ - $(top_builddir)/src/gprs/gprs_llc_xid.o \ + $(top_builddir)/src/sgsn/gprs_llc_xid.o \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 Gerrit-Change-Number: 15363 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:08:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 19:08:35 +0000 Subject: Change in ...osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15364 Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... AUC: Add support for setting the AMF separation bit to '1' for EUTRAN Despite LTE/EUTRAN using the same authentication procedure (UMTS AKA) as 3G, there's one difference: The "operator defined" 16bit AMF field is reduced to 15 bits, with the first bit now being used as 'separation bit'. That bit should be '0' for 2G/3G (as it is right now) and '1' for authentication vectores generated for authentication over EUTRAN/EPS. Depends: libosmocore I93850710ab55a605bf61b95063a69682a2899bb1 (OSMO_GSUP_RAT_TYPES_IE) Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 --- M src/db.h M src/db_auc.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err 5 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/15364/1 diff --git a/src/db.h b/src/db.h index 15d83de..3735834 100644 --- a/src/db.h +++ b/src/db.h @@ -65,7 +65,7 @@ int db_get_auc(struct db_context *dbc, const char *imsi, unsigned int auc_3g_ind, struct osmo_auth_vector *vec, unsigned int num_vec, const uint8_t *rand_auts, - const uint8_t *auts); + const uint8_t *auts, bool separation_bit); #include #include diff --git a/src/db_auc.c b/src/db_auc.c index 2cf7143..6eaee9d 100644 --- a/src/db_auc.c +++ b/src/db_auc.c @@ -189,7 +189,7 @@ int db_get_auc(struct db_context *dbc, const char *imsi, unsigned int auc_3g_ind, struct osmo_auth_vector *vec, unsigned int num_vec, const uint8_t *rand_auts, - const uint8_t *auts) + const uint8_t *auts, bool separation_bit) { struct osmo_sub_auth_data aud2g, aud3g; int64_t subscr_id; @@ -209,6 +209,12 @@ aud3g.u.umts.ind_bitlen, aud3g.u.umts.ind); aud3g.u.umts.ind &= (1U << aud3g.u.umts.ind_bitlen) - 1; } + /* the first bit (bit0) cannot be used as AMF anymore, but has been + * re-appropriated as the separation bit. See 3GPP TS 33.102 Annex H + * together with 3GPP TS 33.401 / 33.402 / 33.501 */ + aud3g.u.umts.amf[0] = aud3g.u.umts.amf[0] & 0x7f; + if (separation_bit) + aud3g.u.umts.amf[0] |= 0x80; LOGAUC(imsi, LOGL_DEBUG, "Calling to generate %u vectors\n", num_vec); rc = auc_compute_vectors(vec, num_vec, &aud2g, &aud3g, rand_auts, auts); diff --git a/src/hlr.c b/src/hlr.c index 8b9dff1..4a9ef89 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -233,6 +233,7 @@ { struct osmo_gsup_message gsup_out; struct msgb *msg_out; + bool separation_bit = false; int rc; subscr_create_on_demand(gsup->imsi); @@ -241,10 +242,13 @@ memset(&gsup_out, 0, sizeof(gsup_out)); memcpy(&gsup_out.imsi, &gsup->imsi, sizeof(gsup_out.imsi)); + if (gsup->rat_types_len >= 1 && gsup->rat_types[0] == OSMO_RAT_EUTRAN_SGS) + separation_bit = true; + rc = db_get_auc(dbc, gsup->imsi, conn->auc_3g_ind, gsup_out.auth_vectors, ARRAY_SIZE(gsup_out.auth_vectors), - gsup->rand, gsup->auts); + gsup->rand, gsup->auts, separation_bit); if (rc <= 0) { gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR; switch (rc) { diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 1da2752..7c31da6 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -115,7 +115,7 @@ #define ASSERT_DB_GET_AUC(imsi, expect_rc) \ do { \ struct osmo_auth_vector vec[N_VECTORS]; \ - ASSERT_RC(db_get_auc(dbc, imsi, 3, vec, N_VECTORS, NULL, NULL), expect_rc); \ + ASSERT_RC(db_get_auc(dbc, imsi, 3, vec, N_VECTORS, NULL, NULL, false), expect_rc); \ } while (0) /* Not linking the real auc_compute_vectors(), just returning num_vec. diff --git a/tests/db/db_test.err b/tests/db/db_test.err index a3e4d58..6423550 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -814,7 +814,7 @@ DAUC IMSI='999999999': No such subscriber -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -2 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -2 DAUC IMSI='123456789000000': No such subscriber @@ -833,7 +833,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -852,7 +852,7 @@ } 3G: none -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': No 3G Auth Data DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors @@ -915,7 +915,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -940,7 +940,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -963,7 +963,7 @@ .u.umts.ind_bitlen = 5, } -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors @@ -1042,7 +1042,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1064,7 +1064,7 @@ .u.umts.ind_bitlen = 5, } -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors @@ -1077,7 +1077,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1105,7 +1105,7 @@ .u.umts.ind_bitlen = 5, } -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors DAUC IMSI='123456789000000': Updating SQN=0 in DB @@ -1323,7 +1323,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1332,7 +1332,7 @@ db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> -ENOENT DAUC Cannot read subscriber from db: IMSI='123456789000000': No such subscriber -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -2 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -2 DAUC IMSI='123456789000000': No such subscriber ===== test_subscr_aud: SUCCESS -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:12:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 19:12:57 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: GSUP_Types: Add support for GSUP_IE_RAT_TYPE Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15365 Change subject: GSUP_Types: Add support for GSUP_IE_RAT_TYPE ...................................................................... GSUP_Types: Add support for GSUP_IE_RAT_TYPE Depends: libosmocore I93850710ab55a605bf61b95063a69682a2899bb1 Change-Id: I5d899fc6f6d4cf6123609b596022a853561f35f5 --- M library/GSUP_Types.ttcn 1 file changed, 46 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/15365/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 74fbfc4..e1aa24c 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -43,6 +43,7 @@ OSMO_GSUP_AUTS_IE ('26'O), OSMO_GSUP_RES_IE ('27'O), OSMO_GSUP_CN_DOMAIN_IE ('28'O), + OSMO_GSUP_RAT_TYPE_IE ('29'O), OSMO_GSUP_SESSION_ID_IE ('30'O), OSMO_GSUP_SESSION_STATE_IE ('31'O), @@ -232,11 +233,21 @@ cause_rr, tag = OSMO_GSUP_CAUSE_RR_IE; cause_bssap, tag = OSMO_GSUP_CAUSE_BSSAP_IE; cause_sm, tag = OSMO_GSUP_CAUSE_SM_IE; + rat_type, tag = OSMO_GSUP_RAT_TYPE_IE; )" }; type record of GSUP_IE GSUP_IEs; +type enumerated GSUP_RatType { + RAT_TYPE_UNKNOWN (0), + RAT_TYPE_GERAN_A (1), + RAT_TYPE_UTRAN_Iu (2), + RAT_TYPE_EUTRAN_SGs (3) +} with { variant "FIELDLENGTH(8)" }; + +type record of GSUP_RatType GSUP_RatTypes; + type union GSUP_IeValue { hexstring imsi, integer cause, @@ -287,7 +298,9 @@ OCT1 cause_rr, OCT1 cause_bssap, - OCT1 cause_sm + OCT1 cause_sm, + + GSUP_RatTypes rat_type }; type record GSUP_PDU { @@ -433,6 +446,12 @@ template (value) GSUP_PDU ts_GSUP_SAI_REQ(hexstring imsi) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { valueof(ts_GSUP_IE_IMSI(imsi)) }); +template (value) GSUP_PDU ts_GSUP_SAI_REQ_EPS(hexstring imsi) := + ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_RAT_TYPE({RAT_TYPE_EUTRAN_SGs})) + }); + template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi); @@ -1105,6 +1124,23 @@ } } + +template (present) GSUP_IE tr_GSUP_IE_RAT_TYPE(template (present) GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_RAT_TYPE_IE, + len := ?, + val := { + rat_type := ratt + } +} +template (value) GSUP_IE ts_GSUP_IE_RAT_TYPE(GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_RAT_TYPE_IE, + len := 0, /* overwritten */ + val := { + rat_type := ratt + } +} + + private function f_gen_ts_ss_ies( hexstring imsi, OCT4 sid, @@ -1486,14 +1522,18 @@ } ); -function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { - for (var integer i := 0; i < sizeof(msg.ies); i := i+1) { - if (msg.ies[i].tag == iei) { - ret := msg.ies[i].val; +function f_gsup_find_nested_ie(GSUP_IEs ies, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { + for (var integer i := 0; i < sizeof(ies); i := i+1) { + if (ies[i].tag == iei) { + ret := ies[i].val; return true; } } - return false; + return false; +} + +function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { + return f_gsup_find_nested_ie(msg.ies, iei, ret); } template GSUP_AN_APDU t_GSUP_AN_APDU( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15365 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: I5d899fc6f6d4cf6123609b596022a853561f35f5 Gerrit-Change-Number: 15365 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:12:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 19:12:58 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 Change subject: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 ...................................................................... HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 Depends: osmo-hlr Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Change-Id: I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf --- M hlr/HLR_Tests.ttcn 1 file changed, 75 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/15366/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index f309575..4354a9f 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -293,6 +293,30 @@ return sl; } +function f_gen_3G_subs() runs on test_CT return HlrSubscriberList { + var HlrSubscriber sub; + var HlrSubscriberList sl := {}; + + sub := valueof(t_Sub3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), "milenage", false)); + sl := sl & { sub }; + + sub := valueof(t_Sub3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), "milenage", true)); + sl := sl & { sub }; + + sub := valueof(t_Sub2G3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), + "comp128v1", "milenage", false)); + sl := sl & { sub }; + + sub := valueof(t_Sub2G3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), + "comp128v2", "milenage", false)); + sl := sl & { sub }; + + sub := valueof(t_Sub2G3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), + "comp128v3", "milenage", false)); + sl := sl & { sub }; + + return sl; +} function f_vty_transceive_match(TELNETasp_PT pt, charstring cmd, template charstring exp_ret) { var charstring ret := f_vty_transceive_ret(pt, cmd); @@ -370,7 +394,8 @@ ***********************************************************************/ /* perform SendAuthInfo for given imsi, return the GSUP response/error */ -function f_perform_SAI(hexstring imsi, template (omit) integer exp_err_cause := omit) +function f_perform_SAI(hexstring imsi, template (omit) integer exp_err_cause := omit, + boolean is_eps := false) runs on HLR_ConnHdlr return GSUP_PDU { var GSUP_PDU ret; timer T := 3.0; @@ -379,7 +404,11 @@ exp_fail := true; } - GSUP.send(valueof(ts_GSUP_SAI_REQ(imsi))); + if (is_eps) { + GSUP.send(ts_GSUP_SAI_REQ_EPS(imsi)); + } else { + GSUP.send(valueof(ts_GSUP_SAI_REQ(imsi))); + } T.start; alt { [exp_fail] GSUP.receive(tr_GSUP_SAI_ERR(imsi, exp_err_cause)) -> value ret { @@ -668,6 +697,7 @@ private function f_TC_gsup_sai() runs on HLR_ConnHdlr { var GSUP_PDU res; res := f_perform_SAI(g_pars.sub.imsi); + f_ensure_amf_separation_bit(res, '0'B); /* TODO: match if tuple[s] matches expectation */ setverdict(pass); } @@ -683,6 +713,48 @@ setverdict(pass); } +private function f_ensure_amf_separation_bit(GSUP_PDU res, BIT1 sep_bit) +{ + for (var integer i := 0; i < lengthof(res.ies); i := i+1) { + var GSUP_IE tuple := res.ies[i]; + if (tuple.tag != OSMO_GSUP_AUTH_TUPLE_IE) { + continue; + } + var GSUP_IeValue autn; + if (f_gsup_find_nested_ie(tuple.val.auth_tuple, OSMO_GSUP_AUTN_IE, autn) == false) { + setverdict(fail, "Couldn't find AUTN IE in tuple ", i); + mtc.stop; + } + var bitstring amf := oct2bit(substr(autn.autn, 6, 2)); + if (amf[0] != sep_bit) { + setverdict(fail, "AMF bit 0 (separation bit) must be ", sep_bit," but was not"); + mtc.stop; + } + } +} + +/* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ +private function f_TC_gsup_sai_eps() runs on HLR_ConnHdlr { + var GSUP_PDU res; + res := f_perform_SAI(g_pars.sub.imsi, is_eps := true); + f_ensure_amf_separation_bit(res, '1'B); + + /* TODO: match if tuple[s] matches expectation */ + setverdict(pass); +} +testcase TC_gsup_sai_eps() runs on test_CT { + var HlrSubscriberList sl; + var GSUP_PDU res; + + f_init(false); + + sl := f_gen_3G_subs(); + f_start_handler_per_sub(refers(f_TC_gsup_sai_eps), sl); + + setverdict(pass); +} + + /* test UL for unknown IMSI */ private function f_TC_ul_unknown_imsi() runs on HLR_ConnHdlr { var GSUP_PDU res; @@ -1383,6 +1455,7 @@ control { execute( TC_gsup_sai_err_invalid_imsi() ); execute( TC_gsup_sai() ); + execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); execute( TC_gsup_sai_err_unknown_imsi() ); execute( TC_gsup_ul() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 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: I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf Gerrit-Change-Number: 15366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 30 19:20:28 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 30 Aug 2019 19:20:28 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-gmr_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#2261?= In-Reply-To: <687988353.523.1567153801673.JavaMail.jenkins@jenkins.osmocom.org> References: <687988353.523.1567153801673.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <552155535.528.1567192828595.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:26:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 19:26:09 +0000 Subject: Change in ...osmo-ggsn[master]: gtp_update_pdp_ind(): fix NULL-pointer dereference Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15367 Change subject: gtp_update_pdp_ind(): fix NULL-pointer dereference ...................................................................... gtp_update_pdp_ind(): fix NULL-pointer dereference As stated in the comment above, we need to use the tunnel identifier to find a GTP context, and derive both IMSI and NSAPI from that TID, when speaking GTP version 0. This change fixes the following warnings (found with Clang): gtp.c:2115:22: warning: variable 'pdp' is uninitialized when used here [-Wuninitialized] pdp_set_imsi_nsapi(pdp, tid); ^^^ gtp.c:2118:34: warning: variable 'imsi' is uninitialized when used here [-Wuninitialized] if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) ^^^^ gtp.c:2118:40: warning: variable 'nsapi' is uninitialized when used here [-Wuninitialized] if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) ^^^^^ Change-Id: I8f1c8d0ba2e8189d97fe1bb5c872680e5ad1cd7a --- M gtp/gtp.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/67/15367/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 2ea949d..b18f76f 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -2110,12 +2110,8 @@ /* For GTP1 we must use imsi and nsapi if imsi is present. Otherwise */ /* we have to use the tunnel endpoint identifier */ if (version == 0) { - uint64_t tid = be64toh(((union gtp_packet *)pack)->gtp0.h.tid); - - pdp_set_imsi_nsapi(pdp, tid); - /* Find the context in question */ - if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) { + if (gtp_pdp_tidget(gsn, &pdp, get_tid(pack))) { gsn->err_unknownpdp++; GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown PDP context\n"); @@ -2123,6 +2119,9 @@ len, NULL, GTPCAUSE_NON_EXIST); } + + /* Update IMSI and NSAPI */ + pdp_set_imsi_nsapi(pdp, get_tid(pack)); } else if (version == 1) { /* NSAPI (mandatory) */ if (gtpie_gettv1(ie, GTPIE_NSAPI, 0, &nsapi)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8f1c8d0ba2e8189d97fe1bb5c872680e5ad1cd7a Gerrit-Change-Number: 15367 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:26:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 19:26:09 +0000 Subject: Change in ...osmo-ggsn[master]: gtp/gtp.c: cosmetic: use get_tid() where we need TID Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15369 Change subject: gtp/gtp.c: cosmetic: use get_tid() where we need TID ...................................................................... gtp/gtp.c: cosmetic: use get_tid() where we need TID Change-Id: I39e92f25ed51665c8a615826ed52f35024bdd54b --- M gtp/gtp.c 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/69/15369/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 8b2373e..5af877c 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1423,11 +1423,8 @@ pdp = &pdp_buf; memset(pdp, 0, sizeof(struct pdp_t)); - if (version == 0) { - uint64_t tid = be64toh(((union gtp_packet *)pack)->gtp0.h.tid); - - pdp_set_imsi_nsapi(pdp, tid); - } + if (version == 0) + pdp_set_imsi_nsapi(pdp, get_tid(pack)); pdp->seq = seq; pdp->sa_peer = *peer; @@ -2737,7 +2734,7 @@ /* Find the context in question */ if (version == 0) { - if (gtp_pdp_tidget(gsn, &pdp, be64toh(((union gtp_packet *)pack)->gtp0.h.tid))) { + if (gtp_pdp_tidget(gsn, &pdp, get_tid(pack))) { gsn->err_unknownpdp++; GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown PDP context\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I39e92f25ed51665c8a615826ed52f35024bdd54b Gerrit-Change-Number: 15369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 19:26:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 19:26:09 +0000 Subject: Change in ...osmo-ggsn[master]: gtp_error_ind_conf(): fix: guard against an unknown GTP version Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15368 Change subject: gtp_error_ind_conf(): fix: guard against an unknown GTP version ...................................................................... gtp_error_ind_conf(): fix: guard against an unknown GTP version This change fixes the following compiler warnings (found by Clang): gtp.c:2747:13: warning: variable 'pdp' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] } else if (version == 1) { gtp.c:2781:14: note: uninitialized use occurs here OSMO_ASSERT(pdp); ^^^ Shall not happen in general, but let's make Clang happy. Change-Id: Id471b22afd4c45435589a4edda0a804e66be3a7a --- M gtp/gtp.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/68/15368/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index b18f76f..8b2373e 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -2768,6 +2768,9 @@ GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown PDP context\n"); return EOF; } + } else { + LOGP(DLGTP, LOGL_ERROR, "Unknown version: %d\n", version); + return EOF; } GTP_LOGPKG(LOGL_ERROR, peer, pack, len, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id471b22afd4c45435589a4edda0a804e66be3a7a Gerrit-Change-Number: 15368 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:14:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:14:05 +0000 Subject: Change in ...osmo-msc[master]: log, cosmetic: add "RR" to "Ciphering Mode Complete" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15318 ) Change subject: log, cosmetic: add "RR" to "Ciphering Mode Complete" ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4 Gerrit-Change-Number: 15318 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 30 Aug 2019 20:14:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:17:51 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:17:51 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15342/2/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/#/c/15342/2/src/libmsc/ran_msg_a.c at 763 PS2, Line 763: \n Looks like we don't need a new line here. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:17:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:19:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:19:29 +0000 Subject: Change in ...osmo-ggsn[master]: gtp/gtp.c: cosmetic: use get_tid() where we need TID In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15369 ) Change subject: gtp/gtp.c: cosmetic: use get_tid() where we need TID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I39e92f25ed51665c8a615826ed52f35024bdd54b Gerrit-Change-Number: 15369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:19:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:21:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:21:44 +0000 Subject: Change in ...osmo-ggsn[master]: gtp_update_pdp_ind(): fix NULL-pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15367 ) Change subject: gtp_update_pdp_ind(): fix NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8f1c8d0ba2e8189d97fe1bb5c872680e5ad1cd7a Gerrit-Change-Number: 15367 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:21:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:23:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:23:10 +0000 Subject: Change in ...osmo-msc[master]: msc_vlr_tests: GSUP: don't care about extra IEs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15343 ) Change subject: msc_vlr_tests: GSUP: don't care about extra IEs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11 Gerrit-Change-Number: 15343 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:23:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:23:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:23:16 +0000 Subject: Change in ...osmo-ggsn[master]: gtp_error_ind_conf(): fix: guard against an unknown GTP version In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15368 ) Change subject: gtp_error_ind_conf(): fix: guard against an unknown GTP version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id471b22afd4c45435589a4edda0a804e66be3a7a Gerrit-Change-Number: 15368 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:23:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:24:12 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:24:12 +0000 Subject: Change in ...osmo-msc[master]: gsm48_tch_rtp_create(): check against NULL mgcp_info In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15344 ) Change subject: gsm48_tch_rtp_create(): check against NULL mgcp_info ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I98fe5860c49751ade1af10d99487aba259504f23 Gerrit-Change-Number: 15344 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:24:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:24:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 20:24:36 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15340 ) Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition ...................................................................... OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition Since (R)->ip is a char[], it is always non-NULL. The (x ? : "") condition is completely pointless. Remove it. Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec --- M include/osmocom/core/sockaddr_str.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 253b755..7c01732 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -62,7 +62,7 @@ * printf("got " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(my_sockaddr_str)); */ #define OSMO_SOCKADDR_STR_FMT "%s:%u" -#define OSMO_SOCKADDR_STR_FMT_ARGS(R) ((R)->ip ? : ""), (R)->port +#define OSMO_SOCKADDR_STR_FMT_ARGS(R) (R)->ip, (R)->port bool osmo_sockaddr_str_is_set(const struct osmo_sockaddr_str *sockaddr_str); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13ed06776a784cfa99bbdfca2bb4dfe12913a1ec Gerrit-Change-Number: 15340 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:24:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 30 Aug 2019 20:24:37 +0000 Subject: Change in ...libosmocore[master]: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer In-Reply-To: References: Message-ID: laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15341 ) Change subject: OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer ...................................................................... OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer The pointless '(R)->ip?' condition of the previous commit made me want to protect against R == NULL instead. Change-Id: Ie2f47ad8ae585aaf67a6476c67f8e014820a72bc --- M include/osmocom/core/sockaddr_str.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 7c01732..d16dc86 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -62,7 +62,7 @@ * printf("got " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(my_sockaddr_str)); */ #define OSMO_SOCKADDR_STR_FMT "%s:%u" -#define OSMO_SOCKADDR_STR_FMT_ARGS(R) (R)->ip, (R)->port +#define OSMO_SOCKADDR_STR_FMT_ARGS(R) ((R)? (R)->ip : "NULL"), ((R)? (R)->port : 0) bool osmo_sockaddr_str_is_set(const struct osmo_sockaddr_str *sockaddr_str); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2f47ad8ae585aaf67a6476c67f8e014820a72bc Gerrit-Change-Number: 15341 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:26:58 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:26:58 +0000 Subject: Change in ...osmo-msc[master]: msc_a.c, CC trans: change a comment to a debug log In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15345 ) Change subject: msc_a.c, CC trans: change a comment to a debug log ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15345/2/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/#/c/15345/2/src/libmsc/msc_a.c at 1674 PS2, Line 1674: this trans Looks like LOG_TRANS() would be more suitable here. But since other parts of this function are using LOG_MSC_A(), we can change it separately. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5 Gerrit-Change-Number: 15345 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:26:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:27:57 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:27:57 +0000 Subject: Change in ...osmo-msc[master]: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15346 ) Change subject: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I576bc5c1fd63fe8048a7a6a2d06763fc3221fa49 Gerrit-Change-Number: 15346 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:27:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:28:58 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:28:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:30:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:30:23 +0000 Subject: Change in ...osmo-sgsn[master]: Move out gtphub to its own subdir In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 to look at the new patch set (#2). Change subject: Move out gtphub to its own subdir ...................................................................... Move out gtphub to its own subdir Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea --- M configure.ac M debian/copyright M doc/examples/osmo-gtphub/gtphub-example.txt M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/gtphub/Makefile.am R src/gtphub/gtphub.c R src/gtphub/gtphub_ares.c R src/gtphub/gtphub_main.c R src/gtphub/gtphub_sock.c R src/gtphub/gtphub_vty.c M tests/gtphub/Makefile.am 13 files changed, 49 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/15362/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea Gerrit-Change-Number: 15362 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:32:52 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 30 Aug 2019 20:32:52 +0000 Subject: Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 ) Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9 Gerrit-Change-Number: 15337 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:32:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:36:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:36:58 +0000 Subject: Change in ...osmo-hlr[master]: change format of 'last LU seen' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: change format of 'last LU seen' ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15359/1/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/15359/1/src/hlr_vty_subscr.c at 43 PS1, Line 43: tm = *gmtime(t); wow I didn't know it was possible de-referencing a pointer returned from a function this way. Are you sure it works as expected? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:36:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:39:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:39:00 +0000 Subject: Change in ...osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15364 ) Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15364/1/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/15364/1/src/hlr.c at 245 PS1, Line 245: if (gsup->rat_types_len >= 1 && gsup->rat_types[0] == OSMO_RAT_EUTRAN_SGS) Can it be that EUTRAN is not in rat_types[0] but in another index? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:39:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:39:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:39:33 +0000 Subject: Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15342 ) Change subject: ran_dec logging: log message sizes on errors ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb Gerrit-Change-Number: 15342 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:39:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:41:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:41:57 +0000 Subject: Change in ...osmo-sgsn[master]: Move out gtphub to its own subdir In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 to look at the new patch set (#3). Change subject: Move out gtphub to its own subdir ...................................................................... Move out gtphub to its own subdir Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea --- M configure.ac M debian/copyright M doc/examples/osmo-gtphub/gtphub-example.txt M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/gtphub/Makefile.am R src/gtphub/gtphub.c R src/gtphub/gtphub_ares.c R src/gtphub/gtphub_main.c R src/gtphub/gtphub_sock.c R src/gtphub/gtphub_vty.c M tests/gtphub/Makefile.am 13 files changed, 55 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/15362/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea Gerrit-Change-Number: 15362 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:42:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:42:57 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: GSUP_Types: Add support for GSUP_IE_RAT_TYPE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15365 ) Change subject: GSUP_Types: Add support for GSUP_IE_RAT_TYPE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15365 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: I5d899fc6f6d4cf6123609b596022a853561f35f5 Gerrit-Change-Number: 15365 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:42:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 30 20:46:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 30 Aug 2019 20:46:18 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 ) Change subject: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15366/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/15366/1/hlr/HLR_Tests.ttcn at 408 PS1, Line 408: GSUP.send(ts_GSUP_SAI_REQ_EPS(imsi)); What about adding is_eps as a parameter to ts_GSUP_SAI_REQ_EPS()? https://gerrit.osmocom.org/#/c/15366/1/hlr/HLR_Tests.ttcn at 742 PS1, Line 742: /* TODO: match if tuple[s] matches expectation */ I think you can drop this TODO since matching is done inside f_ensure_*() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 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: I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf Gerrit-Change-Number: 15366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 30 Aug 2019 20:46:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 31 01:59:56 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 01:59:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d69d4b06954b_6aec2acc1e0e65f4322674@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 310s] ar: `u' modifier ignored since `D' is the default (see `U') [ 310s] libtool: link: ranlib .libs/libtransceiver_common.a [ 310s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 310s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 311s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 311s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 311s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 311s] collect2: error: ld returned 1 exit status [ 311s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 311s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 311s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 311s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 311s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 311s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 311s] make[1]: *** [Makefile:444: all] Error 2 [ 311s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 311s] dh_auto_build: make -j1 returned exit code 2 [ 311s] make: *** [debian/rules:6: build] Error 255 [ 311s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 311s] [ 311s] sheep81 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 01:59:52 UTC 2019. [ 311s] [ 311s] ### VM INTERACTION START ### [ 314s] [ 301.577754] sysrq: SysRq : Power Off [ 314s] [ 301.583392] reboot: Power down [ 314s] ### VM INTERACTION END ### [ 314s] [ 314s] sheep81 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 01:59:55 UTC 2019. [ 314s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 31 02:03:05 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 02:03:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d69d567873f6_6aec2acc1e0e65f4323280@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 662s] ar: `u' modifier ignored since `D' is the default (see `U') [ 662s] libtool: link: ranlib .libs/libtransceiver_common.a [ 662s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 662s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 662s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 663s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 663s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 663s] collect2: error: ld returned 1 exit status [ 663s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 663s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 663s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 663s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 663s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 663s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 663s] make[1]: *** [Makefile:444: all] Error 2 [ 663s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 663s] dh_auto_build: make -j1 returned exit code 2 [ 663s] make: *** [debian/rules:6: build] Error 255 [ 663s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 663s] [ 663s] cloud129 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 02:02:52 UTC 2019. [ 663s] [ 663s] ### VM INTERACTION START ### [ 666s] [ 613.574559] sysrq: SysRq : Power Off [ 666s] [ 613.579556] reboot: Power down [ 668s] ### VM INTERACTION END ### [ 668s] [ 668s] cloud129 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 02:02:58 UTC 2019. [ 668s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 31 06:31:56 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 06:31:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6a146fd31fe_6aec2acc1e0e65f43645ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 257s] ar: `u' modifier ignored since `D' is the default (see `U') [ 257s] libtool: link: ranlib .libs/libtransceiver_common.a [ 257s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 257s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 257s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 257s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 257s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 257s] collect2: error: ld returned 1 exit status [ 257s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 257s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 257s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 257s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 257s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 257s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 257s] make[1]: *** [Makefile:444: all] Error 2 [ 257s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 257s] dh_auto_build: make -j1 returned exit code 2 [ 257s] make: *** [debian/rules:6: build] Error 255 [ 257s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 257s] [ 257s] build80 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 06:31:44 UTC 2019. [ 257s] [ 257s] ### VM INTERACTION START ### [ 260s] [ 248.510984] sysrq: SysRq : Power Off [ 260s] [ 248.513576] reboot: Power down [ 260s] ### VM INTERACTION END ### [ 260s] [ 260s] build80 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 06:31:48 UTC 2019. [ 260s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 31 06:32:31 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 06:32:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6a148f6307f_6aec2acc1e0e65f436464@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 516s] ar: `u' modifier ignored since `D' is the default (see `U') [ 516s] libtool: link: ranlib .libs/libtransceiver_common.a [ 516s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 516s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 516s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 517s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 517s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 517s] collect2: error: ld returned 1 exit status [ 517s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 517s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 517s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 517s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 517s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 517s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 517s] make[1]: *** [Makefile:444: all] Error 2 [ 517s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 517s] dh_auto_build: make -j1 returned exit code 2 [ 517s] make: *** [debian/rules:6: build] Error 255 [ 517s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 517s] [ 517s] lamb12 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 06:32:17 UTC 2019. [ 517s] [ 517s] ### VM INTERACTION START ### [ 520s] [ 498.173650] sysrq: SysRq : Power Off [ 520s] [ 498.184251] reboot: Power down [ 520s] ### VM INTERACTION END ### [ 520s] [ 520s] lamb12 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 06:32:21 UTC 2019. [ 520s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 31 06:33:22 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 06:33:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6a14ca44184_6aec2acc1e0e65f43649ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 454s] ar: `u' modifier ignored since `D' is the default (see `U') [ 454s] libtool: link: ranlib .libs/libtransceiver_common.a [ 454s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 454s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 455s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 455s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 455s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 455s] collect2: error: ld returned 1 exit status [ 455s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 455s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 455s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 455s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 455s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 455s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 455s] make[1]: *** [Makefile:444: all] Error 2 [ 455s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 455s] dh_auto_build: make -j1 returned exit code 2 [ 455s] make: *** [debian/rules:6: build] Error 255 [ 455s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 455s] [ 455s] lamb05 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 31 06:33:08 UTC 2019. [ 455s] [ 455s] ### VM INTERACTION START ### [ 458s] [ 439.995279] sysrq: SysRq : Power Off [ 458s] [ 440.004814] reboot: Power down [ 458s] ### VM INTERACTION END ### [ 458s] [ 458s] lamb05 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 31 06:33:12 UTC 2019. [ 458s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 31 06:35:22 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 06:35:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5d6a1543cdd62_6aec2acc1e0e65f4365072@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 642s] ar: `u' modifier ignored since `D' is the default (see `U') [ 642s] libtool: link: ranlib .libs/libtransceiver_common.a [ 642s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 642s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 643s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 643s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 643s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 643s] collect2: error: ld returned 1 exit status [ 643s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 643s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 643s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 643s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 643s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 643s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 643s] make[1]: *** [Makefile:444: all] Error 2 [ 643s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 643s] dh_auto_build: make -j1 returned exit code 2 [ 643s] make: *** [debian/rules:6: build] Error 255 [ 643s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 643s] [ 643s] lamb26 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 31 06:35:07 UTC 2019. [ 643s] [ 643s] ### VM INTERACTION START ### [ 646s] [ 625.189008] sysrq: SysRq : Power Off [ 646s] [ 625.212507] reboot: Power down [ 646s] ### VM INTERACTION END ### [ 646s] [ 647s] lamb26 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 31 06:35:12 UTC 2019. [ 647s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Aug 31 09:58:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 09:58:32 +0000 Subject: Change in ...osmo-sgsn[master]: gprs_gmm.c: Replace inet_ntoa with inet_ntop In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15352 ) Change subject: gprs_gmm.c: Replace inet_ntoa with inet_ntop ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0c708d047122f349acf46797a9e5973040e7ae04 Gerrit-Change-Number: 15352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 09:58:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:41:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:41:49 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce FSM mm_state_gb_fsm In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15353 ) Change subject: Introduce FSM mm_state_gb_fsm ...................................................................... Patch Set 1: with this kind of intrusive changes, it makes sense to first ensure there's sufficient test coverage for the related state machines in SGSN_Tests.ttcn *before* merging this code (ideally even before writing it). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I04004423e993107374d5a3549b8a93ac169251dd Gerrit-Change-Number: 15353 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:41:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:41:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:41:53 +0000 Subject: Change in ...osmo-sgsn[master]: Introduce FSM mm_state_iu_fsm In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15354 ) Change subject: Introduce FSM mm_state_iu_fsm ...................................................................... Patch Set 1: with this kind of intrusive changes, it makes sense to first ensure there's sufficient test coverage for the related state machines in SGSN_Tests.ttcn *before* merging this code (ideally even before writing it). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4c9cf8c27194817c56e8949af0205e1cc14af317 Gerrit-Change-Number: 15354 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:41:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:42:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:42:14 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_vty: Fix mmctx rate_ctr output indentation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15356 ) Change subject: sgsn_vty: Fix mmctx rate_ctr output indentation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1b89c179e1ba08b65e31727fdce90c7b578f4d6d Gerrit-Change-Number: 15356 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:42:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:42:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:42:29 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_vty: Print correct Iu mmctx id in 'show mm-context' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 ) Change subject: sgsn_vty: Print correct Iu mmctx id in 'show mm-context' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6 Gerrit-Change-Number: 15355 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:42:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:42:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:42:52 +0000 Subject: Change in ...osmo-sgsn[master]: vty: Print MM state and RAN type in show mm-context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 ) Change subject: vty: Print MM state and RAN type in show mm-context ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba Gerrit-Change-Number: 15357 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:42:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:43:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:43:02 +0000 Subject: Change in ...osmo-sgsn[master]: sgsn_cdrc: Fix ip addr string buffer size In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15358 ) Change subject: sgsn_cdrc: Fix ip addr string buffer size ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9 Gerrit-Change-Number: 15358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:43:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:43:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:43:46 +0000 Subject: Change in ...osmo-sgsn[master]: src/gprs/Makefile.am: Move build of shared .c files to an internal lib In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 ) Change subject: src/gprs/Makefile.am: Move build of shared .c files to an internal lib ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6 Gerrit-Change-Number: 15360 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:43:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:44:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:44:07 +0000 Subject: Change in ...osmo-sgsn[master]: Move out gbproxy to its own subdir In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15361 ) Change subject: Move out gbproxy to its own subdir ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e Gerrit-Change-Number: 15361 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:44:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:44:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:44:22 +0000 Subject: Change in ...osmo-sgsn[master]: Move out gtphub to its own subdir In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 ) Change subject: Move out gtphub to its own subdir ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea Gerrit-Change-Number: 15362 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:44:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:44:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:44:30 +0000 Subject: Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 ) Change subject: Move out sgsn to its own subdir ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 Gerrit-Change-Number: 15363 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:44:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:46:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:46:42 +0000 Subject: Change in ...osmo-ttcn3-hacks[master]: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 ) Change subject: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/15366/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/15366/1/hlr/HLR_Tests.ttcn at 408 PS1, Line 408: GSUP.send(ts_GSUP_SAI_REQ_EPS(imsi)); > What about adding is_eps as a parameter to ts_GSUP_SAI_REQ_EPS()? it is easier to do it as-is. https://gerrit.osmocom.org/#/c/15366/1/hlr/HLR_Tests.ttcn at 742 PS1, Line 742: /* TODO: match if tuple[s] matches expectation */ > I think you can drop this TODO since matching is done inside f_ensure_*() we're only matching that particular separation bit, but not the actual content of the tuple itself (i.e. the AUTN generation, ... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 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: I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf Gerrit-Change-Number: 15366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 31 Aug 2019 10:46:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 10:49:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 10:49:27 +0000 Subject: Change in ...osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15364 ) Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15364/1/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/15364/1/src/hlr.c at 245 PS1, Line 245: if (gsup->rat_types_len >= 1 && gsup->rat_types[0] == OSMO_RAT_EUTRAN_SGS) > Can it be that EUTRAN is not in rat_types[0] but in another index? "per common sense" we will only have one RAT type in the UpdateLocation, as the LU REQ has arrived over one RAT type, and not over multiple at the same time. Multiple elements in the rat_types array is only used in the "insert subscriber data" (AFAIR), where the HLR can restrict the RAT types a MS/UE may use. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 31 Aug 2019 10:49:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 19:28:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 19:28:39 +0000 Subject: Change in ...libosmocore[master]: cbsp: Fix endless loop iteration when decoding cell list IEs Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15370 Change subject: cbsp: Fix endless loop iteration when decoding cell list IEs ...................................................................... cbsp: Fix endless loop iteration when decoding cell list IEs The CBSP code assumed that gsm0808_decode_cell_id_u() would return the number of bytes it has consumed/parsed. But it actually always returns '0', whcih makes us run in an endless loop :( Change-Id: I5758af4ec11a827d4b888a3a16c4ec22de90a7d6 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/cbsp.c M src/gsm/gsm0808_utils.c 3 files changed, 26 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/15370/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 76db2b6..ccdf5ed 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -95,6 +95,7 @@ int gsm0808_cell_id_to_cgi(struct osmo_cell_global_id *cgi, const struct gsm0808_cell_id *cid); void gsm0808_msgb_put_cell_id_u(struct msgb *msg, enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *u); int gsm0808_decode_cell_id_u(union gsm0808_cell_id_u *out, enum CELL_IDENT discr, const uint8_t *buf, unsigned int len); +int gsm0808_cell_id_size(enum CELL_IDENT discr); uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause); uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index 84b9235..c13be61 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -515,7 +515,7 @@ osmo_cbsp_errstr = "cell list: error decoding cell_id_union"; return rc; } - cur += rc; + cur += gsm0808_cell_id_size(cl->id_discr); llist_add_tail(&ent->list, &cl->list); } return 0; @@ -538,7 +538,7 @@ osmo_cbsp_errstr = "fail list: error decoding cell_id_union"; return rc; } - cur += rc; + cur += gsm0808_cell_id_size(ent->id_discr); ent->cause = *cur++; llist_add_tail(&ent->list, fl); } @@ -562,7 +562,7 @@ osmo_cbsp_errstr = "load list: error decoding cell_id_union"; return rc; } - cur += rc; + cur += gsm0808_cell_id_size(ll->id_discr); if (cur + 2 > buf + len) { talloc_free(ent); osmo_cbsp_errstr = "load list: truncated IE"; @@ -592,7 +592,7 @@ osmo_cbsp_errstr = "completed list: error decoding cell_id_union"; return rc; } - cur += rc; + cur += gsm0808_cell_id_size(cl->id_discr); if (cur + 3 > buf + len) { talloc_free(ent); osmo_cbsp_errstr = "completed list: truncated IE"; diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 364a04f..7416d8f 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -767,6 +767,27 @@ return (int)(elem - old_elem); } +/* Return the size of the value part of a cell identifier of given type */ +int gsm0808_cell_id_size(enum CELL_IDENT discr) +{ + switch (discr) { + case CELL_IDENT_WHOLE_GLOBAL: + return 7; + case CELL_IDENT_LAC_AND_CI: + return 4; + case CELL_IDENT_CI: + return 2; + case CELL_IDENT_LAI_AND_LAC: + return 5; + case CELL_IDENT_LAC: + return 2; + case CELL_IDENT_BSS: + case CELL_IDENT_NO_CELL: + return 0; + default: + return -EINVAL; + } +} /*! Decode a single GSM 08.08 Cell ID list element payload * \param[out] out caller-provided output union * \param[in] discr Cell ID discriminator describing type to be decoded -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5758af4ec11a827d4b888a3a16c4ec22de90a7d6 Gerrit-Change-Number: 15370 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 31 19:28:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 31 Aug 2019 19:28:39 +0000 Subject: Change in ...libosmocore[master]: cbsp: Remove printf() statement from early development/debugging Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/15371 Change subject: cbsp: Remove printf() statement from early development/debugging ...................................................................... cbsp: Remove printf() statement from early development/debugging Change-Id: I6916e2330e004f20a22f273147fa6288d18b5d0d --- M src/gsm/cbsp.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/15371/1 diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index c13be61..591ff25 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -1468,7 +1468,6 @@ return rc; discard_msg: - printf("discard_msg\n"); if (tmp_msg) *tmp_msg = NULL; msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6916e2330e004f20a22f273147fa6288d18b5d0d Gerrit-Change-Number: 15371 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 31 21:23:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 21:23:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6ae57c7bdb8_6aec2acc1e0e65f4499997@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 412s] ar: `u' modifier ignored since `D' is the default (see `U') [ 412s] libtool: link: ranlib .libs/libtransceiver_common.a [ 412s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 412s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 412s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 412s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 412s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 412s] collect2: error: ld returned 1 exit status [ 412s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 412s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 412s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 412s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 412s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 412s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 412s] make[1]: *** [Makefile:444: all] Error 2 [ 412s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 412s] dh_auto_build: make -j1 returned exit code 2 [ 412s] make: *** [debian/rules:6: build] Error 255 [ 412s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 412s] [ 412s] lamb18 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 21:23:38 UTC 2019. [ 412s] [ 412s] ### VM INTERACTION START ### [ 416s] [ 397.511061] sysrq: SysRq : Power Off [ 416s] [ 397.518759] reboot: Power down [ 416s] ### VM INTERACTION END ### [ 416s] [ 416s] lamb18 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Sat Aug 31 21:23:41 UTC 2019. [ 416s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 31 21:27:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 31 Aug 2019 21:27:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5d6ae65172f07_6aec2acc1e0e65f45004cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 526s] ar: `u' modifier ignored since `D' is the default (see `U') [ 526s] libtool: link: ranlib .libs/libtransceiver_common.a [ 526s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 526s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 526s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 526s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 526s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 526s] collect2: error: ld returned 1 exit status [ 526s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 526s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 526s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 526s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 526s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 526s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 526s] make[1]: *** [Makefile:444: all] Error 2 [ 526s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 526s] dh_auto_build: make -j1 returned exit code 2 [ 526s] make: *** [debian/rules:6: build] Error 255 [ 526s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 526s] [ 526s] cloud117 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 31 21:27:27 UTC 2019. [ 526s] [ 527s] ### VM INTERACTION START ### [ 530s] [ 484.370053] sysrq: SysRq : Power Off [ 530s] [ 484.382647] reboot: Power down [ 531s] ### VM INTERACTION END ### [ 531s] [ 531s] cloud117 failed "build osmo-trx_1.1.1.dsc" at Sat Aug 31 21:27:32 UTC 2019. [ 531s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)