- gerrit-log - lists.osmocom.org

Change in osmo-e1-hardware[master]: icE1usb doc: Link to wiki page about iso USB issues

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26948 ) Change subject: icE1usb doc: Link to wiki page about iso USB issues ...................................................................... icE1usb doc: Link to wiki page about iso USB issues Change-Id: Id5f555519d5e320570017178613c752591db4a2f --- M doc/manuals/chapters/firmware.adoc 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 1b440bd..5ae5fb1 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -185,7 +185,8 @@ activation of both icE1usb ports simultaneously. The XHCI controller firmware erroneously claims that there is insufficient bus bandwidth. However, the same icE1usb hardware/firmware works perfectly fine with -OHCI, UHCI and EHCI host controllers. +OHCI, UHCI and EHCI host controllers. See +https://osmocom.org/projects/e1-t1-adapter/wiki/Isochronous_USB_Issues for a user-maintained list of USB hosts / controllers and whether or not they work with two E1 ports. As most modern [PC] hardware has XHCI host controllers, you need to choose your hardware carefully if concurrent operation of both icE1usb -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id5f555519d5e320570017178613c752591db4a2f Gerrit-Change-Number: 26948 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb doc: Add pictures of front and back side

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26949 ) Change subject: icE1usb doc: Add pictures of front and back side ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ifc382c762119b397dd9a6b484ebc9a237897fba9 Gerrit-Change-Number: 26949 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jan 2022 20:22:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb doc: Link to wiki page about iso USB issues

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26948 ) Change subject: icE1usb doc: Link to wiki page about iso USB issues ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id5f555519d5e320570017178613c752591db4a2f Gerrit-Change-Number: 26948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jan 2022 19:58:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb doc: Add pictures of front and back side

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26949 ) Change subject: icE1usb doc: Add pictures of front and back side ...................................................................... icE1usb doc: Add pictures of front and back side Closes: OS#5406 Change-Id: Ifc382c762119b397dd9a6b484ebc9a237897fba9 --- M doc/manuals/chapters/hardware.adoc A doc/manuals/images/icE1usb-e1_side.jpg A doc/manuals/images/icE1usb-usb_side.jpg 3 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/49/26949/1 diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 8055e64..0e129c2 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -19,7 +19,14 @@ PDF rendered schematics are available at https://git.osmocom.org/osmo-e1-hardware/plain/hardware/icE1usb/r1.0/icE1us… -=== Connectors +=== Connectors on E1 side + +image::images/icE1usb-e1_side.jpg[width=400,title="E1 side of icE1usb"] + +From left to right, there are the following connectors: + +* X5A: Primary E1 Port +* X5B: Secondary E1 Port ==== X5A and X5B: E1 Interface Connectors @@ -57,6 +64,17 @@ different pin-out. Particularly, you cannot use an Ethernet cross-over cable as an E1 cross-over! +=== Connectors on USB side + +image::images/icE1usb-usb_side.jpg[width=400,title="USB side of icE1usb"] + +From left to right, there are the following connectors: + +* X1: GPS Antenna Connector +* X2: Serial Console Connector +* X4: USB Connector +* X3: GPIO / Extension Connector + ==== X4: USB Connector The USB connector is a USB Type C connector. However, it only carries diff --git a/doc/manuals/images/icE1usb-e1_side.jpg b/doc/manuals/images/icE1usb-e1_side.jpg new file mode 100644 index 0000000..5bd274d --- /dev/null +++ b/doc/manuals/images/icE1usb-e1_side.jpg Binary files differ diff --git a/doc/manuals/images/icE1usb-usb_side.jpg b/doc/manuals/images/icE1usb-usb_side.jpg new file mode 100644 index 0000000..5d833d6 --- /dev/null +++ b/doc/manuals/images/icE1usb-usb_side.jpg Binary files differ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ifc382c762119b397dd9a6b484ebc9a237897fba9 Gerrit-Change-Number: 26949 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb doc: Link to wiki page about iso USB issues

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26948 ) Change subject: icE1usb doc: Link to wiki page about iso USB issues ...................................................................... icE1usb doc: Link to wiki page about iso USB issues Change-Id: Id5f555519d5e320570017178613c752591db4a2f --- M doc/manuals/chapters/firmware.adoc 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/48/26948/1 diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 1b440bd..5ae5fb1 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -185,7 +185,8 @@ activation of both icE1usb ports simultaneously. The XHCI controller firmware erroneously claims that there is insufficient bus bandwidth. However, the same icE1usb hardware/firmware works perfectly fine with -OHCI, UHCI and EHCI host controllers. +OHCI, UHCI and EHCI host controllers. See +https://osmocom.org/projects/e1-t1-adapter/wiki/Isochronous_USB_Issues for a user-maintained list of USB hosts / controllers and whether or not they work with two E1 ports. As most modern [PC] hardware has XHCI host controllers, you need to choose your hardware carefully if concurrent operation of both icE1usb -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id5f555519d5e320570017178613c752591db4a2f Gerrit-Change-Number: 26948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jenkins-jobs: add master build for opencm3 projects

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26693 ) Change subject: jenkins-jobs: add master build for opencm3 projects ...................................................................... jenkins-jobs: add master build for opencm3 projects Change-Id: I95f84079478ce57d8d5c0cffd71bc67e1605e68e --- M jobs/master-builds.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3b341ec..0c2be30 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -350,6 +350,9 @@ - simtrace2: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de + - osmo-opencm3-projects: + cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-e1d - osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I95f84079478ce57d8d5c0cffd71bc67e1605e68e Gerrit-Change-Number: 26693 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-mgw[master]: Make function amr_is_octet_aligned publicly available

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/26822 ) Change subject: Make function amr_is_octet_aligned publicly available ...................................................................... Make function amr_is_octet_aligned publicly available it will be used by mgcp_iuup.c in follow-up patch. Change-Id: Iffaf90c1f713feef0c609a7581a346f5f28141d9 --- M include/osmocom/mgcp/mgcp_codec.h M src/libosmo-mgcp/mgcp_codec.c 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/22/26822/1 diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 97650e4..97e6b8d 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -17,3 +17,4 @@ int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, const char *subtype_name, unsigned int match_nr); +bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec); diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 70a6638..6b8d14a 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -355,7 +355,7 @@ * * https://tools.ietf.org/html/rfc4867 */ -static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec) +bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec) { if (!codec->param_present) return false; @@ -379,7 +379,7 @@ if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; if (!strcmp(codec_a->subtype_name, "AMR")) { - if (amr_is_octet_aligned(codec_a) != amr_is_octet_aligned(codec_b)) + if (mgcp_codec_amr_is_octet_aligned(codec_a) != mgcp_codec_amr_is_octet_aligned(codec_b)) return false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/26822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iffaf90c1f713feef0c609a7581a346f5f28141d9 Gerrit-Change-Number: 26822 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

3
3
0 0

Change in libosmocore[master]: osmo_fsm: Ensure all state and event names are valid identifiers

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16355 ) Change subject: osmo_fsm: Ensure all state and event names are valid identifiers ...................................................................... Patch Set 7: (1 comment) File src/fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/16355/comment/1f3d90b6_861c25bb PS7, Line 296: "state name '%s'\n", states[i].name); > I think this is problematic. osmo_fsm_register() may be called before the log is set up. […] I think we should rather make sure that our logging subsystem does something useful (and not assert) if log output is generated before the log subsystem configuration is initialized. This has been hurting us over and over again. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7 Gerrit-Change-Number: 16355 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 14:55:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: iuup: do not use illegal characters in state/event names.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26947 ) Change subject: iuup: do not use illegal characters in state/event names. ...................................................................... iuup: do not use illegal characters in state/event names. The event names contain '.', and there are spaces ' ' in the state names. This is a problem since states and events can also be monitored via the CTRL interface. Unfortunately the CTRL interface does not allow certain reserved characters. So lets rename the states and event names to make them compatible with the CTRL interface. Change-Id: Id19973b56f9d7b1e3d0b0d7c7d0be7beba5428fc Related OS#4149 Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa --- M src/gsm/iuup.c 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index dbca344..eb595ce 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -160,15 +160,15 @@ }; static const struct value_string iuup_fsm_event_names[] = { - { IUUP_FSM_EVT_IUUP_CONFIG_REQ, "IuUP-CONFIG.req" }, - { IUUP_FSM_EVT_IUUP_DATA_REQ, "IuUP-DATA.req" }, - { IUUP_FSM_EVT_IUUP_DATA_IND, "IuUP-DATA.ind" }, - { IUUP_FSM_EVT_IUUP_STATUS_REQ, "IuUP-STATUS.req" }, - { IUUP_FSM_EVT_IUUP_STATUS_IND, "IuUP-STATUS.ind" }, - { IUUP_FSM_EVT_SSASAR_UNITDATA_REQ, "SSSAR-UNITDATA.req" }, - { IUUP_FSM_EVT_SSASAR_UNITDATA_IND, "SSSAR-UNITDATA.ind" }, - { IUUP_FSM_EVT_IUUP_UNITDATA_REQ, "IuUP-UNITDATA.req" }, - { IUUP_FSM_EVT_IUUP_UNITDATA_IND, "IuUP-UNITDATA.ind" }, + { IUUP_FSM_EVT_IUUP_CONFIG_REQ, "IuUP-CONFIG-req" }, + { IUUP_FSM_EVT_IUUP_DATA_REQ, "IuUP-DATA-req" }, + { IUUP_FSM_EVT_IUUP_DATA_IND, "IuUP-DATA-ind" }, + { IUUP_FSM_EVT_IUUP_STATUS_REQ, "IuUP-STATUS-req" }, + { IUUP_FSM_EVT_IUUP_STATUS_IND, "IuUP-STATUS-ind" }, + { IUUP_FSM_EVT_SSASAR_UNITDATA_REQ, "SSSAR-UNITDATA-req" }, + { IUUP_FSM_EVT_SSASAR_UNITDATA_IND, "SSSAR-UNITDATA-ind" }, + { IUUP_FSM_EVT_IUUP_UNITDATA_REQ, "IuUP-UNITDATA-req" }, + { IUUP_FSM_EVT_IUUP_UNITDATA_IND, "IuUP-UNITDATA-ind" }, { IUUP_FSM_EVT_INIT, "INIT" }, { IUUP_FSM_EVT_LAST_INIT_ACK, "LAST_INIT_ACK" }, { IUUP_FSM_EVT_INIT_NACK, "INIT_NACK" }, @@ -789,7 +789,7 @@ S(IUUP_FSM_EVT_SSASAR_UNITDATA_REQ) | S(IUUP_FSM_EVT_SSASAR_UNITDATA_IND), .out_state_mask = S(IUUP_FSM_ST_NULL), - .name = "TrM Data Transfer Ready", + .name = "TrM_Data_Transfer_Ready", .action = iuup_fsm_trm_data, }, [IUUP_FSM_ST_INIT] = { @@ -808,7 +808,7 @@ S(IUUP_FSM_EVT_IUUP_DATA_IND), .out_state_mask = S(IUUP_FSM_ST_NULL) | S(IUUP_FSM_ST_INIT), - .name = "SMpSDU Data Transfer Ready", + .name = "SMpSDU_Data_Transfer_Ready", .action = iuup_fsm_smpsdu_data, }, }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa Gerrit-Change-Number: 26947 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: iuup: do not use illegal characters in state/event names.

by laforge

Attention is currently required from: osmith, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26947 ) Change subject: iuup: do not use illegal characters in state/event names. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa Gerrit-Change-Number: 26947 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 14:54:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: iuup: do not use illegal characters in state/event names.

by pespin

Attention is currently required from: osmith, laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26947 ) Change subject: iuup: do not use illegal characters in state/event names. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa Gerrit-Change-Number: 26947 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 11:46:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: osmo_fsm: Ensure all state and event names are valid identifiers

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16355 ) Change subject: osmo_fsm: Ensure all state and event names are valid identifiers ...................................................................... Patch Set 7: (2 comments) Patchset: PS7: I think this is a good idea, but there are indeed a lot of applications that have problems. Especially event names like XXXX.ind or XXXX.req are used quite often. I would suggest to replace the dot with a '-'. File src/fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/16355/comment/61fc3595_0879039d PS7, Line 296: "state name '%s'\n", states[i].name); I think this is problematic. osmo_fsm_register() may be called before the log is set up. Maybe we should consider using printf here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7 Gerrit-Change-Number: 16355 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jan 2022 11:21:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: iuup: do not use illegal characters in state/event names.

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26947 ) Change subject: iuup: do not use illegal characters in state/event names. ...................................................................... iuup: do not use illegal characters in state/event names. The event names contain '.', and there are spaces ' ' in the state names. This is a problem since states and events can also be monitored via the CTRL interface. Unfortunately the CTRL interface does not allow certain reserved characters. So lets rename the states and event names to make them compatible with the CTRL interface. Change-Id: Id19973b56f9d7b1e3d0b0d7c7d0be7beba5428fc Related OS#4149 Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa --- M src/gsm/iuup.c 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/26947/1 diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index dbca344..eb595ce 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -160,15 +160,15 @@ }; static const struct value_string iuup_fsm_event_names[] = { - { IUUP_FSM_EVT_IUUP_CONFIG_REQ, "IuUP-CONFIG.req" }, - { IUUP_FSM_EVT_IUUP_DATA_REQ, "IuUP-DATA.req" }, - { IUUP_FSM_EVT_IUUP_DATA_IND, "IuUP-DATA.ind" }, - { IUUP_FSM_EVT_IUUP_STATUS_REQ, "IuUP-STATUS.req" }, - { IUUP_FSM_EVT_IUUP_STATUS_IND, "IuUP-STATUS.ind" }, - { IUUP_FSM_EVT_SSASAR_UNITDATA_REQ, "SSSAR-UNITDATA.req" }, - { IUUP_FSM_EVT_SSASAR_UNITDATA_IND, "SSSAR-UNITDATA.ind" }, - { IUUP_FSM_EVT_IUUP_UNITDATA_REQ, "IuUP-UNITDATA.req" }, - { IUUP_FSM_EVT_IUUP_UNITDATA_IND, "IuUP-UNITDATA.ind" }, + { IUUP_FSM_EVT_IUUP_CONFIG_REQ, "IuUP-CONFIG-req" }, + { IUUP_FSM_EVT_IUUP_DATA_REQ, "IuUP-DATA-req" }, + { IUUP_FSM_EVT_IUUP_DATA_IND, "IuUP-DATA-ind" }, + { IUUP_FSM_EVT_IUUP_STATUS_REQ, "IuUP-STATUS-req" }, + { IUUP_FSM_EVT_IUUP_STATUS_IND, "IuUP-STATUS-ind" }, + { IUUP_FSM_EVT_SSASAR_UNITDATA_REQ, "SSSAR-UNITDATA-req" }, + { IUUP_FSM_EVT_SSASAR_UNITDATA_IND, "SSSAR-UNITDATA-ind" }, + { IUUP_FSM_EVT_IUUP_UNITDATA_REQ, "IuUP-UNITDATA-req" }, + { IUUP_FSM_EVT_IUUP_UNITDATA_IND, "IuUP-UNITDATA-ind" }, { IUUP_FSM_EVT_INIT, "INIT" }, { IUUP_FSM_EVT_LAST_INIT_ACK, "LAST_INIT_ACK" }, { IUUP_FSM_EVT_INIT_NACK, "INIT_NACK" }, @@ -789,7 +789,7 @@ S(IUUP_FSM_EVT_SSASAR_UNITDATA_REQ) | S(IUUP_FSM_EVT_SSASAR_UNITDATA_IND), .out_state_mask = S(IUUP_FSM_ST_NULL), - .name = "TrM Data Transfer Ready", + .name = "TrM_Data_Transfer_Ready", .action = iuup_fsm_trm_data, }, [IUUP_FSM_ST_INIT] = { @@ -808,7 +808,7 @@ S(IUUP_FSM_EVT_IUUP_DATA_IND), .out_state_mask = S(IUUP_FSM_ST_NULL) | S(IUUP_FSM_ST_INIT), - .name = "SMpSDU Data Transfer Ready", + .name = "SMpSDU_Data_Transfer_Ready", .action = iuup_fsm_smpsdu_data, }, }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ebc9ab5b1456fee29aa4e254fae862dc053f0aa Gerrit-Change-Number: 26947 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-e1-recorder[master]: checkpatch.conf: new file

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 ) Change subject: checkpatch.conf: new file ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I8b6f5f0b1dd980003a4ae2feaee78fc62debbc9c Gerrit-Change-Number: 26946 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm23003: fix docstring for osmo_plmn_from_bcd()

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26919 ) Change subject: gsm23003: fix docstring for osmo_plmn_from_bcd() ...................................................................... gsm23003: fix docstring for osmo_plmn_from_bcd() The parameters described in the docstrings for osmo_plmn_from_bcd() do not match the actual parameter list. Change-Id: Ic0999dbe096a98418db7482bd110e20497d8e4a5 --- M src/gsm/gsm23003.c 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/26919/1 diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 71d44fb..b893873 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -445,14 +445,12 @@ } } -/* Convert given 3-byte BCD buffer to integers and write results to *mcc and - * *mnc. The first three BCD digits result in the MCC and the remaining ones in - * the MNC. Return mnc_3_digits as false if the MNC's most significant digit is encoded as 0xF, true - * otherwise; i.e. true if MNC > 99 or if it is represented with leading zeros instead of 0xF. +/* Convert given 3-byte BCD buffer to integers and write results to plmn->mcc and plmn->mnc. The first three BCD digits + * result in the MCC and the remaining ones in the MNC. Set plmn->mnc_3_digits as false if the MNC's most significant + * digit is encoded as 0xF, true otherwise; i.e. true if MNC > 99 or if it is represented with leading zeros instead of + * 0xF. * \param[in] bcd_src 3-byte BCD buffer containing MCC+MNC representations. - * \param[out] mcc MCC result buffer, or NULL. - * \param[out] mnc MNC result buffer, or NULL. - * \param[out] mnc_3_digits Result buffer for 3-digit flag, or NULL. + * \param[out] plmn user provided memory to store the result. */ void osmo_plmn_from_bcd(const uint8_t *bcd_src, struct osmo_plmn_id *plmn) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic0999dbe096a98418db7482bd110e20497d8e4a5 Gerrit-Change-Number: 26919 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

4
4
0 0

Change in osmo-ci[master]: Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26944 ) Change subject: Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware" ...................................................................... Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware" Enable the linter again, as we decided to use a repo-specific checkpatch config in these. This reverts commit 2c6aa82c9a8a81addd805fe211b048076e01f8c5. Related: OS#5399 Change-Id: Ib79a20658bfae64d9b718e53e6a9393708a4e694 --- M jobs/gerrit-lint.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index b98a041..45db681 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -73,7 +73,9 @@ - simtrace2 - osmo-asf4-dfu - osmo-ccid-firmware + - osmo-e1d - osmo-cbc + - osmo-e1-recorder - gapk - osmo-uecups - osmo-el2tpd -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib79a20658bfae64d9b718e53e6a9393708a4e694 Gerrit-Change-Number: 26944 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware"

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26944 ) Change subject: Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib79a20658bfae64d9b718e53e6a9393708a4e694 Gerrit-Change-Number: 26944 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 09:07:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1d[master]: checkpatch.conf: new file

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26945 ) Change subject: checkpatch.conf: new file ...................................................................... checkpatch.conf: new file Related: OS#5399 Change-Id: I4bd109009cbe16f313e19ab78bd5fbcb13b0f656 --- A .checkpatch.conf 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..20c0832 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,2 @@ +--ignore OPEN_BRACE +--ignore SPACING -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4bd109009cbe16f313e19ab78bd5fbcb13b0f656 Gerrit-Change-Number: 26945 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-e1d[master]: checkpatch.conf: new file

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26945 ) Change subject: checkpatch.conf: new file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4bd109009cbe16f313e19ab78bd5fbcb13b0f656 Gerrit-Change-Number: 26945 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 09:07:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-recorder[master]: checkpatch.conf: new file

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 ) Change subject: checkpatch.conf: new file ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: this was actually an error on my side. osmo-e1-recorder is a normal osmocom project with no exceptions. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I8b6f5f0b1dd980003a4ae2feaee78fc62debbc9c Gerrit-Change-Number: 26946 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 09:06:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-recorder[master]: checkpatch.conf: new file

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 ) Change subject: checkpatch.conf: new file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I8b6f5f0b1dd980003a4ae2feaee78fc62debbc9c Gerrit-Change-Number: 26946 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jan 2022 09:06:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-recorder[master]: checkpatch.conf: new file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 ) Change subject: checkpatch.conf: new file ...................................................................... checkpatch.conf: new file Related: OS#5399 Change-Id: I8b6f5f0b1dd980003a4ae2feaee78fc62debbc9c --- A .checkpatch.conf 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/46/26946/1 diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..20c0832 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,2 @@ +--ignore OPEN_BRACE +--ignore SPACING -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/26946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I8b6f5f0b1dd980003a4ae2feaee78fc62debbc9c Gerrit-Change-Number: 26946 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-e1d[master]: checkpatch.conf: new file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26945 ) Change subject: checkpatch.conf: new file ...................................................................... checkpatch.conf: new file Related: OS#5399 Change-Id: I4bd109009cbe16f313e19ab78bd5fbcb13b0f656 --- A .checkpatch.conf 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/45/26945/1 diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..20c0832 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,2 @@ +--ignore OPEN_BRACE +--ignore SPACING -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4bd109009cbe16f313e19ab78bd5fbcb13b0f656 Gerrit-Change-Number: 26945 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware"

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/26944 ) Change subject: Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware" ...................................................................... Revert "remove linter jobs for osmo-e1d and osmo-e1-firmware" Enable the linter again, as we decided to use a repo-specific checkpatch config in these. This reverts commit 2c6aa82c9a8a81addd805fe211b048076e01f8c5. Related: OS#5399 Change-Id: Ib79a20658bfae64d9b718e53e6a9393708a4e694 --- M jobs/gerrit-lint.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/26944/1 diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index b98a041..45db681 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -73,7 +73,9 @@ - simtrace2 - osmo-asf4-dfu - osmo-ccid-firmware + - osmo-e1d - osmo-cbc + - osmo-e1-recorder - gapk - osmo-uecups - osmo-el2tpd -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib79a20658bfae64d9b718e53e6a9393708a4e694 Gerrit-Change-Number: 26944 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: checkpatch.conf: new file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26927 ) Change subject: checkpatch.conf: new file ...................................................................... checkpatch.conf: new file Disable spacing and open brace checks, as this repository follows a different code style. If needed, the checkpatch file can be extended with other checks: * get the check name from the linter output, e.g. SPACING in: firmware/ice40-riscv/icE1usb/fw_app.c:155: ERROR:SPACING: spaces required around that '=' (ctx:VxV) * add a new "--ignore NAME" line to the file Related: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26841 Related: OS#5399 Change-Id: I4d2cf2eb698b8f4e54f04e62e4dbbc37146daf88 --- A .checkpatch.conf 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/27/26927/1 diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..20c0832 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,2 @@ +--ignore OPEN_BRACE +--ignore SPACING -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4d2cf2eb698b8f4e54f04e62e4dbbc37146daf88 Gerrit-Change-Number: 26927 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

3
3
0 0

Change in docker-playground[master]: gerrit: Upgrade to 3.4.3

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26943 ) Change subject: gerrit: Upgrade to 3.4.3 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I91ebd53ea7279f76950cde959ffa2472d8f78593 Gerrit-Change-Number: 26943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 17 Jan 2022 17:27:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: gerrit: upgrade to 3.3.9 based container

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26942 ) Change subject: gerrit: upgrade to 3.3.9 based container ...................................................................... gerrit: upgrade to 3.3.9 based container ... primarily as intermediate step towards 3.4 Related: OS#5404 Change-Id: Iabb36f0754773dc2e8a5be7d44979b85034e2d01 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index b0b84ab..d5e5cbc 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.2.12 +FROM gerritcodereview/gerrit:3.3.9 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iabb36f0754773dc2e8a5be7d44979b85034e2d01 Gerrit-Change-Number: 26942 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: gerrit: Upgrade to 3.4.3

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26943 ) Change subject: gerrit: Upgrade to 3.4.3 ...................................................................... gerrit: Upgrade to 3.4.3 Change-Id: I91ebd53ea7279f76950cde959ffa2472d8f78593 Closes: OS#5404 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index d5e5cbc..4ef1cba 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.3.9 +FROM gerritcodereview/gerrit:3.4.3 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I91ebd53ea7279f76950cde959ffa2472d8f78593 Gerrit-Change-Number: 26943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: gerrit: upgrade to 3.3.9 based container

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26942 ) Change subject: gerrit: upgrade to 3.3.9 based container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iabb36f0754773dc2e8a5be7d44979b85034e2d01 Gerrit-Change-Number: 26942 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 17 Jan 2022 17:27:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: update manual to reflect firmware 0.2 (GPS-DO, 2 ports)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26926 ) Change subject: icE1usb: update manual to reflect firmware 0.2 (GPS-DO, 2 ports) ...................................................................... icE1usb: update manual to reflect firmware 0.2 (GPS-DO, 2 ports) Change-Id: I9dac5b9479af37270dc13e334a278f91f260c7ce --- M doc/manuals/chapters/firmware.adoc M doc/manuals/chapters/hardware.adoc M doc/manuals/chapters/host-software.adoc M doc/manuals/icE1usb-usermanual-docinfo.xml 4 files changed, 93 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/26/26926/1 diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 12c5710..1b440bd 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -145,3 +145,70 @@ === Use of the Multi-Color RGB LED FIXME: describe how it is used. + + +=== Firmware <-> USB Host Interface + +The icE1usb firmware provides a USB 1.1 full-speed (FS) device with + +* one configuration +* 5 interfaces +** E1 port 0 +** E1 port 1 +** CDC-ACM (control + data) +** DFU (device firmware upgrade) + +The interfaces have self-explanatory string descriptors like + +---- + iInterface 6 E1 port 0 + iInterface 8 E1 port 1 + iInterface 9 GPS (CDC control) + iInterface 10 GPS (CDC data) + iInterface 11 DFU runtime +---- + +==== E1 ports + +There are two physical E1 ports in the icE1usb. Each is exposed via its own USB _interface_. + +Each port (USB _interface_) contains two _altsettings_: + +* one altsetting with no data endpoints (E1 disabled, this is the default) +* one altsetting with isochronous IN/OUT endpoints (E1 enabled) + +In order to activate one E1 port, the driver must perform a USB standard +request to activate the _enabled_ altsetting. + +NOTE:: Please note that on many XHCI host controllers there seem to be +implementation flaws in the XHCI host controller firmware preventing the +activation of both icE1usb ports simultaneously. The XHCI controller +firmware erroneously claims that there is insufficient bus bandwidth. +However, the same icE1usb hardware/firmware works perfectly fine with +OHCI, UHCI and EHCI host controllers. + +As most modern [PC] hardware has XHCI host controllers, you need to +choose your hardware carefully if concurrent operation of both icE1usb +ports is required in your application. + +==== CDC-ACM with GPS NMEA + +There's a CDC-ACM (virtual com port) interface available in the icE1usb. +This will be supported by the standard `cdc_acm` driver of your +operating system, and will expose a `/dev/ttyACMx` device on Linux. + +The port provides read-only access to the GPS receiver on-board the +icE1usb. You can use this to + +* determine the GPS fix (and hence 1PPS frequency reference) + availability +* obtain the GPS position of the device + +NOTE:: Write access to the GPS receiver is not permitted as the icE1usb +firmware needs to control the GPS receiver for frequency reference +purposes. + +==== DFU (Device Firmware Upgrade) + +There's a DFU interface available in order to update the icE1usb +gateware and firmware. For more information, see [[firmware]] above. diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 4b2f694..8055e64 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -7,8 +7,8 @@ It's main building blocks are: * an iCE40 FPGA -* Two E1 line interface (transformers, biasing networks and ESD protection) footnote:[Only one E1 line supported by firmware so far] -* a GPS receiver module with 1PPS output to the FPGA footnote:[GPS-DO supported by firmware yet] +* Two E1 line interface (transformers, biasing networks and ESD protection) footnote:[Second interface requires firmware >= 0.2 and OHCI/OHCI/EHCI host controller] +* a GPS receiver module with 1PPS output to the FPGA footnote:[Requires firmware >= 0.2] === Schematics diff --git a/doc/manuals/chapters/host-software.adoc b/doc/manuals/chapters/host-software.adoc index 356c897..4c8578e 100644 --- a/doc/manuals/chapters/host-software.adoc +++ b/doc/manuals/chapters/host-software.adoc @@ -3,13 +3,19 @@ Host Software is software running on the USB host computer to which the icE1usb is attached. -At the time of this writing, the only software implementing icE1usb -support is `osmo-e1d`. +At the time of this writing, there are two options for icE1usb driver interfaces: +`osmo-e1d` and `DAHDI`. === `osmo-e1d` -`osmo-e1d` utilizes `libusb` to talk to the icE1usb hardware and offers -a unix domain socket based interface to application software. +`osmo-e1d` is a pure user-space driver, not requiring any specific Linux kernel, +kernel patches or out-of-tree kernel modules. It utilizes `libusb` to +talk to the icE1usb hardware and offers a unix domain socket based +interface to application software. + +In theory, `osmo-e1d` should work on any operating system with libusb +support for isochronous transfers. However, official support is limited +to GNU/Linux at this point. Software such as `osmo-bsc` and `osmo-mgw` can interface `osmo-e1d` via the `libosmo-abis` support for `osmo-e1d`. @@ -23,6 +29,11 @@ popular driver for a variety of POTS/PSTN and also TDM interface boards by originally Zaptel, later Digium and now most recently Sangoma. +DAHDI is available only for Linux, and is provided as source code for a +set of out-of-tree kernel modules. You must compile those modules for +each specific Linux kernel version you are using. Keep this in mind +when performing kernel upgrades and the like. + DAHDI is supported by a wide range of open source PBX / softswitch software, including Asterisk, FreeSWITCH and yate. diff --git a/doc/manuals/icE1usb-usermanual-docinfo.xml b/doc/manuals/icE1usb-usermanual-docinfo.xml index 1c7e7fd..246e014 100644 --- a/doc/manuals/icE1usb-usermanual-docinfo.xml +++ b/doc/manuals/icE1usb-usermanual-docinfo.xml @@ -1,5 +1,13 @@ <revhistory> <revision> + <revnumber>2</revnumber> + <date>January 17, 2022</date> + <authorinitials>HW</authorinitials> + <revremark> + Update documentation to firmware 0.2 (GPS-DO, second E1 port) + </revremark> + </revision> + <revision> <revnumber>1</revnumber> <date>December 13, 2020</date> <authorinitials>HW</authorinitials> @@ -24,7 +32,7 @@ </authorgroup> <copyright> - <year>2020</year> + <year>2020-2022</year> <holder>sysmocom - s.f.m.c. GmbH</holder> </copyright> -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I9dac5b9479af37270dc13e334a278f91f260c7ce Gerrit-Change-Number: 26926 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

2
3
0 0

Change in docker-playground[master]: gerrit: Upgrade to 3.4.3

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/26943 ) Change subject: gerrit: Upgrade to 3.4.3 ...................................................................... gerrit: Upgrade to 3.4.3 Change-Id: I91ebd53ea7279f76950cde959ffa2472d8f78593 Closes: OS#5404 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/26943/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index d5e5cbc..4ef1cba 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.3.9 +FROM gerritcodereview/gerrit:3.4.3 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I91ebd53ea7279f76950cde959ffa2472d8f78593 Gerrit-Change-Number: 26943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: gerrit: upgrade to 3.3.9 based container

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/26942 ) Change subject: gerrit: upgrade to 3.3.9 based container ...................................................................... gerrit: upgrade to 3.3.9 based container ... primarily as intermediate step towards 3.4 Related: OS#5404 Change-Id: Iabb36f0754773dc2e8a5be7d44979b85034e2d01 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/42/26942/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index b0b84ab..d5e5cbc 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.2.12 +FROM gerritcodereview/gerrit:3.3.9 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iabb36f0754773dc2e8a5be7d44979b85034e2d01 Gerrit-Change-Number: 26942 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs: explicitly enable ansi color wrapper

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/26925 ) Change subject: jobs: explicitly enable ansi color wrapper ...................................................................... jobs: explicitly enable ansi color wrapper For some reason (jenkins upgrade?), output is not colored anymore. Explicitly enable the ansi color wrapper in the jjb configs, where we have such colors in the output. Change-Id: I2d3faaf608ae9d12573f5c0f740ff7ee4b33358e --- M jobs/gerrit-lint.yml M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml A test-ci-lint 4 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/26925/1 diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 768df7d..b98a041 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -145,4 +145,8 @@ builders: - shell: '{obj:cmd}' + wrappers: + - ansicolor: + colormap: xterm + # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 1bc07d5..37f9170 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -125,5 +125,8 @@ num-to-keep: 120 artifact-days-to-keep: -1 artifact-num-to-keep: -1 + wrappers: + - ansicolor: + colormap: xterm # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 8f59d82..172cfec 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -507,5 +507,8 @@ num-to-keep: 120 artifact-days-to-keep: -1 artifact-num-to-keep: -1 + wrappers: + - ansicolor: + colormap: xterm # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/test-ci-lint b/test-ci-lint new file mode 100644 index 0000000..7e96e53 --- /dev/null +++ b/test-ci-lint @@ -0,0 +1 @@ +File with typo to test if ansi color output from linter is displayed properly in jenkins again: asssert -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2d3faaf608ae9d12573f5c0f740ff7ee4b33358e Gerrit-Change-Number: 26925 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

3
5
0 0

Change in osmo-dev[master]: Add tmux scripts for ttcn3-{msc,bsc,bts}-test

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26485 ) Change subject: Add tmux scripts for ttcn3-{msc,bsc,bts}-test ...................................................................... Add tmux scripts for ttcn3-{msc,bsc,bts}-test Change-Id: I201b77c013cbeef9d1a07b9422b27f375811ed69 --- M README A ttcn3/tmux/ttcn3-bsc-test.sh A ttcn3/tmux/ttcn3-bts-test.sh A ttcn3/tmux/ttcn3-msc-test.sh 4 files changed, 132 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Verified diff --git a/README b/README index 7f1b594..f4f4eda 100644 --- a/README +++ b/README @@ -169,6 +169,15 @@ [1] https://jenkins.osmocom.org/jenkins/view/TTCN3/ +=== ttcn3/tmux + +It's possible to run TTCN-3 test cases without using Docker. This directory +contains scripts for starting a testsuite and the related binaries in a tmux +session. For example, ttcn3-bsc-test.sh does the following: + +* Starts osmo-bsc, osmo-stp, and three instances of osmo-bts-omldummy. +* Prepares a command for execuring the test suite. + === Troubleshooting When using sanitize.opts, osmo-trx is not built with the address sanitizer diff --git a/ttcn3/tmux/ttcn3-bsc-test.sh b/ttcn3/tmux/ttcn3-bsc-test.sh new file mode 100755 index 0000000..c0d9709 --- /dev/null +++ b/ttcn3/tmux/ttcn3-bsc-test.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +SESSION="ttcn3-bsc-test" + +OSMO_DIR="/home/$USER/osmocom" +SUITE_DIR="$OSMO_DIR/osmo-ttcn3-hacks" +RESPAWN="$OSMO_DIR/scripts/respawn.sh" + +if [ ! -d $SUITE_DIR ]; then + echo "Directory '$SUITE_DIR' does not exist" + echo "Please specify where to find osmo-ttcn3-hacks" + exit 1 +fi + +if [ ! -f $RESPAWN ]; then + echo "Script '$RESPAWN' does not exist" + echo "Please specify where to find respawn.sh" + exit 1 +fi + +tmux new-session -s $SESSION -n $SESSION -d + +tmux split-window -t $SESSION:0 -v +tmux send-keys -t $SESSION:0.0 "cd $SUITE_DIR/bsc" C-m +tmux send-keys -t $SESSION:0.0 "osmo-bsc -c osmo-bsc.cfg" C-m +tmux send-keys -t $SESSION:0.1 "cd $SUITE_DIR/bsc" C-m +tmux send-keys -t $SESSION:0.1 "../start-testsuite.sh ./BSC_Tests BSC_Tests.cfg" + +tmux new-window -t $SESSION:1 +tmux split-window -t $SESSION:1 -v +tmux split-window -t $SESSION:1 -v +tmux split-window -t $SESSION:1 -v +tmux split-window -t $SESSION:1 -v + +# Start osmo-stp +tmux send-keys -t $SESSION:1.0 "cd $SUITE_DIR/bsc" C-m +tmux send-keys -t $SESSION:1.0 "osmo-stp -c osmo-stp.cfg" C-m +# Start osmo-bts-omldummy +tmux send-keys -t $SESSION:1.1 "$RESPAWN osmo-bts-omldummy 127.0.0.1 1234" C-m +tmux send-keys -t $SESSION:1.2 "$RESPAWN osmo-bts-omldummy 127.0.0.1 1235" C-m +tmux send-keys -t $SESSION:1.3 "$RESPAWN osmo-bts-omldummy 127.0.0.1 1236" C-m + +tmux attach -t $SESSION:0 diff --git a/ttcn3/tmux/ttcn3-bts-test.sh b/ttcn3/tmux/ttcn3-bts-test.sh new file mode 100755 index 0000000..78acad9 --- /dev/null +++ b/ttcn3/tmux/ttcn3-bts-test.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +SESSION="ttcn3-bts-test" + +OSMO_DIR="/home/$USER/osmocom" +OBB_DIR="$OSMO_DIR/osmocom-bb" +SUITE_DIR="$OSMO_DIR/osmo-ttcn3-hacks" +RESPAWN="$OSMO_DIR/scripts/respawn.sh" + +if [ ! -d $SUITE_DIR ]; then + echo "Directory '$SUITE_DIR' does not exist" + echo "Please specify where to find osmo-ttcn3-hacks" + exit 1 +fi + +if [ ! -d $OBB_DIR ]; then + echo "Directory '$OBB_DIR' does not exist" + echo "Please specify where to find osmocom-bb" + exit 1 +fi + +if [ ! -f $RESPAWN ]; then + echo "Script '$RESPAWN' does not exist" + echo "Please specify where to find respawn.sh" + exit 1 +fi + +tmux new-session -s $SESSION -n $SESSION -d + +tmux split-window -t $SESSION:0 -v +tmux send-keys -t $SESSION:0.0 "cd $SUITE_DIR/bts" C-m +tmux send-keys -t $SESSION:0.0 "$RESPAWN osmo-bts-trx -c osmo-bts.cfg" +tmux send-keys -t $SESSION:0.1 "cd $SUITE_DIR/bts" C-m +tmux send-keys -t $SESSION:0.1 "../start-testsuite.sh ./BTS_Tests BTS_Tests.cfg" + + +tmux new-window -t $SESSION:1 +tmux split-window -t $SESSION:1 -v +tmux split-window -t $SESSION:1 -v + +# Start osmo-bsc +tmux send-keys -t $SESSION:1.0 "cd $SUITE_DIR/bts" C-m +tmux send-keys -t $SESSION:1.0 "osmo-bsc -c osmo-bsc.cfg" C-m +# Start trxcon +tmux send-keys -t $SESSION:1.1 "cd $OBB_DIR/src/host/trxcon" C-m +tmux send-keys -t $SESSION:1.1 "./trxcon -s /tmp/osmocom_l2" C-m +# Start fake_trx.py +tmux send-keys -t $SESSION:1.2 "cd $OBB_DIR/src/target/trx_toolkit" C-m +tmux send-keys -t $SESSION:1.2 "./fake_trx.py \ + --trx TRX1@127.0.0.1:5700/1 \ + --trx TRX1@127.0.0.1:5700/2 \ + --trx TRX1@127.0.0.1:5700/3" C-m + +tmux attach -t $SESSION:0 diff --git a/ttcn3/tmux/ttcn3-msc-test.sh b/ttcn3/tmux/ttcn3-msc-test.sh new file mode 100755 index 0000000..fee1383 --- /dev/null +++ b/ttcn3/tmux/ttcn3-msc-test.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +SESSION="ttcn3-msc-test" + +OSMO_DIR="/home/$USER/osmocom" +SUITE_DIR="$OSMO_DIR/osmo-ttcn3-hacks" + +if [ ! -d $SUITE_DIR ]; then + echo "Directory '$SUITE_DIR' does not exist" + echo "Please specify where to find osmo-ttcn3-hacks" + exit 1 +fi + +tmux new-session -s $SESSION -n $SESSION -d + +tmux split-window -t $SESSION:0 -v +tmux send-keys -t $SESSION:0.0 "cd $SUITE_DIR/msc" C-m +tmux send-keys -t $SESSION:0.0 "osmo-msc -c osmo-msc.cfg" C-m +tmux send-keys -t $SESSION:0.1 "cd $SUITE_DIR/msc" C-m +tmux send-keys -t $SESSION:0.1 "../start-testsuite.sh ./MSC_Tests MSC_Tests.cfg" + +tmux new-window -t $SESSION:1 +tmux send-keys -t $SESSION:1.0 "cd $SUITE_DIR/msc" C-m +tmux send-keys -t $SESSION:1.0 "osmo-stp -c osmo-stp.cfg" C-m + +tmux attach -t $SESSION:0 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I201b77c013cbeef9d1a07b9422b27f375811ed69 Gerrit-Change-Number: 26485 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: Add tmux scripts for ttcn3-{msc,bsc,bts}-test

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26485 ) Change subject: Add tmux scripts for ttcn3-{msc,bsc,bts}-test ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I201b77c013cbeef9d1a07b9422b27f375811ed69 Gerrit-Change-Number: 26485 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 15:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-msc[master]: call_leg: local_bridge: Avoid null pointer access if CN-side not ready

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/26917 ) Change subject: call_leg: local_bridge: Avoid null pointer access if CN-side not ready ...................................................................... call_leg: local_bridge: Avoid null pointer access if CN-side not ready This happens if for instance an HNBGW drops the RAB-AssignmentRequest and does nothing with it. call_leg.c:348:15: runtime error: member access within null pointer of type 'struct rtp_stream' Related: OS#5401 Change-Id: I67d2d5b2dd3b367c34f929d63c056306ec001431 --- M src/libmsc/call_leg.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/26917/1 diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index 6242a80..e890f75 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -344,6 +344,9 @@ } codec = cl1->rtp[RTP_TO_RAN]->codec; + if (!cl1->rtp[RTP_TO_CN] || !cl2->rtp[RTP_TO_CN]) + return -ENOTCONN; + call_leg_ensure_ci(cl1, RTP_TO_CN, call_id1, trans1, &codec, &cl2->rtp[RTP_TO_CN]->local); call_leg_ensure_ci(cl2, RTP_TO_CN, call_id2, trans2, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/26917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I67d2d5b2dd3b367c34f929d63c056306ec001431 Gerrit-Change-Number: 26917 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

4
8
0 0

Change in osmo-bsc[master]: nm_bts_fsm: fix sourcecode formatting

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26924 ) Change subject: nm_bts_fsm: fix sourcecode formatting ...................................................................... nm_bts_fsm: fix sourcecode formatting Change-Id: If7db7f5611e0ebf69d66b135515c0a08c6edfb11 --- M src/osmo-bsc/nm_bts_fsm.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/26924/1 diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index eda74fd..b9ed5a0 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -366,15 +366,15 @@ .action = st_op_disabled_offline, }, [NM_BTS_ST_OP_ENABLED] = { - .in_event_mask = - X(NM_EV_STATE_CHG_REP), - .out_state_mask = - X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) | - X(NM_BTS_ST_OP_DISABLED_DEPENDENCY) | - X(NM_BTS_ST_OP_DISABLED_OFFLINE), - .name = "ENABLED", - .onenter = st_op_enabled_on_enter, - .action = st_op_enabled, + .in_event_mask = + X(NM_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_BTS_ST_OP_DISABLED_DEPENDENCY) | + X(NM_BTS_ST_OP_DISABLED_OFFLINE), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7db7f5611e0ebf69d66b135515c0a08c6edfb11 Gerrit-Change-Number: 26924 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

2
2
0 0

Change in osmo-dev[master]: Add tmux scripts for ttcn3-{msc,bsc,bts}-test

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26485 ) Change subject: Add tmux scripts for ttcn3-{msc,bsc,bts}-test ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I201b77c013cbeef9d1a07b9422b27f375811ed69 Gerrit-Change-Number: 26485 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 10:30:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: > having stale configs downloaded. what I mean: * the config gets downloaded once on a developer's machine * the config changes in osmo-ttcn3-hacks * now the config does not get downloaded again, since the file already exists * tests will start failing, developer needs to figure out why -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 10:29:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: Should this be marked as WIP? In OS#5377 fixeria wrote: "the configuration file is still not understood correctly" Regarding the patch, I would try to avoid downloading the files with wget, and rather run the config merge inside docker, where the config files are available in the checked out osmo-ttcn3-hacks.git. Then we would avoid the problem of having stale configs downloaded. But not sure if it's worth investing time to refactor it at this point, the solution from this patch should work well enough. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 10:27:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-hnbgw[master]: hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26920 ) Change subject: hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd ...................................................................... hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd The function gsm48_mcc_mnc_from_bcd is deprecated. Lets use osmo_plmn_from_bcd instead. Change-Id: I01406a4cf86d4f3ed162c9df55880941e54d654e --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/20/26920/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 5b92e4e..4c3a5c0 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -398,6 +398,7 @@ struct hnb_context *hnb; HNBAP_HNBRegisterRequestIEs_t ies; int rc; + struct osmo_plmn_id plmn; rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { @@ -413,7 +414,9 @@ ctx->id.sac = asn1str_to_u16(&ies.sac); ctx->id.rac = asn1str_to_u8(&ies.rac); ctx->id.cid = asn1bitstr_to_u28(&ies.cellIdentity); - gsm48_mcc_mnc_from_bcd(ies.plmNidentity.buf, &ctx->id.mcc, &ctx->id.mnc); + osmo_plmn_from_bcd(ies.plmNidentity.buf, &plmn); + ctx->id.mcc = plmn.mcc; + ctx->id.mnc = plmn.mnc; llist_for_each_entry(hnb, &ctx->gw->hnb_list, list) { if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/26920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I01406a4cf86d4f3ed162c9df55880941e54d654e Gerrit-Change-Number: 26920 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

3
3
0 0

Change in osmo-ci[master]: jenkins-jobs: add master build for opencm3 projects

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26693 ) Change subject: jenkins-jobs: add master build for opencm3 projects ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I95f84079478ce57d8d5c0cffd71bc67e1605e68e Gerrit-Change-Number: 26693 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:16:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: all.deps, werror.opts: add osmo-bsc-nat

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26666 ) Change subject: all.deps, werror.opts: add osmo-bsc-nat ...................................................................... all.deps, werror.opts: add osmo-bsc-nat Change-Id: Ica90826c8bfbf4f295c49702d36e7c88e43f80cd --- M all.deps M werror.opts 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/all.deps b/all.deps index 65bdf27..54209eb 100644 --- a/all.deps +++ b/all.deps @@ -23,6 +23,7 @@ asn1c libasn1c osmo-gbproxy libosmocore osmo-pcap libosmocore +osmo-bsc-nat libosmo-sccp # can only clone these docker-playground diff --git a/werror.opts b/werror.opts index 2121fca..21c876a 100644 --- a/werror.opts +++ b/werror.opts @@ -12,3 +12,4 @@ osmo-msc --enable-werror osmo-sgsn --enable-werror osmo-bts --enable-werror +osmo-bsc-nat --enable-werror -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ica90826c8bfbf4f295c49702d36e7c88e43f80cd Gerrit-Change-Number: 26666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: refactor kill logic

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26667 ) Change subject: net/templates/run.sh: refactor kill logic ...................................................................... net/templates/run.sh: refactor kill logic Put the terminal PIDs into a variable instead of running kill %1 %2 etc. This makes it easier to conditionally spawn some of the programs. Change-Id: Iaf6c175de2edf720009af13eace2b0ef83b0735b --- M net/templates/run.sh 1 file changed, 34 insertions(+), 3 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index 8571a42..cd0fc72 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -118,33 +118,62 @@ sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & +PIDS="" + term "$ggsn" GGSN & +PIDS="$PIDS $!" + sleep .2 term "$stp" STP & +PIDS="$PIDS $!" + sleep .2 term "$hlr" HLR & +PIDS="$PIDS $!" + sleep .2 term "$sgsn" SGSN & +PIDS="$PIDS $!" + sleep .2 term "$gbproxy" GBPROXY & +PIDS="$PIDS $!" + sleep .2 term "$mgw4msc" MGW4MSC & +PIDS="$PIDS $!" + sleep .2 term "$mgw4bsc" MGW4BSC & +PIDS="$PIDS $!" + sleep .2 term "$msc" MSC & +PIDS="$PIDS $!" + sleep 2 term "$hnbgw" HNBGW & +PIDS="$PIDS $!" + sleep .2 term "$bsc" BSC & +PIDS="$PIDS $!" if [ "x${MSC_MNCC}" != "xinternal" ]; then sleep .2 term "$sipcon" SIPCON & + PIDS="$PIDS $!" + sleep .2 case "${PBX_SERVER}" in - "kamailio") term "$kamailio" KAMAILIO &;; - "freeswitch") term "./freeswitch/freeswitch.sh" FREESWITCH &;; + "kamailio") + term "$kamailio" KAMAILIO & + PIDS="$PIDS $!" + ;; + "freeswitch") + term "./freeswitch/freeswitch.sh" FREESWITCH & + PIDS="$PIDS $!" + ;; esac fi @@ -157,7 +186,9 @@ #ssh bts neels/stop_remote.sh -kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 +for i in $PIDS; do + kill "$i" +done killall osmo-msc killall osmo-bsc killall osmo-gbproxy -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaf6c175de2edf720009af13eace2b0ef83b0735b Gerrit-Change-Number: 26667 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: add osmo-bsc-nat

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26668 ) Change subject: net: add osmo-bsc-nat ...................................................................... net: add osmo-bsc-nat Make STP_CN_IP and STP_RAN_IP configurable. If they are not set to the same IP, run a second OsmoSTP and OsmoBSCNAT to connect both OsmoSTP. Related: OS#2545 Change-Id: I8bfbd00bfeeebc6e1b87a8cd6333212db4380653 --- M net/config_2g3g A net/templates/osmo-bsc-nat.cfg M net/templates/osmo-bsc.cfg M net/templates/osmo-msc.cfg A net/templates/osmo-stp-cn.cfg R net/templates/osmo-stp-ran.cfg M net/templates/run.sh 7 files changed, 92 insertions(+), 5 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/config_2g3g b/net/config_2g3g index 263629f..c1498be 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -109,6 +109,18 @@ SIPCON_SIP="${TO_SIP_IP}" SIPCON_SIP_PORT="5060" +STP_CN_IP="127.0.0.1" +STP_RAN_IP="127.0.0.1" +# Set STP_CN_IP different from STP_RAN_IP, to run a second OsmoSTP and +# OsmoBSCNAT to connect both +# STP_RAN_IP="127.0.0.2" + +# Enabled only when STP_CN_IP != STP_RAN_IP +BSCNAT_CN_PC="${BSC_PC}" +BSCNAT_CN_IP="127.0.0.3" +BSCNAT_RAN_PC="${MSC_PC}" +BSCNAT_RAN_IP="127.0.0.4" + # PBX_SERVER: # "kamailio" -- launch kamailio # "freeswitch" -- launch freeswitch diff --git a/net/templates/osmo-bsc-nat.cfg b/net/templates/osmo-bsc-nat.cfg new file mode 100644 index 0000000..c9a71da --- /dev/null +++ b/net/templates/osmo-bsc-nat.cfg @@ -0,0 +1,21 @@ +${include(common_template_warning)} +cs7 instance 0 + point-code ${BSCNAT_CN_PC} + asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua + remote-ip ${STP_CN_IP} + local-ip ${BSCNAT_CN_IP} + +cs7 instance 1 + point-code ${BSCNAT_RAN_PC} + asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua + remote-ip ${STP_RAN_IP} + local-ip ${BSCNAT_RAN_IP} + +bsc-nat + cs7-instance-cn 0 + cs7-instance-ran 1 + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} +${foreach_end} diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg index ab10a81..98f4e0c 100644 --- a/net/templates/osmo-bsc.cfg +++ b/net/templates/osmo-bsc.cfg @@ -19,7 +19,8 @@ ipa bind ${BSC_IP} cs7 instance 0 point-code ${BSC_PC} - asp asp-clnt-msc-0 2905 0 m3ua + asp asp-clnt-bsc-0 2905 0 m3ua + remote-ip ${STP_RAN_IP} network network country code ${MCC} mobile network code ${MNC} diff --git a/net/templates/osmo-msc.cfg b/net/templates/osmo-msc.cfg index 00bf182..c018c78 100644 --- a/net/templates/osmo-msc.cfg +++ b/net/templates/osmo-msc.cfg @@ -1,4 +1,8 @@ ${include(common_template_warning)} +cs7 instance 0 + point-code ${MSC_PC} + asp asp-clnt-msc-0 2905 0 m3ua + remote-ip ${STP_CN_IP} network network country code ${MCC} mobile network code ${MNC} diff --git a/net/templates/osmo-stp-cn.cfg b/net/templates/osmo-stp-cn.cfg new file mode 100644 index 0000000..c84168c --- /dev/null +++ b/net/templates/osmo-stp-cn.cfg @@ -0,0 +1,24 @@ +${include(common_template_warning)} + +# By default, osmo-dev starts one osmo-stp with this config. If STP_CN_IP and +# STP_RAN_IP are changed to be different, osmo-dev starts two osmo-stp, one +# with this config and another one with osmo-stp-ran.cfg. + +line vty + bind ${STP_CN_IP} + +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + listen m3ua 2905 + accept-asp-connections dynamic-permitted + local-ip ${STP_CN_IP} + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level linp notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice +${foreach_end} diff --git a/net/templates/osmo-stp.cfg b/net/templates/osmo-stp-ran.cfg similarity index 70% rename from net/templates/osmo-stp.cfg rename to net/templates/osmo-stp-ran.cfg index d7d1515..c753108 100644 --- a/net/templates/osmo-stp.cfg +++ b/net/templates/osmo-stp-ran.cfg @@ -1,8 +1,16 @@ ${include(common_template_warning)} + +# This file does not get used by default, only if STP_CN_IP and STP_RAN_IP are +# changed to be different! + +line vty + bind ${STP_RAN_IP} + cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted listen m3ua 2905 accept-asp-connections dynamic-permitted + local-ip ${STP_RAN_IP} ${foreach(LOG_OUTPUT)} log ${LOG_OUTPUTn_TYPE} diff --git a/net/templates/run.sh b/net/templates/run.sh index cd0fc72..311cdd9 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -81,8 +81,10 @@ #mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc.cfg" mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.cfg" hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" -stp="osmo-stp" +stp4cn="osmo-stp -c osmo-stp-cn.cfg" +stp4ran="osmo-stp -c osmo-stp-ran.cfg" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" +bscnat="osmo-bsc-nat" if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" @@ -123,9 +125,23 @@ term "$ggsn" GGSN & PIDS="$PIDS $!" -sleep .2 -term "$stp" STP & -PIDS="$PIDS $!" +if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then + sleep .2 + term "$stp4cn" STP & + PIDS="$PIDS $!" +else + sleep .2 + term "$stp4cn" STP4CN & + PIDS="$PIDS $!" + + sleep .2 + term "$stp4ran" STP4RAN & + PIDS="$PIDS $!" + + sleep .2 + term "$bscnat" BSCNAT & + PIDS="$PIDS $!" +fi sleep .2 term "$hlr" HLR & @@ -199,6 +215,7 @@ killall -9 osmo-stp sudo killall tcpdump killall osmo-ggsn +killall osmo-bsc-nat if [ "x${MSC_MNCC}" != "xinternal" ]; then # 'killall' seems to work only with the shortened name -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bfbd00bfeeebc6e1b87a8cd6333212db4380653 Gerrit-Change-Number: 26668 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: add osmo-bsc-nat

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26668 ) Change subject: net: add osmo-bsc-nat ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bfbd00bfeeebc6e1b87a8cd6333212db4380653 Gerrit-Change-Number: 26668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:11:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: refactor kill logic

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26667 ) Change subject: net/templates/run.sh: refactor kill logic ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaf6c175de2edf720009af13eace2b0ef83b0735b Gerrit-Change-Number: 26667 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:11:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: all.deps, werror.opts: add osmo-bsc-nat

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26666 ) Change subject: all.deps, werror.opts: add osmo-bsc-nat ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ica90826c8bfbf4f295c49702d36e7c88e43f80cd Gerrit-Change-Number: 26666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:11:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26860 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp ...................................................................... mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp This test validates we can connect 3G to 2G AMR calls fine. Change-Id: I3627711d80c5e42d56e478c1c4ff3fb5b27adfdf --- M mgw/MGCP_Test.ttcn 1 file changed, 122 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/26860/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index e1d713e..9defea7 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2463,7 +2463,7 @@ setverdict(pass); } - /* create two local RTP emulations and pass data in both directions */ + /* create two local RTP+IuUP emulations and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; @@ -2580,6 +2580,126 @@ mp_local_ipv4, mp_remote_ipv4); } + /* create two local emulations (1 RTP, 1 RTP+IuUP) and pass data in both directions */ + function f_tc_two_crcx_mdcx_and_iuup_rtp(charstring local_ip_a, charstring remote_ip_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { + var RtpFlowData flow[2]; + var RtpemStats stats[2]; + var MgcpResponse resp; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + var integer num_pkts_tx[2]; + var integer temp; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.tx_payload_type := flow[0].pt; + flow[0].rtp_cfg.tx_fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; + flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ + flow[0].rtp_cfg.iuup_mode := true; + flow[0].rtp_cfg.iuup_tx_init := true; + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, regular RTP) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 112, "AMR/8000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.tx_payload_type := flow[1].pt; + flow[1].rtp_cfg.tx_fixed_payload := '0382155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0'O; + flow[1].rtp_cfg.rx_fixed_payload := 'f3d3ca2567ffae00607d713a0f45db225ed2938ccca60ccd066924f298f7b5b8'O; /* flow[0].rtp_cfg.tx_fixed_payload converted AMR-IuUP->AMR-BE-RTP*/ + flow[1].rtp_cfg.iuup_mode := false; + f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); + + /* The first leg starts transmitting */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* The second leg starts transmitting a little later */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY); + f_sleep(1.0); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* The first leg will now be switched into bidirectional + * mode, but we do not expect any data coming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + num_pkts_tx[1] := stats[1].num_pkts_tx; + f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* When the second leg is switched into bidirectional mode + * as well, then the MGW will connect the two together and + * we should see RTP streams passing through from both ends. */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + num_pkts_tx[0] := stats[0].num_pkts_tx; + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + f_sleep(2.0); + + stats[0] := f_rtpem_stats_get(RTPEM[0]); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + + temp := stats[0].num_pkts_tx - num_pkts_tx[0] - stats[1].num_pkts_rx; + if (temp > 3 or temp < -3) { + setverdict(fail, "number of packets not within normal parameters:", temp); + mtc.stop; + } + + temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx; + if (temp > 3 or temp < -3) { + setverdict(fail, "number of packets not within normal parameters:", temp); + mtc.stop; + } + + f_rtpem_stats_err_check(stats[0]); + f_rtpem_stats_err_check(stats[1]); + + /* Tear down */ + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + setverdict(pass); + } + testcase TC_two_crcx_mdcx_and_iuup_rtp() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + control { execute(TC_selftest()); execute(TC_crcx()); @@ -2655,6 +2775,7 @@ execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); execute(TC_two_crcx_mdcx_and_iuup()); + execute(TC_two_crcx_mdcx_and_iuup_rtp()); /* Note: This testcase will trigger an OSMO_ASSERT() bug in * older versions of osmo-mgw. This eventually leads into -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3627711d80c5e42d56e478c1c4ff3fb5b27adfdf Gerrit-Change-Number: 26860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

2
3
0 0

Change in libosmocore[master]: PFCP: add DLPFCP and osmo-upf port numbers

by lynxis lazus

lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26606 ) Change subject: PFCP: add DLPFCP and osmo-upf port numbers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a46b147ec6a76d909df28136cfd2b764b2c75ea Gerrit-Change-Number: 26606 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 08:07:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log