Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64
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/)
Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests
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
Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors
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
Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap()
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@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 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: neels
Gerrit-MessageType: comment
Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init()
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set
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@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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment
Change in ...libosmocore[master]: add vty logp command to echo on all log targets
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 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: neighbor config: allow re-using ARFCN+BSIC pairs
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 neigh
Change in ...osmo-ttcn3-hacks[master]: bsc: add TC_ho_neighbor_config_1 thru _7
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);
+
Change in ...docker-playground[master]: adjust osmo-bsc.cfg for TC_ho_neighbor_config_1 thru _7
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
Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests
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
Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets
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(&sho
Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests
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
Change in ...osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests
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 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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
Change in ...osmo-sgsn[master]: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present
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
Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request
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
Change in ...osmo-sgsn[master]: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code
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
Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert
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
Change in ...osmo-sgsn[master]: gprs_gmm: Clarify comment during TLLI assignment
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
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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
Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in...
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
Change in ...osmo-iuh[master]: iu_client: introduce a connection state
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@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@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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED
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 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED
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
Change in ...osmo-iuh[master]: iu_client: introduce a connection state
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
Change in ...osmo-iuh[master]: iu_client: introduce a connection state
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 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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@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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm.c: Fix typo in log message
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
Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert
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
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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
Change in ...osmo-iuh[master]: iu_client: introduce a connection state
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
Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications
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
Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm: Clarify comment during TLLI assignment
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_sgsn.c: Remove recently introduced assert
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
Change in ...osmo-sgsn[master]: gprs_gmm: Clarify comment during TLLI assignment
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
Change in ...osmo-sgsn[master]: gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static
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
Change in ...osmo-sgsn[master]: gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type
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);
+
Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64
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/)
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in...
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: introduce a connection state
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@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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported
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
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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@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@136
PS2, Line 136: {
Call it ue_ctx.
https://gerrit.osmocom.org/#/c/15161/2/src/iu_client.c@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 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: sgsn: Actual first Iu test case
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup
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
Change in ...osmo-iuh[master]: iu_client: ensure UE is not NULL on CO primitives
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
Change in ...osmo-iuh[master]: iu_client: introduce a connection state
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
Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications
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
Change in ...osmo-iuh[master]: iu_client: define RANAP_IU_EVENT_SECURITY_MODE_FAILED
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
Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: set rc early
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
Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in...
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
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
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
Change in ...osmo-sgsn[master]: gprs_gmm: refactor msgid2mmctx() out of switch/case
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@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 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present
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@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@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 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...simtrace2[master]: USB: place version string in interface
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 wr
Change in ...osmo-msc[master]: add separate vty cfg for Iu encryption / fix ttcn3 iu tests
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,
Change in ...osmo-sgsn[master]: gprs_gmm: refactor msgid2mmctx() out of switch/case
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
Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present
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
Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request
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
Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu
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
Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: SGSN: introduce f_send_l3() to allow one function for Gb & Iu
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 := ''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) ->
Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: fsm: Quote received event token in logging line
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@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 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...simtrace2[master]: disable ERASE pin
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...simtrace2[master]: disable ERASE pin
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
Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro...
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
Change in ...osmo-sgsn[master]: gprs_gmm: Introduce assert to guard against unexpected condition
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro...
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: sgsn: add TC_iu_attach_gmm_rau
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: sgsn: make the ranap interface optional
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: RAN_Emulation: Support for PS domain
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: sgsn: Integrate RANAP
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: protect RAN_EMULATION_CTRL with ifdef
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: RAN_Emulation: Support for PS domain
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 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: Abandon "BssgpDecoded" intermediate structure
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-sgsn: Unifi osmo-sgsn.cfg's logging setup to resemble other pro...
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: tests: Fix db_test err file to expect error code name instead of value
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='12345678900': Error reading Ki, expected length 16 but has length 15 DAUC IMSI='12345678900': 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
Change in ...osmo-hlr[master]: tests: Fix db_test err file to expect error code name instead of value
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 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: tests: Fix db_test err file to expect error code name instead of value
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='12345678900': Error reading Ki, expected length 16 but has length 15 DAUC IMSI='12345678900': 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
