Change in libosmocore[master]: port rest octets encoding code from osmo-bsc
Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10189 to look at the new patch set (#7). Change subject: port rest octets encoding code from osmo-bsc .. port rest octets encoding code from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports osmo-bsc code for encoding SI rest octets. The conversion was a bit tricky in some places because some functions receive a 'struct gsm_bts' parameter in osmo-bsc. In this libosmocore version, such functions expect parameters which correspond to the individual fields of 'struct gsm_bts' which are used by these functions. Several structs from osmo-bsc's system_information.h are now also declared in libosmocore headers, with an added osmo_ prefix to avoid collisions with existing definitions in osmo-bsc. Some helpers were ported from osmo-bsc's system_information.c to libosmocore's gsm48_rest_octets.c. Contrary to osmo-bsc's implementation they are now only visible within this file. Unfortunately, this code ported from osmo-bsc lacks unit tests. Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Related: OS#3075 --- M include/Makefile.am M include/osmocom/gprs/protocol/gsm_04_60.h A include/osmocom/gsm/gsm48_rest_octets.h A src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 5 files changed, 1,084 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10189/7 -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr
Change in libosmocore[master]: port rest octets encoding code from osmo-bsc
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc .. Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/10189/6/include/osmocom/gprs/protocol/gsm_04_60.h File include/osmocom/gprs/protocol/gsm_04_60.h: https://gerrit.osmocom.org/#/c/10189/6/include/osmocom/gprs/protocol/gsm_04_60.h@338 PS6, Line 338: uint8_t use_egprs_p_ch_req; > Extra tabs looks off. Indeed, thanks. Fixed in next patch set. https://gerrit.osmocom.org/#/c/10189/6/src/gsm/gsm48_rest_octets.c File src/gsm/gsm48_rest_octets.c: https://gerrit.osmocom.org/#/c/10189/6/src/gsm/gsm48_rest_octets.c@64 PS6, Line 64: #define SI2Q_MIN_LEN 18 > Those are used in 3 different files in OsmoBSC - any reason for not making > this part of public heade […] Sure, I will move these to the public header in the next patch set. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 07 Jan 2019 12:17:39 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in libosmocore[master]: port arfcn range encode support from osmo-bsc
Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#9). Change subject: port arfcn range encode support from osmo-bsc .. port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 7 files changed, 760 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/9 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 9 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther
Change in libosmocore[master]: port arfcn range encode support from osmo-bsc
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/10185 )
Change subject: port arfcn range encode support from osmo-bsc
..
Patch Set 8:
(3 comments)
https://gerrit.osmocom.org/#/c/10185/8/include/osmocom/gsm/gsm48_arfcn_range_encode.h
File include/osmocom/gsm/gsm48_arfcn_range_encode.h:
https://gerrit.osmocom.org/#/c/10185/8/include/osmocom/gsm/gsm48_arfcn_range_encode.h@22
PS8, Line 22: int osmo_gsm48_range_enc_range128(uint8_t *chan_list, int f0, int
*w);
> I think single "range" in function name is enough - it's already pretty long.
Fixed in next patch set.
https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c
File src/gsm/gsm48_arfcn_range_encode.c:
https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c@54
PS8, Line 54: */
> Can we use this as static function? In OsmoBSC it's called only once from
> _range_enc_arfcns()
No this function cannot be static because it is also being called from
gsm0408_test.c, which can only link to exported symbols.
https://gerrit.osmocom.org/#/c/10185/8/src/gsm/gsm48_arfcn_range_encode.c@302
PS8, Line 302: {
> This helper is used only in range_encode() in OsmoBSC which is static in this
> patch. […]
This is being called by test code as well.
--
To view, visit https://gerrit.osmocom.org/10185
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c
Gerrit-Change-Number: 10185
Gerrit-PatchSet: 8
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Stefan Sperling
Gerrit-CC: Holger Freyther
Gerrit-Comment-Date: Mon, 07 Jan 2019 12:01:20 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in libosmocore[master]: port rest octets encoding code from osmo-bsc
Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10189 to look at the new patch set (#6). Change subject: port rest octets encoding code from osmo-bsc .. port rest octets encoding code from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports osmo-bsc code for encoding SI rest octets. The conversion was a bit tricky in some places because some functions receive a 'struct gsm_bts' parameter in osmo-bsc. In this libosmocore version, such functions expect parameters which correspond to the individual fields of 'struct gsm_bts' which are used by these functions. Several structs from osmo-bsc's system_information.h are now also declared in libosmocore headers, with an added osmo_ prefix to avoid collisions with existing definitions in osmo-bsc. Some helpers were ported from osmo-bsc's system_information.c to libosmocore's gsm48_rest_octets.c. Contrary to osmo-bsc's implementation they are now only visible within this file. Unfortunately, this code ported from osmo-bsc lacks unit tests. Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Related: OS#3075 --- M include/Makefile.am M include/osmocom/gprs/protocol/gsm_04_60.h A include/osmocom/gsm/gsm48_rest_octets.h A src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 5 files changed, 1,084 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10189/6 -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr
Change in libosmocore[master]: port arfcn range encode support from osmo-bsc
Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#8). Change subject: port arfcn range encode support from osmo-bsc .. port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 7 files changed, 760 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/8 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther
Change in libosmocore[master]: port arfcn range encode support from osmo-bsc
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc .. Patch Set 7: Licence change has been cleared. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Sun, 30 Dec 2018 12:29:34 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: port rest octets encoding code from osmo-bsc
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc .. Patch Set 5: Licence change has been cleared. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 30 Dec 2018 12:29:24 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API .. Patch Set 4: https://gerrit.osmocom.org/#/c/osmo-msc/+/12446 depends on this. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 12:33:05 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12446 ) Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO .. Patch Set 2: Build will of ocurse fail until I5535f0d149c2173294538df75764dd181b023312 is merged to master. -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 12:32:21 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO
Stefan Sperling has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12446 ) Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO .. add BSC/MSC neighbor VTY commands for inter-MSC HO Allow configuration of neighbor BSC/MSC via osmo-msc.cfg and the VTY. Each neighbor is mapped to the list of identifiers of cells which are reachable via that neighbor. A new neighbor_ident API manages the neighbor list and supports mapping neighboring BSCs/MSCs to cells, and vice versa. Neighbours are managed with the following new VTY commands: [no] neighbor lac <0-65535> bsc-pc POINT_CODE [no] neighbor lac <0-65535> msc-ip-name IPA_NAME [no] neighbor lac <0-65535> ci <0-999>bsc-pc POINT_CODE [no] neighbor lac <0-65535> ci <0-999> msc-ip-name IPA_NAME [no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> bsc-pc POINT_CODE [no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> msc-ipa-name IPA_NAME show neighbor all show neighbor bsc-pc POINT_CODE show neighbor msc-ipa-name IPA_NAME Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Depends: I5535f0d149c2173294538df75764dd181b023312 Related: OS#3618 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_data.h A include/osmocom/msc/neighbor_ident.h M src/libmsc/Makefile.am M src/libmsc/msc_vty.c A src/libmsc/neighbor_ident.c A src/libmsc/neighbor_ident_vty.c 7 files changed, 700 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/12446/2 -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-CC: Jenkins Builder (102)
Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12446
Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO
..
add BSC/MSC neighbor VTY commands for inter-MSC HO
Allow configuration of neighbor BSC/MSC via osmo-msc.cfg
and the VTY.
Each neighbor is mapped to the list of identifiers of cells
which are reachable via that neighbor. A new neighbor_ident
API manages the neighbor list and supports mapping neighboring
BSCs/MSCs to cells, and vice versa.
Neighbours are managed with the following new VTY commands:
[no] neighbor lac <0-65535> bsc-pc POINT_CODE
[no] neighbor lac <0-65535> msc-ip-name IPA_NAME
[no] neighbor lac <0-65535> ci <0-999>bsc-pc POINT_CODE
[no] neighbor lac <0-65535> ci <0-999> msc-ip-name IPA_NAME
[no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> bsc-pc POINT_CODE
[no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> msc-ipa-name IPA_NAME
show neighbor all
show neighbor bsc-pc POINT_CODE
show neighbor msc-ipa-name IPA_NAME
Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4
Depends: I5535f0d149c2173294538df75764dd181b023312
---
M include/osmocom/msc/Makefile.am
M include/osmocom/msc/gsm_data.h
A include/osmocom/msc/neighbor_ident.h
M src/libmsc/Makefile.am
M src/libmsc/msc_vty.c
A src/libmsc/neighbor_ident.c
A src/libmsc/neighbor_ident_vty.c
7 files changed, 700 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/12446/1
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index d98bc9c..e821993 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -19,6 +19,7 @@
msc_common.h \
msc_ifaces.h \
msc_mgcp.h \
+ neighbor_ident.h \
a_reset.h \
ran_conn.h \
rrlp.h \
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index d2511cb..8930380 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -16,6 +16,7 @@
#include
#include
+#include
#include "gsm_data_shared.h"
@@ -208,6 +209,10 @@
struct osmo_sccp_instance *sccp;
} a;
+ /* A list of neighbor BSCs. This list is defined statically via VTY and
does not
+ * necessarily correspond to BSCs attached to the A interface at a given
moment. */
+ struct neighbor_ident_list *neighbor_list;
+
struct {
/* MSISDN to which to route MO emergency calls */
char *route_to_msisdn;
diff --git a/include/osmocom/msc/neighbor_ident.h
b/include/osmocom/msc/neighbor_ident.h
new file mode 100644
index 000..d79d262
--- /dev/null
+++ b/include/osmocom/msc/neighbor_ident.h
@@ -0,0 +1,71 @@
+/* Manage identity of neighboring BSS cells for inter-BSC handover */
+#pragma once
+
+#include
+#include
+
+#include
+#include
+
+struct vty;
+struct gsm_network;
+
+enum msc_neighbor_type {
+ /* Neighboring BSC reachable via SCCP. */
+ MSC_NEIGHBOR_TYPE_BSC,
+
+ /* Neighboring MSC reachable via GSUP. */
+ MSC_NEIGHBOR_TYPE_MSC
+};
+
+struct neighbor_ident_addr {
+ enum msc_neighbor_type type;
+ union {
+ int point_code; /* BSC */
+ const char *ipa_name; /* MSC */
+ } a;
+};
+
+struct neighbor_ident_list {
+ struct llist_head list;
+};
+
+struct neighbor_ident {
+ struct llist_head entry;
+
+ /* Address of a neighboring BSC or MSC. */
+ struct neighbor_ident_addr addr;
+
+ /* IDs of cells in this neighbor's domain. */
+ struct gsm0808_cell_id_list2 cell_ids;
+};
+
+struct gsm0808_cell_id;
+struct gsm0808_cell_id_list2;
+
+const char *neighbor_ident_addr_name(struct gsm_network *net, const struct
neighbor_ident_addr *ni_addr);
+
+struct neighbor_ident_list *neighbor_ident_init(void *talloc_ctx);
+void neighbor_ident_free(struct neighbor_ident_list *nil);
+
+bool neighbor_ident_addr_match(const struct neighbor_ident_addr *entry,
+ const struct neighbor_ident_addr *search_for,
+ bool exact_match);
+
+int neighbor_ident_add(struct neighbor_ident_list *nil, const struct
neighbor_ident_addr *addr,
+ const struct gsm0808_cell_id_list2 *cell_ids);
+const struct gsm0808_cell_id_list2 *neighbor_ident_get(const struct
neighbor_ident_list *nil,
+ const struct
neighbor_ident_addr *addr);
+const struct neighbor_ident_addr *neighbor_ident_lookup_cell(const struct
neighbor_ident_list *nil,
+struct
gsm0808_cell_id *cell_id);
+bool neighbor_ident_del(struct neighbor_ident_list *nil, const struct
neighbor_ident_addr *addr);
+void neighbor_ident_clear(struc
Change in osmo-ttcn3-hacks[master]: mgw: Tear down all RTP flows to avoid race condition on tear down
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12297 ) Change subject: mgw: Tear down all RTP flows to avoid race condition on tear down .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12297/1/mgw/MGCP_Test.ttcn File mgw/MGCP_Test.ttcn: https://gerrit.osmocom.org/#/c/12297/1/mgw/MGCP_Test.ttcn@1215 PS1, Line 1215: f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); > I'm kinda confused by this: why do we have to do this for RTPEM[2] but not > for 0 and 1? And where do […] It is done for RTPEM[0] and RTPEM[1], inside f_flow_delete(). -- To view, visit https://gerrit.osmocom.org/12297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied839596589609e75fa487046a85db48991e4c73 Gerrit-Change-Number: 12297 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 17:22:27 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable .. Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c@709 PS3, Line 709: sizeof(mgcp->actual.endpoint_domain_name)); Check for truncation and log a warning if name is truncated? Or perhaps even error out because truncation of multiple names risks duplicates? if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname)) goto toolong; http://man.openbsd.org/strlcpy#EXAMPLES https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client_vty.c@147 PS3, Line 147: sizeof(global_mgcp_client_conf->endpoint_domain_name)); Truncation check? -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 17:16:25 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 17:09:08 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has submitted this change and it was merged. (
https://gerrit.osmocom.org/12243 )
Change subject: make gsup ipa name configurable in osmo-sgsn.cfg
..
make gsup ipa name configurable in osmo-sgsn.cfg
Add a 'gsup ipa-name' VTY command which overrides the default
IPA name used by the SGSN on the GSUP link towards the HLR.
This is required for GSUP routing in multi-SGSN networks.
The 'gsup ipa-name' option can only be set via the config file
because changing the IPA name at run-time conflicts with active
GSUP connections and routes configured in the HLR. The osmo-sgsn
program must be restarted if its IPA name needs to change.
Related: OS#3356
Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f
---
M include/osmocom/sgsn/sgsn.h
M src/gprs/gprs_subscriber.c
M src/gprs/sgsn_vty.c
3 files changed, 36 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Max: Looks good to me, but someone else must approve
Stefan Sperling: Looks good to me, approved
diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h
index 3a34ff9..c80355d 100644
--- a/include/osmocom/sgsn/sgsn.h
+++ b/include/osmocom/sgsn/sgsn.h
@@ -124,6 +124,12 @@
enum ranap_nsap_addr_enc rab_assign_addr_enc;
} iu;
#endif
+
+ /* This is transmitted as IPA Serial Number tag, which is used for GSUP
routing (e.g. in OsmoHLR).
+* This name must be set in a multi-SGSN network, and it must be unique
to each SGSN.
+* If no name is set, the IPA Serial Number will be the same as the
Unit Name,
+* and will be of the form 'SGSN-00-00-00-00-00-00' */
+ char *sgsn_ipa_name;
};
struct sgsn_instance {
diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c
index 4ab45c2..484c7ef 100644
--- a/src/gprs/gprs_subscriber.c
+++ b/src/gprs/gprs_subscriber.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -63,15 +64,20 @@
int gprs_subscr_init(struct sgsn_instance *sgi)
{
const char *addr_str;
+ struct ipaccess_unit *ipa_dev;
if (!sgi->cfg.gsup_server_addr.sin_addr.s_addr)
return 0;
addr_str = inet_ntoa(sgi->cfg.gsup_server_addr.sin_addr);
- sgi->gsup_client = osmo_gsup_client_create(
+ ipa_dev = talloc_zero(sgi, struct ipaccess_unit);
+ ipa_dev->unit_name = "SGSN";
+ ipa_dev->serno = sgi->cfg.sgsn_ipa_name; /* NULL unless configured via
VTY */
+
+ sgi->gsup_client = osmo_gsup_client_create2(
sgi,
- "SGSN",
+ ipa_dev,
addr_str, sgi->cfg.gsup_server_port,
_read_cb,
>cfg.oap);
diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 601b3c5..3757c07 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -203,6 +203,8 @@
vty_out(vty, " encryption %s%s",
get_value_string(gprs_cipher_names, g_cfg->cipher),
VTY_NEWLINE);
+ if (g_cfg->sgsn_ipa_name)
+ vty_out(vty, " gsup ipa-name %s%s", g_cfg->sgsn_ipa_name,
VTY_NEWLINE);
if (g_cfg->gsup_server_addr.sin_addr.s_addr)
vty_out(vty, " gsup remote-ip %s%s",
inet_ntoa(g_cfg->gsup_server_addr.sin_addr),
VTY_NEWLINE);
@@ -1075,6 +1077,25 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_gsup_ipa_name,
+ cfg_gsup_ipa_name_cmd,
+ "gsup ipa-name NAME",
+ "GSUP Parameters\n"
+ "Set the IPA name of this SGSN\n"
+ "A unique name for this SGSN. For example: PLMN + redundancy server
number: SGSN-901-70-0. "
+ "This name is used for GSUP routing and must be set if more than one
SGSN is connected to the network. "
+ "The default is 'SGSN-00-00-00-00-00-00'.\n")
+{
+ if (vty->type != VTY_FILE) {
+ vty_out(vty, "The IPA name cannot be changed at run-time; "
+ "It can only be set in the configuraton file.%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ g_cfg->sgsn_ipa_name = talloc_strdup(tall_vty_ctx, argv[0]);
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_gsup_remote_ip, cfg_gsup_remote_ip_cmd,
"gsup remote-ip A.B.C.D",
"GSUP Parameters\n"
@@ -1365,6 +1386,7 @@
install_element(SGSN_NODE, _imsi_acl_cmd);
install_element(SGSN_NODE, _auth_policy_cmd);
install_element(SGSN_NODE, _encrypt_cmd);
+ install_element(SGSN_NODE, _gsup_ipa_name_cmd);
install_element(SGSN_NODE, _gsup_remote_ip_cmd);
install_element(SGSN_NODE, _gsup_remote_port_cmd);
install_elemen
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 17:06:05 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition
Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12364 to look at the new patch set (#2). Change subject: fix ipa_asp_fsm down state transition .. fix ipa_asp_fsm down state transition Properly transition into IPA_ASP_S_DOWN from IPA_ASP_S_ACTIVE and fix the mask of legal out states from IPA_ASP_S_ACTIVE. BSC-sccplite tests are still passing with this change. Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Related: OS#3111 --- M src/xua_asp_fsm.c 1 file changed, 27 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12364/2 -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c@1092 PS5, Line 1092: return CMD_WARNING; > Please read the long discussion above before adding further input to this > topic. It seems to be kinda hidden in later patch sets :( See https://gerrit.osmocom.org/c/osmo-sgsn/+/12243/3/src/gprs/sgsn_vty.c#1195 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:15:20 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#7). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/7 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c@181 PS5, Line 181: ipa-name > Missing "gsup" prefix. […] Ooops, thanks nice catch. https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c@1092 PS5, Line 1092: "It can only be se > Could we just warn user that this change has no effect until restart? […] Please read the long discussion above before adding further input to this topic. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:11:52 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#6). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/6 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith
Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher .. Patch Set 1: > Patch Set 1: > > > Patch Set 1: Code-Review+1 > > > > Did some tests fail because of this? > > Not sure. I found the issue by code inspection. This tests is failing on Jenkins and it seems to be related to not cleaning up the connection: 04:43:31.397996 596 - Removing unterminated connection between port GSUP and MSC_Test-GSUP(594):GSUP_CLIENT. 04:43:31.398018 588 BSSMAP_Emulation.ttcn:390 Dynamic test case error: Sending data on the connection of port CLIENT to 596:BSSAP failed. (Broken pipe) 04:43:31.398043 596 - Message with id 2 was extracted from the queue of GSUP. 04:43:31.398053 588 BSSMAP_Emulation.ttcn:390 setverdict(error): none -> error -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:00:19 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#5). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/5 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 4: > Patch Set 4: Code-Review-1 > > Please see: https://gerrit.osmocom.org/#/c/osmo-msc/+/12387/ OK we discussed this internally and I'll update this patch. Thanks. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 14:40:40 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. Patch Set 1: Also please add this to the log msg: Related: OS#3355 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 14:40:03 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. Patch Set 1: Please update expected VTY test output as well. -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 14:39:09 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/12364 )
Change subject: fix ipa_asp_fsm down state transition
..
Patch Set 1:
(3 comments)
https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c
File src/xua_asp_fsm.c:
https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c@920
PS1, Line 920: {
> So the only use of fi is to get *priv? Than better just pass struct
> ipa_asp_fsm_priv *iafp as parame […]
Hmm, yes, good suggestion.
https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c@939
PS1, Line 939: osmo_timer_del(>pong_timer);
> I don't understand how it works if we bail out before reaching here. […]
This timer is actually never scheduled as far as I can see. And indeed it is
bogus that we won't delete it if returning early. But note that this bug is
part of code I merely moved around, so I'd rather fix it in a separate patch.
https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c@1060
PS1, Line 1060: ipa_asp_fsm_del_route(fi);
> I'd rather see ipa_asp_fsm_cleanup() moved in place of
> ipa_asp_fsm_del_route() instead of keeping it […]
In an earlier version of this patch I just called ipa_asp_fsm_cleanup() from
ipa_asp_fsm_active().
What made me uncomfortable about that is that it looks like this cleanup
handler is supposed to be invoked by the generic FSM code, not from within the
FSM itself.
It just so happens that we need to run the same code when the FSM terminates
and when we transition ACTIVE->DOWN.
I don't really care though because both approaches work. Would you prefer to
call ipa_asp_fsm_cleanup() from ipa_asp_fsm_active()?
--
To view, visit https://gerrit.osmocom.org/12364
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571
Gerrit-Change-Number: 12364
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Stefan Sperling
Gerrit-Comment-Date: Thu, 20 Dec 2018 11:42:45 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11918 ) Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 11:35:53 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP .. Patch Set 8: (3 comments) https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c@802 PS8, Line 802: goto sms_over_gsup; Could put this right here on this line: return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); Instead of using 'goto'. https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c@825 PS8, Line 825: return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); And then we could remove this part. https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c@845 PS8, Line 845: goto sms_over_gsup; Same here, just use the patern if (..) return foo(); -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:35:22 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/11919 )
Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP
..
Patch Set 8:
(1 comment)
https://gerrit.osmocom.org/#/c/11919/2/src/libmsc/gsm_04_11.c
File src/libmsc/gsm_04_11.c:
https://gerrit.osmocom.org/#/c/11919/2/src/libmsc/gsm_04_11.c@674
PS2, Line 674:
> Yep, I expected this question. The main idea is that some […]
I agree that if { } else { } would be better.
We shouldn't let code quality suffer just because code we write is supposed to
be temporary.
--
To view, visit https://gerrit.osmocom.org/11919
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8
Gerrit-Change-Number: 11919
Gerrit-PatchSet: 8
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-CC: Harald Welte
Gerrit-CC: Stefan Sperling
Gerrit-Comment-Date: Thu, 20 Dec 2018 11:28:44 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in libosmocore[master]: LCLS: use proper types for value_string wrappers
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12367 ) Change subject: LCLS: use proper types for value_string wrappers .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e Gerrit-Change-Number: 12367 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:21:25 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: LCLS: fix LCLS-CONNECT-CONTROL encoder
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12376 ) Change subject: LCLS: fix LCLS-CONNECT-CONTROL encoder .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f Gerrit-Change-Number: 12376 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:20:11 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: LCLS: don't encode incorrect values
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12375 ) Change subject: LCLS: don't encode incorrect values .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 20 Dec 2018 11:18:14 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: LCLS: use enum values instead of magic numbers
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12378 ) Change subject: LCLS: use enum values instead of magic numbers .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Gerrit-Change-Number: 12378 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:16:43 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: LCLS: don't send invalid status in HO messages
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:15:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/12271 )
Change subject: tests/gsm0808: use new msgb comparison API
..
Patch Set 3: Code-Review-1
(1 comment)
https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c
File tests/gsm0808/gsm0808_test.c:
https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c@45
PS3, Line 45:
To avoid unintended side-effects from indentation without braces, this macro
should be wrapped in do { ... } while (0); like EXPECTED_ENCODED above.
Or just make this a proper function...
--
To view, visit https://gerrit.osmocom.org/12271
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b
Gerrit-Change-Number: 12271
Gerrit-PatchSet: 3
Gerrit-Owner: Max
Gerrit-Assignee: fixeria
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Stefan Sperling
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-CC: fixeria
Gerrit-Comment-Date: Thu, 20 Dec 2018 11:08:41 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: LCLS: log config/control update
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12366 ) Change subject: LCLS: log config/control update .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 Gerrit-Change-Number: 12366 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 11:06:10 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12380 to look at the new patch set (#2). Change subject: add a test for LU with invalid LAI .. add a test for LU with invalid LAI Verify that the MSC rejects a location update with a LAI that contains a PLMN which does not match the network's PLMN. Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Related: OS#3162 --- M library/BSSMAP_Templates.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 4 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/12380/2 -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy
Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12380 ) Change subject: add a test for LU with invalid LAI .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn@2839 PS1, Line 2839: f_enc_mcc_mnc > This function is private in BSSMAP_Templates. […] Sorry, I forgot to 'git add' another file. https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn@2844 PS1, Line 2844: tr_ML3_MT_LU_Rej > Should we expect any particular reject cause? I don't know which cause would be appropriate per the spec. osmo-msc sends reject cause '16'O, which maps to GSM48_REJECT_MSC_TMP_NOT_REACHABLE. Should we check just for this one or allow a few additional causes? -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 11:01:22 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12380
Change subject: add a test for LU with invalid LAI
..
add a test for LU with invalid LAI
Verify that the MSC rejects a location update with a LAI that
contains a PLMN which does not match the network's PLMN.
Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1
Related: OS#3162
---
M msc/MSC_Tests.cfg
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
3 files changed, 36 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/80/12380/1
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index b412889..efe4666 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -61,3 +61,4 @@
#MSC_Tests.TC_reset_two
#MSC_Tests.TC_lu_and_mt_call
#MSC_Tests.TC_cipher_complete_with_invalid_cipher
+#MSC_Tests.TC_lu_with_invalid_lai
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 1b37329..bf83427 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2826,6 +2826,38 @@
vc_conn.done;
}
+/* Location Update with PLMN mismatch in the LAI. */
+private function f_tc_lu_with_invalid_lai(charstring id, BSC_ConnHdlrPars
pars) runs on BSC_ConnHdlr {
+ f_init_handler(pars);
+
+ /* tell GSUP dispatcher to send this IMSI to us */
+ f_create_gsup_expect(hex2str(g_pars.imsi));
+
+ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
+ var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)
+ /* Override the location update's LAI with a different PLMN;
osmo-msc.cfg uses mcc 262 mnc 42 */
+ l3_lu.msgs.mm.locationUpdateRequest.locationAreaIdentification.mcc_mnc
:= f_enc_mcc_mnc('262'H, '23'H);
+ f_bssap_compl_l3(l3_lu);
+
+ /* Expect LU reject from MSC. */
+ alt {
+ [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
+ setverdict(pass);
+ }
+ [] BSSAP.receive {
+ setverdict(fail, "Unknown/unexpected BSSAP received");
+ mtc.stop;
+ }
+ }
+}
+
+testcase TC_lu_with_invalid_lai() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init();
+ vc_conn := f_start_handler(refers(f_tc_lu_with_invalid_lai), 53);
+ vc_conn.done;
+}
+
/* TODO (SMS):
* different user data lengths
* SMPP transaction mode with unsuccessful delivery
@@ -2916,6 +2948,8 @@
execute( TC_cipher_complete_with_invalid_cipher() );
+ execute( TC_lu_with_invalid_lai() );
+
/* Run this last: at the time of writing this test crashes the MSC */
execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() );
execute( TC_mo_cc_bssmap_clear() );
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index 83c8010..8eebd57 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -70,6 +70,7 @@
+
--
To view, visit https://gerrit.osmocom.org/12380
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1
Gerrit-Change-Number: 12380
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Change in libosmocore[master]: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12374
Change subject: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI
..
rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI
The name "LAI AND LAC" makes no sense because a LAC
is part of a LAI. Keep the old name available for
API backwards compatibility.
Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065
Related: OS#3124
---
M include/osmocom/gsm/protocol/gsm_08_08.h
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/12374/1
diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h
b/include/osmocom/gsm/protocol/gsm_08_08.h
index cb9fe01..676d1cf 100644
--- a/include/osmocom/gsm/protocol/gsm_08_08.h
+++ b/include/osmocom/gsm/protocol/gsm_08_08.h
@@ -18,14 +18,15 @@
CELL_IDENT_LAC_AND_CI = 1,
CELL_IDENT_CI = 2,
CELL_IDENT_NO_CELL = 3,
- CELL_IDENT_LAI_AND_LAC = 4,
+ CELL_IDENT_LAI = 4,
CELL_IDENT_LAC = 5,
CELL_IDENT_BSS = 6,
CELL_IDENT_UTRAN_PLMN_LAC_RNC = 8,
CELL_IDENT_UTRAN_RNC= 9,
CELL_IDENT_UTRAN_LAC_RNC= 10,
};
-
+/* Keep this misnamed CELL_IDENT for API backwards compatibility (see
OS#3124). */
+#define CELL_IDENT_LAI_AND_LAC CELL_IDENT_LAI
/* GSM 08.06 § 6.3 */
enum BSSAP_MSG_TYPE {
--
To view, visit https://gerrit.osmocom.org/12374
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065
Gerrit-Change-Number: 12374
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send()
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 18:20:43 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error .. Patch Set 1: Then perhaps the best course of action is to just leave things as they are? -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 14:31:43 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: MNCC: use log wrapper for call processing
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Dec 2018 14:30:13 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send()
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 14:28:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: Use msgb helper instead of local #define for debug print
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print .. Patch Set 2: > Patch Set 2: > > > Ok, if there is no known way to do it with spatch, why not to do it > > manually, by hands? What's the point of using spatch? Speed vs > > quality? > > > > I can update this change, if you don't mind. > > I agree with Vadim here I'm confused why VERIFY() is even a macro instead of a function. Anyway, I agree that just changing the macro body to use the function would be sufficient. Would it not? -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 14:26:50 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12364
Change subject: fix ipa_asp_fsm down state transition
..
fix ipa_asp_fsm down state transition
Properly transition into IPA_ASP_S_DOWN from IPA_ASP_S_ACTIVE
and fix the mask of legal out states from IPA_ASP_S_ACTIVE.
BSC-sccplite tests are still passing with this change.
Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571
Related: OS#3111
---
M src/xua_asp_fsm.c
1 file changed, 26 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12364/1
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index d6edac0..b0c672b 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -916,6 +916,28 @@
}
}
+static void ipa_asp_fsm_del_route(struct osmo_fsm_inst *fi)
+{
+ struct ipa_asp_fsm_priv *iafp = fi->priv;
+ struct osmo_ss7_asp *asp = iafp->asp;
+ struct osmo_ss7_instance *inst = asp->inst;
+ struct osmo_ss7_as *as = osmo_ss7_as_find_by_rctx(inst, 0);
+ struct osmo_ss7_route *rt;
+
+ OSMO_ASSERT(as);
+
+ /* find the route which we have created if we ever reached
ipa_asp_fsm_wait_id_ack2 */
+ rt = osmo_ss7_route_find_dpc_mask(inst->rtable_system,
as->cfg.routing_key.pc, 0xff);
+ /* no route found, bail out */
+ if (!rt)
+ return;
+ /* route points to different AS, bail out */
+ if (rt->dest.as != as)
+ return;
+
+ osmo_ss7_route_destroy(rt);
+ osmo_timer_del(>pong_timer);
+}
/* Server + Client: We're actively transmitting user data */
static void ipa_asp_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
@@ -923,7 +945,8 @@
switch (event) {
case XUA_ASP_E_M_ASP_DOWN_REQ:
case XUA_ASP_E_M_ASP_INACTIVE_REQ:
- /* FIXME: kill ASP and (wait for) re-connect */
+ ipa_asp_fsm_del_route(fi);
+ osmo_fsm_inst_state_chg(fi, IPA_ASP_S_DOWN, 0, 0);
break;
}
}
@@ -1025,8 +1048,7 @@
[IPA_ASP_S_ACTIVE] = {
.in_event_mask = S(XUA_ASP_E_M_ASP_DOWN_REQ) |
S(XUA_ASP_E_M_ASP_INACTIVE_REQ),
- .out_state_mask = S(XUA_ASP_S_INACTIVE) |
- S(XUA_ASP_S_DOWN),
+ .out_state_mask = S(IPA_ASP_S_DOWN),
.name = "ASP_ACTIVE",
.action = ipa_asp_fsm_active,
.onenter = ipa_asp_fsm_active_onenter,
@@ -1035,25 +1057,7 @@
static void ipa_asp_fsm_cleanup(struct osmo_fsm_inst *fi, enum
osmo_fsm_term_cause cause)
{
- struct ipa_asp_fsm_priv *iafp = fi->priv;
- struct osmo_ss7_asp *asp = iafp->asp;
- struct osmo_ss7_instance *inst = asp->inst;
- struct osmo_ss7_as *as = osmo_ss7_as_find_by_rctx(inst, 0);
- struct osmo_ss7_route *rt;
-
- OSMO_ASSERT(as);
-
- /* find the route which we have created if we ever reached
ipa_asp_fsm_wait_id_ack2 */
- rt = osmo_ss7_route_find_dpc_mask(inst->rtable_system,
as->cfg.routing_key.pc, 0xff);
- /* no route found, bail out */
- if (!rt)
- return;
- /* route points to different AS, bail out */
- if (rt->dest.as != as)
- return;
-
- osmo_ss7_route_destroy(rt);
- osmo_timer_del(>pong_timer);
+ ipa_asp_fsm_del_route(fi);
}
struct osmo_fsm ipa_asp_fsm = {
--
To view, visit https://gerrit.osmocom.org/12364
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571
Gerrit-Change-Number: 12364
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher .. Patch Set 1: > Patch Set 1: Code-Review+1 > > Did some tests fail because of this? Not sure. I found the issue by code inspection. -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 09:12:27 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: use vty->type instead of local variable
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12353
Change subject: use vty->type instead of local variable
..
use vty->type instead of local variable
We can check if we're parsing the config file by checking
whether vty->type equals VTY_FILE. This avoids the use of
an extra local variable to track the parsing state.
Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75
Fixes: 1051c4208834c22d344dd92d25addfd8e5d95993
Related: OS#3355
---
M include/osmocom/msc/vty.h
M src/libmsc/msc_vty.c
M src/osmo-msc/msc_main.c
3 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/12353/1
diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h
index 60a36d7..6a55df7 100644
--- a/include/osmocom/msc/vty.h
+++ b/include/osmocom/msc/vty.h
@@ -31,6 +31,4 @@
struct gsm_network *gsmnet_from_vty(struct vty *vty);
-extern bool msc_parsing_config_file;
-
#endif
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 87adc82..13790bb 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -466,7 +466,7 @@
"This name is used for GSUP routing and must be set if more than one MSC
is connected to the HLR. "
"The default is 'MSC-00-00-00-00-00-00'.\n")
{
- if (!msc_parsing_config_file) {
+ if (vty->type != VTY_FILE) {
vty_out(vty, "The IPA name cannot be changed at run-time; "
"It can only be set in the configuraton file.%s",
VTY_NEWLINE);
return CMD_WARNING;
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 4dce2b8..6eecf46 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -515,8 +515,6 @@
extern void *tall_call_ctx;
extern void *tall_trans_ctx;
-bool msc_parsing_config_file = false;
-
int main(int argc, char **argv)
{
int rc;
@@ -569,9 +567,7 @@
return -1;
#endif
- msc_parsing_config_file = true;
rc = vty_read_config_file(msc_cmdline_config.config_file, NULL);
- msc_parsing_config_file = false;
if (rc < 0) {
LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file:
'%s'\n",
msc_cmdline_config.config_file);
--
To view, visit https://gerrit.osmocom.org/12353
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75
Gerrit-Change-Number: 12353
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Hello Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#4). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. make gsup ipa name configurable in osmo-sgsn.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'ipa-name' option can only be set via the configuration file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/4 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: osmith
Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default .. Patch Set 1: > Patch Set 1: > > > There is code which calls sap_open() in mobile/app_mobile.c as > > well, and it's inside #if 0 ; should that dead code also be > > removed? > > WOW, yes, definitely! But, in a separate change ;) Sure, a separate patch is appropriate. -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 17:49:54 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error
Stefan Sperling has removed a vote on this change. Change subject: MSC: adjust gsup log level to error .. Removed Code-Review+1 by Stefan Sperling -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter
Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error .. Patch Set 1: Code-Review+1 > Patch Set 1: > > I am not sure if this is a very good idea. Shouldn't the integration tests > log as much as possible to allow investigation afterwards. What if there is a > bug hiding in the gsub code? > > Maybe we should try to find a more reasonable logging level for the related > GSUP logging in osmo-msc? I agree that the message is annoying, I also see it a lot: Tue Dec 18 18:45:47 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:47 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:48 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:48 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:49 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:49 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:50 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:50 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:51 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:51 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:52 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:52 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:53 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:53 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:54 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:54 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Simply changing the log level of this message in osmo-msc might be fine indeed. -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 17:46:34 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: LCLS: update parameter representation
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 17:43:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: add to osmo_sock_get_name*() API
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12268/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/2/src/socket.c@825 PS2, Line 825: /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ Could we keep this comment in osmo_sock_get_name() also? Without that command the 1 + 5 + 3 + 2 is impossible to understand. -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:41:28 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c@642 PS2, Line 642: if (strlen(vsub->imei)) > Simply check like this: […] Yeah that would be a better idiom but not critical from my point of view. -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:35:39 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-msc[master]: msc_vty: display current RAN type
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12345 ) Change subject: msc_vty: display current RAN type .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Gerrit-Change-Number: 12345 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:33:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: msc_vty: display subscriber flags
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags .. Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:31:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: msc_vty: display subscriber flags
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags .. Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12344/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12344/2/src/libmsc/msc_vty.c@659 PS2, Line 659: vty_out(vty, " Received cancel locataion: %s%s", typo: "location" -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:31:27 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 .. Patch Set 4: Code-Review+1 Silly of them to break the API without backwards compat... -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:29:46 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:27:31 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default .. Patch Set 1: Code-Review+1 There is code which calls sap_open() in mobile/app_mobile.c as well, and it's inside #if 0 ; should that dead code also be removed? -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:22:16 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE()
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12351 ) Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 17:18:33 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: VLR: drop unused struct members
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:17:19 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12349 to look at the new patch set (#2). Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE .. improve handling of BSC-chosen algo in CIPHER MODE COMPLETE The BSC may choose to omit the chosenEntryptionAlgorithm IE in the CIPHER MODE COMPLETE command. When this happens, we used to default to A5/1 and disregarded the list of ciphers which we requested in the CIPHER MODE CMD. Fall back to the best cipher instead of hard-coding a fallback to A5/1. If the BSC does specify an algorithm, ensure that the chosen value falls within the range allowed by GSM 04.08, and ensure that the chosen value matches one of the values we sent in CIPHER MODE CMD. Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Related: OS#2872 --- M include/osmocom/msc/gsm_04_08.h M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c 3 files changed, 53 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/12349/2 -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12349
Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE
..
improve handling of BSC-chosen algo in CIPHER MODE COMPLETE
The BSC may choose to omit the chosenEntryptionAlgorithm IE in
the CIPHER MODE COMPLETE command. When this happens, we used to
default to A5/1 and disregarded the list of ciphers which we
requested in the CIPHER MODE CMD. Fall back to the best cipher
instead of hard-coding a fallback to A5/1.
If the BSC does specify an algorithm, ensure that the chosen value
falls within the range allowed by GSM 04.08, and ensure that the
chosen value matches one of the values we sent in CIPHER MODE CMD.
Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81
Related: OS#2872
---
M include/osmocom/msc/gsm_04_08.h
M src/libmsc/a_iface_bssap.c
M src/libmsc/gsm_04_08.c
3 files changed, 53 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/12349/1
diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h
index 5ff16de..79f7e0f 100644
--- a/include/osmocom/msc/gsm_04_08.h
+++ b/include/osmocom/msc/gsm_04_08.h
@@ -77,5 +77,7 @@
int gsm48_tch_rtp_create(struct gsm_trans *trans);
int gsm48_conn_sendmsg(struct msgb *msg, struct ran_conn *conn, struct
gsm_trans *trans);
+struct gsm_classmark;
+int gsm48_classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5);
#endif
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index d84a234..69824c7 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
@@ -386,14 +387,59 @@
* is not able to deal with msg = NULL and apperently
* ran_conn_cipher_mode_compl() was never meant to be used without L3
data.
* This needs to be discussed further! */
-
- uint8_t alg_id = 1;
+ struct gsm_network *net = conn->network;
+ int alg_id = -1;
struct rate_ctr_group *msc = conn->network->msc_ctrs;
+ struct gsm0808_encrypt_info ei = { 0 };
+ int i, j = 0;
LOGPCONN(conn, LOGL_DEBUG, "Rx BSSMAP CIPHER MODE COMPLETE\n");
if (TLVP_PRESENT(tp, GSM0808_IE_CHOSEN_ENCR_ALG)) {
- alg_id = TLVP_VAL(tp, GSM0808_IE_CHOSEN_ENCR_ALG)[0] - 1;
+ uint8_t val = TLVP_VAL(tp, GSM0808_IE_CHOSEN_ENCR_ALG)[0];
+ if (val < GSM0808_ALG_ID_A5_0 || val > GSM0808_ALG_ID_A5_7) {
+ LOGPCONN(conn, LOGL_ERROR, "Invalid encryption
algorithm in CIPHER MODE COMPLETE: 0x%x\n", val);
+ return -EINVAL;
+ }
+ alg_id = val - 1;
+ } else {
+ /* The BSC did not choose an algorithm. We sort this out below.
*/
+ }
+
+ /* Recompute the ENCRYPTION INFORMATION IE we sent in CIPHER MODE CMD.
*/
+ for (i = 0; i < 8; i++) {
+ int supported;
+
+ /* A5/n permitted by osmo-msc.cfg? */
+ if (!(net->a5_encryption_mask & (1 << i)))
+ continue;
+
+ /* A5/n supported by MS? */
+ supported = gsm48_classmark_supports_a5(>vsub->classmark,
i);
+ if (supported == 1)
+ ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i);
+ }
+ ei.perm_algo_len = j;
+
+ if (alg_id == -1) {
+ if (ei.perm_algo_len > 0) {
+ /* Pick the best available algorithm. */
+ alg_id = ei.perm_algo[ei.perm_algo_len - 1] - 1;
+ } else
+ alg_id = VLR_CIPH_NONE;
+ LOGPCONN(conn, LOGL_NOTICE, "BSC didn't specify algorithm in
CIHPER MODE COMPLETE; falling back to A5/%d\n", alg_id);
+ } else {
+ int chosen = -1;
+ for (j = 0; j < ei.perm_algo_len; j++) {
+ if (ei.perm_algo[j] == alg_id) {
+ chosen = j;
+ break;
+ }
+ }
+ if (chosen == -1) {
+ LOGPCONN(conn, LOGL_ERROR, "Unsupported encryption
algorithm in CIHPER MODE COMPLETE: A5/%d\n", alg_id);
+ return -EINVAL;
+ }
}
if (TLVP_PRESENT(tp, GSM0808_IE_LAYER_3_MESSAGE_CONTENTS)) {
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index dc0476b..bfad853 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -122,7 +122,7 @@
* Return 1 when the given A5/n is permitted, 0 when not, and negative if the
respective MS CLASSMARK is
* not known, where the negative number indicates the classmark type: -2 means
Classmark 2 is not
* available. */
Change in osmo-ttcn3-hacks[master]: add three tests for CIPHER MODE COMPLETE without algo
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12347
Change subject: add three tests for CIPHER MODE COMPLETE without algo
..
add three tests for CIPHER MODE COMPLETE without algo
Add three tests which exercise MSC behaviour when a CIPHER MODE
COMPLETE command lacks the optional chosenEncryptionAlgorithm IE.
Check for behaviour with A5/1, A5/3, and A5/1 + A5/3 configured
in the network, and expect the location update to succeed.
These tests pass on master, but they should somehow verify the
cipher the MSC ends up using. I am not quite sure how to do that.
Would inspecting the MSC's VTY be a reasonable approach? How
could his be done by code which runs on BSC_ConnectionHandler?
Change-Id: I1a2a126795c544613a7a87e238e1fc8c4e943885
Related: OS#2872
---
M library/BSSMAP_Templates.ttcn
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.cfg
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
5 files changed, 142 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/47/12347/1
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index ff151f0..0db61b2 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -1032,6 +1032,19 @@
}
}
+template PDU_BSSAP ts_BSSMAP_CipherModeComplAlg(template
BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := ?)
+modifies ts_BSSAP_BSSMAP := {
+ pdu := {
+ bssmap := {
+ cipherModeComplete := {
+ messageType := '55'O,
+ layer3MessageContents := omit,
+ chosenEncryptionAlgorithm :=
chosenEncryptionAlgorithm
+ }
+ }
+ }
+}
+
template PDU_BSSAP tr_BSSMAP_CipherModeCompl(template OCT1 alg := ?) modifies
tr_BSSAP_BSSMAP := {
pdu := {
bssmap := {
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index f005e02..c6029b7 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -295,28 +295,17 @@
}
}
-function f_perform_lu()
-runs on BSC_ConnHdlr {
- var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)
- var PDU_DTAP_MT dtap_mt;
-
- /* tell GSUP dispatcher to send this IMSI to us */
- f_create_gsup_expect(hex2str(g_pars.imsi));
-
- /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
- f_bssap_compl_l3(l3_lu);
-
- if (g_pars.send_early_cm) {
- BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));
- }
-
- f_mm_common();
-
+function f_msc_lu_hlr() runs on BSC_ConnHdlr
+{
/* Expect MSC to perform LU with HLR */
GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi));
GSUP.send(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn));
GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi));
GSUP.send(ts_GSUP_UL_RES(g_pars.imsi));
+}
+
+function f_accept_reject_lu() runs on BSC_ConnHdlr {
+ var PDU_DTAP_MT dtap_mt;
alt {
[] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt {
@@ -343,10 +332,34 @@
mtc.stop;
}
}
- /* FIXME: there could be pending SMS or other common procedures by the
MSC, let's ignore them */
+}
+
+function f_bssap_clear() runs on BSC_ConnHdlr {
BSSAP.receive(tr_BSSMAP_ClearCommand);
BSSAP.send(ts_BSSMAP_ClearComplete);
BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
+}
+
+function f_perform_lu()
+runs on BSC_ConnHdlr {
+ var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)
+
+ /* tell GSUP dispatcher to send this IMSI to us */
+ f_create_gsup_expect(hex2str(g_pars.imsi));
+
+ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
+ f_bssap_compl_l3(l3_lu);
+
+ if (g_pars.send_early_cm) {
+ BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));
+ }
+
+ f_mm_common();
+ f_msc_lu_hlr();
+ f_accept_reject_lu();
+ /* FIXME: there could be pending SMS or other common procedures by the
MSC, let's ignore them */
+ f_bssap_clear();
+
setverdict(pass);
}
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index b412889..b852bac 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -61,3 +61,6 @@
#MSC_Tests.TC_reset_two
#MSC_Tests.TC_lu_and_mt_call
#MSC_Tests.TC_cipher_complete_with_invalid_cipher
+#MSC_Tests.TC_cipher_complete_1_without_cipher
+#MSC_Tests.TC_cipher_complete_3_without_cipher
+#MSC_Tests.TC_cipher_complete_13_without_cipher
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index adaeea3..3b40f50 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2814,6 +2814,68 @@
}
}
+private function f_tc_cipher_complete_without_alg(charstring id,
BSC_ConnHdlrPars pars, octetstr
Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12346
Change subject: wait for subscriber conn in
TC_cipher_complete_with_invalid_cipher
..
wait for subscriber conn in TC_cipher_complete_with_invalid_cipher
Ensure that tests running after TC_cipher_complete_with_invalid_cipher
won't see a left-over subscriber connection at the MSC.
Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706
Related: OS#2872
---
M msc/MSC_Tests.ttcn
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/46/12346/1
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index adaeea3..828620d 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2812,6 +2812,7 @@
mtc.stop;
}
}
+ f_expect_clear();
}
testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT {
--
To view, visit https://gerrit.osmocom.org/12346
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706
Gerrit-Change-Number: 12346
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Change in osmo-msc[master]: VLR: drop unused struct members
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12335/3/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/12335/3/include/osmocom/msc/vlr.h@174 PS3, Line 174: } ps; Any reason we keep 'ps' around if there's only one list left as a struct member? -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 15:29:07 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: Use proper type for tch_rtp_connect() parameter
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12330 ) Change subject: Use proper type for tch_rtp_connect() parameter .. Patch Set 2: Code-Review+1 Yeah ok. -- To view, visit https://gerrit.osmocom.org/12330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 Gerrit-Change-Number: 12330 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 15:27:53 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: MNCC: use log wrapper for call processing
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing .. Patch Set 2: Yep, looks fine. -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 15:25:09 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: Remove redundancy in LAC processing
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing .. Patch Set 3: Code-Review+1 Yes makes sense. -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 15:23:32 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages .. Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 15:17:37 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/11751 )
Change subject: GSUP/SMS: introduce READY-FOR-SM message
..
Patch Set 6:
(1 comment)
https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c
File src/gsm/gsup.c:
https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c@710
PS6, Line 710: if ((u8 = gsup_msg->sm_alert_rsn)) {
> Well, this approach is quite common, look at: […]
The only benefit is that it would help code readers like me :)
I think it is more obvious to check against != NONE if there's a NONE value
specifically defined for this set of values.
--
To view, visit https://gerrit.osmocom.org/11751
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3
Gerrit-Change-Number: 11751
Gerrit-PatchSet: 6
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Stefan Sperling
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Comment-Date: Tue, 18 Dec 2018 11:15:40 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py)
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 11:13:08 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12336 ) Change subject: VLR tests: add logging macro with explicit value description .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12336/1/tests/msc_vlr/msc_vlr_tests.h File tests/msc_vlr/msc_vlr_tests.h: https://gerrit.osmocom.org/#/c/12336/1/tests/msc_vlr/msc_vlr_tests.h@185 PS1, Line 185: #define V_ASSERT(desc, val, expect_op, fmt) \ Perhaps call this VAL_ASSERT instead of V_ASSERT? It's hard to tell the semantic difference between V_ and VERBOSE_; VAL_ and VERBOSE_ would be a clearer distinction. -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 11:11:47 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details .. Patch Set 1: Code-Review+1 (1 comment) Yes I agree this is better. https://gerrit.osmocom.org/#/c/12337/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12337/1//COMMIT_MSG@10 PS1, Line 10: test output: that's irrelevant clutter which forces unnucessary test typo: "unnecessary" -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 11:09:30 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 11:07:05 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 11:06:27 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command
Stefan Sperling has submitted this change and it was merged. (
https://gerrit.osmocom.org/12332 )
Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command
..
add MSC test for an invalid CIPHER MODE COMPLETE command
Add new test TC_cipher_complete_with_invalid_cipher which verifies
that the MSC will reject a CIPHER MODE COMPLETE command with a
cipher which wasn't part of the preceding CIPHER MODE command.
Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a
Related: OS#2872
---
M msc/MSC_Tests.cfg
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
3 files changed, 61 insertions(+), 0 deletions(-)
Approvals:
Neels Hofmeyr: Looks good to me, but someone else must approve
Stefan Sperling: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index 5a3c33c..b412889 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -60,3 +60,4 @@
#MSC_Tests.TC_lu_and_mt_call_no_dlcx_resp
#MSC_Tests.TC_reset_two
#MSC_Tests.TC_lu_and_mt_call
+#MSC_Tests.TC_cipher_complete_with_invalid_cipher
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index dc616a8..adaeea3 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2766,6 +2766,63 @@
f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0");
}
+/* A5/1 only permitted on network side; attempt an invalid CIPHER MODE
COMPLETE with A5/3 which MSC should reject. */
+private function f_tc_cipher_complete_with_invalid_cipher(charstring id,
BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
+ pars.net.expect_auth := true;
+ pars.net.expect_ciph := true;
+ pars.net.kc_support := '02'O; /* A5/1 only */
+ f_init_handler(pars);
+
+ g_pars.vec := f_gen_auth_vec_2g();
+
+ /* Can't use f_perform_lu() directly. Code below is based on it. */
+
+ /* tell GSUP dispatcher to send this IMSI to us */
+ f_create_gsup_expect(hex2str(g_pars.imsi));
+
+ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
+ var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)
+ f_bssap_compl_l3(l3_lu);
+
+ f_mm_auth();
+
+ var OCT1 a5_net := f_alg_mask_from_cm(g_pars.cm2);
+ var OCT1 a5_intersect := g_pars.net.kc_support and4b a5_net;
+ alt {
+ [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(a5_intersect, g_pars.vec.kc)) {
+ BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(4 /* "accept" A5/3
*/, 1)));
+ }
+ [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(?, g_pars.vec.kc)) {
+ setverdict(fail, "Wrong ciphering algorithm mask in
CiphModCmd");
+ mtc.stop;
+ }
+ [] BSSAP.receive {
+ setverdict(fail, "Unknown/unexpected BSSAP received");
+ mtc.stop;
+ }
+ }
+
+ /* Expect LU reject from MSC. */
+ alt {
+ [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
+ setverdict(pass);
+ }
+ [] BSSAP.receive {
+ setverdict(fail, "Unknown/unexpected BSSAP received");
+ mtc.stop;
+ }
+ }
+}
+
+testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init();
+ f_vty_config(MSCVTY, "network", "encryption a5 1");
+
+ vc_conn :=
f_start_handler(refers(f_tc_cipher_complete_with_invalid_cipher), 52);
+ vc_conn.done;
+}
+
/* TODO (SMS):
* different user data lengths
* SMPP transaction mode with unsuccessful delivery
@@ -2854,6 +2911,8 @@
execute( TC_lu_and_mo_ussd_mo_release() );
execute( TC_lu_and_ss_session_timeout() );
+ execute( TC_cipher_complete_with_invalid_cipher() );
+
/* Run this last: at the time of writing this test crashes the MSC */
execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() );
execute( TC_mo_cc_bssmap_clear() );
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index 4a9529e..83c8010 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -69,6 +69,7 @@
+
--
To view, visit https://gerrit.osmocom.org/12332
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a
Gerrit-Change-Number: 12332
Gerrit-PatchSet: 3
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Stefan Sperling
Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12332 ) Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command .. Patch Set 2: Code-Review+2 > Patch Set 2: Code-Review+1 > > If the chosen cipher is not part of the offered ciphers, that should result > in a LU reject, yes. In that case the current behaviour seems to be correct? Issue OS#2872 is asking for a test and a fix. Since we now have a test and the behaviour seems OK, can I simply close the issue? > > But possibly, what you have tested is that A5/2 is generally deprecated and > should always be rejected? > > Please clarify this with another test run and then submit. Yes the test is still passing with A5/3 instead of A5/2. -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 10:58:49 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/12243 )
Change subject: make gsup ipa name configurable in osmo-sgsn.cfg
..
Patch Set 3:
(1 comment)
https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c
File src/gprs/sgsn_vty.c:
https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c@1195
PS3, Line 1195: if (!parsing_config_file) {
> my question: do things break when changing during run-time? […]
I can't enumerate the consequences of changing this name on the fly.
What seems obvious is that changing this name will result in some IPA
connections using name A and others using name B.
Likewise for routes which get installed in the HLR which refers to these names,
both of which point towards the same SGSN.
Will this cause real harm? I cannot tell. Will connections using the old name
be negatively impacted? Maybe.
What I am pretty certain about is that it risks putting the system into an
inconsistent state.
What I also know is that this is an unprecedented use case because Osmocom has
never run in multi-MSC/multi-SGSN setups
which means that we cannot really judge the consequences based on past
experience. We'd have to do a lot of testing and
code audit to be sure of the consequences. And all that for what looks like an
edge-case to me which should never happen
in real multi-MSC/multi-SGSN deployments as far as I can tell.
So I'll turn the question around on you again:
Why would you want to change this name without also restarting the process?
What is the use case for this?
--
To view, visit https://gerrit.osmocom.org/12243
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f
Gerrit-Change-Number: 12243
Gerrit-PatchSet: 3
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Stefan Sperling
Gerrit-Comment-Date: Tue, 18 Dec 2018 10:51:33 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 3: > Not necessarily. I think I already described it. You could simply print it > won't be applied until next restart, but still give the option that it is > saved so next time you start it it will be taken into account. Otherwise user > really needs to modify the cfg file manually. I really don't see why a regular user would want to clear the name, write the config, and then configure the name again to prevent the network from falling apart: no ipa-name write file ipa-name 'SGSN-911-123456879' Just to save the effort of removing one line from the saved file? Considering that multi-SGSN and multi-MSC setups will be an exception rather than the norm, how often do you think users will even run into this? Do you have a concrete situation where you would use this yourself? Or are you arguing based on "consistency is good" (which it isn't in this case, I would say)? If I were an admin of such a network, I'd be incredibly happy to have a unique identifier in all my configuration files saved from different SGSN/MSC. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 16:09:44 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network
Stefan Sperling has submitted this change and it was merged. (
https://gerrit.osmocom.org/12242 )
Change subject: remove pointless declaration of struct gsm_network
..
remove pointless declaration of struct gsm_network
We were passing a NULL pointer of type struct gsm_network * to
ctrl_interface_setup_dynip(). Remove the pointless declaration
of this struct. Also, replace the sgsn_controlif_setup() helper
function with a direct call to ctrl_interface_setup_dynip().
The helper fnuction was just a thin wrapper around the latter.
Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759
Related: OS#3356
---
M include/osmocom/sgsn/gprs_sgsn.h
M src/gprs/sgsn_ctrl.c
M src/gprs/sgsn_main.c
3 files changed, 2 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
Max: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index b6afe69..a0a056f 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -404,9 +404,6 @@
/*
* ctrl interface related work
*/
-struct gsm_network;
-struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *,
-const char *bind_addr, uint16_t port);
int sgsn_ctrl_cmds_install(void);
/*
diff --git a/src/gprs/sgsn_ctrl.c b/src/gprs/sgsn_ctrl.c
index dc5ae79..ad91d25 100644
--- a/src/gprs/sgsn_ctrl.c
+++ b/src/gprs/sgsn_ctrl.c
@@ -60,9 +60,3 @@
rc |= ctrl_cmd_install(CTRL_NODE_ROOT, _subscriber_list);
return rc;
}
-
-struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *net,
-const char *bind_addr, uint16_t port)
-{
- return ctrl_interface_setup_dynip(net, bind_addr, port, NULL);
-}
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index 798e507..f12270d 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -450,8 +450,8 @@
/* start control interface after reading config for
* ctrl_vty_get_bind_addr() */
- g_ctrlh = sgsn_controlif_setup(NULL, ctrl_vty_get_bind_addr(),
- OSMO_CTRL_PORT_SGSN);
+ g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(),
+ OSMO_CTRL_PORT_SGSN, NULL);
if (!g_ctrlh) {
LOGP(DGPRS, LOGL_ERROR, "Failed to create CTRL interface.\n");
exit(1);
--
To view, visit https://gerrit.osmocom.org/12242
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759
Gerrit-Change-Number: 12242
Gerrit-PatchSet: 2
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Stefan Sperling
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 3: > I was just replying that I still lack a "no ipa-name" in order to be able to > go back to default before saving the config, but I didn't really understand > your arguments against it, I was just stating I don't get them and trying to > explain why. I know your patch currently doesn't do that. OK, I see. I don't think 'no ipa-name' is a good idea, for the same reasons that changing the name at runtime is not a good idea. As I understand, the semantics of 'no ipa-name' would include switching the IPA name back to the default name at run-time, would it not? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:44:24 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12332 to look at the new patch set (#2). Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command .. add MSC test for an invalid CIPHER MODE COMPLETE command Add new test TC_cipher_complete_with_invalid_cipher which verifies that the MSC will reject a CIPHER MODE COMPLETE command with a cipher which wasn't part of the preceding CIPHER MODE command. Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Related: OS#2872 --- M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/12332/2 -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling
Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/12332 )
Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command
..
Patch Set 1:
(3 comments)
https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn
File msc/MSC_Tests.ttcn:
https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn@2793
PS1, Line 2793: BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(3
/* "accept" A5/3 */, 1)));
> (isn't 0x3 == A5/2? maybe I'm confusing the IEs)
Oh, right. I'll fix this, thanks!
https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn@2820
PS1, Line 2820: f_vty_config(MSCVTY, "network", "authentication
required");
> ('authentication required' is implied by enabling encryption, so you could
> drop this first vty cmd)
Will fix, thanks.
https://gerrit.osmocom.org/#/c/12332/1/msc/expected-results.xml
File msc/expected-results.xml:
https://gerrit.osmocom.org/#/c/12332/1/msc/expected-results.xml@72
PS1, Line 72:
> from the issue i understand that the test should currently be failing? this
> here marks it as expecte […]
Yes it is expected to pass. As I explained in the issue, the current behaviour
is that the MSC returns a LU reject, and the test has been written to expect
this. I don't know how the MSC should behave in this case. I've read some parts
of the spec but haven't found out about this detail yet. Any clues?
--
To view, visit https://gerrit.osmocom.org/12332
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a
Gerrit-Change-Number: 12332
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Stefan Sperling
Gerrit-Comment-Date: Mon, 17 Dec 2018 15:37:01 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/12243 )
Change subject: make gsup ipa name configurable in osmo-sgsn.cfg
..
Patch Set 3:
(1 comment)
https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c
File src/gprs/sgsn_vty.c:
https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c@1195
PS3, Line 1195: if (!parsing_config_file) {
> instead you can do […]
OK, so say the user changes the ipa-name. And now we print a warning that they
did something bad.
Can you tell me:
1) What would the resulting system behaviour be?
2) And what should this warning say?
>From my point my view, the resulting behaviour is essentially undefined, so
>the warning would have to say something like: "We are sorry, you have just
>changed an option which should not be changed at run-time because it leads to
>what essentially amounts to undefined behaviour of our application. Have fun!"
--
To view, visit https://gerrit.osmocom.org/12243
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f
Gerrit-Change-Number: 12243
Gerrit-PatchSet: 3
Gerrit-Owner: Stefan Sperling
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Stefan Sperling
Gerrit-Comment-Date: Mon, 17 Dec 2018 15:31:52 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg .. Patch Set 3: > Patch Set 3: > > > I don't see a beneficial use case in clearing the IPA name before > > saving the current config. Why would anyone want to omit that name? > > If we require the name to be stored in the config file, why should > > it not always be saved when the file gets written out? > > > I don't get you there. I don't see anywhere that it is REQUIRED that the name > is stored in the config file. That's why we have defaults right? When storing > the config back into the cfg file we usually have same approach. If it's the > default value, don't save it, because it means the user simply wants the > default value and we may decide later that another default value is better, > this way the user can benefit from it for free. It also keeps config files > shorter and easy to find "user specific values". But... wait... my patch saves the ipa-name to the config file only if the user has overridden it. If the user does not change it, the 'ipa-name' line won't appear in the saved configuration. You sound like you believed we'd save the default name "MSC-00-00-00-00-00-00"? That is not the case! Does this address your concern or did I misunderstand you? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:28:21 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command
Stefan Sperling has uploaded this change for review. (
https://gerrit.osmocom.org/12332
Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command
..
add MSC test for an invalid CIPHER MODE COMPLETE command
Add new test TC_cipher_complete_with_invalid_cipher which verifies
that the MSC will reject a CIPHER MODE COMPLETE command with a
cipher which wasn't part of the preceding CIPHER MODE command.
Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a
Related: OS#2872
---
M msc/MSC_Tests.cfg
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
3 files changed, 62 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/32/12332/1
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index 5a3c33c..b412889 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -60,3 +60,4 @@
#MSC_Tests.TC_lu_and_mt_call_no_dlcx_resp
#MSC_Tests.TC_reset_two
#MSC_Tests.TC_lu_and_mt_call
+#MSC_Tests.TC_cipher_complete_with_invalid_cipher
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index dc616a8..41964a4 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2766,6 +2766,64 @@
f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0");
}
+/* A5/1 only permitted on network side; attempt an invalid CIPHER MODE
COMPLETE with A5/3 which MSC should reject. */
+private function f_tc_cipher_complete_with_invalid_cipher(charstring id,
BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
+ pars.net.expect_auth := true;
+ pars.net.expect_ciph := true;
+ pars.net.kc_support := '02'O; /* A5/1 only */
+ f_init_handler(pars);
+
+ g_pars.vec := f_gen_auth_vec_2g();
+
+ /* Can't use f_perform_lu() directly. Code below is based on it. */
+
+ /* tell GSUP dispatcher to send this IMSI to us */
+ f_create_gsup_expect(hex2str(g_pars.imsi));
+
+ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
+ var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)
+ f_bssap_compl_l3(l3_lu);
+
+ f_mm_auth();
+
+ var OCT1 a5_net := f_alg_mask_from_cm(g_pars.cm2);
+ var OCT1 a5_intersect := g_pars.net.kc_support and4b a5_net;
+ alt {
+ [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(a5_intersect, g_pars.vec.kc)) {
+ BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(3 /* "accept" A5/3
*/, 1)));
+ }
+ [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(?, g_pars.vec.kc)) {
+ setverdict(fail, "Wrong ciphering algorithm mask in
CiphModCmd");
+ mtc.stop;
+ }
+ [] BSSAP.receive {
+ setverdict(fail, "Unknown/unexpected BSSAP received");
+ mtc.stop;
+ }
+ }
+
+ /* Expect LU reject from MSC. */
+ alt {
+ [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
+ setverdict(pass);
+ }
+ [] BSSAP.receive {
+ setverdict(fail, "Unknown/unexpected BSSAP received");
+ mtc.stop;
+ }
+ }
+}
+
+testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init();
+ f_vty_config(MSCVTY, "network", "authentication required");
+ f_vty_config(MSCVTY, "network", "encryption a5 1");
+
+ vc_conn :=
f_start_handler(refers(f_tc_cipher_complete_with_invalid_cipher), 52);
+ vc_conn.done;
+}
+
/* TODO (SMS):
* different user data lengths
* SMPP transaction mode with unsuccessful delivery
@@ -2854,6 +2912,8 @@
execute( TC_lu_and_mo_ussd_mo_release() );
execute( TC_lu_and_ss_session_timeout() );
+ execute( TC_cipher_complete_with_invalid_cipher() );
+
/* Run this last: at the time of writing this test crashes the MSC */
execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() );
execute( TC_mo_cc_bssmap_clear() );
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index 4a9529e..83c8010 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -69,6 +69,7 @@
+
--
To view, visit https://gerrit.osmocom.org/12332
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a
Gerrit-Change-Number: 12332
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling
Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-Comment-Date: Mon, 17 Dec 2018 11:51:56 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py)
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) .. Patch Set 3: Code-Review+1 I agree with Max: More information in the log message couldn't hurt. -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 11:49:46 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message .. Patch Set 7: Code-Review+1 Looks good to me now. -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:31:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:30:20 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send()
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:28:32 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE .. Patch Set 4: Code-Review+1 I also think updating libosmocore would be better, but won't stand in the way of this patch getting merged first. If you are pressed for time now, there's nothing much that can be done about it. Maybe you will find time later? -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:27:18 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11776 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP .. Patch Set 5: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11776/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11776/5//COMMIT_MSG@10 PS5, Line 10: over GSUP towards HLR. The algorythm is equivalent to MO SMS. spelling: "algorithm" https://gerrit.osmocom.org/#/c/11776/5/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/11776/5/msc/BSC_ConnectionHandler.ttcn@817 PS5, Line 817: /* just in case this is routed to SMPP.. */ This comment assumes the reader already knows about the consequences of routing over SMPP, so it doesn't really explain anything. What does routing over SMPP imply? -- To view, visit https://gerrit.osmocom.org/11776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Gerrit-Change-Number: 11776 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 11:12:13 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12058 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms .. Patch Set 3: Code-Review+1 Looks fine to me. -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 11:07:50 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err}
Stefan Sperling has posted comments on this change. (
https://gerrit.osmocom.org/11924 )
Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err}
..
Patch Set 5: Code-Review+1
(2 comments)
https://gerrit.osmocom.org/#/c/11924/5//COMMIT_MSG
Commit Message:
https://gerrit.osmocom.org/#/c/11924/5//COMMIT_MSG@10
PS5, Line 10: initiated by ESME over GSUP. Basically, the algorythm is
spelling: "algorithm"
https://gerrit.osmocom.org/#/c/11924/5/msc/MSC_Tests.ttcn
File msc/MSC_Tests.ttcn:
https://gerrit.osmocom.org/#/c/11924/5/msc/MSC_Tests.ttcn@2160
PS5, Line 2160: sm_rp_ui := '0006802143658111328130858200'O,
What information is encoded in this string? It might be obvious to those
familiar with the data structures involved, but a comment here could help
readers who are unfamiliar with them.
--
To view, visit https://gerrit.osmocom.org/11924
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f
Gerrit-Change-Number: 11924
Gerrit-PatchSet: 5
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Stefan Sperling
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-CC: Holger Freyther
Gerrit-Comment-Date: Mon, 17 Dec 2018 11:05:31 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes
